removing repetition from the panel container and using a static list of panels.

- Fixing the bugs associated with the repetition of component and PI problems.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 61 insertions, 40 deletions

diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index e0bf3f18..be03d019 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,21 @@ 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) {
+                console.log("load content");
+                // 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();
+            }
         }
     },