Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into working

2 files changed, 26 insertions, 23 deletions

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index 345e361c..79567453 100644
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -45,13 +45,16 @@ exports.ShapeProperties = Montage.create(ToolProperties, {
                 this._selectedSubTool = value;
                 this[this._selectedSubTool.properties].visible = true;
 
-//                if(this._selectedSubTool.id === "LineTool") {
-//                    this._fillIcon.style["display"] = "none";
-//                    this._fillMaterial.style["display"] = "none";
-//                } else {
-//                    this._fillIcon.style["display"] = "";
-//                    this._fillMaterial.style["display"] = "";
-//                }
+                if(this._useWebGL.checked)
+                {
+                    if(this._selectedSubTool.id === "LineTool") {
+                        this._fillIcon.style["display"] = "none";
+                        this._fillMaterial.visible = false;
+                    } else {
+                        this._fillIcon.style["display"] = "";
+                        this._fillMaterial.visible = true;
+                    }
+                }
                 
             }
         }
@@ -62,23 +65,23 @@ exports.ShapeProperties = Montage.create(ToolProperties, {
             if(this._useWebGL.checked)
             {
                 this._use3D = true;
-//                this._materialLabel.style["display"] = "";
-//                this._strokeIcon.style["display"] = "";
-//                this._strokeMaterial.style["display"] = "";
-//                if(this.selectedSubTool.id !== "LineTool")
-//                {
-//                    this._fillIcon.style["display"] = "";
-//                    this._fillMaterial.style["display"] = "";
-//                }
+                this._materialLabel.style["display"] = "";
+                this._strokeIcon.style["display"] = "";
+                this._strokeMaterial.visible = true;
+                if(this.selectedSubTool.id !== "LineTool")
+                {
+                    this._fillIcon.style["display"] = "";
+                    this._fillMaterial.visible = true;
+                }
             }
             else
             {
                 this._use3D = false;
-//                this._materialLabel.style["display"] = "none";
-//                this._strokeIcon.style["display"] = "none";
-//                this._strokeMaterial.style["display"] = "none";
-//                this._fillIcon.style["display"] = "none";
-//                this._fillMaterial.style["display"] = "none";
+                this._materialLabel.style["display"] = "none";
+                this._strokeIcon.style["display"] = "none";
+                this._strokeMaterial.visible = false;
+                this._fillIcon.style["display"] = "none";
+                this._fillMaterial.visible = false;
             }
         }
     }
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html
index c7588b9e..2b81bb71 100644
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -56,9 +56,9 @@
                     <label class="label"> Tag Name:</label>
 
                     <select id="customTagCB" class="nj-skinned">
-                        <option>Article</option>
-                        <option>Aside</option>
-                        <option>Section</option>
+                        <option>article</option>
+                        <option>aside</option>
+                        <option>section</option>
                     </select>
                 </div>