Prevent g v and ? also from the keycodes

mesosphere · Feb 5, 2016 · 9b738c6 · 9b738c6
1 parent 9d8749c
commit 9b738c6
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/js/components/Marathon.jsx b/src/js/components/Marathon.jsx
@@ -142,9 +142,12 @@ var Marathon = React.createClass({
     }.bind(this));
 
     Mousetrap.bind("g v", function () {
+      if (this.state.modal != null) {
+        return null;
+      }
       DialogActions.alert({message:`You're running version ${config.version}.`,
         title: "Marathon UI"});
-    });
+    }.bind(this));
 
     Mousetrap.bind("shift+,", function () {
       if (this.state.modal != null) {
@@ -155,7 +158,7 @@ var Marathon = React.createClass({
 
     Mousetrap.bind("?", function () {
       if (this.state.modal != null) {
-        this.handleModalDestroy();
+        return null;
       }
       router.transitionTo(router.getCurrentPathname(), {}, {modal: "help"});
     }.bind(this));