diff --git a/js/lattice/CompositeEditorLattice.js b/js/lattice/CompositeEditorLattice.js index 9795dd74e4282316ef7d19200ca14c4be2981d71..58b9154f03229452e511b3514c49434c4dbd2306 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 fcd2ad41e59f07d7b58173a595a61f8cffc89317..d54511f9849c191fb3880746ab4d5baa75cb8b69 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 9879f6bbc8a1a20df9789d6e26e1aef4fb9f7759..306735f33ab852182af61e1d3ac9260ca2dc7f0f 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 58b11fcfa3be38be014b15a92e2137e3b33c2814..6c37bdc3841c1e4a8c7a0f2da6c3198f21e7fdd2 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" },