From e248cb0315928c2ff922785410d9b20837f4d677 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 6 Feb 2015 17:43:48 -0500
Subject: [PATCH] deallocation
---
js/models/AppState.js | 6 ++++++
js/models/BasePlane.js | 12 ++++++------
js/models/Lattice.js | 13 +++++++++++++
3 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/js/models/AppState.js b/js/models/AppState.js
index 13e15096..53e1fa12 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -62,6 +62,7 @@ AppState = Backbone.Model.extend({
this.listenTo(this, "change:currentTab", this._updateCellMode);
this.listenTo(this, "change:cellMode", this._cellModeDidChange);
+ this.listenTo(this, "change:cellType change:connectionType", this._buildNewLattice);
this.listenTo(this, "change:lattice", this._buildLatticeMenu);
@@ -111,6 +112,11 @@ AppState = Backbone.Model.extend({
this.set("menuWrapper", new MenuWrapper({lattice:this.get("lattice"), model:this}));
},
+ _buildNewLattice: function(){
+ this.get("lattice").destroy();
+// var mode =
+ },
+
///////////////////////////////////////////////////////////////////////////////
/////////////////////KEY BINDINGS//////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
diff --git a/js/models/BasePlane.js b/js/models/BasePlane.js
index 191c31a6..64b120a2 100644
--- a/js/models/BasePlane.js
+++ b/js/models/BasePlane.js
@@ -52,12 +52,12 @@ BasePlane = Backbone.Model.extend({
},
destroy: function(){
- this.set("zIndex", null);
- this.set("mesh", null);
- this.set("material", null);
- this.set("unitGeometry", null);
- this.set("dimX", null);
- this.set("dimY", null);
+ this.set("zIndex", null, {silent:true});
+ this.set("mesh", null, {silent:true});
+ this.set("material", null, {silent:true});
+ this.set("unitGeometry", null, {silent:true});
+ this.set("dimX", null, {silent:true});
+ this.set("dimY", null, {silent:true});
}
});
diff --git a/js/models/Lattice.js b/js/models/Lattice.js
index 9a782610..c98268f9 100644
--- a/js/models/Lattice.js
+++ b/js/models/Lattice.js
@@ -290,6 +290,19 @@ Lattice = Backbone.Model.extend({
getScale: function(){
return this.get("scale");
+ },
+
+ destroy: function(){
+ this.set("scale", null, {silent:true});
+ this.set("nodes", null, {silent:true});
+ this.clearCells();
+ this.set("cells", null, {silent:true});
+ this.set("inverseCells", null, {silent:true});
+ this.set("cellsMin", null, {silent:true});
+ this.set("cellsMax", null, {silent:true});
+ this.set("numCells", null, {silent:true});
+ this.get("basePlane").destroy();
+ this.set("basePlane", null, {silent:true});
}
});
--
GitLab