aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel/Panel.js
diff options
context:
space:
mode:
authorhwc4872012-06-13 14:04:09 -0700
committerhwc4872012-06-13 14:04:09 -0700
commit3e481dd581e0305dd8b572ed0d17e86622223464 (patch)
treeaca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/panels/Panel.reel/Panel.js
parenta7aa51e6b91623772eef54b827616432838b560e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/panels/Panel.reel/Panel.js')
-rwxr-xr-xjs/panels/Panel.reel/Panel.js12
1 files changed, 9 insertions, 3 deletions
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, {
13 value: "Panel" 13 value: "Panel"
14 }, 14 },
15 15
16 panelContent: {
17 value: null,
18 serializable: true
19 },
20
16 _collapsed: { 21 _collapsed: {
17 value: false 22 value: false
18 }, 23 },
@@ -46,7 +51,8 @@ exports.Panel = Montage.create(Component, {
46 }, 51 },
47 52
48 resizer: { 53 resizer: {
49 value: null 54 value: null,
55 serializable: true
50 }, 56 },
51 57
52 modulePath: { 58 modulePath: {
@@ -116,8 +122,8 @@ exports.Panel = Montage.create(Component, {
116 122
117 this._currentDocument = value; 123 this._currentDocument = value;
118 124
119 if(typeof this.panelContent.content[0].controller._currentDocument !== "undefined") { 125 if(typeof this.panelContent.content._element.controller._currentDocument !== "undefined") {
120 this.panelContent.content[0].controller.currentDocument = this._currentDocument; 126 this.panelContent.content._element.controller.currentDocument = this._currentDocument;
121 } 127 }
122 128
123 if(!value) { 129 if(!value) {