From 406b9279e2005238745548c80048ffdaf39e190f Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 23 Jun 2015 10:55:59 -0700
Subject: [PATCH] eod
---
js/lattice/CompositeEditorLattice.js | 3 ---
js/lattice/Lattice.js | 8 ++------
js/lattice/LatticeBase.js | 1 -
js/models/PList.js | 2 +-
4 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/js/lattice/CompositeEditorLattice.js b/js/lattice/CompositeEditorLattice.js
index 9795dd74..58b9154f 100644
--- a/js/lattice/CompositeEditorLattice.js
+++ b/js/lattice/CompositeEditorLattice.js
@@ -19,9 +19,6 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
color: null
}),
- __bindEvents: function(){
- },
-
__initialize: function(options, callback){
if (!options.id || options.id == "") this.set("id", "super" + this.cid);
if (!options.color || options.color == "") this.set("color", makeRandomColor(), {silent:true});
diff --git a/js/lattice/Lattice.js b/js/lattice/Lattice.js
index fcd2ad41..d54511f9 100644
--- a/js/lattice/Lattice.js
+++ b/js/lattice/Lattice.js
@@ -22,8 +22,7 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
}),
-
- __bindEvents: function(){
+ __initialize: function(){
this.listenTo(this, "change:partType", this._updatePartType);
this.listenTo(this, "change:cellType change:connectionType", function(){
@@ -32,9 +31,7 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
this.listenTo(this, "change:cellSeparation", this._updateCellSeparation);
this.listenTo(appState, "change:currentNav", this._navChanged);
- },
- __initialize: function(){
this._updateLatticeType();
},
@@ -248,8 +245,7 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
},
inCompositeMode: function(){
- if (this.compositeEditor) return true;
- return false;
+ return this.compositeEditor != null;
},
_isSingltonLattice: function(){
diff --git a/js/lattice/LatticeBase.js b/js/lattice/LatticeBase.js
index 9879f6bb..306735f3 100644
--- a/js/lattice/LatticeBase.js
+++ b/js/lattice/LatticeBase.js
@@ -31,7 +31,6 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
this.listenTo(appState, "change:cellMode", this._updateForMode);
this.listenTo(appState, "change:cellsVisible", this._setCellVisibility);
- if (this.__bindEvents) this.__bindEvents();
if (this.__initialize) this.__initialize(options, callback);
},
diff --git a/js/models/PList.js b/js/models/PList.js
index 58b11fcf..6c37bdc3 100644
--- a/js/models/PList.js
+++ b/js/models/PList.js
@@ -8,9 +8,9 @@ define(['three'], function(THREE){
allMenuTabs: {
navDesign:{
lattice:"Lattice",
- import:"Import",
//sketch:"Sketch",
material:"Material",
+ import:"Import",
part:"Part",
script:"Script"
},
--
GitLab