mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
sortable: option dropOnEmpty wasn't working correctly - in fact, you could always drop on empty containers. Now it checks again for the option, but it's default is true.
This commit is contained in:
parent
e7a179ef42
commit
18296272ad
@ -150,17 +150,6 @@
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
},
|
},
|
||||||
//This method checks approximately if the item is dragged in a container, but doesn't touch any items
|
|
||||||
inEmptyZone: function(container) {
|
|
||||||
|
|
||||||
if(!$(container.options.items, container.element).length) {
|
|
||||||
return container.options.dropOnEmpty ? true : false;
|
|
||||||
};
|
|
||||||
|
|
||||||
var last = $(container.options.items, container.element).not('.ui-sortable-helper'); last = $(last[last.length-1]);
|
|
||||||
var top = last.offset()[this.floating ? 'left' : 'top'] + last[0][this.floating ? 'offsetWidth' : 'offsetHeight'];
|
|
||||||
return (this.position.absolute[this.floating ? 'left' : 'top'] > top);
|
|
||||||
},
|
|
||||||
refresh: function() {
|
refresh: function() {
|
||||||
this.refreshItems();
|
this.refreshItems();
|
||||||
this.refreshPositions();
|
this.refreshPositions();
|
||||||
@ -252,6 +241,9 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled
|
||||||
|
continue;
|
||||||
|
|
||||||
//We also need to exchange the placeholder
|
//We also need to exchange the placeholder
|
||||||
if(this.placeholder) this.placeholder.remove();
|
if(this.placeholder) this.placeholder.remove();
|
||||||
if(this.containers[i].options.placeholder) {
|
if(this.containers[i].options.placeholder) {
|
||||||
@ -467,7 +459,8 @@
|
|||||||
delay: 0,
|
delay: 0,
|
||||||
cancel: ":input,button",
|
cancel: ":input,button",
|
||||||
items: '> *',
|
items: '> *',
|
||||||
zIndex: 1000
|
zIndex: 1000,
|
||||||
|
dropOnEmpty: true
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user