DD Build

build/dd-drag/dd-drag-debug.js

@@ -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);
                 }

build/dd-drag/dd-drag.js

@@ -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);
                 }

build/dd-plugin/dd-plugin-debug.js

@@ -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});

build/dd-plugin/dd-plugin.js

@@ -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});

build/dd-scroll/dd-scroll-debug.js

@@ -235,7 +235,15 @@ 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) {
@@ -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});