diff options
Diffstat (limited to 'js/panels')
52 files changed, 1077 insertions, 447 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js index 2176c6d5..c600fd0d 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js | |||
@@ -68,7 +68,8 @@ exports.MaterialsLibraryPanel = Montage.create(Component, { | |||
68 | }, | 68 | }, |
69 | 69 | ||
70 | _materialInfo: { | 70 | _materialInfo: { |
71 | enumerable:true | 71 | enumerable:true, |
72 | serializable: true | ||
72 | }, | 73 | }, |
73 | 74 | ||
74 | _showMaterialPopup: { | 75 | _showMaterialPopup: { |
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index a4f758cf..0a32447e 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
@@ -12,6 +12,21 @@ var Montage = require("montage/core/core").Montage, | |||
12 | //Exporting as MaterialsPopup | 12 | //Exporting as MaterialsPopup |
13 | exports.MaterialsPopup = Montage.create(Component, { | 13 | exports.MaterialsPopup = Montage.create(Component, { |
14 | //////////////////////////////////////////////////////////////////// | 14 | //////////////////////////////////////////////////////////////////// |
15 | okButton: { | ||
16 | value: null, | ||
17 | serializable: true | ||
18 | }, | ||
19 | |||
20 | cancelButton: { | ||
21 | value: null, | ||
22 | serializable: true | ||
23 | }, | ||
24 | |||
25 | materialTitle: { | ||
26 | value: null, | ||
27 | serializable: true | ||
28 | }, | ||
29 | |||
15 | // Material Properties | 30 | // Material Properties |
16 | _materialName: { | 31 | _materialName: { |
17 | enumerable: true, | 32 | enumerable: true, |
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 @@ | |||
75 | "prototype": "montage/ui/button.reel", | 75 | "prototype": "montage/ui/button.reel", |
76 | "properties": { | 76 | "properties": { |
77 | "element": {"#": "btnClose"}, | 77 | "element": {"#": "btnClose"}, |
78 | "pressedClass": "hide", | ||
79 | "identifier": "btnClose" | 78 | "identifier": "btnClose" |
80 | }, | 79 | }, |
81 | "listeners": [ | 80 | "listeners": [ |
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js index 3783459e..16643813 100755 --- a/js/panels/Panel.reel/Panel.js +++ b/js/panels/Panel.reel/Panel.js | |||
@@ -13,10 +13,15 @@ exports.Panel = Montage.create(Component, { | |||
13 | value: "Panel" | 13 | value: "Panel" |
14 | }, | 14 | }, |
15 | 15 | ||
16 | groups: { | 16 | groups: { |
17 | value: [] | 17 | value: [] |
18 | }, | 18 | }, |
19 | 19 | ||
20 | panelContent: { | ||
21 | value: null, | ||
22 | serializable: true | ||
23 | }, | ||
24 | |||
20 | _collapsed: { | 25 | _collapsed: { |
21 | value: false | 26 | value: false |
22 | }, | 27 | }, |
@@ -50,7 +55,8 @@ exports.Panel = Montage.create(Component, { | |||
50 | }, | 55 | }, |
51 | 56 | ||
52 | resizer: { | 57 | resizer: { |
53 | value: null | 58 | value: null, |
59 | serializable: true | ||
54 | }, | 60 | }, |
55 | 61 | ||
56 | modulePath: { | 62 | modulePath: { |
@@ -120,8 +126,8 @@ exports.Panel = Montage.create(Component, { | |||
120 | 126 | ||
121 | this._currentDocument = value; | 127 | this._currentDocument = value; |
122 | 128 | ||
123 | if(typeof this.panelContent.content[0].controller._currentDocument !== "undefined") { | 129 | if(typeof this.panelContent.content._element.controller._currentDocument !== "undefined") { |
124 | this.panelContent.content[0].controller.currentDocument = this._currentDocument; | 130 | this.panelContent.content._element.controller.currentDocument = this._currentDocument; |
125 | } | 131 | } |
126 | 132 | ||
127 | if(!value) { | 133 | if(!value) { |
diff --git a/js/panels/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer.reel/PanelContainer.js index 82069146..e0e547f9 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 | |||