Merge remote-tracking branch 'upstream/master' into json-polyfill

tripp · Oct 25, 2012 · 9beb03c · 9beb03c
2 parents c1bfa14 + 94b86a1
commit 9beb03c
Show file tree

Hide file tree

Showing 33 changed files with 96 additions and 780 deletions.
diff --git a/build/calendar-base/lang/calendar-base_it.js b/build/calendar-base/lang/calendar-base_it.js
diff --git a/build/calendar/lang/calendar_it.js b/build/calendar/lang/calendar_it.js
diff --git a/build/dd-drag/dd-drag-coverage.js b/build/dd-drag/dd-drag-coverage.js
diff --git a/build/dd-drag/dd-drag-debug.js b/build/dd-drag/dd-drag-debug.js
@@ -1203,8 +1203,14 @@ YUI.add('dd-drag', function (Y, NAME) {
         _defDragFn: function(e) {
             if (this.get('move')) {
                 if (e.scroll && e.scroll.node) {
-                    e.scroll.node.set('scrollTop', e.scroll.top);
-                    e.scroll.node.set('scrollLeft', e.scroll.left);
+                    var domNode = e.scroll.node.getDOMNode();
+                    //If it's the window
+                    if (domNode === Y.config.win) {
+                        domNode.scrollTo(e.scroll.left, e.scroll.top);
+                    } else {
+                        e.scroll.node.set('scrollTop', e.scroll.top);
+                        e.scroll.node.set('scrollLeft', e.scroll.left);
+                    }
                 }
                 this.get(DRAG_NODE).setXY([e.pageX, e.pageY]);
                 this.realXY = [e.pageX, e.pageY];

diff --git a/build/dd-drag/dd-drag-min.js b/build/dd-drag/dd-drag-min.js
diff --git a/build/dd-drag/dd-drag.js b/build/dd-drag/dd-drag.js
@@ -1200,8 +1200,14 @@ YUI.add('dd-drag', function (Y, NAME) {
         _defDragFn: function(e) {
             if (this.get('move')) {
                 if (e.scroll && e.scroll.node) {
-                    e.scroll.node.set('scrollTop', e.scroll.top);
-                    e.scroll.node.set('scrollLeft', e.scroll.left);
+                    var domNode = e.scroll.node.getDOMNode();
+                    //If it's the window
+                    if (domNode === Y.config.win) {
+                        domNode.scrollTo(e.scroll.left, e.scroll.top);
+                    } else {
+                        e.scroll.node.set('scrollTop', e.scroll.top);
+                        e.scroll.node.set('scrollLeft', e.scroll.left);
+                    }
                 }
                 this.get(DRAG_NODE).setXY([e.pageX, e.pageY]);
                 this.realXY = [e.pageX, e.pageY];

diff --git a/build/get-nodejs/get-coverage.js b/build/get-nodejs/get-coverage.js
diff --git a/build/get-nodejs/get-debug.js b/build/get-nodejs/get-debug.js
diff --git a/build/get-nodejs/get-min.js b/build/get-nodejs/get-min.js