diff options
author | Valerio Virgillito | 2012-02-29 15:04:36 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-29 15:04:36 -0800 |
commit | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (patch) | |
tree | 49b07dfb52252ac986c567ad5c3a7c39ebcc86e2 /js/ninja.reel/ninja.html | |
parent | 551e1f2be11e9e6ab7af17816396b88aafd57dff (diff) | |
parent | 2b9f63089534356607ad7e0ddde6f22e42d04f80 (diff) | |
download | ninja-b09956e4a9a35c5588cc7cd1f01efb617cbe0884.tar.gz |
Merge branch 'refs/heads/integration-candidate'
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index b1fb6352..a20a6090 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -181,7 +181,13 @@ | |||
181 | "name": "Breadcrumb", | 181 | "name": "Breadcrumb", |
182 | "properties":{ | 182 | "properties":{ |
183 | "element":{"#" : "breadCrumbComponent"} | 183 | "element":{"#" : "breadCrumbComponent"} |
184 | 184 | }, | |
185 | "bindings" : { | ||
186 | "container": { | ||
187 | "boundObject": {"@": "owner"}, | ||
188 | "boundObjectPropertyPath": "currentSelectedContainer", | ||
189 | "oneway": false | ||
190 | } | ||
185 | } | 191 | } |
186 | }, | 192 | }, |
187 | 193 | ||
@@ -369,10 +375,10 @@ | |||
369 | </section> | 375 | </section> |
370 | </section> | 376 | </section> |
371 | 377 | ||
372 | <section data-montage-id="timelineResizer" class="timelineResizer resizeBar"></section> | 378 | <section id="breadCrumbComponent"></section> |
373 | <section id="breadCrumbTrail"> | 379 | |
374 | <div id="breadCrumbComponent"></div> | 380 | <section id="timelineResizer" class="timelineResizer resizeBar"></section> |
375 | </section> | 381 | |
376 | <section id="bottomPanelContainer" class="panelContainer"> | 382 | <section id="bottomPanelContainer" class="panelContainer"> |
377 | <section id="timelinePanel" class="panel"> | 383 | <section id="timelinePanel" class="panel"> |
378 | <div id="timelinePanelComponent"></div> | 384 | <div id="timelinePanelComponent"></div> |