diff options
Diffstat (limited to 'js')
-rw-r--r-- | js/data/panels-data.js | 27 | ||||
-rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.html | 14 |
2 files changed, 15 insertions, 26 deletions
diff --git a/js/data/panels-data.js b/js/data/panels-data.js index 6792aa51..fd83d0c7 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js | |||
@@ -125,20 +125,21 @@ exports.PanelsData = Montage.create(Montage, { | |||
125 | open: true, | 125 | open: true, |
126 | modulePath: "js/panels/binding-panel.reel", | 126 | modulePath: "js/panels/binding-panel.reel", |
127 | moduleName: "BindingPanel" | 127 | moduleName: "BindingPanel" |
128 | }, | ||
129 | { | ||
130 | name: "Objects", | ||
131 | groups: ["ws-binding"], | ||
132 | minHeight: 100, | ||
133 | height: 100, | ||
134 | maxHeight: null, | ||
135 | flexible: true, | ||
136 | collapsed: true, | ||
137 | scrollable: true, | ||
138 | open: true, | ||
139 | modulePath: "js/panels/objects/objects-panel.reel", | ||
140 | moduleName: "ObjectsPanel" | ||
141 | } | 128 | } |
129 | // , | ||
130 | // { | ||
131 | // name: "Objects", | ||
132 | // groups: ["ws-binding"], | ||
133 | // minHeight: 100, | ||
134 | // height: 100, | ||
135 | // maxHeight: null, | ||
136 | // flexible: true, | ||
137 | // collapsed: true, | ||
138 | // scrollable: true, | ||
139 | // open: true, | ||
140 | // modulePath: "js/panels/objects/objects-panel.reel", | ||
141 | // moduleName: "ObjectsPanel" | ||
142 | // } | ||
142 | ] | 143 | ] |
143 | } | 144 | } |
144 | 145 | ||
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index 9842a1d1..ed6e8463 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.html | |||
@@ -94,16 +94,6 @@ | |||
94 | } | 94 | } |
95 | }, | 95 | }, |
96 | 96 | ||
97 | "panel_8": { | ||
98 | "prototype": "js/panels/Panel.reel", | ||
99 | "properties": { | ||
100 | "element": {"#": "panel_8"} | ||
101 | }, | ||
102 | "bindings": { | ||
103 | "currentDocument": {"<-": "@owner.currentDocument"} | ||
104 | } | ||
105 | }, | ||
106 | |||
107 | "owner": { | 97 | "owner": { |
108 | "prototype": "js/panels/PanelContainer.reel", | 98 | "prototype": "js/panels/PanelContainer.reel", |
109 | "properties": { | 99 | "properties": { |
@@ -116,8 +106,7 @@ | |||
116 | "panel_4": {"@": "panel_4"}, | 106 | "panel_4": {"@": "panel_4"}, |
117 | "panel_5": {"@": "panel_5"}, | 107 | "panel_5": {"@": "panel_5"}, |
118 | "panel_6": {"@": "panel_6"}, | 108 | "panel_6": {"@": "panel_6"}, |
119 | "panel_7": {"@": "panel_7"}, | 109 | "panel_7": {"@": "panel_7"} |
120 | "panel_8": {"@": "panel_8"} | ||
121 | }, | 110 | }, |
122 | "listeners": [ | 111 | "listeners": [ |
123 | { | 112 | { |
@@ -149,7 +138,6 @@ | |||
149 | <article data-montage-id="panel_5"></article> | 138 | <article data-montage-id="panel_5"></article> |
150 | <article data-montage-id="panel_6"></article> | 139 | <article data-montage-id="panel_6"></article> |
151 | <article data-montage-id="panel_7"></article> | 140 | <article data-montage-id="panel_7"></article> |
152 | <article data-montage-id="panel_8"></article> | ||
153 | </article> | 141 | </article> |
154 | </section> | 142 | </section> |
155 | </body> | 143 | </body> |