Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements

22 files changed, 397 insertions, 79 deletions

diff --git a/js/panels/Components/ComponentsPanel.js b/js/panels/Components/ComponentsPanel.js
deleted file mode 100755
index df1d74bb..00000000
--- a/js/panels/Components/ComponentsPanel.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* <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> */
-
-var Montage = require("montage/core/core").Montage;
-
-var     PanelBase = require("js/panels/PanelBase").PanelBase;
-var ComponentsPanelBase = require("js/panels/Components/ComponentsPanelBase.reel").ComponentsPanelBase;
-
-exports.ComponentsPanel = Montage.create(PanelBase, {
-    id : {value : "componentsPanel", writable:true, enumerable:true, configurable:true},
-    panelName : {value : "Components", writable:true, enumerable:true, configurable:true},
-    panelHeaderID : {value : "componentsPanelHeader", writable:true, enumerable:true, configurable:true},
-    disclosureIconID : {value : "componentsPanelDisclosureIcon", writable:true, enumerable:true, configurable:true},
-    closeButtonID : {value : "componentsPanelCloseButton", writable:true, enumerable:true, configurable:true},
-    panelContentID : {value : "componentsPanelContent", writable:true, enumerable:true, configurable:true},
-
-    init : {
-        value : function()
-        {
-            this.contentHeight = 200;
-            this.minHeight = 100;
-            this.defaultHeight = 200;
-
-            /* OLD WAY -- Removing the temporary div
-            // TODO: Remove this comment once this is tested.
-            var panelContainer = document.createElement("div");
-            this._componentsPanelBase = ComponentsPanelBase.create();
-            this._componentsPanelBase.element = panelContainer;
-
-            this.content = this._componentsPanelBase;
-            this._componentsPanelBase.needsDraw = true;
-            */
-
-            this.content = ComponentsPanelBase.create();
-        }
-    },
-
-    _componentsPanelBase:{
-        enumerable: true,
-        value: null,
-        writable:true
-    }
-
-});
\ No newline at end of file
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css
index 89233c64..2d339411 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.css
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.css
@@ -37,21 +37,53 @@
 .mp_property
 {
     height:40px;
+    position: relative;
 }
 
 .mp_property > .prop-label
 {
-  float: left;
-  /*width:86px;*/
-  margin: 0px 8px 2px 5px;
+    position:relative;
+    top:12px;
+    float: left;
+    width: 100px;
 }
 
 .mp_property > .prop-controller
 {
-  float: right;
-  clear: left;
-  width: auto;
-  margin: 0px 0px 3px 0px;
+    position:relative;
+    top:12px;
+    left: 10px;
+    float: left;
+}
+
+.mp_property .hottext,
+.mp_property .hottextInput
+{
+    width: 30px;
+}
+
+.mp_property .button
+{
+    width: 30px;
+    height: 20px;
+}
+
+.mp_property .inputRow
+{
+    top: 8px;
+    position: relative;
+}
+
+.mp_properties_list
+{
+   padding-bottom: 8px;
+}
+
+.mp_properties_list > .mp_property > .colortoolbar
+{
+        width: 27px !important;
+        height: 27px !important;
+    overflow:hidden !important;
 }
 
 .mp_buttons {
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index 34f68554..ae0ee2c8 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -104,7 +104,7 @@
 
             <hr />
 
-            <div id="mp_properties_list" class="mp_properties_list" style="-webkit-user-select: none;">
+            <div id="mp_properties_list" class="mp_properties_list">
                 <div id="mp_property" class="mp_property"></div>
             </div>
 
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index b44761bc..bbccf45d 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -237,7 +237,7 @@ exports.MaterialsPopup = Montage.create(Component, {
             }
             else
             {
-                this.materialsData = this._dummyData1;
+                this.materialsData = this._dummyData1.slice(0);
             }
             
            this.needsDraw = true;
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index 33f9b3a7..613bef4b 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -125,7 +125,10 @@ exports.Panel = Montage.create(Component, {
                 require.async(this.modulePath)
                     .then(function(panelContent) {
                         var componentRequire = panelContent[that.moduleName];
-                        that.panelContent.content = componentRequire.create();
+                        var componentInstance = componentRequire.create();
+
+                        componentInstance.ownerComponent = that.ownerComponent;
+                        that.panelContent.content = componentInstance;
                     })
                     .end();
             }
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index 251e86e4..d3673105 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -62,6 +62,13 @@
                 }
             },
 
+            "panel_6": {
+                "prototype": "js/panels/Panel.reel",
+                "properties": {
+                    "element": {"#": "panel_6"}
+                }
+            },
+
             "owner": {
                 "module": "js/panels/PanelContainer.reel",
                 "name": "PanelContainer",
@@ -74,7 +81,8 @@
                     "panel_2":          {"@": "panel_2"},
                     "panel_3":          {"@": "panel_3"},
                     "panel_4":          {"@": "panel_4"},