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 Packages Projects Releases Wiki Activity

Droppable: Only react to drag events if they're not canceled. Fixed pointer intersection.

Browse Source
This commit is contained in:
Scott González 2012-01-15 13:35:23 -05:00
parent 003bbf42fc
commit 2c9ee0252d
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui/jquery.ui.droppable.js vendored
View File

@ -18,17 +18,19 @@ var guid = 0,
droppables = {}; droppables = {};
(function() { (function() {
// TODO: we need to react after the event, in case an event handler changes the position
// TODO: don't react if the event is canceled
// TODO: we need access to pointerPosition
var orig = $.ui.draggable.prototype._trigger; var orig = $.ui.draggable.prototype._trigger;
$.ui.draggable.prototype._trigger = function( type, event, ui ) { $.ui.draggable.prototype._trigger = function( type, event, ui ) {
var droppable, var droppable,
method = "_draggable" + type.substr( 0, 1 ).toUpperCase() + type.substr( 1 ); method = "_draggable" + type.substr( 0, 1 ).toUpperCase() + type.substr( 1 ),
for ( droppable in droppables ) { allowed = orig.apply( this, arguments );
droppables[ droppable ][ method ].call( droppables[ droppable ], event, ui );
if ( allowed ) {
for ( droppable in droppables ) {
droppables[ droppable ][ method ]( event, ui );
}
} }
orig.apply( this, arguments );
return allowed;
}; };
})(); })();
@ -141,14 +143,9 @@ $.ui.droppable.tolerance = {
}, },
// Pointer overlaps droppable // Pointer overlaps droppable
// TODO: this has to use pointerPosition, not event
pointer: function( event, edges, ui ) { pointer: function( event, edges, ui ) {
var xOverlap = event.pageX >= this.offset.left && return ui.pointer.x >= this.offset.left && ui.pointer.x <= edges.right &&
event.pageX <= edges.right, ui.pointer.y >= this.offset.top && ui.pointer.y <= edges.bottom;
yOverlap = event.pageY >= this.offset.top &&
event.pageY <= edges.bottom;
return xOverlap && yOverlap;
} }
}; };