Permalink
Browse files

Droppable: this.over is changed even for non acceptable draggables. F…

…ixes Ticket #8060. Over was not fired correctly.
  • Loading branch information...
1 parent 4f15e66 commit 16368304fafb9d847e071e4ca1a07920bbfaf9d0 @nhatcher committed Jan 26, 2012
Showing with 3 additions and 2 deletions.
  1. +3 −2 ui/jquery.ui.droppable.js
@@ -226,9 +226,10 @@ $.ui.ddmanager = {
if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance))
dropped = this._drop.call(this, event) || dropped;
- if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+ if (!this.options.disabled && this.visible) {
this.isout = 1; this.isover = 0;
- this._deactivate.call(this, event);
+ if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element)))
+ this._deactivate.call(this, event);
}
});

0 comments on commit 1636830

Please sign in to comment.