Build scrollview

derek · Sep 10, 2012 · eec0e8e · eec0e8e
1 parent 05e32fa
commit eec0e8e
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 92 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
@@ -306,7 +306,7 @@ Y.ScrollView = Y.extend(ScrollView, Y.Widget, {
 
             sv._set(AXIS, sv._cAxis);
         }
-        
+
         // get text direction on or inherited by scrollview node
         sv.rtl = (sv._cb.getComputedStyle('direction') === 'rtl');
 
@@ -745,15 +745,18 @@ Y.ScrollView = Y.extend(ScrollView, Y.Widget, {
         }
 
         var sv = this,
-            gesture = sv._gesture,
             svAxis = sv._cAxis,
             flick = e.flick,
             flickAxis = flick.axis,
             flickVelocity = flick.velocity,
             axisAttr = flickAxis === DIM_X ? SCROLL_X : SCROLL_Y,
             startPosition = sv.get(axisAttr);
 
-        gesture.flick = flick;
+        // Sometimes flick is enabled, but drag is disabled
+        if (sv._gesture) {
+            sv._gesture.flick = flick;
+        }
+
         // Prevent unneccesary firing of _flickFrame if we can't scroll on the flick axis
         if (svAxis[flickAxis]) {
             sv._flickFrame(flickVelocity, flickAxis, startPosition);

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
@@ -306,7 +306,7 @@ Y.ScrollView = Y.extend(ScrollView, Y.Widget, {
 
             sv._set(AXIS, sv._cAxis);
         }
-        
+
         // get text direction on or inherited by scrollview node
         sv.rtl = (sv._cb.getComputedStyle('direction') === 'rtl');
 
@@ -745,15 +745,18 @@ Y.ScrollView = Y.extend(ScrollView, Y.Widget, {
         }
 
         var sv = this,
-            gesture = sv._gesture,
             svAxis = sv._cAxis,
             flick = e.flick,
             flickAxis = flick.axis,
             flickVelocity = flick.velocity,
             axisAttr = flickAxis === DIM_X ? SCROLL_X : SCROLL_Y,
             startPosition = sv.get(axisAttr);
 
-        gesture.flick = flick;
+        // Sometimes flick is enabled, but drag is disabled
+        if (sv._gesture) {
+            sv._gesture.flick = flick;
+        }
+
         // Prevent unneccesary firing of _flickFrame if we can't scroll on the flick axis
         if (svAxis[flickAxis]) {
             sv._flickFrame(flickVelocity, flickAxis, startPosition);