Merge branch 'sdl_mouse_wheel' of github.com:jechter/emscripten into incoming1.18.1

Conflicts:
	emscripten-version.txt

1 files changed, 15 insertions, 1 deletions

diff --git a/src/library_browser.js b/src/library_browser.js
index 57fe1f9f..fce7bdd5 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -478,7 +478,21 @@ mergeInto(LibraryManager.library, {
     },
 
     getMouseWheelDelta: function(event) {
-      return Math.max(-1, Math.min(1, event.type === 'DOMMouseScroll' ? event.detail : -event.wheelDelta));
+      var delta = 0;
+      switch (event.type) {
+        case 'DOMMouseScroll': 
+          delta = event.detail;
+          break;
+        case 'mousewheel': 
+          delta = -event.wheelDelta;
+          break;
+        case 'wheel': 
+          delta = event.deltaY;
+          break;
+        default:
+          throw 'unrecognized mouse wheel event: ' + event.type;
+      }
+      return Math.max(-1, Math.min(1, delta));
     },
 
     mouseX: 0,