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/PanelContainer.reel | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/PanelContainer.reel')
-rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.js | 48 |
1 files changed, 47 insertions, 1 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer.reel/PanelContainer.js index 7cb03255..5c733b92 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.js +++ b/js/panels/PanelContainer.reel/PanelContainer.js | |||
@@ -12,8 +12,54 @@ var Montage = require("montage/core/core").Montage, | |||
12 | 12 | ||
13 | exports.PanelContainer = Montage.create(Component, { | 13 | exports.PanelContainer = Montage.create(Component, { |
14 | 14 | ||
15 | panelSplitter: { | ||
16 | value: null, | ||
17 | serializable: true | ||
18 | }, | ||
19 | |||
20 | appModel: { | ||
21 | value: null, | ||
22 | serializable: true | ||
23 | }, | ||
24 | |||
15 | panelData: { | 25 | panelData: { |
16 | value: null | 26 | value: null, |
27 | serializable: true | ||
28 | }, | ||
29 | |||
30 | panel_0: { | ||
31 | value: null, | ||
32 | serializable: true | ||
33 | }, | ||
34 | |||
35 | panel_1: { | ||
36 | value: null, | ||
37 | serializable: true | ||
38 | }, | ||
39 | |||
40 | panel_2: { | ||
41 | value: null, | ||
42 | serializable: true | ||
43 | }, | ||
44 | |||
45 | panel_3: { | ||
46 | value: null, | ||
47 | serializable: true | ||
48 | }, | ||
49 | |||
50 | panel_4: { | ||
51 | value: null, | ||
52 | serializable: true | ||
53 | }, | ||
54 | |||
55 | panel_5: { | ||
56 | value: null, | ||
57 | serializable: true | ||
58 | }, | ||
59 | |||
60 | panel_6: { | ||
61 | value: null, | ||
62 | serializable: true | ||
17 | }, | 63 | }, |
18 | 64 | ||
19 | _currentDocument: { | 65 | _currentDocument: { |