aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-02-13 16:19:21 -0800
committerAnanya Sen2012-02-13 16:19:21 -0800
commitb58dafe332fb57210f3d059a518a3d183c222631 (patch)
tree09fd958b0f7f3f51dc88e613e7764bdfc642b742 /js/ninja.reel
parentf3dc624fa464a79fd8e8cec1ddd16ed2109bda23 (diff)
parentf70701db069a10dc5195605fc378a022125b434f (diff)
downloadninja-b58dafe332fb57210f3d059a518a3d183c222631.tar.gz
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html21
1 files changed, 12 insertions, 9 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 6630f4a8..9a1a6b97 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
@@ -269,13 +269,18 @@
269 "name": "CoreIoApi" 269 "name": "CoreIoApi"
270 }, 270 },
271 271
272 "mainMenuController": {
273 "module": "js/controllers/main-menu-controller",
274 "name": "MainMenuController"
275 },
276
272 "owner": { 277 "owner": {
273 "module": "js/ninja.reel", 278 "module": "js/ninja.reel",
274 "name": "Ninja", 279 "name": "Ninja",
275 "properties": { 280 "properties": {
276 "element": {"#": "main"}, 281 "element": {"#": "main"},
277 "rulerTop": {"#": "rulerTop"}, 282 "rulerTop": {"#": "rulerTop"},
278 "rulerLeft": {"#": "rulerLeft"}, 283 "rulerLeft": {"#": "rulerLeft"},
279 "appModel": {"@": "appModel"}, 284 "appModel": {"@": "appModel"},
280 "toolsData": {"@": "toolsData1"}, 285 "toolsData": {"@": "toolsData1"},
281 "toolsList": {"@": "toolsList1"}, 286 "toolsList": {"@": "toolsList1"},
@@ -293,10 +298,11 @@
293 "newFileController": {"@": "newFileController"}, 298 "newFileController": {"@": "newFileController"},
294 "coreIoApi": {"@": "coreIoApi1"}, 299 "coreIoApi": {"@": "coreIoApi1"},
295 "documentBar": {"@": "documentBar"}, 300 "documentBar": {"@": "documentBar"},
296 "ioMediator": {"@": "ioMediator"} 301 "ioMediator": {"@": "ioMediator"},
302 "timeline": {"@": "timeline"},
303 "mainMenuController": {"@": "mainMenuController"}
297 } 304 }
298 } 305 }
299
300 } 306 }
301 </script> 307 </script>
302 308
@@ -358,13 +364,10 @@
358 </section> 364 </section>
359 365
360 <section id="timelineResizer" class="timelineResizer resizeBar"></section> 366 <section id="timelineResizer" class="timelineResizer resizeBar"></section>
361
362 <section id="bottomPanelContainer" class="panelContainer">
363
364 <section id="breadCrumbTrail"> 367 <section id="breadCrumbTrail">
365 <div id="breadCrumbComponent"></div> 368 <div id="breadCrumbComponent"></div>
366 </section> 369 </section>
367 370 <section id="bottomPanelContainer" class="panelContainer">
368 <section id="timelinePanel" class="panel"> 371 <section id="timelinePanel" class="panel">
369 <div id="timelinePanelComponent"></div> 372 <div id="timelinePanelComponent"></div>
370 </section> 373 </section>