diff --git a/js/lattice/CompositeEditorLattice.js b/js/lattice/CompositeEditorLattice.js index 618f89ca44a9dcd6dcfa4d1da5568e72b2533ae4..9c4aaac5104e24faa08e597cd59c91012bbfaeef 100644 --- a/js/lattice/CompositeEditorLattice.js +++ b/js/lattice/CompositeEditorLattice.js @@ -16,7 +16,7 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre defaults: _.extend(LatticeBase.prototype.defaults, { name: "", - color: null + color: null, }), __initialize: function(options, callback){ diff --git a/js/menus/templates/CompositeMenuView.html b/js/menus/templates/CompositeMenuView.html index bf882d68779825ea503b3a461e53a5f1ae1704c3..4f18c256a6597afe1e0c3beab2c8ee8ad22b7394 100644 --- a/js/menus/templates/CompositeMenuView.html +++ b/js/menus/templates/CompositeMenuView.html @@ -14,7 +14,20 @@ Available Materials:<br/> </label> <% }); %> <% _.each(_.keys(materials), function(key){ - if (key == id || key.substr(0,5) != "super") return; %> + <!--if (key == id || key.substr(0,5) != "super") return;--> + <!--if (checkForLoops(key)) return;--> + <!--function checkForLoops(_key){--> + <!--console.log(materials[_key].compositeChildren);--> + <!--if (materials[_key].compositeChildren) {--> + <!--if (materials[_key].compositeChildren.indexOf(id)>0) return true;--> + <!--var childMatches = _.filter(materials[_key].compositeChildren, function(childKey){--> + <!--return checkForLoops(childKey);--> + <!--});--> + <!--if (childMatches.length>0) return true;--> + <!--}--> + <!--return false;--> + <!--}--> + %> <label class="radio colorSwatches"> <input type="radio" <%if (key == materialType){ %>checked<%}%> name="materialType" value="<%= key %>" data-toggle="radio" class="custom-radio appState"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span> <div class="materialColorSwatch">