library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Droppable: Fixed #3727: Use this._trigger for all callbacks/events.

Browse Source
This commit is contained in:
Scott González 2009-01-03 15:30:23 +00:00
parent 81f9d28d60
commit 7467ce3ef1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/ui.droppable.js
View File

@ -63,7 +63,7 @@ $.widget("ui.droppable", {
var draggable = $.ui.ddmanager.current; var draggable = $.ui.ddmanager.current;
$.ui.plugin.call(this, 'activate', [event, this.ui(draggable)]); $.ui.plugin.call(this, 'activate', [event, this.ui(draggable)]);
if(draggable) this.element.triggerHandler("dropactivate", [event, this.ui(draggable)], this.options.activate); (draggable && this._trigger('activate', event, this.ui(draggable)));
}, },
@ -71,7 +71,7 @@ $.widget("ui.droppable", {
var draggable = $.ui.ddmanager.current; var draggable = $.ui.ddmanager.current;
$.ui.plugin.call(this, 'deactivate', [event, this.ui(draggable)]); $.ui.plugin.call(this, 'deactivate', [event, this.ui(draggable)]);
if(draggable) this.element.triggerHandler("dropdeactivate", [event, this.ui(draggable)], this.options.deactivate); (draggable && this._trigger('deactivate', event, this.ui(draggable)));
}, },
@ -82,7 +82,7 @@ $.widget("ui.droppable", {
if (this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) { if (this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
$.ui.plugin.call(this, 'over', [event, this.ui(draggable)]); $.ui.plugin.call(this, 'over', [event, this.ui(draggable)]);
this.element.triggerHandler("dropover", [event, this.ui(draggable)], this.options.over); this._trigger('over', event, this.ui(draggable));
} }
}, },
@ -94,7 +94,7 @@ $.widget("ui.droppable", {
if (this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) { if (this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
$.ui.plugin.call(this, 'out', [event, this.ui(draggable)]); $.ui.plugin.call(this, 'out', [event, this.ui(draggable)]);
this.element.triggerHandler("dropout", [event, this.ui(draggable)], this.options.out); this._trigger('out', event, this.ui(draggable));
} }
}, },
@ -115,7 +115,7 @@ $.widget("ui.droppable", {
if(this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) { if(this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
$.ui.plugin.call(this, 'drop', [event, this.ui(draggable)]); $.ui.plugin.call(this, 'drop', [event, this.ui(draggable)]);
this.element.triggerHandler("drop", [event, this.ui(draggable)], this.options.drop); this._trigger('drop', event, this.ui(draggable));
return this.element; return this.element;
} }
@ -140,6 +140,7 @@ $.widget("ui.droppable", {
$.extend($.ui.droppable, { $.extend($.ui.droppable, {
version: "@VERSION", version: "@VERSION",
eventPrefix: 'drop',
defaults: { defaults: {
accept: '*', accept: '*',
activeClass: null, activeClass: null,