summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/fields
diff options
context:
space:
mode:
authorKevin Baptiste <kba@odoo.com>2019-12-05 07:18:28 +0000
committerKevin Baptiste <kba@odoo.com>2019-12-09 10:33:36 +0000
commit6cbe824871da51af27ac5b2feb7ecc9fcd6b18d0 (patch)
tree5e3300c274fdedb5f8a13e0dc964f89941e17538 /addons/web/static/src/js/fields
parent78ae3da90213261071fdadb06cbb0507182303e2 (diff)
[REV] web: reverts update to fontawesome 5.11.2
This reverts commit ff1c35513aecef5fbc30f7c2f3834450e719714e. closes odoo/odoo#41480 X-original-commit: 116057b26e71db4692280463669f3e80d813ddcc Related: odoo/enterprise#7110 Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/web/static/src/js/fields')
-rw-r--r--addons/web/static/src/js/fields/basic_fields.js19
-rw-r--r--addons/web/static/src/js/fields/relational_fields.js2
2 files changed, 10 insertions, 11 deletions
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js
index 6e6f85e1214..350dc5f5674 100644
--- a/addons/web/static/src/js/fields/basic_fields.js
+++ b/addons/web/static/src/js/fields/basic_fields.js
@@ -539,7 +539,7 @@ var LinkButton = AbstractField.extend({
*/
_render: function () {
if (this.value) {
- var className = this.attrs.icon || 'fa-globe-americas';
+ var className = this.attrs.icon || 'fa-globe';
this.$el.html("<span role='img'/>");
this.$el.addClass("fa "+ className);
@@ -1393,7 +1393,7 @@ var ListFieldText = FieldText.extend({
var HandleWidget = AbstractField.extend({
description: _lt("Handle"),
noLabel: true,
- className: 'o_row_handle fas fa-expand-arrows-alt ui-sortable-handle',
+ className: 'o_row_handle fa fa-arrows ui-sortable-handle',
widthInList: '33px',
tagName: 'span',
supportedFieldTypes: ['integer'],
@@ -2147,10 +2147,9 @@ var PriorityWidget = AbstractField.extend({
.attr('title', tip)
.attr('aria-label', tip)
.attr('data-index', index)
- .addClass('o_priority_star')
- .toggleClass('fas', isFull)
- .toggleClass('far', !isFull)
- .addClass('fa-star');
+ .addClass('o_priority_star fa')
+ .toggleClass('fa-star', isFull)
+ .toggleClass('fa-star-o', !isFull);
},
//--------------------------------------------------------------------------
@@ -2195,8 +2194,8 @@ var PriorityWidget = AbstractField.extend({
*/
_onMouseOver: function (event) {
clearTimeout(this.hoverTimer);
- this.$('.o_priority_star').removeClass('far').addClass('fas');
- $(event.currentTarget).nextAll().removeClass('fas').addClass('far');
+ this.$('.o_priority_star').removeClass('fa-star-o').addClass('fa-star');
+ $(event.currentTarget).nextAll().removeClass('fa-star').addClass('fa-star-o');
},
});
@@ -2352,8 +2351,8 @@ var FavoriteWidget = AbstractField.extend({
*/
_render: function () {
var tip = this.value ? _t('Remove from Favorites') : _t('Add to Favorites');
- var template = this.attrs.nolabel ? '<a href="#"><i class="%s" title="%s" aria-label="%s" role="img"></i></a>' : '<a href="#"><i class="%s" role="img" aria-label="%s"></i> %s</a>';
- this.$el.empty().append(_.str.sprintf(template, this.value ? 'fas fa-star' : 'far fa-star', tip, tip));
+ var template = this.attrs.nolabel ? '<a href="#"><i class="fa %s" title="%s" aria-label="%s" role="img"></i></a>' : '<a href="#"><i class="fa %s" role="img" aria-label="%s"></i> %s</a>';
+ this.$el.empty().append(_.str.sprintf(template, this.value ? 'fa-star' : 'fa-star-o', tip, tip));
},
//--------------------------------------------------------------------------
diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index ed0bcc3e8c8..51a9c434589 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -241,7 +241,7 @@ var FieldMany2One = AbstractField.extend({
_addAutocompleteSource: function (method, params) {
this._autocompleteSources.push({
method: method,
- placeholder: (params.placeholder ? _t(params.placeholder) : _t('Loading...')) + '<i class="fa fa-spinner fa-spin fa-pull-right"></i>' ,
+ placeholder: (params.placeholder ? _t(params.placeholder) : _t('Loading...')) + '<i class="fa fa-spinner fa-spin pull-right"></i>' ,
validation: params.validation,
loading: false,
order: params.order || 999