[MERGE] forward port of branch 9.0 up to b44cb82

4 files changed, 23 insertions, 12 deletions

diff --git a/addons/web_editor/static/src/css/inline.css b/addons/web_editor/static/src/css/inline.css
index cba6343becb..af827d21356 100644
--- a/addons/web_editor/static/src/css/inline.css
+++ b/addons/web_editor/static/src/css/inline.css
@@ -29,7 +29,7 @@ body {
 
 .editor_enable #wrapwrap > main > div:first-child {
     border-top: 1px dashed #888;
-    margin-top: 50px;
+    margin-top: 60px;
 }
 
 .editor_enable #wrapwrap > main > div:first-child:before, #wrapwrap > main > div:first-child:after {
@@ -41,7 +41,7 @@ body {
     top: -4px;
     overflow: hidden;
     z-index: -1;
-    margin-top: 54px;
+    margin-top: 64px;
 }
 .editor_enable #wrapwrap > main > div:first-child[data-oe-placeholder]:empty:before {
     content: " \00a0 " attr(data-oe-placeholder);
diff --git a/addons/web_editor/static/src/css/snippets.css b/addons/web_editor/static/src/css/snippets.css
index e203e514e87..eecbe8e51f9 100644
--- a/addons/web_editor/static/src/css/snippets.css
+++ b/addons/web_editor/static/src/css/snippets.css
@@ -233,6 +233,11 @@
 }
 
 /* ---- SNIPPET MANIPULATOR ----  {{{ */
+#oe_manipulators {
+  position: absolute;
+  top: 0;
+  z-index: 1050;
+}
 .resize_editor_busy {
   background-color: rgba(0, 0, 0, 0.3);
 }
diff --git a/addons/web_editor/static/src/css/snippets.sass b/addons/web_editor/static/src/css/snippets.sass
index 710c358a527..68983c107b9 100644
--- a/addons/web_editor/static/src/css/snippets.sass
+++ b/addons/web_editor/static/src/css/snippets.sass
@@ -181,6 +181,11 @@
 
 /* ---- SNIPPET MANIPULATOR ----  {{{ */
 
+#oe_manipulators
+    position: absolute
+    top: 0
+    z-index: 1050
+
 .resize_editor_busy
     background-color: rgba(0,0,0,0.3)
 
diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/rte.summernote.js
index 094d13340dc..8cbb80583b7 100644
--- a/addons/web_editor/static/src/js/rte.summernote.js
+++ b/addons/web_editor/static/src/js/rte.summernote.js
@@ -295,11 +295,12 @@ eventHandler.modules.handle.update = function ($handle, oStyle, isAirMode) {
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
 /* hack for image and link editor */
 
-function getImgTarget () {
-  return $(".note-control-selection").data('target');
+function getImgTarget ($editable) {
+    var $handle = $editable ? dom.makeLayoutInfo($editable).handle() : undefined;
+    return $(".note-control-selection", $handle).data('target');
 }
 eventHandler.modules.editor.padding = function ($editable, sValue) {
-    var $target = $(getImgTarget());
+    var $target = $(getImgTarget($editable));
     var paddings = "small medium large xl".split(/\s+/);
     $editable.data('NoteHistory').recordUndo();
     if (sValue.length) {
@@ -309,16 +310,16 @@ eventHandler.modules.editor.padding = function ($editable, sValue) {
     $target.removeClass("padding-" + paddings.join(" padding-"));
 };
 eventHandler.modules.editor.resize = function ($editable, sValue) {
-    var $target = $(getImgTarget());
+    var $target = $(getImgTarget($editable));
     $editable.data('NoteHistory').recordUndo();
     var width = ($target.attr('style') || '').match(/(^|;|\s)width:\s*([0-9]+)%/);
     if (width) {
         width = width[2]/100;
     }
-    $(getImgTarget()).css('width', width != sValue ? (sValue * 100) + '%' : '');
+    $target.css('width', width != sValue ? (sValue * 100) + '%' : '');
 };
 eventHandler.modules.editor.resizefa = function ($editable, sValue) {
-    var $target = $(getImgTarget());
+    var $target = $(getImgTarget($editable));
     $editable.data('NoteHistory').recordUndo();
     $target.attr('class', $target.attr('class').replace(/\s*fa-[0-9]+x/g, ''));
     if (+sValue > 1) {
@@ -326,7 +327,7 @@ eventHandler.modules.editor.resizefa = function ($editable, sValue) {
     }
 };
 eventHandler.modules.editor.floatMe = function ($editable, sValue) {
-    var $target = $(getImgTarget());
+    var $target = $(getImgTarget($editable));
     $editable.data('NoteHistory').recordUndo();
     switch (sValue) {
         case 'center': $target.toggleClass('center-block').removeClass('pull-right pull-left'); break;
@@ -335,7 +336,7 @@ eventHandler.modules.editor.floatMe = function ($editable, sValue) {
     }
 };
 eventHandler.modules.editor.imageShape = function ($editable, sValue) {
-    var $target = $(getImgTarget());
+    var $target = $(getImgTarget($editable));
     $editable.data('NoteHistory').recordUndo();
     $target.toggleClass(sValue);
 };
@@ -565,8 +566,8 @@ function summernote_mouseup (event) {
     }
     // don't rerange if simple click
     if (initial_data.event) {
-        var dx = event.clientX - (event.shiftKey ? initial_data.rect.left : initial_data.event.clientX);
-        var dy = event.clientY - (event.shiftKey ? initial_data.rect.top : initial_data.event.clientY);
+        var dx = event.clientX - (event.shiftKey && initial_data.rect ? initial_data.rect.left : initial_data.event.clientX);
+        var dy = event.clientY - (event.shiftKey && initial_data.rect ? initial_data.rect.top : initial_data.event.clientY);
         if (10 < Math.pow(dx, 2)+Math.pow(dy, 2)) {
             reRangeSelect(event, dx, dy);
         }