From 59dbeefd527752f076b85cd254f5594874711748 Mon Sep 17 00:00:00 2001 From: Jonas Felber Date: Sat, 22 Jun 2019 22:32:49 +0200 Subject: [PATCH] Changed scrolling of various screens, because they where broken on latest Firefox? --- web/client/controls.js | 20 ++++++++++---------- web/client/strace.js | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/web/client/controls.js b/web/client/controls.js index b50eb0a1..55793c91 100644 --- a/web/client/controls.js +++ b/web/client/controls.js @@ -78,9 +78,9 @@ $(document).ready(function() { } if (isend) is_dragging = false; } - $('#cfg-static').on('mousewheel', '#outergbox', function(e) { - var wdx = e.originalEvent.wheelDeltaX; - var wdy = e.originalEvent.wheelDeltaY; + $('#cfg-static').on('wheel', '#outergbox', function(e) { + var wdx = e.originalEvent.deltaX; + var wdy = e.originalEvent.deltaY; $("#gbox").css("margin-left", fdec($("#gbox").css("margin-left")) + wdx); $("#gbox").css("margin-top", fdec($("#gbox").css("margin-top")) + wdy); }); @@ -103,20 +103,20 @@ $(document).ready(function() { endDrag(e.screenX, e.screenY, true); }*/ }); - $('body').on('mousewheel', '.flat', function(e) { + $('body').on('wheel', '.flat', function(e) { var cdr = $(".flat").children(); - p(e.originalEvent.wheelDelta); - if (e.originalEvent.wheelDelta < 0) { + p(e.originalEvent.deltaY); + if (e.originalEvent.deltaY > 0) { Session.set('iview', bn_add(Session.get('iview'), -1)); - } else if (e.originalEvent.wheelDelta > 0) { + } else if (e.originalEvent.deltaY < 0) { Session.set('iview', bn_add(Session.get('iview'), 1)); } }); - $("#idump")[0].addEventListener("mousewheel", function(e) { + $("#idump")[0].addEventListener("wheel", function(e) { //p("idump mousewheel"); - if (e.wheelDelta < 0) { + if (e.deltaY > 0) { Session.set('clnum', Session.get('clnum')+1); - } else if (e.wheelDelta > 0) { + } else if (e.deltaY < 0) { Session.set('clnum', Session.get('clnum')-1); } }); diff --git a/web/client/strace.js b/web/client/strace.js index c7c1fcc4..584ab1cc 100644 --- a/web/client/strace.js +++ b/web/client/strace.js @@ -58,16 +58,16 @@ Deps.autorun(function() { DA("updating sview on fork/cl change"); }); $(document).ready(function() { - $("#strace")[0].addEventListener("mousewheel", function(e) { + $("#strace")[0].addEventListener("wheel", function(e) { var sv = Session.get('sview'); var forknum = Session.get("forknum"); if (traces[forknum] === undefined) return; var t = traces[forknum]; - if (e.wheelDelta < 0) { + if (e.deltaY > 0) { if (sv[1] < t.length) { Session.set('sview', [sv[0]+1, sv[1]+1]); } - } else if (e.wheelDelta > 0) { + } else if (e.deltaY < 0) { if (sv[0] > 0) { Session.set('sview', [sv[0]-1, sv[1]-1]); }