aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorEric Guzman2012-02-13 15:48:37 -0800
committerEric Guzman2012-02-13 15:48:37 -0800
commitb2672478decd3ee3bfacf86b525551c997f9604d (patch)
tree79a88684406d3adf00350246a4da884b97fb0eac /js/ninja.reel/ninja.html
parenta738121a921e4c721b280434952b415b9ab3b1a8 (diff)
parent0620e2f788861e824d6e49fa319da4d20b18a556 (diff)
downloadninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts: js/controllers/styles-controller.js
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rw-r--r--js/ninja.reel/ninja.html15
1 files changed, 9 insertions, 6 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 706c8243..c8625159 100644
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -259,6 +259,11 @@
259 "name": "NewFileWorkflowController" 259 "name": "NewFileWorkflowController"
260 }, 260 },
261 261
262 "mainMenuController": {
263 "module": "js/controllers/main-menu-controller",
264 "name": "MainMenuController"
265 },
266
262 "owner": { 267 "owner": {
263 "module": "js/ninja.reel", 268 "module": "js/ninja.reel",
264 "name": "Ninja", 269 "name": "Ninja",
@@ -279,10 +284,11 @@
279 "stylesController": {"@": "stylesController"}, 284 "stylesController": {"@": "stylesController"},
280 "filePickerController": {"@": "filePickerController"}, 285 "filePickerController": {"@": "filePickerController"},
281 "newFileController": {"@": "newFileController"}, 286 "newFileController": {"@": "newFileController"},
282 "documentBar": {"@": "documentBar"} 287 "documentBar": {"@": "documentBar"},
288 "timeline": {"@": "timeline"},
289 "mainMenuController": {"@": "mainMenuController"}
283 } 290 }
284 } 291 }
285
286 } 292 }
287 </script> 293 </script>
288 294
@@ -344,13 +350,10 @@
344 </section> 350 </section>
345 351
346 <section id="timelineResizer" class="timelineResizer resizeBar"></section> 352 <section id="timelineResizer" class="timelineResizer resizeBar"></section>
347
348 <section id="bottomPanelContainer" class="panelContainer">
349
350 <section id="breadCrumbTrail"> 353 <section id="breadCrumbTrail">
351 <div id="breadCrumbComponent"></div> 354 <div id="breadCrumbComponent"></div>
352 </section> 355 </section>
353 356 <section id="bottomPanelContainer" class="panelContainer">
354 <section id="timelinePanel" class="panel"> 357 <section id="timelinePanel" class="panel">
355 <div id="timelinePanelComponent"></div> 358 <div id="timelinePanelComponent"></div>
356 </section> 359 </section>