From bce08389388ec21bc904035a7267afed255573f4 Mon Sep 17 00:00:00 2001 From: Philipp Benjamin Köppchen Date: Mon, 27 Aug 2012 20:37:04 +0200 Subject: Droppable: greedy children now consider only parents with same scope as parents. Fixed #8524 - Nested greedy droppables trigger parents events even when scopes are different --- ui/jquery.ui.droppable.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'ui') diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js index 36179d6d5..a99ec50a3 100644 --- a/ui/jquery.ui.droppable.js +++ b/ui/jquery.ui.droppable.js @@ -253,7 +253,12 @@ $.ui.ddmanager = { var parentInstance; if (this.options.greedy) { - var parent = this.element.parents(':data(droppable):eq(0)'); + // find droppable parents with same scope + var scope = this.options.scope; + var parent = this.element.parents(':data(droppable)').filter(function () { + return $.data(this, 'droppable').options.scope === scope; + }); + if (parent.length) { parentInstance = $.data(parent[0], 'droppable'); parentInstance.greedyChild = (c == 'isover' ? 1 : 0); -- cgit v1.2.3