Skip to content
Permalink
Browse files

draggable, droppable: added a class do the active draggable helper, t…

…hat will be ignored by droppables as droppable target (fixes #2886)
  • Loading branch information
Paul Bakaus
Paul Bakaus committed May 25, 2008
1 parent 0f9bb62 commit 57266e1ba467e67120e023491082db31ce1fa787
Showing with 3 additions and 1 deletion.
  1. +2 −0 ui/source/ui.draggable.js
  2. +1 −1 ui/source/ui.droppable.js
@@ -118,6 +118,7 @@
this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Recache the helper size
if ($.ui.ddmanager && !o.dropBehaviour) $.ui.ddmanager.prepareOffsets(this, e);

this.helper.addClass("ui-draggable-dragging");
this.mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position
return true;
},
@@ -223,6 +224,7 @@
return false;
},
clear: function() {
this.helper.removeClass("ui-draggable-dragging");
if(this.options.helper != 'original' && !this.cancelHelperRemoval) this.helper.remove();
if($.ui.ddmanager) $.ui.ddmanager.current = null;
this.helper = null;
@@ -96,7 +96,7 @@
if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return false; // Bail if draggable and droppable are same element

var childrenIntersection = false;
this.element.find(".ui-droppable").each(function() {
this.element.find(".ui-droppable").not(".ui-draggable-dragging").each(function() {
var inst = $.data(this, 'droppable');
if(inst.options.greedy && $.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)) {
childrenIntersection = true; return false;

0 comments on commit 57266e1

Please sign in to comment.
You can’t perform that action at this time.