From 8c1bc54d7f6ecb04ef9e6499ad0f0d09e0eb85d9 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 25 May 2015 11:38:01 -0700
Subject: [PATCH] navbar small changes
---
js/menus/Navbar.js | 9 ++++++---
js/models/Lattice.js | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/js/menus/Navbar.js b/js/menus/Navbar.js
index e57f0480..851c3199 100644
--- a/js/menus/Navbar.js
+++ b/js/menus/Navbar.js
@@ -18,8 +18,9 @@ NavBar = Backbone.View.extend({
"click .saveJSON": "_save",
"click .saveAsJSON": "_saveAs",
-// "change #saveAsModel": "_saveAs",//detect enter key
+ "change #saveAsFileName": "_saveAs",//detect enter key
"click .saveUser": "_saveUser",
+ "change #saveUserFileName": "_saveUser",//detect enter key
"click .importJSON": "_importJSON",
"change #jsonInput": "_selectJSONFiles",
@@ -99,8 +100,7 @@ NavBar = Backbone.View.extend({
$(e.target).find("input.filename").blur();
},
-
-
+
_save: function(e){
@@ -122,6 +122,9 @@ NavBar = Backbone.View.extend({
$('#saveUserModel').modal('hide');
},
+
+
+
_importJSON: function(e){
e.preventDefault();
$("#jsonInput").click();
diff --git a/js/models/Lattice.js b/js/models/Lattice.js
index c7ca2f44..ddcdd330 100644
--- a/js/models/Lattice.js
+++ b/js/models/Lattice.js
@@ -606,6 +606,6 @@ Lattice = Backbone.Model.extend({
toJSON: function(){//a minimal toJSON for ui stuff - no need to parse all cells
return _.omit(this.attributes, ["cells", "nodes"]);//omit makes a copy
- },//todo something weird here
+ }//todo something weird here
});
\ No newline at end of file
--
GitLab