library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

draggable: more intersect calculation improvements when connected to sortables

Browse Source
This commit is contained in:
Paul Bakaus 2008-05-30 11:48:11 +00:00
parent 5f24485abe
commit feb96d88fc
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/source/ui.draggable.js
View File

@ -438,12 +438,9 @@
var sortable = $.data(this, 'sortable'); var sortable = $.data(this, 'sortable');
inst.sortables.push({ inst.sortables.push({
instance: sortable, instance: sortable,
offset: sortable.element.offset(),
width: sortable.element.width(),
height: sortable.element.height(),
shouldRevert: sortable.options.revert shouldRevert: sortable.options.revert
}); });
sortable.refresh(); //Do a one-time refresh at start to refresh the containerCache
sortable.propagate("activate", e, inst); sortable.propagate("activate", e, inst);
} }
}); });
@ -481,18 +478,14 @@
var l = o.left, r = l + o.width, var l = o.left, r = l + o.width,
t = o.top, b = t + o.height; t = o.top, b = t + o.height;
return (l < (this.positionAbs.left + this.offset.click.left) && (this.positionAbs.left + this.offset.click.left) < r return (l < (this.positionAbs.left + this.offset.click.left) && (this.positionAbs.left + this.offset.click.left) < r
&& t < (this.positionAbs.top + this.offset.click.top) && (this.positionAbs.top + this.offset.click.top) < b); && t < (this.positionAbs.top + this.offset.click.top) && (this.positionAbs.top + this.offset.click.top) < b);
}; };
$.each(inst.sortables, function(i) { $.each(inst.sortables, function(i) {
if(checkPos.call(inst, this.instance.containerCache)) {
if(checkPos.call(inst, {
left: this.offset.left, top: this.offset.top,
width: this.width, height: this.height
})) {
//If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once //If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
if(!this.instance.isOver) { if(!this.instance.isOver) {