From 16368304fafb9d847e071e4ca1a07920bbfaf9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Hatcher=20Andr=C3=A9s?= Date: Thu, 26 Jan 2012 11:13:21 +0100 Subject: [PATCH] Droppable: this.over is changed even for non acceptable draggables. Fixes Ticket #8060. Over was not fired correctly. --- ui/jquery.ui.droppable.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js index 62bba2abad9..691fb0b4328 100644 --- a/ui/jquery.ui.droppable.js +++ b/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); } });