Skip to content
Snippets Groups Projects
Commit fba9cade authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

composite menu fixes

parent 863e9f07
Branches
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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: &nbsp;&nbsp;<input id="compositeName" data-property="name" value="<%= name %>" placeholder="Enter Name" class="seventyFiveWidth form-control textInput lattice" type="text"><br/><br/>\
Name: &nbsp;&nbsp;<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: &nbsp;&nbsp;\
<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>\
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment