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

13 files changed, 108 insertions, 26 deletions

diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index 3200b01c..bc433f52 100644
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -104,6 +104,26 @@ exports.Combobox = Montage.create(Component, {
         }
     },
 
+    _visible: {
+        enumerable: false,
+        value: true
+    },
+
+    visible: {
+        enumerable: true,
+        serializable: true,
+        get: function() {
+            return this._visible;
+        },
+        set: function(value) {
+            if(value !== this._visible)
+            {
+                this._visible = value;
+                this.needsDraw = true;
+            }
+        }
+    },
+
     handleChange:
     {
         value:function(event)
@@ -158,6 +178,14 @@ exports.Combobox = Montage.create(Component, {
                     this.element.appendChild(optionItem);
                 }
                 this.element.disabled = !this._enabled;
+                if(this._visible)
+                {
+                    this.element.style.visibility = "visible";
+                }
+                else
+                {
+                    this.element.style.visibility = "hidden";
+                }
             }
         }
     },
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>
 
diff --git a/js/components/treeview/branch.reel/branch.css b/js/components/treeview/branch.reel/branch.css
index 5998e0f0..0f4e4a87 100644
--- a/js/components/treeview/branch.reel/branch.css
+++ b/js/components/treeview/branch.reel/branch.css
@@ -1,3 +1,9 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
 .treeRoot > .branch > ul {
     margin-top: 0;
 }
diff --git a/js/components/treeview/branch.reel/branch.html b/js/components/treeview/branch.reel/branch.html
index 31a4cf18..b44a54c5 100644
--- a/js/components/treeview/branch.reel/branch.html
+++ b/js/components/treeview/branch.reel/branch.html
@@ -1,4 +1,9 @@
 <!DOCTYPE html>
+<!-- <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> -->
 <html lang="en">
 <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
diff --git a/js/components/treeview/leaf.reel/leaf.css b/js/components/treeview/leaf.reel/leaf.css
index fea5a2c4..41fb02ff 100644
--- a/js/components/treeview/leaf.reel/leaf.css
+++ b/js/components/treeview/leaf.reel/leaf.css
@@ -1,3 +1,9 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
 .leaf > .leaf-label {
     opacity: 0.8;
     cursor: pointer;
diff --git a/js/components/treeview/leaf.reel/leaf.html b/js/components/treeview/leaf.reel/leaf.html
index 991a4323..cf0b4e40 100644
--- a/js/components/treeview/leaf.reel/leaf.html
+++ b/js/components/treeview/leaf.reel/leaf.html
@@ -1,4 +1,9 @@
 <!DOCTYPE html>
+<!-- <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> -->
 <html lang="en">
 <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css
index 698fcd21..6a458cc7 100644
--- a/