enable mousewheel zooming in firefox; fixes #https://github.com/danvk/dygraphs/issues/788
Costa Tsaousis committed
Oct 24, 2016 at 15:53 UTC
211fc92059825d90ea294e547ddd5e8584996641
2 files changed
+12
-5
web/dashboard.js
+11
-4
@@ -4207,9 +4207,9 @@
4207
state.log('interactionModel.dblclick()');
4208
NETDATA.resetAllCharts(state);
4209
},
4210
- mousewheel: function(event, dygraph, context) {
4210
+ wheel: function(event, dygraph, context) {
4211
if(NETDATA.options.debug.dygraph === true || state.debug === true)
4212
- state.log('interactionModel.mousewheel()');
4212
+ state.log('interactionModel.wheel()');
4213
4214
// Take the offset of a mouse event on the dygraph canvas and
4215
// convert it to a pair of percentages from the bottom left.
@@ -4277,7 +4277,15 @@
4277
state.globalSelectionSyncDelay();
4278
4279
// http://dygraphs.com/gallery/interaction-api.js
4280
- var normal = (event.detail) ? event.detail * -1 : event.wheelDelta / 40;
4280
+ var normal_def;
4281
+ if(typeof event.wheelDelta === 'number' && event.wheelDelta != NaN)
4282
+ // chrome
4283
+ normal_def = event.wheelDelta / 40;
4284
+ else
4285
+ // firefox
4286
+ normal_def = event.deltaY * -2;
4287
+
4288
+ var normal = (event.detail) ? event.detail * -1 : normal_def;
4289
var percentage = normal / 50;
4290
4291
if (!(event.offsetX && event.offsetY)){
@@ -4290,7 +4298,6 @@
4298
var yPct = percentages[1];
4299
4300
var new_x_range = zoomRange(dygraph, percentage, xPct, yPct);
4293
-
4301
var after = new_x_range[0];
4302
var before = new_x_range[1];
4303
web/index.html
+1
-1
@@ -3102,4 +3102,4 @@
3102
</div>
3103
</body>
3104
</html>
3105
-<script type="text/javascript" src="dashboard.js?v20161011-1"></script>
3105
+<script type="text/javascript" src="dashboard.js?v20161024-5"></script>