r1548 - trunk/ui
r1548 - trunk/ui
Author: paul.bakaus
Date: Wed Jan 7 23:54:40 2009
New Revision: 1548
Modified:
trunk/ui/ui.draggable.js
Log:
draggable: partial fix for remaining scroll issues (containment, grid
broken atm, comes with next commit)
Modified: trunk/ui/ui.draggable.js
==============================================================================
--- trunk/ui/ui.draggable.js (original)
+++ trunk/ui/ui.draggable.js Wed Jan 7 23:54:40 2009
@@ -121,6 +121,11 @@
//Compute the helpers position
this.position = this._generatePosition(event);
this.positionAbs = this._convertPositionTo("absolute");
+
+ /*
+ * - Position constraining -
+ * Constrain the position to a mix of grid, containment.
+ */
//Call plugins and callbacks and use the resulting position if something
is returned
if(!noPropagation) this.position = this._propagate("drag", event) ||
this.position;
@@ -239,8 +244,8 @@
if(o.containment == 'document' || o.containment == 'window')
this.containment = [
0 - this.offset.relative.left - this.offset.parent.left,
0 - this.offset.relative.top - this.offset.parent.top,
- $(o.containment == 'document' ? document : window).width() -
this.offset.relative.left - this.offset.parent.left -
this.helperProportions.width - this.margins.left -
(parseInt(this.element.css("marginRight"),10) || 0),
- ($(o.containment == 'document' ? document : window).height() ||
document.body.parentNode.scrollHeight) - this.offset.relative.top -
this.offset.parent.top - this.helperProportions.height - this.margins.top -
(parseInt(this.element.css("marginBottom"),10) || 0)
+ $(o.containment == 'document' ? document : window).width() -
this.helperProportions.width - this.margins.left,
+ ($(o.containment == 'document' ? document : window).height() ||
document.body.parentNode.scrollHeight) - this.helperProportions.height -
this.margins.top
];
if(!(/^(document|window|parent)$/).test(o.containment)) {
@@ -249,10 +254,10 @@
var over = ($(ce).css("overflow") != 'hidden');
this.containment = [
- co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) -
this.offset.relative.left - this.offset.parent.left - this.margins.left,
- co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) -
this.offset.relative.top - this.offset.parent.top - this.margins.top,
- co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) :
ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) -
this.offset.relative.left - this.offset.parent.left -
this.helperProportions.width - this.margins.left,
- co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) :
ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) -
this.offset.relative.top - this.offset.parent.top -
this.helperProportions.height - this.margins.top
+ co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) -
this.margins.left,
+ co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) -
this.margins.top,
+ co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) :
ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) -
this.helperProportions.width - this.margins.left,
+ co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) :
ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) -
this.helperProportions.height - this.margins.top
];
}
@@ -286,6 +291,22 @@
var o = this.options, scroll = this[(this.cssPosition
== 'absolute' ? 'offset' : 'scroll')+'Parent'], scrollIsRootNode = (/(html|
body)/i).test(scroll[0].tagName);
+ // This is a special case where we need to modify a offset calculated on
start, since the following happened:
+ // 1. The position of the helper is absolute, so it's position is
calculated based on the next positioned parent
+ // 2. The actual offset parent is a child of the scroll parent, and the
scroll parent isn't the document, which means that
+ // the scroll is included in the initial calculation of the offset of
the parent, and never recalculated upon drag
+ if(this.cssPosition == 'absolute' && this.scrollParent[0] != document &&
$.ui.contains(this.scrollParent[0], this.offsetParent[0])) {
+ this.offset.parent = this._getParentOffset();
+ }
+
+ // This is another very weird special case that only happens for
relative elements:
+ // 1. If the css position is relative
+ // 2. and the scroll parent is the document or similar to the offset
parent
+ // we have to refresh the relative offset during the scroll so there are
no jumps
+ if(this.cssPosition == 'relative' && !(this.scrollParent[0] != document
&& this.scrollParent[0] != this.offsetParent[0])) {
+ this.offset.relative = this._getRelativeOffset();
+ }
+
var position = {
top: (
event.pageY // The absolute mouse position
@@ -303,27 +324,6 @@
)
};
- if(!this.originalPosition) return position; //If we are not
dragging yet, we won't check for options
-
- /*
- * - Position constraining -
- * Constrain the position to a mix of grid, containment.
- */
- if(this.containment) {
- if(position.left < this.containment[0]) position.left =
this.containment[0];
- if(position.top < this.containment[1]) position.top =
this.containment[1];
- if(position.left > this.containment[2]) position.left =
this.containment[2];
- if(position.top > this.containment[3]) position.top =
this.containment[3];
- }
-
- if(o.grid) {
- var top = this.originalPosition.top + Math.round((position.top -
this.originalPosition.top) / o.grid[1]) * o.grid[1];
- position.top = this.containment ? (!(top < this.containment[1] || top >
this.containment[3]) ? top : (!(top < this.containment[1]) ? top -
o.grid[1] : top + o.grid[1])) : top;
-
- var left = this.originalPosition.left + Math.round((position.left -
this.originalPosition.left) / o.grid[0]) * o.grid[0];
- position.left = this.containment ? (!(left < this.containment[0] ||
left > this.containment[2]) ? left : (!(left < this.containment[0]) ? left
- o.grid[0] : left + o.grid[0])) : left;
- }
-
return position;
},
@@ -592,26 +592,6 @@
if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
$.ui.ddmanager.prepareOffsets(i, event);
-
-
-
- // This is a special case where we need to modify a offset calculated on
start, since the following happened:
- // 1. The position of the helper is absolute, so it's position is
calculated based on the next positioned parent
- // 2. The actual offset parent is a child of the scroll parent, and the
scroll parent isn't the document, which means that
- // the scroll is included in the initial calculation of the offset of
the parent, and never recalculated upon drag
- if(scrolled !== false && i.cssPosition == 'absolute' &&
i.scrollParent[0] != document && $.ui.contains(i.scrollParent[0],
i.offsetParent[0])) {
- i.offset.parent = i._getParentOffset();
-
- }
-
- // This is another very weird special case that only happens for
relative elements:
- // 1. If the css position is relative
- // 2. and the scroll parent is the document or similar to the offset
parent
- // we have to refresh the relative offset during the scroll so there are
no jumps
- if(scrolled !== false && i.cssPosition == 'relative'
&& !(i.scrollParent[0] != document && i.scrollParent[0] !=
i.offsetParent[0])) {
- i.offset.relative = i._getRelativeOffset();
- }
-
}
});