From 6ff77eeaea013d64c7e9784709fdc387a6d233cd Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Thu, 2 Jul 2015 16:14:13 -0700
Subject: [PATCH] small changes

---
 js/materials/DMAMaterials.js           | 3 +--
 js/menus/MenuWrapperView.js            | 1 -
 js/menus/templates/ESetupMenuView.html | 2 +-
 js/parts/DMAPart.js                    | 1 -
 js/plists/PList.js                     | 3 +--
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/js/materials/DMAMaterials.js b/js/materials/DMAMaterials.js
index 34ed4c23..801b8176 100644
--- a/js/materials/DMAMaterials.js
+++ b/js/materials/DMAMaterials.js
@@ -209,7 +209,6 @@ define(['underscore', 'three', 'appState', 'lattice', 'plist', 'threeModel'], fu
     }
 
     function makeMaterialObject(color, transparent){
-//        return new THREE.MeshNormalMaterial({shading:THREE.FlatShading});
         if (transparent) return new THREE.MeshLambertMaterial({color:color, shading:THREE.FlatShading, transparent: true, opacity:0.1});
         return new THREE.MeshLambertMaterial({color:color, shading:THREE.FlatShading});
     }
@@ -225,7 +224,7 @@ define(['underscore', 'three', 'appState', 'lattice', 'plist', 'threeModel'], fu
     }
 
     return {
-        list:materialsList,
+        list: materialsList,
         setMaterial: setMaterial,
         getCompositeKeys: getCompositeKeys,
         getVaildAvailableCompositeKeys: getVaildAvailableCompositeKeys,
diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js
index 17f8b42d..7322e9cc 100644
--- a/js/menus/MenuWrapperView.js
+++ b/js/menus/MenuWrapperView.js
@@ -185,7 +185,6 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice', 'appState', 'tex
                 return;
             }
             if (key){
-                console.log(this._getOwnerProperty(owner, property));
                 var propObject = this._getOwnerProperty(owner, property).clone();
                 propObject[key] = newVal;
                 this._setOwnerProperty(owner, property, propObject);
diff --git a/js/menus/templates/ESetupMenuView.html b/js/menus/templates/ESetupMenuView.html
index 80aaea56..7bc4f413 100644
--- a/js/menus/templates/ESetupMenuView.html
+++ b/js/menus/templates/ESetupMenuView.html
@@ -13,7 +13,7 @@ Simulation Type: &nbsp;&nbsp;
     <% if(conductorGroups.length > 0){ %>
         <label class="radio">
             <input type="radio" <% if (visibleConductorGroup < 0){ %>checked<% } %> name="visibleConductorGroup" value="-1" data-toggle="radio" class="custom-radio eSim"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
-            Show All
+            Show All Conducting Groups
         </label>
         <% _.each(conductorGroups, function(groupNum, index){ %>
             <label class="radio">
diff --git a/js/parts/DMAPart.js b/js/parts/DMAPart.js
index de0a14a5..9efd36d3 100644
--- a/js/parts/DMAPart.js
+++ b/js/parts/DMAPart.js
@@ -28,7 +28,6 @@ define(['underscore', 'three'], function(_, THREE){
     };
 
     DMAPart.prototype.getMaterial = function(returnTHREEObject){
-//        return new THREE.MeshLambertMaterial({color:'#aaaaaa', shading:THREE.FlatShading});
         return this.parentCell.getMaterial(returnTHREEObject);
     };
 
diff --git a/js/plists/PList.js b/js/plists/PList.js
index 06c9a73a..ce4a2f22 100644
--- a/js/plists/PList.js
+++ b/js/plists/PList.js
@@ -17,8 +17,7 @@ define(['three'], function(THREE){
             electronicNavSim:{
                 eSetup:"Connectivity",
                 eStatic:"Statics",
-                eDynamic:"Dynamics",
-                optimize:"Optimize"
+                eDynamic:"Dynamics"
             },
             mechanicalNavSim:{
                 mSetup:"Setup",
-- 
GitLab