aboutsummaryrefslogtreecommitdiff
path: root/js/panels/PanelContainer.reel/PanelContainer.html
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-17 13:28:06 -0700
committerNivesh Rajbhandari2012-04-17 13:28:06 -0700
commit88f83856dcec50fd850622eec21195379e5844fb (patch)
treef6aa54de1100d6d5b9a2e3683f10daf61f865ad1 /js/panels/PanelContainer.reel/PanelContainer.html
parentf11ed767396996c236bb8ef0e5f89fedddcaa0d7 (diff)
parentcacb4a21825818af392c2949967b0f3c1df509c5 (diff)
downloadninja-88f83856dcec50fd850622eec21195379e5844fb.tar.gz
Merge branch 'refs/heads/ninja-internal' into AllFixes
Diffstat (limited to 'js/panels/PanelContainer.reel/PanelContainer.html')
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html11
1 files changed, 10 insertions, 1 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index 251e86e4..d3673105 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -62,6 +62,13 @@
62 } 62 }
63 }, 63 },
64 64
65 "panel_6": {
66 "prototype": "js/panels/Panel.reel",
67 "properties": {
68 "element": {"#": "panel_6"}
69 }
70 },
71
65 "owner": { 72 "owner": {
66 "module": "js/panels/PanelContainer.reel", 73 "module": "js/panels/PanelContainer.reel",
67 "name": "PanelContainer", 74 "name": "PanelContainer",
@@ -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>