Droppable: greedy children now consider only parents with same scope as parents....

(cherry picked from commit bce08389388ec21bc904035a7267afed255573f4)

diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index 2adc48cf2ac4f8acdc00eec14b555aae3b5184dd..791cc98e35cda474ef54b22cdb567aa28a735821 100644 (file)
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -260,7 +260,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);