From e1a4ab80666415f0e868a140d3741f2776f600a4 Mon Sep 17 00:00:00 2001
From: Younn Olivier <yol@odoo.com>
Date: Fri, 22 Oct 2021 10:49:05 +0000
Subject: [PATCH] [FIX] web_editor: correctly move snippets on a popup
Inside a scrollable popup, the scroll was not correctly triggered when
moving one of its snippets through drag and drop.
This commit correctly defines the SmoothScrollOnDrag.$scrollTarget when
a modal is shown.
task-2431469
closes odoo/odoo#78813
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Co-authored-by: qsm-odoo <qsm@odoo.com>
---
.../web_editor/static/src/js/editor/snippets.editor.js | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/addons/web_editor/static/src/js/editor/snippets.editor.js b/addons/web_editor/static/src/js/editor/snippets.editor.js
index 6f59198f21a5..7524245393b6 100644
--- a/addons/web_editor/static/src/js/editor/snippets.editor.js
+++ b/addons/web_editor/static/src/js/editor/snippets.editor.js
@@ -107,7 +107,10 @@ var SnippetEditor = Widget.extend({
},
},
});
- this.draggableComponent = new SmoothScrollOnDrag(this, this.$el, $().getScrollingElement(), smoothScrollOptions);
+ const modalAncestorEl = this.$target[0].closest('.modal');
+ const $scrollTarget = modalAncestorEl && $(modalAncestorEl)
+ || $().getScrollingElement();
+ this.draggableComponent = new SmoothScrollOnDrag(this, this.$el, $scrollTarget, smoothScrollOptions);
} else {
this.$('.o_overlay_move_options').addClass('d-none');
$customize.find('.oe_snippet_clone').addClass('d-none');
@@ -722,10 +725,6 @@ var SnippetEditor = Widget.extend({
},
});
- // If a modal is open, the scroll target must be that modal
- const $openModal = self.$editable.find('.modal:visible');
- self.draggableComponent.$scrollTarget = $openModal.length ? $openModal : self.$scrollingElement;
-
// Trigger a scroll on the draggable element so that jQuery updates
// the position of the drop zones.
self.draggableComponent.$scrollTarget.on('scroll.scrolling_element', function () {
--
GitLab