summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src/js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-06-21 15:16:54 +0200
committerChristophe Simonis <chs@odoo.com>2019-06-21 15:16:54 +0200
commit78b2063b29a321d152df9badb2d0324578ffe2ec (patch)
tree8ecfa4d4acec837795d84f75c39dc10ab98929d8 /addons/web_editor/static/src/js
parente416428669fb18b59893b63f1d9769e871ac9321 (diff)
parent8747d72f1efbc3f32c41c20d4d3198410639d2aa (diff)
[MERGE] forward port branch saas-12.2 up to 8747d72f1ef
Diffstat (limited to 'addons/web_editor/static/src/js')
-rw-r--r--addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js
index aacdfff9e0c..fa642338399 100644
--- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js
+++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js
@@ -68,6 +68,8 @@ Wysiwyg.include({
}
$(document.body).off('.' + this.id);
+ this.$iframe.parents().removeClass('o_wysiwyg_no_transform');
+
this.$target.insertBefore(this.$iframe);
delete window.top[this._onUpdateIframeId];
@@ -100,6 +102,10 @@ Wysiwyg.include({
}
self.$iframe.toggleClass('o_fullscreen');
self.$iframe.contents().find('body').toggleClass('o_fullscreen');
+
+ // Hack to avoid a parent of the fullscreen iframe to have a
+ // transform (otherwise the position: fixed won't work)
+ self.$iframe.parents().toggleClass('o_wysiwyg_no_transform');
},
isFullscreen: function () {
if (!self.$iframe) {