Revert 56bfe03 (bubbling up scroll) but try to allow the same thing using scrollResponseBoundary values

Author: rowanbeentje

component.json

@@ -1,7 +1,7 @@
 {
   "name": "ftscroller",
   "description": "FTScroller is a cross-browser Javascript/CSS library to allow touch, mouse or scrollwheel scrolling within specified elements, with pagination, snapping and bouncing support.",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "main": "lib/ftscroller.js",
   "scripts": [
     "lib/ftscroller.js"

lib/ftscroller.js

@@ -39,7 +39,7 @@
  *
  * @copyright The Financial Times Ltd [All rights reserved]
  * @codingstandard ftlabs-jslint
- * @version 0.6.2
+ * @version 0.7.0
  */
 /**
  * @license FTScroller is (c) 2012 The Financial Times Ltd [All rights reserved] and licensed under the MIT license.
@@ -733,15 +733,6 @@ var FTScroller, CubicBezier;
 				y: inputY - _gestureStart.y
 			};
 
-			// if only one axis scroll is used, bubble up the other scroll wheel event
-			// e.g. if only x axis scroll is used then scrolling y axis can bubble up to scroll the page
-			if(!_instanceOptions.invertScrollWheel && (
-					(_instanceOptions.scrollingX && !_instanceOptions.scrollingY && Math.abs(gesture.x) < Math.abs(gesture.y)) ||
-					(!_instanceOptions.scrollingX && _instanceOptions.scrollingY && Math.abs(gesture.x) > Math.abs(gesture.y))
-				)) {
-				return;
-			}
-
 			// Opera fix
 			if (inputTime <= 0) {
 				inputTime = Date.now();
@@ -785,18 +776,18 @@ var FTScroller, CubicBezier;
 				// Determine scroll distance beyond bounds
 				distancesBeyondBounds = _distancesBeyondBounds(_targetScrollPosition);
 
-				// Determine whether to prevent the default scroll event - if the scroll could still
-				// be triggered, prevent the default to avoid problems (particularly on PlayBook)
-				if (_instanceOptions.bouncing || scrollInterrupt || (_scrollableAxes.x && gesture.x && distancesBeyondBounds.x < 0) || (_scrollableAxes.y && gesture.y && distancesBeyondBounds.y < 0)) {
-					rawEvent.preventDefault();
-				}
-
 				// Check scrolled distance against the boundary limit to see if scrolling can be triggered.
 				// If the scroll has been interrupted, trigger at once
 				if (!scrollInterrupt && (!_scrollableAxes.x || Math.abs(gesture.x) < _instanceOptions.scrollResponseBoundary) && (!_scrollableAxes.y || Math.abs(gesture.y) < _instanceOptions.scrollResponseBoundary)) {
 					return;
 				}
 
+				// Determine whether to prevent the default scroll event - if the scroll could still
+				// be triggered, prevent the default to avoid problems (particularly on PlayBook)
+				if (_instanceOptions.bouncing || scrollInterrupt || (_scrollableAxes.x && gesture.x && distancesBeyondBounds.x < 0) || (_scrollableAxes.y && gesture.y && distancesBeyondBounds.y < 0)) {
+					rawEvent.preventDefault();
+				}
+
 				// If bouncing is disabled, and already at an edge and scrolling beyond the edge, ignore the scroll for
 				// now - this allows other scrollers to claim if appropriate, allowing nicer nested scrolls.
 				if (!_instanceOptions.bouncing && !scrollInterrupt && (!_scrollableAxes.x || !gesture.x || distancesBeyondBounds.x > 0) && (!_scrollableAxes.y || !gesture.y || distancesBeyondBounds.y > 0)) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ftscroller",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "author": "FT Labs <[email protected]> (http://labs.ft.com/)",
   "description": "FTScroller is a cross-browser Javascript/CSS library to allow touch, mouse or scrollwheel scrolling within specified elements, with pagination, snapping and bouncing support.",
   "contributors": [