aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorAnanya Sen2012-02-10 16:03:52 -0800
committerAnanya Sen2012-02-10 16:03:52 -0800
commitc48eeb01bd726895dc577d8b843b2a75883eee07 (patch)
tree5945556f80723285396059aaecb523e27b1cbb0d /js/ninja.reel/ninja.html
parentc627ebb5735d55218813b073c655dae6cded6040 (diff)
downloadninja-c48eeb01bd726895dc577d8b843b2a75883eee07.tar.gz
Merge from /joseeight/ninja-internal/tree/FileIO
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html14
1 files changed, 6 insertions, 8 deletions
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 @@
232 }, 232 },
233 233
234 "documentController1": { 234 "documentController1": {
235 "module": "js/io/document/document-controller", 235 "module": "js/controllers/document-controller",
236 "name": "DocumentController" 236 "name": "DocumentController"
237 }, 237 },
238 238
@@ -293,7 +293,8 @@
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"}
297 } 298 }
298 } 299 }
299 300
@@ -358,13 +359,10 @@
358 </section> 359 </section>
359 360
360 <section id="timelineResizer" class="timelineResizer resizeBar"></section> 361 <section id="timelineResizer" class="timelineResizer resizeBar"></section>
361 362 <section id="breadCrumbTrail">
363 <div id="breadCrumbComponent"></div>
364 </section>
362 <section id="bottomPanelContainer" class="panelContainer"> 365 <section id="bottomPanelContainer" class="panelContainer">
363
364 <section id="breadCrumbTrail">
365 <div id="breadCrumbComponent"></div>
366 </section>
367
368 <section id="timelinePanel" class="panel"> 366 <section id="timelinePanel" class="panel">
369 <div id="timelinePanelComponent"></div> 367 <div id="timelinePanelComponent"></div>
370 </section> 368 </section>