aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-02-10 16:05:27 -0800
committerAnanya Sen2012-02-10 16:05:27 -0800
commitf3dc624fa464a79fd8e8cec1ddd16ed2109bda23 (patch)
treef716757dab75d7626297893c7f4aca3596d606de /js/ninja.reel
parentc48eeb01bd726895dc577d8b843b2a75883eee07 (diff)
downloadninja-f3dc624fa464a79fd8e8cec1ddd16ed2109bda23.tar.gz
Revert "Merge from /joseeight/ninja-internal/tree/FileIO"
This reverts commit c48eeb01bd726895dc577d8b843b2a75883eee07. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html14
1 files changed, 8 insertions, 6 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index a17f6583..6630f4a8 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -232,7 +232,7 @@
232 }, 232 },
233 233
234 "documentController1": { 234 "documentController1": {
235 "module": "js/controllers/document-controller", 235 "module": "js/io/document/document-controller",
236 "name": "DocumentController" 236 "name": "DocumentController"
237 }, 237 },
238 238
@@ -293,8 +293,7 @@
293 "newFileController": {"@": "newFileController"}, 293 "newFileController": {"@": "newFileController"},
294 "coreIoApi": {"@": "coreIoApi1"}, 294 "coreIoApi": {"@": "coreIoApi1"},
295 "documentBar": {"@": "documentBar"}, 295 "documentBar": {"@": "documentBar"},
296 "ioMediator": {"@": "ioMediator"}, 296 "ioMediator": {"@": "ioMediator"}
297 "timeline": {"@": "timeline"}
298 } 297 }
299 } 298 }
300 299
@@ -359,10 +358,13 @@
359 </section> 358 </section>
360 359
361 <section id="timelineResizer" class="timelineResizer resizeBar"></section> 360 <section id="timelineResizer" class="timelineResizer resizeBar"></section>
362 <section id="breadCrumbTrail"> 361
363 <div id="breadCrumbComponent"></div>
364 </section>
365 <section id="bottomPanelContainer" class="panelContainer"> 362 <section id="bottomPanelContainer" class="panelContainer">
363
364 <section id="breadCrumbTrail">
365 <div id="breadCrumbComponent"></div>
366 </section>
367
366 <section id="timelinePanel" class="panel"> 368 <section id="timelinePanel" class="panel">
367 <div id="timelinePanelComponent"></div> 369 <div id="timelinePanelComponent"></div>
368 </section> 370 </section>