From d6be199b78e8704416fd756526e70d0ea8bc6297 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Sat, 7 Mar 2015 02:07:52 -0500
Subject: [PATCH] in progress
---
js/menus/Navbar.js | 2 +-
js/models/AppState.js | 16 +++++++++++++---
main.html | 2 +-
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/js/menus/Navbar.js b/js/menus/Navbar.js
index aabdd116..adbaae9c 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 da1790be..0933d331 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 90543f9e..fffec280 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>
--
GitLab