diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-07-29 17:55:21 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-07-29 17:55:21 +0200 |
| commit | 523d3af131a48e527012d93d17e74b496b93085d (patch) | |
| tree | c14274da7f7caf836c5d200a5bb253f6d95f4521 /addons/web_editor/static/src/js/snippets.editor.js | |
| parent | 6a4899ea8f53a2dd355b49ee1c1fb475235a3d79 (diff) | |
| parent | 16d65a8493187a4524f53b57650495fbbe529cbd (diff) | |
[MERGE] forward port branch saas-12 up to 16d65a8
Diffstat (limited to 'addons/web_editor/static/src/js/snippets.editor.js')
| -rw-r--r-- | addons/web_editor/static/src/js/snippets.editor.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/snippets.editor.js b/addons/web_editor/static/src/js/snippets.editor.js index 082a3b6204d..19f60a25741 100644 --- a/addons/web_editor/static/src/js/snippets.editor.js +++ b/addons/web_editor/static/src/js/snippets.editor.js @@ -500,6 +500,7 @@ data.Class = Widget.extend({ appendTo: 'body', cursor: "move", handle: ".oe_snippet_thumbnail", + distance: 30, cursorAt: { 'left': left, 'top': top @@ -553,7 +554,7 @@ data.Class = Widget.extend({ stop: function (ev, ui) { $toInsert.removeClass('oe_snippet_body'); - if (! dropped && self.$editable.find('.oe_drop_zone') && ui.position.top > 3) { + if (! dropped && self.$editable.find('.oe_drop_zone') && ui.position.top > 3 && ui.position.left + 50 > self.$el.outerWidth()) { var el = self.$editable.find('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first(); if (el.length) { el.after($toInsert); |
