diff --git a/js/materials/DMAMaterials.js b/js/materials/DMAMaterials.js index 93db7144785e3238250c8a7a9c1fcdb75dae56d2..b654aed7893908631eaac9d4895c195691fc8b9c 100644 --- a/js/materials/DMAMaterials.js +++ b/js/materials/DMAMaterials.js @@ -57,7 +57,6 @@ define(['underscore', 'three', 'appState', 'lattice', 'plist', 'threeModel'], fu lattice.reinitAllCellsOfTypes(allChangedMaterialsList); } - console.log(materialsList); return false; } diff --git a/js/menus/MaterialEditorMenuView.js b/js/menus/MaterialEditorMenuView.js index 1a6cb1f513b87cda2d18e00e7ad16e9bfccda965..2f7df13de306b98b494cc6bbdb8606f89f4f620d 100644 --- a/js/menus/MaterialEditorMenuView.js +++ b/js/menus/MaterialEditorMenuView.js @@ -62,7 +62,10 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'materials', 'text!materi _deleteMaterial: function(e){ e.preventDefault(); - if (!materials.list(materials.getEditingMaterial())) this.exit(); + if (!materials.list[materials.getEditingMaterial()]) { + this._exit(); + return; + } var deleted = materials.setMaterial(materials.getEditingMaterial(), null); if (deleted) this._exit(); }, diff --git a/js/menus/MaterialMenuView.js b/js/menus/MaterialMenuView.js index be19c7dbe8e86e18d929a197f515a330e58885cf..16d5f51c49eefe4faccd4956dfc64082aa266737 100644 --- a/js/menus/MaterialMenuView.js +++ b/js/menus/MaterialMenuView.js @@ -50,7 +50,6 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'globals', 'ma }, _openMaterialEditor: function(id){ - console.log(id); materials.setEditingMaterial(id); this.model.set("currentTab", "materialEditor", {silent:true}); this.model.set("currentNav", "navMaterial"); diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js index 7322e9cca7fae905aa270789a51dab821be0ac1e..df86a778a444484fe0f2f9e6da0d7611664db9a7 100644 --- a/js/menus/MenuWrapperView.js +++ b/js/menus/MenuWrapperView.js @@ -138,11 +138,12 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice', 'appState', 'tex var $target = $(e.target); $target.blur(); var property = $target.data("property"); + var key = $target.data("key"); if (!property) { console.warn("no property associated with checkbox input"); return; } - this._toggleProperty($target, property); + this._toggleProperty($target, property, key); }, _radioSelection: function(e){ @@ -172,9 +173,9 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice', 'appState', 'tex return null; }, - _toggleProperty: function($target, property){ //val = !val + _toggleProperty: function($target, property, key){ //val = !val var owner = this._getPropertyOwner($target); - if (owner) this._setOwnerProperty(owner, property, !this._getOwnerProperty(owner, property)); + if (owner) this._setProperty($target, property, !(this._getOwnerProperty(owner, property)[key]), key); }, _setProperty: function($target, property, newVal, key){ @@ -185,7 +186,9 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice', 'appState', 'tex return; } if (key){ - var propObject = this._getOwnerProperty(owner, property).clone(); + var propObject = this._getOwnerProperty(owner, property); + if (propObject.clone) propObject = propObject.clone(); + else propObject = _.clone(propObject); propObject[key] = newVal; this._setOwnerProperty(owner, property, propObject); } else { diff --git a/js/menus/templates/MaterialEditorMenuView.html b/js/menus/templates/MaterialEditorMenuView.html index 7443bf4a4f31c3fe401fc3747c936406bea13925..87e90477f9dbdceeac96a10d5680f1a35e8e34dd 100644 --- a/js/menus/templates/MaterialEditorMenuView.html +++ b/js/menus/templates/MaterialEditorMenuView.html @@ -4,7 +4,12 @@ Display Color: <a id="newRandomColor" href="#" class="btn btn-block btn-lg btn-default">New Random Display Color</a><br/> Realistic Color: <input id="materialAltColor" style="border-color: <%= color %> ;" data-property="color" value="<%= color %>" placeholder="Enter HEX" class="halfWidth materialEditor form-control hexInput" type="text"><br/><br/> -Material Properties:<br/><br/>- add properties here<br/><br/> +Material Properties:<br/> + <label class="checkbox" for="conductive"> + <input id="conductive" data-property="properties" data-key="conductive" type="checkbox" <% if (properties.conductive){ %> checked="checked"<% } %> value="" data-toggle="checkbox" class="materialEditor custom-checkbox"> + <span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span> + Conductive</label><br/> +<br/> <a id="finishMaterial" href="#" class="btn btn-block btn-lg btn-success">Save Material</a><br/> <% if (noDelete){ %> <a id="cancelMaterial" href="#" class="btn btn-halfWidth btn-lg btn-default">Cancel / Exit</a>