mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
parent
23d0884e66
commit
62c8217185
@ -348,6 +348,7 @@ test( "repeated out & over between connected sortables", function() {
|
||||
overCount++;
|
||||
},
|
||||
out: function( event, ui ) {
|
||||
|
||||
// Ignore events that trigger when an item has dropped
|
||||
// checking for the presence of the helper.
|
||||
if ( !ui.helper ) {
|
||||
|
@ -292,7 +292,6 @@ return $.widget("ui.sortable", $.ui.mouse, {
|
||||
this._cacheHelperProportions();
|
||||
}
|
||||
|
||||
|
||||
//Post "activate" events to possible containers
|
||||
if ( !noActivation ) {
|
||||
for ( i = this.containers.length - 1; i >= 0; i-- ) {
|
||||
@ -498,6 +497,7 @@ return $.widget("ui.sortable", $.ui.mouse, {
|
||||
}
|
||||
|
||||
if ( this.placeholder ) {
|
||||
|
||||
//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
|
||||
if ( this.placeholder[ 0 ].parentNode ) {
|
||||
this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] );
|
||||
@ -879,6 +879,7 @@ return $.widget("ui.sortable", $.ui.mouse, {
|
||||
innermostIndex = i;
|
||||
|
||||
} else {
|
||||
|
||||
// container doesn't intersect. trigger "out" event if necessary
|
||||
if ( this.containers[ i ].containerCache.over ) {
|
||||
this.containers[ i ]._trigger( "out", event, this._uiHash( this ) );
|
||||
@ -955,7 +956,6 @@ return $.widget("ui.sortable", $.ui.mouse, {
|
||||
this.containers[ innermostIndex ].containerCache.over = 1;
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
|
||||
_createHelper: function( event ) {
|
||||
@ -1006,7 +1006,6 @@ return $.widget("ui.sortable", $.ui.mouse, {
|
||||
|
||||
_getParentOffset: function() {
|
||||
|
||||
|
||||
//Get the offsetParent and cache its position
|
||||
this.offsetParent = this.helper.offsetParent();
|
||||
var po = this.offsetParent.offset();
|
||||
@ -1208,6 +1207,7 @@ return $.widget("ui.sortable", $.ui.mouse, {
|
||||
_clear: function( event, noPropagation ) {
|
||||
|
||||
this.reverting = false;
|
||||
|
||||
// We delay all events that have to be triggered to after the point where the placeholder has been removed and
|
||||
// everything else normalized again
|
||||
var i,
|
||||
@ -1249,7 +1249,6 @@ return $.widget("ui.sortable", $.ui.mouse, {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//Post events to containers
|
||||
function delayEvent( type, instance, container ) {
|
||||
return function( event ) {
|
||||
|
Loading…
Reference in New Issue
Block a user