mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
Sortable: Don't create functions inside loops.
(cherry picked from commit 7033544cdd
)
This commit is contained in:
parent
1a4e6e98fd
commit
b147d00ce1
20
ui/jquery.ui.sortable.js
vendored
20
ui/jquery.ui.sortable.js
vendored
@ -15,8 +15,6 @@
|
||||
*/
|
||||
(function( $, undefined ) {
|
||||
|
||||
/*jshint loopfunc: true */
|
||||
|
||||
function isOverAxis( x, reference, size ) {
|
||||
return ( x > reference ) && ( x < ( reference + size ) );
|
||||
}
|
||||
@ -640,10 +638,11 @@ $.widget("ui.sortable", $.ui.mouse, {
|
||||
|
||||
queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), this]);
|
||||
|
||||
function addItems() {
|
||||
items.push( this );
|
||||
}
|
||||
for (i = queries.length - 1; i >= 0; i--){
|
||||
queries[i][0].each(function() {
|
||||
items.push(this);
|
||||
});
|
||||
queries[i][0].each( addItems );
|
||||
}
|
||||
|
||||
return $(items);
|
||||
@ -1201,12 +1200,17 @@ $.widget("ui.sortable", $.ui.mouse, {
|
||||
|
||||
|
||||
//Post events to containers
|
||||
function delayEvent( type, instance, container ) {
|
||||
return function( event ) {
|
||||
container._trigger( type, event, instance._uiHash( instance ) );
|
||||
};
|
||||
}
|
||||
for (i = this.containers.length - 1; i >= 0; i--){
|
||||
if(!noPropagation) {
|
||||
delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); }; }).call(this, this.containers[i]));
|
||||
if (!noPropagation) {
|
||||
delayedTriggers.push( delayEvent( "deactivate", this, this.containers[ i ] ) );
|
||||
}
|
||||
if(this.containers[i].containerCache.over) {
|
||||
delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); }; }).call(this, this.containers[i]));
|
||||
delayedTriggers.push( delayEvent( "out", this, this.containers[ i ] ) );
|
||||
this.containers[i].containerCache.over = 0;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user