aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel/Panel.js
diff options
context:
space:
mode:
authorJon Reid2012-06-15 10:10:41 -0700
committerJon Reid2012-06-15 10:10:41 -0700
commit526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch)
tree65939e59615aaa10a7db77211e71616ad531bd0e /js/panels/Panel.reel/Panel.js
parentb5b760ee82e5cc4da176914983a6002cbf86c11a (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
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) {