From c48eeb01bd726895dc577d8b843b2a75883eee07 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 10 Feb 2012 16:03:52 -0800
Subject: Merge from /joseeight/ninja-internal/tree/FileIO

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/ninja.reel/ninja.html | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'js/ninja.reel/ninja.html')

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 6630f4a8..a17f6583 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -232,7 +232,7 @@
             },
 
             "documentController1": {
-                "module": "js/io/document/document-controller",
+                "module": "js/controllers/document-controller",
                 "name": "DocumentController"
             },
 
@@ -293,7 +293,8 @@
                     "newFileController":    {"@": "newFileController"},
                     "coreIoApi":    		{"@": "coreIoApi1"},
                     "documentBar":          {"@": "documentBar"},
-                    "ioMediator":           {"@": "ioMediator"}
+                    "ioMediator":           {"@": "ioMediator"},
+                    "timeline":             {"@": "timeline"}
                 }
             }
 
@@ -358,13 +359,10 @@
                         </section>
 
                         <section id="timelineResizer" class="timelineResizer resizeBar"></section>
-
+                        <section id="breadCrumbTrail">
+                                                        <div id="breadCrumbComponent"></div>
+                                                    </section>
                         <section id="bottomPanelContainer" class="panelContainer">
-
-                            <section id="breadCrumbTrail">
-                                <div id="breadCrumbComponent"></div>
-                            </section>
-
                             <section id="timelinePanel" class="panel">
                                 <div id="timelinePanelComponent"></div>
                             </section>
-- 
cgit v1.2.3