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/Panel.reel/Panel.html1
-rwxr-xr-xjs/panels/Panel.reel/Panel.js8
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.js48
-rwxr-xr-xjs/panels/Resizer.js13
-rwxr-xr-xjs/panels/Splitter.js9
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js122
-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/rule-components/css-style-rule.reel/css-style-rule.html2
-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-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.js9
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.html9
-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
27 files changed, 388 insertions, 58 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/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..fde5c962 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: {
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
17 }, 63 },
18 64
19 _currentDocument: { 65 _currentDocument: {
diff --git a/js/panels/Resizer.js b/js/panels/Resizer.js
index 0252c4fb..0f4c39f7 100755
--- a/js/panels/Resizer.js
+++ b/js/panels/Resizer.js
@@ -54,7 +54,8 @@ exports.Resizer = Montage.create(Component, {
54 }, 54 },
55 set: function(val) { 55 set: function(val) {
56 this._isInversed = val; 56 this._isInversed = val;
57 } 57 },
58 serializable: true
58 }, 59 },
59 60
60 _isVertical: { 61 _isVertical: {
@@ -67,7 +68,8 @@ exports.Resizer = Montage.create(Component, {
67 }, 68 },
68 set: function(val) { 69 set: function(val) {
69 this._isVertical = val; 70 this._isVertical = val;
70 } 71 },
72 serializable: true
71 }, 73 },
72 74
73 _isPanel: { 75 _isPanel: {
@@ -79,8 +81,10 @@ exports.Resizer = Montage.create(Component, {
79 }, 81 },
80 set: function(value) { 82 set: function(value) {
81 this._isPanel = value; 83 this._isPanel = value;
82 } 84 },
85 serializable: true
83 }, 86 },
87
84 _panel : { 88 _panel : {
85 value: null 89 value: null
86 }, 90 },
@@ -92,7 +96,8 @@ exports.Resizer = Montage.create(Component, {
92 set: function(val) { 96 set: function(val) {
93 this._panel = val; 97 this._panel = val;
94 if(val._element) this._panel = val._element; 98 if(val._element) this._panel = val._element;
95 } 99 },
100 serializable: true
96 }, 101 },
97 102
98 height: { 103 height: {
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index f0fb1a45..15865acc 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -18,8 +18,7 @@ exports.Splitter = Montage.create(Component, {
18 }, 18 },
19 19
20 _panel: { 20 _panel: {
21 value: null, 21 value: null
22 enumerable:true
23 }, 22 },
24 23
25 panel: { 24 panel: {
@@ -28,7 +27,8 @@ exports.Splitter = Montage.create(Component, {
28 }, 27 },
29 set: function(value) { 28 set: function(value) {
30 this._panel = value; 29 this._panel = value;
31 } 30 },
31 serializable: true
32 }, 32 },
33 33
34 _resizeBar: { 34 _resizeBar: {
@@ -41,7 +41,8 @@ exports.Splitter = Montage.create(Component, {
41 }, 41 },
42 set: function(val) { 42 set: function(val) {
43 this._resizeBar = val; 43 this._resizeBar = val;
44 }