diff --git a/js/lattice/LatticeBase.js b/js/lattice/LatticeBase.js index 09014bd85279c034dbc9236ac37173f6be6d4e1c..9870070903796d4339e74b6426a28a2cc1317e65 100644 --- a/js/lattice/LatticeBase.js +++ b/js/lattice/LatticeBase.js @@ -336,13 +336,6 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre //save/load - parseJSON: function(json){ - var self = this; - _.each(_.keys(json), function(key){ - self.set(key, json[key], {silent:true}); - }); - }, - parseCellsJSON: function(sparseCells){ var cellsMin = this.get("cellsMin"); this._loopCells(sparseCells, function(cell, x, y, z, self){ diff --git a/js/models/FileSaver.js b/js/models/FileSaver.js index a4d0ff2a6fb7ffefade083c0a53315c8173a66cd..bcc6974222c54aea5b972262bda8eef273211b78 100644 --- a/js/models/FileSaver.js +++ b/js/models/FileSaver.js @@ -59,7 +59,7 @@ define(['underscore', 'fileSaverLib', 'lattice'], function(_, saveAs, lattice){ } lattice.clearCells(); var sparseCells = data.assembly.sparseCells; - lattice.parseJSON(_.omit(data.assembly, sparseCells), false); + _setData(lattice, _.omit(data.assembly, "sparseCells"), false); if (sparseCells) lattice._updateLatticeType(sparseCells); } @@ -67,14 +67,11 @@ define(['underscore', 'fileSaverLib', 'lattice'], function(_, saveAs, lattice){ _setData(data, false); } - function _setData(data, silent){ - if (silent === undefined) silent = false; - _.each(_.keys(data.assembly), function(key){ - lattice.set(key, data.assembly[key], {silent:silent}); - }); - _.each(_.keys(data.cam), function(key){ - cam.set(key, data.assembler[key]); + function _setData(object, data, silent){ + _.each(_.keys(data), function(key){ + object.set(key, data[key], {silent:true}); }); + if (!silent || silent === undefined) object.trigger("change"); } return {//return public methods