diff --git a/js/menus/Navbar.js b/js/menus/Navbar.js index aabdd116f21653aa18ca81630f3e6171002e8a02..adbaae9c10640c5a9364af2ab8156ce2f2a1e8ab 100644 --- a/js/menus/Navbar.js +++ b/js/menus/Navbar.js @@ -13,7 +13,7 @@ NavBar = Backbone.View.extend({ events: { "click #showHideMenu": "_setMenuVis", "click .menuHoverControls": "_setNavSelection", - "click #saveAs": "_saveAs", + "click #saveAsJSON": "_saveAs", "click #importJSON": "_importJSON", "change #jsonInput": "_selectJSONFiles", }, diff --git a/js/models/AppState.js b/js/models/AppState.js index da1790bedc76761bca61b1cb9f1e3ffe7d4ff7fe..0933d3310dcc9c8af8104855fe5413151809a648 100644 --- a/js/models/AppState.js +++ b/js/models/AppState.js @@ -104,12 +104,15 @@ AppState = Backbone.Model.extend({ var state = e.data.state; var currentTab = this.get("currentTab"); - if (state) { + if (e.ctrlKey || e.metaKey){ + + }else if (state) { if (this.downKeys[e.keyCode]) return; this.downKeys[e.keyCode] = true; - } else this.downKeys[e.keyCode] = null; + } else this.downKeys[e.keyCode] = false; + -// console.log(e.keyCode); + console.log(e.keyCode); switch(e.keyCode){ case 16://shift e.preventDefault(); @@ -132,6 +135,13 @@ AppState = Backbone.Model.extend({ case 73://i inverse mode this.lattice.set("inverseMode", !this.lattice.get("inverseMode")); break; + case 83://s save +// e.preventDefault(); +// if (e.ctrlKey || e.metaKey){//command +// console.log("here"); +// dmaGlobals.lattice.saveAsJSON(); +// } + break; default: break; } diff --git a/main.html b/main.html index 90543f9e0ee2f9c2e643a0305e5b0640e17c3025..fffec2809014c7ed09541ee463d4d54c667414b3 100644 --- a/main.html +++ b/main.html @@ -96,7 +96,7 @@ <span class="dropdown-arrow"></span> <ul class="dropdown-menu"> <li><a id="importJSON" href="#">Import Lattice JSON</a></li> - <li><a id="saveAs" href="#">Save Lattice JSON</a></li> + <li><a id="saveAsJSON" href="#">Save Lattice JSON</a></li> <li><a href="#">Something else here</a></li> <li class="divider"></li> <li><a href="#">Separated link</a></li>