Merge branch 'refs/heads/NINJAmaster' into TimelineUber

9 files changed, 224 insertions, 219 deletions

diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index b4eec771..b6bee37d 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -118,7 +118,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
     didCreate: {
         value: function() {
             // Setup the drop delegate
-            this.application.ninja.dragDropMediator.dropDelegate = this;
+//            this.application.ninja.dragDropMediator.dropDelegate = this;
             // Loop through the component and load the JSON data for them
             this._loadComponents();
         }
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index 508b8130..c57bb2d7 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -7,6 +7,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage,
     Component   = require("montage/ui/component").Component;
 var Button =                    require("js/components/button.reel").Button;
+var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
 ////////////////////////////////////////////////////////////////////////
 //Exporting as MaterialsPopup
@@ -223,7 +224,7 @@ exports.MaterialsPopup = Montage.create(Component, {
                                         (materialID ===  "RadialGradientMaterial")
                                 )
                         {
-                                var material = MaterialsLibrary.getMaterial( materialID );
+                                var material = MaterialsModel.getMaterial( materialID );
                                 if (material)
                                 {
                                         this._material = material;
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index e0bf3f18..2b308258 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -9,31 +9,52 @@ var Component = require("montage/ui/component").Component;
 
 exports.Panel = Montage.create(Component, {
 
-    name: { value: "Panel" },
-    collapsedHeight: {value: 26},
-    _collapsed: {value: false},
-    _height: { value: 200 },
-    minHeight: {value: 200 },
-    maxHeight: { value: null},
-    flexible: {value: true},
-    _locked: { value: false},
-    isResizing: {value: false },
-    resizer: {value: null },
-    modulePath: {value: null},
-    moduleName: {value: null},
-    _contentComponent: {value: null},
-
-    contentComponent: {
-        get: function() {
-            return this._contentComponent;
-        },
-        set: function(val) {
-            if (val !== null && val !== this._contentComponent) {
-                this.panelContent.content = val;
-                this.panelContent.needsDraw = true;
-                this._contentComponent = val;
-            }
-        }
+    name: {
+        value: "Panel"
+    },
+
+    _collapsed: {
+        value: false
+    },
+
+    _height: {
+        value: 200
+    },
+
+    minHeight: {
+        value: 200
+    },
+
+    maxHeight: {
+        value: null
+    },
+
+    flexible: {
+        value: true
+    },
+
+    _locked: {
+        value: false
+    },
+
+    isResizing: {
+        value: false
+    },
+
+    _resizedHeight: {
+        value: 0
+    },
+
+    resizer: {
+        value: null
+    },
+
+    modulePath: {
+        value: null
+    },
+
+    moduleName: {
+        value: null
     },
 
     collapsed: {
@@ -63,10 +84,6 @@ exports.Panel = Montage.create(Component, {
         }
     },
 
-    _resizedHeight: {
-        value: 0
-    },
-
     locked: {
         get: function() {
             return this._locked;
@@ -94,17 +111,20 @@ exports.Panel = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
-            //TODO: This line should not be here this line hits each time a panel is loaded. Will Need to move to instance call;
-            this.application.ninja.colorController.colorView = this.application.ninja.colorController.colorPanelBase.create();
-            var myContent;
-            var that = this;
-
-            myContent = require.async(this.modulePath)
-                .then(function(panelContent) {
-                    var componentRequire = panelContent[that.moduleName];
-                    that.contentComponent = componentRequire.create();
-                })
-                .end();
+            if(this.name === "Color") {
+                this.application.ninja.colorController.colorView = this.application.ninja.colorController.colorPanelBase.create();
+            }
+
+            if(this.modulePath && this.moduleName) {
+                // Load the slot content
+                var that = this;
+                require.async(this.modulePath)
+                    .then(function(panelContent) {
+                        var componentRequire = panelContent[that.moduleName];
+                        that.panelContent.content = componentRequire.create();
+                    })
+                    .end();
+            }
         }
     },
 
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
new file mode 100755
index 00000000..251e86e4
--- /dev/null
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -0,0 +1,110 @@
+<!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>
+
+    <script type="text/montage-serialization">
+        {
+            "panelData": {
+                "module": "js/data/panels-data",
+                "name": "PanelsData"
+            },
+
+            "panel_0": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                    "element": {"#": "panel_0"}
+                }
+            },
+
+            "panel_1": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                    "element": {"#": "panel_1"}
+                }
+            },
+
+            "panel_2": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                    "element": {"#": "panel_2"}
+                }
+            },
+
+            "panel_3": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                    "element": {"#": "panel_3"}
+                }
+            },
+
+            "panel_4": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                    "element": {"#": "panel_4"}
+                }
+            },
+
+            "panel_5": {
+                "module": "js/panel