diff options
author | Jonathan Duran | 2012-06-26 13:28:59 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-26 13:28:59 -0700 |
commit | 42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a (patch) | |
tree | ad15f365ffae331ae76060a1ebdfc0f0f029725a /js/panels/PanelContainer.reel/PanelContainer.html | |
parent | cdb5af99be5fca15265e4940dd22870f4c5fef4b (diff) | |
parent | 87a8b62f71bb72274c3dd1fa389e88c12d482ebb (diff) | |
download | ninja-42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/PanelContainer.reel/PanelContainer.html')
-rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.html | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index b22b3609..820348d2 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.html | |||
@@ -74,8 +74,7 @@ | |||
74 | }, | 74 | }, |
75 | 75 | ||
76 | "panel_6": { | 76 | "panel_6": { |
77 | "module": "js/panels/Panel.reel", | 77 | "prototype": "js/panels/Panel.reel", |
78 | "name": "Panel", | ||
79 | "properties": { | 78 | "properties": { |
80 | "element": {"#": "panel_6"} | 79 | "element": {"#": "panel_6"} |
81 | }, | 80 | }, |
@@ -84,6 +83,16 @@ | |||
84 | } | 83 | } |
85 | }, | 84 | }, |
86 | 85 | ||
86 | "panel_7": { | ||
87 | "prototype": "js/panels/Panel.reel", | ||
88 | "properties": { | ||
89 | "element": {"#": "panel_7"} | ||
90 | }, | ||
91 | "bindings": { | ||
92 | "currentDocument": {"<-": "@owner.currentDocument"} | ||
93 | } | ||
94 | }, | ||
95 | |||
87 | "owner": { | 96 | "owner": { |
88 | "prototype": "js/panels/PanelContainer.reel", | 97 | "prototype": "js/panels/PanelContainer.reel", |
89 | "properties": { | 98 | "properties": { |
@@ -95,7 +104,8 @@ | |||
95 | "panel_3": {"@": "panel_3"}, | 104 | "panel_3": {"@": "panel_3"}, |
96 | "panel_4": {"@": "panel_4"}, | 105 | "panel_4": {"@": "panel_4"}, |
97 | "panel_5": {"@": "panel_5"}, | 106 | "panel_5": {"@": "panel_5"}, |
98 | "panel_6": {"@": "panel_6"} | 107 | "panel_6": {"@": "panel_6"}, |
108 | "panel_7": {"@": "panel_7"} | ||
99 | }, | 109 | }, |
100 | "listeners": [ | 110 | "listeners": [ |
101 | { | 111 | { |
@@ -126,6 +136,7 @@ | |||
126 | <article data-montage-id="panel_4"></article> | 136 | <article data-montage-id="panel_4"></article> |
127 | <article data-montage-id="panel_5"></article> | 137 | <article data-montage-id="panel_5"></article> |
128 | <article data-montage-id="panel_6"></article> | 138 | <article data-montage-id="panel_6"></article> |
139 | <article data-montage-id="panel_7"></article> | ||
129 | </article> | 140 | </article> |
130 | </section> | 141 | </section> |
131 | </body> | 142 | </body> |