diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/panels/Panel.reel/Panel.js | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/Panel.reel/Panel.js')
-rwxr-xr-x | js/panels/Panel.reel/Panel.js | 12 |
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) { |