diff options
Diffstat (limited to 'addons/web_editor/static/src/js')
5 files changed, 12 insertions, 12 deletions
diff --git a/addons/web_editor/static/src/js/backend/convert_inline.js b/addons/web_editor/static/src/js/backend/convert_inline.js index 4482a8f67ba..228aefb42e6 100644 --- a/addons/web_editor/static/src/js/backend/convert_inline.js +++ b/addons/web_editor/static/src/js/backend/convert_inline.js @@ -190,7 +190,7 @@ function getMatchedCSSRules(a) { function fontToImg($editable) { var fonts = odoo.__DEBUG__.services["wysiwyg.fonts"]; - $editable.find('.fa').each(function () { + $editable.find('.fa, .fas, .far').each(function () { var $font = $(this); var icon, content; _.find(fonts.fontIcons, function (font) { diff --git a/addons/web_editor/static/src/js/common/ace.js b/addons/web_editor/static/src/js/common/ace.js index dc2d78a53c7..7055b9152b4 100644 --- a/addons/web_editor/static/src/js/common/ace.js +++ b/addons/web_editor/static/src/js/common/ace.js @@ -820,7 +820,7 @@ var ViewEditor = Widget.extend({ if ($elem.data('dirty') || $elem.data('customized')) { $div.prepend($('<span/>', { - class: 'mr8 fa fa-floppy-o ' + ($elem.data('dirty') ? 'text-warning' : 'text-success'), + class: 'mr8 far fa-save ' + ($elem.data('dirty') ? 'text-warning' : 'text-success'), })); } diff --git a/addons/web_editor/static/src/js/editor/rte.summernote.js b/addons/web_editor/static/src/js/editor/rte.summernote.js index 913d35575ab..800cbf3829f 100644 --- a/addons/web_editor/static/src/js/editor/rte.summernote.js +++ b/addons/web_editor/static/src/js/editor/rte.summernote.js @@ -83,7 +83,7 @@ renderer.tplPopovers = function (lang, options) { //////////////// image popover // add center button for images - $(tplIconButton('fa fa-align-center', { + $(tplIconButton('fas fa-align-center', { title: _t('Center'), event: 'floatMe', value: 'center' @@ -101,14 +101,14 @@ renderer.tplPopovers = function (lang, options) { '<li><a class="dropdown-item" data-event="padding" href="#" data-value="large">'+_t('Large')+'</a></li>', '<li><a class="dropdown-item" data-event="padding" href="#" data-value="xl">'+_t('Xl')+'</a></li>', ]; - $(tplIconButton('fa fa-plus-square-o', { + $(tplIconButton('far fa-plus-square', { title: _t('Padding'), dropdown: tplDropdown(dropdown_content) })).appendTo($padding); // circle, boxed... options became toggled $imagePopover.find('[data-event="imageShape"]:not([data-value])').remove(); - var $button = $(tplIconButton('fa fa-sun-o', { + var $button = $(tplIconButton('far fa-sun', { title: _t('Shadow'), event: 'imageShape', value: 'shadow' @@ -116,7 +116,7 @@ renderer.tplPopovers = function (lang, options) { // add spin for fa var $spin = $('<div class="btn-group d-none only_fa"/>').insertAfter($button.parent()); - $(tplIconButton('fa fa-refresh', { + $(tplIconButton('fas fa-sync', { title: _t('Spin'), event: 'imageShape', value: 'fa-spin' @@ -139,16 +139,16 @@ renderer.tplPopovers = function (lang, options) { // show dialog box and delete var $imageprop = $('<div class="btn-group"/>'); $imageprop.appendTo($imagePopover.find('.popover-body')); - $(tplIconButton('fa fa-file-image-o', { + $(tplIconButton('far fa-file-image', { title: _t('Edit'), event: 'showImageDialog' })).appendTo($imageprop); - $(tplIconButton('fa fa-trash-o', { + $(tplIconButton('far fa-trash-alt', { title: _t('Remove'), event: 'delete' })).appendTo($imageprop); - $(tplIconButton('fa fa-crop', { + $(tplIconButton('fas fa-crop', { title: _t('Crop Image'), event: 'cropImage', })).insertAfter($imagePopover.find('[data-event="imageShape"][data-value="img-thumbnail"]')); @@ -165,7 +165,7 @@ renderer.tplPopovers = function (lang, options) { $linkPopover.find('.popover-body').append($airPopover.find(".note-history").clone()); - $linkPopover.find('button[data-event="showLinkDialog"] i').attr("class", "fa fa-link"); + $linkPopover.find('button[data-event="showLinkDialog"] i').attr("class", "fas fa-link"); $linkPopover.find('button[data-event="unlink"]').before($airPopover.find('button[data-event="showImageDialog"]').clone()); //////////////// text/air popover diff --git a/addons/web_editor/static/src/js/editor/summernote.js b/addons/web_editor/static/src/js/editor/summernote.js index 06a282d0076..f6aa18a69f7 100644 --- a/addons/web_editor/static/src/js/editor/summernote.js +++ b/addons/web_editor/static/src/js/editor/summernote.js @@ -2487,7 +2487,7 @@ eventHandler.detach = function (oLayoutInfo, options) { $('.o_table_handler').remove(); }; -options.icons.image.image = "file-image-o"; +options.icons.image.image = "file-image"; $.summernote.lang['en-US'].image.image = "File / Image"; return $.summernote; diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js index 361355c4cab..0d4b67ec9c0 100644 --- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js +++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js @@ -130,7 +130,7 @@ var Wysiwyg = Widget.extend({ $editable.find('[title=""]').removeAttr('title'); $editable.find('[alt=""]').removeAttr('alt'); $editable.find('[data-original-title=""]').removeAttr('data-original-title'); - $editable.find('a.o_image, span.fa, i.fa').html(''); + $editable.find('a.o_image, span.fa, i.fa, span.far, i.far, span.fas, i.fas').html(''); $editable.find('[aria-describedby]').removeAttr('aria-describedby').removeAttr('data-original-title'); return $editable.html(); }, |