Merge branch 'refs/heads/Ninja-Internal' into Color

2 files changed, 9 insertions, 4 deletions

diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index f0fb1044..5937b58f 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -75,7 +75,6 @@
                 "prototype": "montage/ui/button.reel",
                 "properties": {
                     "element": {"#": "btnClose"},
-                    "pressedClass": "hide",
                     "identifier": "btnClose"
                 },
                 "listeners": [
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index 0c5f0b4b..15eb4da9 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -13,6 +13,11 @@ exports.Panel = Montage.create(Component, {
         value: "Panel"
     },
 
+    panelContent: {
+        value: null,
+        serializable: true
+    },
+
     _collapsed: {
         value: false
     },
@@ -46,7 +51,8 @@ exports.Panel = Montage.create(Component, {
     },
 
     resizer: {
-        value: null
+        value: null,
+        serializable: true
     },
 
     modulePath: {
@@ -116,8 +122,8 @@ exports.Panel = Montage.create(Component, {
 
             this._currentDocument = value;
 
-            if(typeof this.panelContent.content[0].controller._currentDocument !== "undefined") {
-                this.panelContent.content[0].controller.currentDocument = this._currentDocument;
+            if(typeof this.panelContent.content._element.controller._currentDocument !== "undefined") {
+                this.panelContent.content._element.controller.currentDocument = this._currentDocument;
             }
 
             if(!value) {