aboutsummaryrefslogtreecommitdiff
path: root/js/panels/PanelContainer.reel/PanelContainer.html
diff options
context:
space:
mode:
authorAnanya Sen2012-06-26 16:07:00 -0700
committerAnanya Sen2012-06-26 16:07:00 -0700
commit1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch)
treebc09c9f08ac2faa955995a91a78337276a81eb77 /js/panels/PanelContainer.reel/PanelContainer.html
parent3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff)
parent46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff)
downloadninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/PanelContainer.reel/PanelContainer.html')
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html17
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>