Permalink
Browse files

DD Build

  • Loading branch information...
1 parent 2ba627a commit aa2d5e6ca91cbb39e9e0f5b3ecd34772893a29d5 @davglass davglass committed May 15, 2012
@@ -1140,9 +1140,11 @@ YUI.add('dd-drag', function(Y) {
* @description This method performs the alignment before the element move.
* @param {Array} eXY The XY to move the element to, usually comes from the mousemove DOM event.
*/
- _alignNode: function(eXY) {
+ _alignNode: function(eXY, scroll) {
this._align(eXY);
- this._moveNode();
+ if (!scroll) {
+ this._moveNode();
+ }
},
/**
* @private
@@ -1194,7 +1196,7 @@ YUI.add('dd-drag', function(Y) {
*/
_defDragFn: function(e) {
if (this.get('move')) {
- if (e.scroll) {
+ if (e.scroll && e.scroll.node) {
e.scroll.node.set('scrollTop', e.scroll.top);
e.scroll.node.set('scrollLeft', e.scroll.left);
}

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -1137,9 +1137,11 @@ YUI.add('dd-drag', function(Y) {
* @description This method performs the alignment before the element move.
* @param {Array} eXY The XY to move the element to, usually comes from the mousemove DOM event.
*/
- _alignNode: function(eXY) {
+ _alignNode: function(eXY, scroll) {
this._align(eXY);
- this._moveNode();
+ if (!scroll) {
+ this._moveNode();
+ }
},
/**
* @private
@@ -1191,7 +1193,7 @@ YUI.add('dd-drag', function(Y) {
*/
_defDragFn: function(e) {
if (this.get('move')) {
- if (e.scroll) {
+ if (e.scroll && e.scroll.node) {
e.scroll.node.set('scrollTop', e.scroll.top);
e.scroll.node.set('scrollLeft', e.scroll.left);
}
@@ -202,4 +202,4 @@ YUI.add('dd-plugin', function(Y) {
-}, '@VERSION@' ,{requires:['dd-drag'], skinnable:false, optional:['dd-constrain', 'dd-proxy']});
+}, '@VERSION@' ,{optional:['dd-constrain', 'dd-proxy'], requires:['dd-drag'], skinnable:false});

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -197,4 +197,4 @@ YUI.add('dd-plugin', function(Y) {
-}, '@VERSION@' ,{requires:['dd-drag'], skinnable:false, optional:['dd-constrain', 'dd-proxy']});
+}, '@VERSION@' ,{optional:['dd-constrain', 'dd-proxy'], requires:['dd-drag'], skinnable:false});
@@ -235,8 +235,16 @@ YUI.add('dd-scroll', function(Y) {
if (nl < 0) {
nl = xy[0];
}
+ if (ho.con) {
+ if (!ho.con.inRegion([nl + sl, nt + st])) {
+ move = false;
+ }
+ }
if (move) {
ho.actXY = [nl, nt];
+ ho._alignNode([nl, nt], true); //We are srolling..
+ xy = ho.actXY;
+ ho.actXY = [nl, nt];
ho._moveNode({ node: win, top: st, left: sl});
if (!st && !sl) {
this._cancelScroll();
@@ -416,4 +424,4 @@ YUI.add('dd-scroll', function(Y) {
-}, '@VERSION@' ,{requires:['dd-drag'], skinnable:false, optional:['dd-proxy']});
+}, '@VERSION@' ,{optional:['dd-proxy'], requires:['dd-drag'], skinnable:false});
Oops, something went wrong.

0 comments on commit aa2d5e6

Please sign in to comment.