From 4b5b6b5f6e2c0fd9e1e5d424d55d494a3915282a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Mon, 31 Aug 2015 17:03:08 +0200
Subject: [FIX] web_editor: drop near select children of editable nodes

---
 addons/web_editor/static/src/js/snippets.editor.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/web_editor/static/src/js/snippets.editor.js')

diff --git a/addons/web_editor/static/src/js/snippets.editor.js b/addons/web_editor/static/src/js/snippets.editor.js
index fef552c0216..994d88402b3 100644
--- a/addons/web_editor/static/src/js/snippets.editor.js
+++ b/addons/web_editor/static/src/js/snippets.editor.js
@@ -140,7 +140,7 @@ var BuildingBlock = Widget.extend({
     _get_snippet_url: function () {
         return '/web_editor/snippets';
     },
-    _add_check_selector : function (selector, no_check) {
+    _add_check_selector : function (selector, no_check, is_children) {
         var self = this;
         var selector = selector.split(/\s*,/).join(":not(.o_snippet_not_selectable), ") + ":not(.o_snippet_not_selectable)";
 
@@ -173,7 +173,7 @@ var BuildingBlock = Widget.extend({
                     });
                 },
                 all: function ($from) {
-                    return $from ? $from.find(selector) : self.$editable.filter(selector).add(self.$editable.find(selector));
+                    return $from ? $from.find(selector) : self.$editable[is_children ? 'find' : 'filter'](selector);
                 },
                 is: function ($from) {
                     return $from.is(selector);
@@ -237,7 +237,7 @@ var BuildingBlock = Widget.extend({
                 'base_selector': $style.data('selector'),
                 'selector': self._add_check_selector($style.data('selector'), no_check),
                 '$el': $style,
-                'drop-near': $style.data('drop-near') && self._add_check_selector($style.data('drop-near'), no_check),
+                'drop-near': $style.data('drop-near') && self._add_check_selector($style.data('drop-near'), no_check, true),
                 'drop-in': $style.data('drop-in') && self._add_check_selector($style.data('drop-in'), no_check),
                 'data': $style.data()
             };
-- 
cgit v1.2.3