enable mousewheel zooming in firefox; fixes #https://github.com/danvk/dygraphs/issues/788

diff --git a/web/dashboard.js b/web/dashboard.js
index 1e42bf2dc7d14ce63a207e9a9218c4781bb101ff..4b812e09d7ffc67745fbfc36007ed65d6731a2eb 100644 (file)
--- a/web/dashboard.js
+++ b/web/dashboard.js
@@ -4207,9 +4207,9 @@
                         state.log('interactionModel.dblclick()');
                     NETDATA.resetAllCharts(state);
                 },
-                mousewheel: function(event, dygraph, context) {
+                wheel: function(event, dygraph, context) {
                     if(NETDATA.options.debug.dygraph === true || state.debug === true)
-                        state.log('interactionModel.mousewheel()');
+                        state.log('interactionModel.wheel()');
 
                     // Take the offset of a mouse event on the dygraph canvas and
                     // convert it to a pair of percentages from the bottom left.
@@ -4277,7 +4277,15 @@
                         state.globalSelectionSyncDelay();
 
                         // http://dygraphs.com/gallery/interaction-api.js
-                        var normal = (event.detail) ? event.detail * -1 : event.wheelDelta / 40;
+                        var normal_def;
+                        if(typeof event.wheelDelta === 'number' && event.wheelDelta != NaN)
+                            // chrome
+                            normal_def = event.wheelDelta / 40;
+                        else
+                            // firefox
+                            normal_def = event.deltaY * -2;
+
+                        var normal = (event.detail) ? event.detail * -1 : normal_def;
                         var percentage = normal / 50;
 
                         if (!(event.offsetX && event.offsetY)){
@@ -4290,7 +4298,6 @@
                         var yPct = percentages[1];
 
                         var new_x_range = zoomRange(dygraph, percentage, xPct, yPct);
-
                         var after = new_x_range[0];
                         var before = new_x_range[1];
 

diff --git a/web/index.html b/web/index.html
index 0f83ca1d74b4af5be486c47c2045df4e020d91ff..554d34f11702bdbaa10c4f3b5114f9e8a958fcea 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -3102,4 +3102,4 @@
     </div>
 </body>
 </html>
-<script type="text/javascript" src="dashboard.js?v20161011-1"></script>
+<script type="text/javascript" src="dashboard.js?v20161024-5"></script>