horizontally scroll on trackpads (refs cubiq#523)

abstraktor · Jul 30, 2014 · b35dba3 · b35dba3
1 parent 44d992b
commit b35dba3
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 6 deletions.
diff --git a/build/iscroll-infinite.js b/build/iscroll-infinite.js
@@ -243,6 +243,7 @@ function IScroll (el, options) {
 	this.options = {
 
 		mouseWheelSpeed: 20,
+		mouseWheelScrollsHorizontally: false,
 
 		snapThreshold: 0.334,
 
@@ -947,7 +948,13 @@ IScroll.prototype = {
 		wheelDeltaX *= this.options.invertWheelDirection;
 		wheelDeltaY *= this.options.invertWheelDirection;
 
-		if ( !this.hasVerticalScroll ) {
+		if ( !this.hasHorizontalScroll ) {
+			wheelDeltaX = 0;
+		} else if ( !this.hasVerticalScroll && this.options.mouseWheelScrollsHorizontally ) {
+			wheelDeltaX = wheelDeltaY;
+			wheelDeltaY = 0;
+		} if ( !this.hasVerticalScroll ) {
+			wheelDeltaY = 0;
 			wheelDeltaX = wheelDeltaY;
 			wheelDeltaY = 0;
 		}

diff --git a/build/iscroll-probe.js b/build/iscroll-probe.js
@@ -245,6 +245,7 @@ function IScroll (el, options) {
 		resizeScrollbars: true,
 
 		mouseWheelSpeed: 20,
+		mouseWheelScrollsHorizontally: false,
 
 		snapThreshold: 0.334,
 
@@ -1069,7 +1070,13 @@ IScroll.prototype = {
 		wheelDeltaX *= this.options.invertWheelDirection;
 		wheelDeltaY *= this.options.invertWheelDirection;
 
-		if ( !this.hasVerticalScroll ) {
+		if ( !this.hasHorizontalScroll ) {
+			wheelDeltaX = 0;
+		} else if ( !this.hasVerticalScroll && this.options.mouseWheelScrollsHorizontally ) {
+			wheelDeltaX = wheelDeltaY;
+			wheelDeltaY = 0;
+		} if ( !this.hasVerticalScroll ) {
+			wheelDeltaY = 0;
 			wheelDeltaX = wheelDeltaY;
 			wheelDeltaY = 0;
 		}

diff --git a/build/iscroll-zoom.js b/build/iscroll-zoom.js
@@ -248,6 +248,7 @@ function IScroll (el, options) {
 		resizeScrollbars: true,
 
 		mouseWheelSpeed: 20,
+		mouseWheelScrollsHorizontally: false,
 
 		snapThreshold: 0.334,
 
@@ -1233,7 +1234,13 @@ IScroll.prototype = {
 		wheelDeltaX *= this.options.invertWheelDirection;
 		wheelDeltaY *= this.options.invertWheelDirection;
 
-		if ( !this.hasVerticalScroll ) {
+		if ( !this.hasHorizontalScroll ) {
+			wheelDeltaX = 0;
+		} else if ( !this.hasVerticalScroll && this.options.mouseWheelScrollsHorizontally ) {
+			wheelDeltaX = wheelDeltaY;
+			wheelDeltaY = 0;
+		} if ( !this.hasVerticalScroll ) {
+			wheelDeltaY = 0;
 			wheelDeltaX = wheelDeltaY;
 			wheelDeltaY = 0;
 		}

diff --git a/build/iscroll.js b/build/iscroll.js
@@ -245,6 +245,7 @@ function IScroll (el, options) {
 		resizeScrollbars: true,
 
 		mouseWheelSpeed: 20,
+		mouseWheelScrollsHorizontally: false,
 
 		snapThreshold: 0.334,
 
@@ -1060,7 +1061,13 @@ IScroll.prototype = {
 		wheelDeltaX *= this.options.invertWheelDirection;
 		wheelDeltaY *= this.options.invertWheelDirection;
 
-		if ( !this.hasVerticalScroll ) {
+		if ( !this.hasHorizontalScroll ) {
+			wheelDeltaX = 0;
+		} else if ( !this.hasVerticalScroll && this.options.mouseWheelScrollsHorizontally ) {
+			wheelDeltaX = wheelDeltaY;
+			wheelDeltaY = 0;
+		} if ( !this.hasVerticalScroll ) {
+			wheelDeltaY = 0;
 			wheelDeltaX = wheelDeltaY;
 			wheelDeltaY = 0;
 		}

diff --git a/src/wheel/build.json b/src/wheel/build.json
@@ -1,6 +1,6 @@
 {
 	"insert": {
-		"OPTIONS": "\t\tmouseWheelSpeed: 20,",
+		"OPTIONS": "\t\tmouseWheelSpeed: 20,\n\t\tmouseWheelScrollsHorizontally: false,",
 		"NORMALIZATION": "\tthis.options.invertWheelDirection = this.options.invertWheelDirection ? -1 : 1;",
 		"_init": "\t\tif ( this.options.mouseWheel ) {\n\t\t\tthis._initWheel();\n\t\t}"
 	}

diff --git a/src/wheel/wheel.js b/src/wheel/wheel.js
@@ -51,7 +51,13 @@
 		wheelDeltaX *= this.options.invertWheelDirection;
 		wheelDeltaY *= this.options.invertWheelDirection;
 
-		if ( !this.hasVerticalScroll ) {
+		if ( !this.hasHorizontalScroll ) {
+			wheelDeltaX = 0;
+		} else if ( !this.hasVerticalScroll && this.options.mouseWheelScrollsHorizontally ) {
+			wheelDeltaX = wheelDeltaY;
+			wheelDeltaY = 0;
+		} if ( !this.hasVerticalScroll ) {
+			wheelDeltaY = 0;
 			wheelDeltaX = wheelDeltaY;
 			wheelDeltaY = 0;
 		}