diff options
author | Pushkar Joshi | 2012-03-02 12:36:34 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-03-02 12:36:34 -0800 |
commit | dc3c813320c8d3fb837d5d18e70ab35a53b116c1 (patch) | |
tree | da417684de5e302d302ea617854015bd9a8ca17a /js/ninja.reel/ninja.html | |
parent | d7d78d4a4e8cf82c56379d25efbe679b3b823abc (diff) | |
parent | 4419209a1fd850ab468209b562b66b0242b42a9c (diff) | |
download | ninja-dc3c813320c8d3fb837d5d18e70ab35a53b116c1.tar.gz |
Merge branch 'brushtool' into pentool
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index b1fb6352..112f844e 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> |
@@ -383,8 +389,8 @@ | |||
383 | 389 | ||
384 | <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section> | 390 | <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section> |
385 | 391 | ||
386 | <section id="rightPanelContainer" class="panelContainer"> | 392 | <section id="rightPanelContainer" class="rightPanelContainer panelContainer"> |
387 | <section id="rightPanelContent"> | 393 | <section id="rightPanelContent" class="rightPanelContent"> |
388 | </section> | 394 | </section> |
389 | </section> | 395 | </section> |
390 | </section> | 396 | </section> |