summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src/js
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web_editor/static/src/js')
-rw-r--r--addons/web_editor/static/src/js/editor/rte.summernote.js10
-rw-r--r--addons/web_editor/static/src/js/tours/rte.js12
2 files changed, 11 insertions, 11 deletions
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 79b70dd7bed..e66ff98c21e 100644
--- a/addons/web_editor/static/src/js/editor/rte.summernote.js
+++ b/addons/web_editor/static/src/js/editor/rte.summernote.js
@@ -266,9 +266,9 @@ eventHandler.modules.popover.button.update = function ($container, oStyle) {
$container.find('.note-color').addClass('d-none');
}
- $container.find('button[data-event="floatMe"][data-value="left"]').toggleClass("active", $(oStyle.image).hasClass("pull-left"));
+ $container.find('button[data-event="floatMe"][data-value="left"]').toggleClass("active", $(oStyle.image).hasClass("float-left"));
$container.find('button[data-event="floatMe"][data-value="center"]').toggleClass("active", $(oStyle.image).hasClass("center-block"));
- $container.find('button[data-event="floatMe"][data-value="right"]').toggleClass("active", $(oStyle.image).hasClass("pull-right"));
+ $container.find('button[data-event="floatMe"][data-value="right"]').toggleClass("active", $(oStyle.image).hasClass("float-right"));
$(oStyle.image).trigger('attributes_change');
}
@@ -360,9 +360,9 @@ eventHandler.modules.editor.floatMe = function ($editable, sValue) {
var $target = $(getImgTarget($editable));
$editable.data('NoteHistory').recordUndo();
switch (sValue) {
- case 'center': $target.toggleClass('center-block').removeClass('pull-right pull-left'); break;
- case 'left': $target.toggleClass('pull-left').removeClass('pull-right center-block'); break;
- case 'right': $target.toggleClass('pull-right').removeClass('pull-left center-block'); break;
+ case 'center': $target.toggleClass('center-block').removeClass('float-right float-left'); break;
+ case 'left': $target.toggleClass('float-left').removeClass('float-right center-block'); break;
+ case 'right': $target.toggleClass('float-right').removeClass('float-left center-block'); break;
}
};
eventHandler.modules.editor.imageShape = function ($editable, sValue) {
diff --git a/addons/web_editor/static/src/js/tours/rte.js b/addons/web_editor/static/src/js/tours/rte.js
index db7d98d20fc..54736b4a290 100644
--- a/addons/web_editor/static/src/js/tours/rte.js
+++ b/addons/web_editor/static/src/js/tours/rte.js
@@ -169,7 +169,7 @@ tour.register('rte', {
}, {
content: "click on create link",
trigger: '.note-image-popover:visible button[data-event="showLinkDialog"]',
- extra_trigger: '#editable_area > section .row > div:first span.fa.pull-right',
+ extra_trigger: '#editable_area > section .row > div:first span.fa.float-right',
}, {
content: "insert a link url",
trigger: 'input[name="url"]',
@@ -177,19 +177,19 @@ tour.register('rte', {
}, {
content: "click on color style",
trigger: '.o_link_dialog_color > .o_link_dialog_color_item.btn-success',
- extra_trigger: 'a#link-preview:containsRegex(/^<span [^>]+><\\/span>$/) > span.fa.fa-3x.pull-right',
+ extra_trigger: 'a#link-preview:containsRegex(/^<span [^>]+><\\/span>$/) > span.fa.fa-3x.float-right',
}, {
content: "save link",
trigger: '.modal-footer > .btn-primary',
- extra_trigger: 'a#link-preview.btn.btn-success span.fa.fa-3x.pull-right',
+ extra_trigger: 'a#link-preview.btn.btn-success span.fa.fa-3x.float-right',
}, {
content: "click on other picture",
trigger: '#editable_area > section .row > div:last img',
- extra_trigger: 'body:not(:has(#link-preview)) a.btn[href^="http://"]:has(span.fa.fa-3x.pull-right)',
+ extra_trigger: 'body:not(:has(#link-preview)) a.btn[href^="http://"]:has(span.fa.fa-3x.float-right)',
}, {
content: "click on create link again",
trigger: '.note-image-popover:visible button[data-event="showLinkDialog"]',
- extra_trigger: '#editable_area > section .row > div:first span.fa.pull-right',
+ extra_trigger: '#editable_area > section .row > div:first span.fa.float-right',
}, {
content: "insert an email",
trigger: 'input[name="url"]',
@@ -292,7 +292,7 @@ tour.register('rte_inline', {
' </td>\n'+
' <td valign="center" width="270">\n'+
' <a href="https://www.facebook.com/Odoo"><span class="fa fa-facebook-square fa-2x text-primary"></span></a>\n'+
- ' <span style="color: rgb(255, 0, 0);" class="fa fa-4x fa-google-plus-square pull-right"></span>\n'+
+ ' <span style="color: rgb(255, 0, 0);" class="fa fa-4x fa-google-plus-square float-right"></span>\n'+
' </td>\n'+
' </tr>\n'+
' </tbody>\n'+