Tweak Mousewheel

The scroll event was triggering during dialog boxes

Author: Gary Keeble

js/main.js

@@ -813,23 +813,25 @@ function BlackboxLogViewer() {
         $(window).resize(updateCanvasSize);
 
         $(document).on("mousewheel", function(e) {
-            var delta = Math.max(-1, Math.min(1, (e.originalEvent.wheelDelta)));
-            if(delta<0) { // scroll down (or left)
-                if (e.altKey || e.shiftKey) {
-                    setGraphZoom(graphZoom - 10.0 - ((e.altKey)?15.0:0.0));
-                    $(".graph-zoom").val(graphZoom + "%");
-                } else {
-                  logJumpBack();
-                }
-            } else { // scroll up or right
-                if (e.altKey || e.shiftKey) {
-                    setGraphZoom(graphZoom + 10.0 + ((e.altKey)?15.0:0.0));
-                    $(".graph-zoom").val(graphZoom + "%");
-                } else {
-                    logJumpForward();
+        if (graph && $(e.target).parents('.modal').length == 0) {
+                var delta = Math.max(-1, Math.min(1, (e.originalEvent.wheelDelta)));
+                if(delta<0) { // scroll down (or left)
+                    if (e.altKey || e.shiftKey) {
+                        setGraphZoom(graphZoom - 10.0 - ((e.altKey)?15.0:0.0));
+                        $(".graph-zoom").val(graphZoom + "%");
+                    } else {
+                      logJumpBack();
+                    }
+                } else { // scroll up or right
+                    if (e.altKey || e.shiftKey) {
+                        setGraphZoom(graphZoom + 10.0 + ((e.altKey)?15.0:0.0));
+                        $(".graph-zoom").val(graphZoom + "%");
+                    } else {
+                        logJumpForward();
+                    }
                 }
+                e.preventDefault();
             }
-            e.preventDefault();
         });
 
         $(document).keydown(function(e) {