[MERGE] forward port branch saas-12.2 up to 243a4ae5cbc

3 files changed, 22 insertions, 4 deletions

diff --git a/addons/web_editor/static/src/js/wysiwyg/plugin/dropzone.js b/addons/web_editor/static/src/js/wysiwyg/plugin/dropzone.js
index 74703b90e45..255561b02be 100644
--- a/addons/web_editor/static/src/js/wysiwyg/plugin/dropzone.js
+++ b/addons/web_editor/static/src/js/wysiwyg/plugin/dropzone.js
@@ -19,6 +19,7 @@ var DropzonePlugin = Plugins.dropzone.extend({
     attachDragAndDropEvent: function () {
         this._super.apply(this, arguments);
         this.$dropzone.off('drop');
+        this.$dropzone.on('dragenter', this._onDragenter.bind(this));
         this.$dropzone.on('drop', this._onDrop.bind(this));
     },
 
@@ -71,7 +72,7 @@ var DropzonePlugin = Plugins.dropzone.extend({
                 if (range.so >= dom.nodeLength(range.sc)) {
                     $(range.sc).append(spinner);
                 } else {
-                    $(range.sc).before(range.sc.childNodes[range.so]);
+                    $(range.sc.childNodes[range.so]).before(spinner);
                 }
             } else {
                 range.sc.splitText(range.so);
@@ -151,7 +152,7 @@ var DropzonePlugin = Plugins.dropzone.extend({
             route: '/web_editor/add_image_base64',
             params: {
                 res_model: options.res_model,
-                res_id: options.res_id,
+                res_id: options.res_id || 0,
                 image_base64: imageBase64.split(';base64,').pop(),
                 filename: fileName,
             },
@@ -161,9 +162,26 @@ var DropzonePlugin = Plugins.dropzone.extend({
      * @private
      * @param {JQueryEvent} e
      */
+    _onDragenter: function (e) {
+        var range = this.context.invoke('editor.createRange');
+        if (!this.editable.contains(range.sc)) {
+            var node = this.editable;
+            if (node && node.firstChild) {
+                node = node.firstChild;
+            }
+            range = this.context.invoke('editor.setRange', node, 0, node, 0);
+            range.select();
+        }
+    },
+    /**
+     * @private
+     * @param {JQueryEvent} e
+     */
     _onDrop: function (e) {
         e.preventDefault();
 
+        this.$editor.removeClass('dragover');
+
         if (this.options.disableDragAndDrop) {
             return;
         }
diff --git a/addons/web_editor/static/src/js/wysiwyg/plugin/media.js b/addons/web_editor/static/src/js/wysiwyg/plugin/media.js
index 85ac5f222f4..e6a598a2813 100644
--- a/addons/web_editor/static/src/js/wysiwyg/plugin/media.js
+++ b/addons/web_editor/static/src/js/wysiwyg/plugin/media.js
@@ -43,6 +43,8 @@ var MediaPlugin = AbstractPlugin.extend({
         'dblclick .note-editable': '_onDblclick',
     },
 
+    mousePosition: {},
+
     //--------------------------------------------------------------------------
     // Public
     //--------------------------------------------------------------------------
diff --git a/addons/web_editor/static/src/scss/bootstrap_overridden.scss b/addons/web_editor/static/src/scss/bootstrap_overridden.scss
index 4517852076f..d1644a1174e 100644
--- a/addons/web_editor/static/src/scss/bootstrap_overridden.scss
+++ b/addons/web_editor/static/src/scss/bootstrap_overridden.scss
@@ -55,5 +55,3 @@ $gray-700: gray('700') !default;
 $gray-800: gray('800') !default;
 $gray-900: gray('900') !default;
 $black: gray('black') !default;
-
-$font-family-sans-serif: "Noto", "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;