aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js3
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js15
-rwxr-xr-xjs/panels/Panel.reel/Panel.html1
-rwxr-xr-xjs/panels/Panel.reel/Panel.js12
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.js48
-rwxr-xr-xjs/panels/Resizer.js13
-rwxr-xr-xjs/panels/Splitter.js6
-rw-r--r--js/panels/Timeline/Collapser.js34
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js47
-rw-r--r--js/panels/Timeline/Style.reel/Style.js30
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js107
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html8
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js83
-rw-r--r--js/panels/Timeline/Track.reel/Track.js5
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js10
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.html3
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.js10
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.html2
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.js21
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html23
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js5
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.js10
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.js5
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.html6
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.js12
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.html2
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.js31
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js13
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.html1
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.js19
-rw-r--r--js/panels/css-panel/styles-view-delegate.js6
-rw-r--r--js/panels/presets/content.reel/content.js15
-rwxr-xr-xjs/panels/properties.reel/properties.html9
-rwxr-xr-xjs/panels/properties.reel/properties.js19
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.js1
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js4
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.html17
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.js41
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html2
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js55
-rw-r--r--js/panels/resize-composer.js6
41 files changed, 665 insertions, 95 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
13exports.MaterialsPopup = Montage.create(Component, { 13exports.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 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) {
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
13exports.PanelContainer = Montage.create(Component, { 13exports.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