Merge pull request harvesthq#1983 from efedorenko/wheel-event

Fixes scrolling with a mouse wheel in Firefox if jquery-mousewheel is used
jordanstephens · Jun 21, 2014 · f019dd7 · f019dd7
2 parents f3bb75d + 4aee5ef
commit f019dd7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee
@@ -141,7 +141,7 @@ class Chosen extends AbstractChosen
     this.results_reset(evt) if evt.target.nodeName is "ABBR" and not @is_disabled
 
   search_results_mousewheel: (evt) ->
-    delta = -evt.originalEvent.wheelDelta or evt.originalEvent.detail if evt.originalEvent
+    delta = evt.originalEvent.deltaY or -evt.originalEvent.wheelDelta or evt.originalEvent.detail if evt.originalEvent
     if delta?
       evt.preventDefault()
       delta = delta * 40 if evt.type is 'DOMMouseScroll'

diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee
@@ -137,7 +137,7 @@ class @Chosen extends AbstractChosen
     this.results_reset(evt) if evt.target.nodeName is "ABBR" and not @is_disabled
 
   search_results_mousewheel: (evt) ->
-    delta = -evt.wheelDelta or evt.detail
+    delta = evt.deltaY or -evt.wheelDelta or evt.detail
     if delta?
       evt.preventDefault()
       delta = delta * 40 if evt.type is 'DOMMouseScroll'