r1810 - trunk/ui
r1810 - trunk/ui
Author: paul.bakaus
Date: Tue Jan 27 06:58:05 2009
New Revision: 1810
Modified:
trunk/ui/ui.droppable.js
Log:
droppable: 'this' in accept should point to the DOMelement not to a jQuery
(fixes #3955)
Modified: trunk/ui/ui.droppable.js
==============================================================================
--- trunk/ui/ui.droppable.js (original)
+++ trunk/ui/ui.droppable.js Tue Jan 27 06:58:05 2009
@@ -76,7 +76,7 @@
var draggable = $.ui.ddmanager.current;
if (!draggable || (draggable.currentItem || draggable.element)[0] ==
this.element[0]) return; // Bail if draggable and droppable are same element
- if (this.options.accept.call(this.element,(draggable.currentItem ||
draggable.element))) {
+ if (this.options.accept.call(this.element[0],(draggable.currentItem ||
draggable.element))) {
if(this.options.hoverClass)
this.element.addClass(this.options.hoverClass);
this._trigger('over', event, this.ui(draggable));
}
@@ -88,7 +88,7 @@
var draggable = $.ui.ddmanager.current;
if (!draggable || (draggable.currentItem || draggable.element)[0] ==
this.element[0]) return; // Bail if draggable and droppable are same element
- if (this.options.accept.call(this.element,(draggable.currentItem ||
draggable.element))) {
+ if (this.options.accept.call(this.element[0],(draggable.currentItem ||
draggable.element))) {
if(this.options.hoverClass)
this.element.removeClass(this.options.hoverClass);
this._trigger('out', event, this.ui(draggable));
}
@@ -109,7 +109,7 @@
});
if(childrenIntersection) return false;
- if(this.options.accept.call(this.element,(draggable.currentItem ||
draggable.element))) {
+ if(this.options.accept.call(this.element[0],(draggable.currentItem ||
draggable.element))) {
if(this.options.activeClass)
this.element.removeClass(this.options.activeClass);
if(this.options.hoverClass)
this.element.removeClass(this.options.hoverClass);
this._trigger('drop', event, this.ui(draggable));
@@ -203,7 +203,7 @@
droppablesLoop: for (var i = 0; i < m.length; i++) {
- if(m[i].options.disabled || (t
&& !m[i].options.accept.call(m[i].element,(t.currentItem || t.element))))
continue; //No disabled and non-accepted
+ if(m[i].options.disabled || (t
&& !m[i].options.accept.call(m[i].element[0],(t.currentItem ||
t.element)))) continue; //No disabled and non-accepted
for (var j=0; j < list.length; j++) { if(list[j] == m[i].element[0]) {
m[i].proportions.height = 0; continue droppablesLoop; } }; //Filter out
elements in the current dragged item
m[i].visible = m[i].element.css("display") != "none"; if(!m[i].visible)
continue; //If the element is not visible, continue
@@ -224,7 +224,7 @@
if (!this.options.disabled && this.visible && $.ui.intersect(draggable,
this, this.options.tolerance))
dropped = this._drop.call(this, event);
- if (!this.options.disabled && this.visible &&
this.options.accept.call(this.element,(draggable.currentItem ||
draggable.element))) {
+ if (!this.options.disabled && this.visible &&
this.options.accept.call(this.element[0],(draggable.currentItem ||
draggable.element))) {
this.isout = 1; this.isover = 0;
this._deactivate.call(this, event);
}