diff --git a/js/lattice/CompositeEditorLattice.js b/js/lattice/CompositeEditorLattice.js index 4ae136ea2fc05e7799f4ec588e42d7c805d6ec75..1c9c010515ecc72735f13c8559c310e64248576e 100644 --- a/js/lattice/CompositeEditorLattice.js +++ b/js/lattice/CompositeEditorLattice.js @@ -30,7 +30,6 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre initLatticeSubclass: function(subclass){ var self = this; require([subclass], function(subclassObject){ - _.extend(self, subclassObject); // //copy over cells to new lattice type diff --git a/js/menus/CompositeMenu.js b/js/menus/CompositeMenu.js index 2017ee1176cb5261170c96ad8aed5577fe58419d..71f49bd8209ed962c64df793ccb7b82ef607f6d8 100644 --- a/js/menus/CompositeMenu.js +++ b/js/menus/CompositeMenu.js @@ -82,10 +82,10 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _ template: _.template('\ <a href="#" class="btn btn-halfWidth btn-lg btn-default importJSON">Load Composite</a>\ <a id="saveComposite" href="#" class="btn btn-halfWidth btn-lg pull-right btn-default">Save Composite</a><br/><br/>\ - Name: <input id="compositeName" data-property="name" value="<%= name %>" placeholder="Enter Name" class="seventyFiveWidth form-control textInput lattice" type="text"><br/><br/>\ + Name: <input id="compositeName" data-property="name" value="<%= name %>" placeholder="Enter Name" class="seventyFiveWidth form-control textInput compositeEditor" type="text"><br/><br/>\ Bounding Box: ()<br/><br/>\ Display Color: \ - <input id="compositeColor" style="border-color: <%= color %> ;" data-property="color" value="<%= color %>" placeholder="Enter HEX" class="halfWidth lattice form-control hexInput" type="text"><br/><br/>\ + <input id="compositeColor" style="border-color: <%= color %> ;" data-property="color" value="<%= color %>" placeholder="Enter HEX" class="halfWidth compositeEditor form-control hexInput" type="text"><br/><br/>\ <a id="newRandomColor" href="#" class="btn btn-block btn-lg btn-default">New Random Color</a><br/><br/>\ <a id="finishComposite" href="#" class="btn btn-block btn-lg btn-success">Finish Composite</a><br/>\ <a id="cancelComposite" href="#" class="btn btn-halfWidth btn-lg btn-default">Cancel / Exit</a>\ diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js index 884d68d6ac52f2bf666c2d0d7bfe5246cad1fe13..ddbabef071ab9138aa68c18299c7a5766d9133f3 100644 --- a/js/menus/MenuWrapperView.js +++ b/js/menus/MenuWrapperView.js @@ -162,6 +162,7 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice'], function($, _, _getPropertyOwner: function($target){ if ($target.hasClass("lattice")) return lattice; + if ($target.hasClass("compositeEditor")) return lattice.compositeEditor; if ($target.hasClass("assembler")) return globals.cam; if ($target.hasClass("appState")) return this.model; console.warn("no owner found for " + $target);