diff options
| author | Kevin Baptiste <kba@odoo.com> | 2019-08-12 07:18:23 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-11-28 10:05:12 +0000 |
| commit | ff1c35513aecef5fbc30f7c2f3834450e719714e (patch) | |
| tree | 8149f14df17095845e735d6cccaf9317a1f97af6 /addons/web/static/src/js/fields | |
| parent | 4c030311ada2ad19a2ee81b15544b7aed35b642b (diff) | |
[IMP] web: update to fontawesome 4.7.0 to 5.11.2
FontAwesome 5 introduced new names for some icons as described on
https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#name-changes
This commit replaces the old names to the new ones.
closes odoo/odoo#35826
Taskid: 2050241
Related: odoo/enterprise#5180
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.js | 19 | ||||
| -rw-r--r-- | addons/web/static/src/js/fields/relational_fields.js | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index 350dc5f5674..6e6f85e1214 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'; + var className = this.attrs.icon || 'fa-globe-americas'; 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 fa fa-arrows ui-sortable-handle', + className: 'o_row_handle fas fa-expand-arrows-alt ui-sortable-handle', widthInList: '33px', tagName: 'span', supportedFieldTypes: ['integer'], @@ -2147,9 +2147,10 @@ var PriorityWidget = AbstractField.extend({ .attr('title', tip) .attr('aria-label', tip) .attr('data-index', index) - .addClass('o_priority_star fa') - .toggleClass('fa-star', isFull) - .toggleClass('fa-star-o', !isFull); + .addClass('o_priority_star') + .toggleClass('fas', isFull) + .toggleClass('far', !isFull) + .addClass('fa-star'); }, //-------------------------------------------------------------------------- @@ -2194,8 +2195,8 @@ var PriorityWidget = AbstractField.extend({ */ _onMouseOver: function (event) { clearTimeout(this.hoverTimer); - this.$('.o_priority_star').removeClass('fa-star-o').addClass('fa-star'); - $(event.currentTarget).nextAll().removeClass('fa-star').addClass('fa-star-o'); + this.$('.o_priority_star').removeClass('far').addClass('fas'); + $(event.currentTarget).nextAll().removeClass('fas').addClass('far'); }, }); @@ -2351,8 +2352,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="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)); + 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)); }, //-------------------------------------------------------------------------- diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js index 51a9c434589..ed0bcc3e8c8 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 pull-right"></i>' , + placeholder: (params.placeholder ? _t(params.placeholder) : _t('Loading...')) + '<i class="fa fa-spinner fa-spin fa-pull-right"></i>' , validation: params.validation, loading: false, order: params.order || 999 |
