diff --git a/js/menus/Navbar.js b/js/menus/Navbar.js index e57f0480c25d1916b942580ce0b0be7577398974..851c319917bbdc655a72e7fc904e6633c733007e 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 c7ca2f44b83179e59cb9e87ce50811a2dae7662c..ddcdd3304a1b5bd54733e38115644d90374d4558 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