9 files changed, 224 insertions, 248 deletions

diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 08eb018f..75968d4a 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -76,7 +76,7 @@ exports.SelectionController = Montage.create(Component, {
 
 
                     this.application.ninja.selectedElements = currentSelectionArray;
-                    NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
+                    NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
 
 
 
@@ -92,12 +92,12 @@ exports.SelectionController = Montage.create(Component, {
     handleSwitchDocument: {
         value: function() {
             this._selectedItems = this.application.ninja.selectedElements.slice(0);
-            if(this._selectedItems.length === 0 ){
+            if(this._selectedItems.length === 0) {
                 this._isDocument = true;
-            }else{
+            } else {
                 this._isDocument = false;
             }
-            NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
+            NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
 
                         this._selectionContainer = this.application.ninja.currentSelectedContainer;
         }
@@ -139,7 +139,7 @@ exports.SelectionController = Montage.create(Component, {
         value: function(event) {
             this.application.ninja.selectedElements = [];
             this._isDocument = true;
-            NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
+            NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
         }
     },
 
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index aa5057a2..2422f5e7 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -19,7 +19,6 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: false,
             collapsed: false,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/Color/colorpanelbase.reel",
             moduleName: "ColorPanelBase"
         },
@@ -32,7 +31,6 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: true,
             collapsed: false,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/properties.reel",
             moduleName: "Properties"
         },
@@ -45,7 +43,6 @@ exports.PanelsData = Montage.create(Montage, {
             collapsed: true,
             scrollable: true,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/Materials/materials-library-panel.reel",
             moduleName: "MaterialsLibraryPanel"
         },
@@ -58,7 +55,6 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: true,
             collapsed: true,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/Components/ComponentsPanelBase.reel",
             moduleName: "ComponentsPanelBase"
         },
@@ -71,7 +67,6 @@ exports.PanelsData = Montage.create(Montage, {
 //            scrollable: true,
 //            collapsed: false,
 //            open: true,
-//            content: null,
 //            modulePath: "js/panels/Project/projectpanelbase.reel",
 //            moduleName: "ProjectPanelBase"
 //        },
@@ -84,7 +79,6 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: true,
             collapsed: true,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/CSSPanel/CSSPanelBase.reel",
             moduleName: "CSSPanelBase"
         },
@@ -97,7 +91,6 @@ exports.PanelsData = Montage.create(Montage, {
             collapsed: true,
             scrollable: true,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/presets/content.reel",
             moduleName: "content"
         }
@@ -118,24 +111,6 @@ exports.PanelsData = Montage.create(Montage, {
             this._panelOrder = val;
         }
     }
-
-
-    panels: {
-        get: function() {
-            var filtered = this._panels.filter(function(item) {
-                return item.open;
-            });
-
-            filtered.sort(function(a,b) {
-               a.name
-            });
-
-            return filtered;
-        },
-        set : function() {
-
-        }
-    }
     */
 
 });
\ No newline at end of file
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index cdf53ddf..8f6f6d7b 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -166,7 +166,7 @@
             },
 
             "panelContainer": {
-                "module": "js/panels/PanelContainer/PanelContainer.reel",
+                "module": "js/panels/PanelContainer.reel",
                 "name": "PanelContainer",
                 "properties": {
                     "element": {"#": "rightPanelContent"},
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/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
+    },