clean up

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){

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