Merge branch '370pr4+pr260+pr261'

yui · Sep 15, 2012 · be82679 · be82679
2 parents b3d5186 + 5f2658c
commit be82679
Show file tree

Hide file tree

Showing 10 changed files with 126 additions and 109 deletions.
diff --git a/build/scrollview-base/scrollview-base-coverage.js b/build/scrollview-base/scrollview-base-coverage.js
diff --git a/build/scrollview-base/scrollview-base-debug.js b/build/scrollview-base/scrollview-base-debug.js
@@ -339,7 +339,7 @@ Y.ScrollView = Y.extend(ScrollView, Y.Widget, {
             // origY = (new WebKitCSSMatrix(cb.getComputedStyle("transform"))).f,
             origX = sv.get(SCROLL_X),
             origY = sv.get(SCROLL_Y),
-            HWTransform,
+            origHWTransform,
             dims;
 
         // TODO: Is this OK? Just in case it's called 'during' a transition.

diff --git a/build/scrollview-base/scrollview-base-min.js b/build/scrollview-base/scrollview-base-min.js
diff --git a/build/scrollview-base/scrollview-base.js b/build/scrollview-base/scrollview-base.js
@@ -339,7 +339,7 @@ Y.ScrollView = Y.extend(ScrollView, Y.Widget, {
             // origY = (new WebKitCSSMatrix(cb.getComputedStyle("transform"))).f,
             origX = sv.get(SCROLL_X),
             origY = sv.get(SCROLL_Y),
-            HWTransform,
+            origHWTransform,
             dims;
 
         // TODO: Is this OK? Just in case it's called 'during' a transition.

diff --git a/build/scrollview-paginator/scrollview-paginator-coverage.js b/build/scrollview-paginator/scrollview-paginator-coverage.js
diff --git a/build/scrollview-paginator/scrollview-paginator-debug.js b/build/scrollview-paginator/scrollview-paginator-debug.js
@@ -370,22 +370,26 @@ Y.extend(PaginatorPlugin, Y.Plugin.Base, {
      */
     _afterIndexChange: function (e) {
         var paginator = this,
-            host = this._host,
+            host = paginator._host,
             index = e.newVal,
-            maxScrollX = paginator._pageDims[index].maxScrollX,
-            maxScrollY = paginator._pageDims[index].maxScrollY,
-            gesture = host._gesture,
-            gestureAxis = gesture && gesture.axis;
+            pageDims = paginator._pageDims[index],
+            hostAxis = host._cAxis,
+            paginatorAxis = paginator._cAxis;
 
         // Cache the new index value
         paginator._cIndex = index;
 
-        if (gestureAxis === DIM_Y) {
-            host._maxScrollX = maxScrollX;
-            host.set(SCROLL_X, paginator._pageDims[index].scrollX, { src: UI });
-        } else if (gestureAxis === DIM_X) {
-            host._maxScrollY = maxScrollY;
-            host.set(SCROLL_Y, paginator._pageDims[index].scrollY, { src: UI });
+        // For dual-axis instances, we need to hack some host properties to the
+        // current page's max height/width and current stored offset
+        if (hostAxis[DIM_X] && hostAxis[DIM_Y]) {
+            if (paginatorAxis[DIM_Y]) {
+                host._maxScrollX = pageDims.maxScrollX;
+                host.set(SCROLL_X, pageDims.scrollX, { src: UI });
+            }
+            else if (paginatorAxis[DIM_X]) {
+                host._maxScrollY = pageDims.maxScrollY;
+                host.set(SCROLL_Y, pageDims.scrollY, { src: UI });
+            }
         }
 
         if (e.src !== UI) {