aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorAnanya Sen2012-02-29 15:21:31 -0800
committerAnanya Sen2012-02-29 15:21:31 -0800
commit8fee7d6bdb55ba18f396c3523081b18499fa1e30 (patch)
treedbd17232983247a38bb6b2cea480242bdf3f2422 /js/ninja.reel/ninja.html
parent5d4f1aad01737695238582c704e6d4f2c3a2f317 (diff)
parentb09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff)
downloadninja-8fee7d6bdb55ba18f396c3523081b18499fa1e30.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into FileIO
Conflicts: js/controllers/selection-controller.js js/document/html-document.js js/panels/properties/content.reel/content.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html16
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>