Merge branch 'master' into brushtool

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 @@
                 "name": "Breadcrumb",
                 "properties":{
                     "element":{"#" : "breadCrumbComponent"}
-
+                },
+                "bindings" : {
+                    "container": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "currentSelectedContainer",
+                        "oneway": false
+                    }
                 }
              },
 
@@ -369,10 +375,10 @@
                             </section>
                         </section>
 
-                        <section data-montage-id="timelineResizer" class="timelineResizer resizeBar"></section>
-                            <section id="breadCrumbTrail">
-                                <div id="breadCrumbComponent"></div>
-                            </section>
+                        <section id="breadCrumbComponent"></section>
+
+                        <section id="timelineResizer" class="timelineResizer resizeBar"></section>
+
                         <section id="bottomPanelContainer" class="panelContainer">
                             <section id="timelinePanel" class="panel">
                                 <div id="timelinePanelComponent"></div>
@@ -383,8 +389,8 @@
 
                 <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
 
-                <section id="rightPanelContainer" class="panelContainer">
-                    <section id="rightPanelContent">
+                <section id="rightPanelContainer" class="rightPanelContainer panelContainer">
+                    <section id="rightPanelContent" class="rightPanelContent">
                     </section>
                 </section>
             </section>