pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web_editor: drop near select children of editable nodes

Browse Source
This commit is contained in:
Christophe Matthieu
2015-09-01 09:23:24 +02:00
parent a5c9be3a8d
commit 4b5b6b5f6e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/snippets.editor.js
+3 -3
View File
@@ -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()
};