Merge pull request #38 from g0t00/master

fixed scrollhandling in firefox and for horizontal scrolling
coverflowjs · Apr 17, 2017 · da59b7c · da59b7c
2 parents 7124ebb + 45bae07
commit da59b7c
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 27 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -6,3 +6,4 @@ Sebastian Sauer <info@dynpages.de>
 Brandon Belvin <brandon.belvin@gmail.com>
 April Barrett
 Kirill Kostko <kirill.kostko@gmail.com>
+Anton Schulte <mail@anton.schulte.de>
diff --git a/dist/AUTHORS.txt b/dist/AUTHORS.txt
@@ -6,3 +6,4 @@ Sebastian Sauer <info@dynpages.de>
 Brandon Belvin <brandon.belvin@gmail.com>
 April Barrett
 Kirill Kostko <kirill.kostko@gmail.com>
+Anton Schulte <mail@anton.schulte.de>
diff --git a/dist/coverflow.css b/dist/coverflow.css
diff --git a/dist/coverflow.js b/dist/coverflow.js
@@ -1,5 +1,5 @@
-/*! CoverflowJS - v3.0.2 - 2015-12-31
+/*! CoverflowJS - v3.0.2 - 2017-04-17
-* Copyright (c) 2015 Paul Baukus, Addy Osmani, Sebastian Sauer, Brandon Belvin, April Barrett, Kirill Kostko; Licensed MIT */
+* Copyright (c) 2017 Paul Baukus, Addy Osmani, Sebastian Sauer, Brandon Belvin, April Barrett, Kirill Kostko, Anton Schulte; Licensed MIT */
 /*! jQuery UI - v1.10.4 - 2014-01-17
 * http://jqueryui.com
 * Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.effect.js
@@ -3296,14 +3296,23 @@ $.extend( $.coverflow.renderer, {
 			ev.preventDefault();
 		},
 		_onMouseWheel : function ( ev ) {
-			var origEv = ev.originalEvent,
+			var origEv = ev.originalEvent, delta;
+			if (typeof origEv.deltaMode !== 'undefined') {
+				delta = Math.abs(origEv.deltaX) > Math.abs(origEv.deltaY) ? -origEv.deltaX : -origEv.deltaY;
+				// mac os specific - fighting trackpad clumsy scrolling behaviour
+				if (origEv.deltaMode === window.WheelEvent.DOM_DELTA_PIXEL && delta > -10 && delta < 3) {
+					return;
+				}
+			} else {
 				delta = Math.abs(origEv.wheelDelta) > 0 ? origEv.wheelDelta : -origEv.detail;
 
-			// mac os specific - fighting trackpad clumsy scrolling behaviour
+				// mac os specific - fighting trackpad clumsy scrolling behaviour
-			if( delta > -10 && delta < 3 ) {
+				if( delta > -10 && delta < 3 ) {
-				return;
+					return;
+				}
 			}
 
+
 			if( delta > 0 ) {
 				this.prev();
 				return;

diff --git a/dist/coverflow.min.js b/dist/coverflow.min.js
diff --git a/dist/coverflow.standalone.js b/dist/coverflow.standalone.js
@@ -1,5 +1,5 @@
-/*! CoverflowJS - v3.0.2 - 2015-12-31
+/*! CoverflowJS - v3.0.2 - 2017-04-17
-* Copyright (c) 2015 Paul Baukus, Addy Osmani, Sebastian Sauer, Brandon Belvin, April Barrett, Kirill Kostko; Licensed MIT */
+* Copyright (c) 2017 Paul Baukus, Addy Osmani, Sebastian Sauer, Brandon Belvin, April Barrett, Kirill Kostko, Anton Schulte; Licensed MIT */
 (function( $, window, document, undefined ) {
 
 $.coverflow = {
@@ -1189,14 +1189,23 @@ $.extend( $.coverflow.renderer, {
 			ev.preventDefault();
 		},
 		_onMouseWheel : function ( ev ) {
-			var origEv = ev.originalEvent,
+			var origEv = ev.originalEvent, delta;
+			if (typeof origEv.deltaMode !== 'undefined') {
+				delta = Math.abs(origEv.deltaX) > Math.abs(origEv.deltaY) ? -origEv.deltaX : -origEv.deltaY;
+				// mac os specific - fighting trackpad clumsy scrolling behaviour
+				if (origEv.deltaMode === window.WheelEvent.DOM_DELTA_PIXEL && delta > -10 && delta < 3) {
+					return;
+				}
+			} else {
 				delta = Math.abs(origEv.wheelDelta) > 0 ? origEv.wheelDelta : -origEv.detail;
 
-			// mac os specific - fighting trackpad clumsy scrolling behaviour
+				// mac os specific - fighting trackpad clumsy scrolling behaviour
-			if( delta > -10 && delta < 3 ) {
+				if( delta > -10 && delta < 3 ) {
-				return;
+					return;
+				}
 			}
 
+
 			if( delta > 0 ) {
 				this.prev();
 				return;

diff --git a/dist/coverflow.standalone.min.js b/dist/coverflow.standalone.min.js
diff --git a/dist/package.json b/dist/package.json
@@ -4,7 +4,7 @@
   "description": "A jQuery UI powered coverflow component that takes advantage of CSS3 features",
   "version": "3.0.2",
   "author": {
-    "name": "Paul Baukus, Addy Osmani, Sebastian Sauer, Brandon Belvin, April Barrett, Kirill Kostko",
+    "name": "Paul Baukus, Addy Osmani, Sebastian Sauer, Brandon Belvin, April Barrett, Kirill Kostko, Anton Schulte",
     "url": "https://github.com/coverflowjs/coverflow"
   },
   "maintainers": [

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "A jQuery UI powered coverflow component that takes advantage of CSS3 features",
   "version": "3.0.2",
   "author": {
-    "name": "Paul Baukus, Addy Osmani, Sebastian Sauer, Brandon Belvin, April Barrett, Kirill Kostko",
+    "name": "Paul Baukus, Addy Osmani, Sebastian Sauer, Brandon Belvin, April Barrett, Kirill Kostko, Anton Schulte",
     "url": "https://github.com/coverflowjs/coverflow"
   },
   "maintainers": [

diff --git a/src/js/coverflow.js b/src/js/coverflow.js
@@ -582,14 +582,23 @@
 			ev.preventDefault();
 		},
 		_onMouseWheel : function ( ev ) {
-			var origEv = ev.originalEvent,
+			var origEv = ev.originalEvent, delta;
+			if (typeof origEv.deltaMode !== 'undefined') {
+				delta = Math.abs(origEv.deltaX) > Math.abs(origEv.deltaY) ? -origEv.deltaX : -origEv.deltaY;
+				// mac os specific - fighting trackpad clumsy scrolling behaviour
+				if (origEv.deltaMode === window.WheelEvent.DOM_DELTA_PIXEL && delta > -10 && delta < 3) {
+					return;
+				}
+			} else {
 				delta = Math.abs(origEv.wheelDelta) > 0 ? origEv.wheelDelta : -origEv.detail;
 
-			// mac os specific - fighting trackpad clumsy scrolling behaviour
+				// mac os specific - fighting trackpad clumsy scrolling behaviour
-			if( delta > -10 && delta < 3 ) {
+				if( delta > -10 && delta < 3 ) {
-				return;
+					return;
+				}
 			}
 
+
 			if( delta > 0 ) {
 				this.prev();
 				return;