Changeset 5125

Timestamp:

03/25/08 16:03:15 (10 months ago)

Author:

paul.bakaus

Message:

droppables: greedy affects the hover state now, too (fixes #2571)

Files:

• trunk/ui/ui.droppable.js (modified) (2 diffs)

trunk/ui/ui.droppable.js

@@ -113 +113 @@
             
             var childrenIntersection = false;
-            this.element.children(".ui-droppable").each(function() {
+            this.element.find(".ui-droppable").each(function() {
                 var inst = $.data(this, 'droppable');
-                if(inst.options.greedy && $.ui.intersect(draggable, { item: inst, offset: inst.element.offset() }, inst.options.tolerance)) childrenIntersection = true;
+                if(inst.options.greedy && $.ui.intersect(draggable, { item: inst, offset: inst.element.offset() }, inst.options.tolerance)) { 
+                    childrenIntersection = true; return false;
+                }
             });
             if(childrenIntersection) return;
@@ -229 +231 @@
             $.each($.ui.ddmanager.droppables, function() {
 
-                if(this.item.options.disabled) return; 
+                if(this.item.disabled || this.greedyChild) return; 
                 var intersects = $.ui.intersect(draggable, this, this.item.options.tolerance);
 
                 var c = !intersects && this.over == 1 ? 'out' : (intersects && this.over == 0 ? 'over' : null);
                 if(!c) return;
-                    
+
+                var instance = $.data(this.item.element[0], 'droppable'); 
+                if (instance.options.greedy) { 
+                    this.item.element.parents('.ui-droppable').each(function() { 
+                        var parent = this; 
+                        $.each($.ui.ddmanager.droppables, function() { 
+                            if (this.item.element[0] != parent) return; 
+                            this[c] = 0; 
+                            this[c == 'out' ? 'over' : 'out'] = 1; 
+                            this.greedyChild = (c == 'over' ? 1 : 0); 
+                            this.item[c == 'out' ? 'over' : 'out'].call(this.item, e); 
+                            return false; 
+                        }); 
+                    }); 
+                } 
+
                 this[c] = 1; this[c == 'out' ? 'over' : 'out'] = 0;
                 this.item[c].call(this.item, e);