Ticket #2122: uidroppable-fix_element_comparer_and_accept_fn.patch

ui.droppable.js

@@ -66 +66 @@
         over: function(e) {
 
             var draggable = $.ui.ddmanager.current;
-            if (!draggable || draggable.element == this.element) return; // Bail if draggable and droppable are same element
-            
-            if (this.options.accept(draggable.element)) {
+            if (!draggable || $(draggable.element)[0] == $(this.element)[0]) return; // Bail if draggable and droppable are same element            
+            if (this.options.accept(this.ui(draggable))) {
                 $.ui.plugin.call(this, 'over', [e, this.ui(draggable)]);
                 $(this.element).triggerHandler("dropover", [e, this.ui(draggable)], this.options.over);
             }
@@ -77 +76 @@
         out: function(e) {
 
             var draggable = $.ui.ddmanager.current;
-            if (!draggable || draggable.element == this.element) return; // Bail if draggable and droppable are same element
+            if (!draggable || $(draggable.element)[0] == $(this.element)[0]) return; // Bail if draggable and droppable are same element
 
-            if (this.options.accept(draggable.element)) {
+            if (this.options.accept(this.ui(draggable))) {
                 $.ui.plugin.call(this, 'out', [e, this.ui(draggable)]);
                 $(this.element).triggerHandler("dropout", [e, this.ui(draggable)], this.options.out);
             }
@@ -88 +87 @@
         drop: function(e) {
 
             var draggable = $.ui.ddmanager.current;
-            if (!draggable || draggable.element == this.element) return; // Bail if draggable and droppable are same element
+            if (!draggable || $(draggable.element)[0] == $(this.element)[0]) return; // Bail if draggable and droppable are same element
             
-            if(this.options.accept(draggable.element)) {
+            if(this.options.accept(this.ui(draggable))) {
                 $.ui.plugin.call(this, 'drop', [e, this.ui(draggable)]);
                 $(this.element).triggerHandler("drop", [e, this.ui(draggable)], this.options.drop);
             }
@@ -163 +162 @@
                 if(m[i].item.disabled) continue;
                 m[i].offset = $(m[i].item.element).offset();
                 
-                if (t && m[i].item.options.accept(t.element)) //Activate the droppable if used directly from draggables
+                if (t && m[i].item.options.accept.call(m[i].item,m[i].item.ui(t))) //Activate the droppable if used directly from draggables
                     m[i].item.activate.call(m[i].item, e);
                     
             }
@@ -175 +174 @@
                 
                 if (!this.item.disabled && $.ui.intersect(draggable, this, this.item.options.tolerance))
                     this.item.drop.call(this.item, e);
-                    
-                if (!this.item.disabled && this.item.options.accept(draggable.element)) {
+                
+                if (!this.item.disabled && this.item.options.accept.call(this.item,this.item.ui(draggable))) {
                     this.out = 1; this.over = 0;
                     this.item.deactivate.call(this.item, e);
                 }