diff options
Diffstat (limited to 'js')
-rw-r--r-- | js/data/panels-data.js | 12 | ||||
-rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.html | 11 | ||||
-rw-r--r-- | js/panels/css-panel/css-panel.reel/css-panel.html | 2 |
3 files changed, 23 insertions, 2 deletions
diff --git a/js/data/panels-data.js b/js/data/panels-data.js index 2422f5e7..84ec9c3c 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js | |||
@@ -83,6 +83,18 @@ exports.PanelsData = Montage.create(Montage, { | |||
83 | moduleName: "CSSPanelBase" | 83 | moduleName: "CSSPanelBase" |
84 | }, | 84 | }, |
85 | { | 85 | { |
86 | name: "CSSPanel", | ||
87 | height: 200, | ||
88 | minHeight: 200, | ||
89 | maxHeight: null, | ||
90 | flexible: true, | ||
91 | scrollable: false, | ||
92 | collapsed: false, | ||
93 | open: true, | ||
94 | modulePath: "js/panels/css-panel/css-panel.reel", | ||
95 | moduleName: "CSSPanelNew" | ||
96 | }, | ||
97 | { | ||
86 | name: "Presets", | 98 | name: "Presets", |
87 | minHeight: 100, | 99 | minHeight: 100, |
88 | height: 100, | 100 | height: 100, |
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index 251e86e4..1561f973 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.html | |||
@@ -61,6 +61,13 @@ | |||
61 | "element": {"#": "panel_5"} | 61 | "element": {"#": "panel_5"} |
62 | } | 62 | } |
63 | }, | 63 | }, |
64 | "panel_6": { | ||
65 | "module": "js/panels/Panel.reel", | ||
66 | "name": "Panel", | ||
67 | "properties": { | ||
68 | "element": {"#": "panel_6"} | ||
69 | } | ||
70 | }, | ||
64 | 71 | ||
65 | "owner": { | 72 | "owner": { |
66 | "module": "js/panels/PanelContainer.reel", | 73 | "module": "js/panels/PanelContainer.reel", |
@@ -74,7 +81,8 @@ | |||
74 | "panel_2": {"@": "panel_2"}, | 81 | "panel_2": {"@": "panel_2"}, |
75 | "panel_3": {"@": "panel_3"}, | 82 | "panel_3": {"@": "panel_3"}, |
76 | "panel_4": {"@": "panel_4"}, | 83 | "panel_4": {"@": "panel_4"}, |
77 | "panel_5": {"@": "panel_5"} | 84 | "panel_5": {"@": "panel_5"}, |
85 | "panel_6": {"@": "panel_6"} | ||
78 | }, | 86 | }, |
79 | "listeners": [ | 87 | "listeners": [ |
80 | { | 88 | { |
@@ -104,6 +112,7 @@ | |||
104 | <article data-montage-id="panel_3"></article> | 112 | <article data-montage-id="panel_3"></article> |
105 | <article data-montage-id="panel_4"></article> | 113 | <article data-montage-id="panel_4"></article> |
106 | <article data-montage-id="panel_5"></article> | 114 | <article data-montage-id="panel_5"></article> |
115 | <article data-montage-id="panel_6"></article> | ||
107 | </article> | 116 | </article> |
108 | </section> | 117 | </section> |
109 | </body> | 118 | </body> |
diff --git a/js/panels/css-panel/css-panel.reel/css-panel.html b/js/panels/css-panel/css-panel.reel/css-panel.html index 899c7786..61ec82bf 100644 --- a/js/panels/css-panel/css-panel.reel/css-panel.html +++ b/js/panels/css-panel/css-panel.reel/css-panel.html | |||
@@ -12,7 +12,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
12 | { | 12 | { |
13 | "owner": { | 13 | "owner": { |
14 | "module" : "js/panels/css-panel/css-panel.reel", | 14 | "module" : "js/panels/css-panel/css-panel.reel", |
15 | "name" : "CSSPanel", | 15 | "name" : "CSSPanelNew", |
16 | "properties" : { | 16 | "properties" : { |
17 | "element" : {"#" : "container"}, | 17 | "element" : {"#" : "container"}, |
18 | "controller": {"@": "cssPanelController"} | 18 | "controller": {"@": "cssPanelController"} |