diff --git a/js/menus/Navbar.js b/js/menus/Navbar.js index 3831f8265b35bcc65e0aa205bd6fd6a19cfbd327..ac4003a3b9e8d7796980fd5d36f28e8a2b06fc00 100644 --- a/js/menus/Navbar.js +++ b/js/menus/Navbar.js @@ -96,13 +96,13 @@ NavBar = Backbone.View.extend({ _save: function(e){ e.preventDefault(); - dmaGlobals.lattice.saveAsJSON(); + dmaGlobals.lattice.saveJSON(); }, _saveAs: function(e){ e.preventDefault(); var fileName = $("#saveAsFileName").val(); - dmaGlobals.lattice.saveAsJSON(fileName); + dmaGlobals.lattice.saveJSON(fileName); $('#saveAsModel').modal('hide'); }, diff --git a/js/models/AppState.js b/js/models/AppState.js index 2b55fa5c724c2c185067846dc8eb1e243de3e24c..ff01a777ad28b20524080c41657fc2e3258c19d3 100644 --- a/js/models/AppState.js +++ b/js/models/AppState.js @@ -108,7 +108,6 @@ AppState = Backbone.Model.extend({ var currentTab = this.get("currentTab"); if (e.ctrlKey || e.metaKey){ - }else if (state) { if (this.downKeys[e.keyCode]) return; this.downKeys[e.keyCode] = true; @@ -142,7 +141,7 @@ AppState = Backbone.Model.extend({ if (e.shiftKey){ $("#saveAsModel").modal("show"); } else { - dmaGlobals.lattice.saveAsJSON(); + dmaGlobals.lattice.saveJSON(); } } break; diff --git a/js/models/Lattice.js b/js/models/Lattice.js index 801b59aa31457935c38ed837c2208525c60e7044..5f905eaab60c051036f61d3e696a58fcacb18a13 100644 --- a/js/models/Lattice.js +++ b/js/models/Lattice.js @@ -454,7 +454,7 @@ Lattice = Backbone.Model.extend({ } }, - saveAsJSON: function(name){ + saveJSON: function(name){ if (!name) name = "lattice"; var data = JSON.stringify(_.omit(this.toJSON(), ["highlighter", "basePlane"])); var blob = new Blob([data], {type: "text/plain;charset=utf-8"});