diff options
Diffstat (limited to 'js/ninja.reel')
-rw-r--r-- | js/ninja.reel/ninja.html | 12 | ||||
-rw-r--r-- | js/ninja.reel/ninja.js | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 706c8243..158bcaff 100644 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -279,7 +279,8 @@ | |||
279 | "stylesController": {"@": "stylesController"}, | 279 | "stylesController": {"@": "stylesController"}, |
280 | "filePickerController": {"@": "filePickerController"}, | 280 | "filePickerController": {"@": "filePickerController"}, |
281 | "newFileController": {"@": "newFileController"}, | 281 | "newFileController": {"@": "newFileController"}, |
282 | "documentBar": {"@": "documentBar"} | 282 | "documentBar": {"@": "documentBar"}, |
283 | "timeline": {"@": "timeline"} | ||
283 | } | 284 | } |
284 | } | 285 | } |
285 | 286 | ||
@@ -344,13 +345,10 @@ | |||
344 | </section> | 345 | </section> |
345 | 346 | ||
346 | <section id="timelineResizer" class="timelineResizer resizeBar"></section> | 347 | <section id="timelineResizer" class="timelineResizer resizeBar"></section> |
347 | 348 | <section id="breadCrumbTrail"> | |
349 | <div id="breadCrumbComponent"></div> | ||
350 | </section> | ||
348 | <section id="bottomPanelContainer" class="panelContainer"> | 351 | <section id="bottomPanelContainer" class="panelContainer"> |
349 | |||
350 | <section id="breadCrumbTrail"> | ||
351 | <div id="breadCrumbComponent"></div> | ||
352 | </section> | ||
353 | |||
354 | <section id="timelinePanel" class="panel"> | 352 | <section id="timelinePanel" class="panel"> |
355 | <div id="timelinePanelComponent"></div> | 353 | <div id="timelinePanelComponent"></div> |
356 | </section> | 354 | </section> |
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 90015f5a..469d38f7 100644 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -14,7 +14,7 @@ exports.Ninja = Montage.create(Component, { | |||
14 | _preload: { value: false }, | 14 | _preload: { value: false }, |
15 | 15 | ||
16 | ninjaVersion: { | 16 | ninjaVersion: { |
17 | value: window.ninjaVersion.ninja.version | 17 | value: null |
18 | }, | 18 | }, |
19 | 19 | ||
20 | toolsData: { value: null }, | 20 | toolsData: { value: null }, |
@@ -34,6 +34,7 @@ exports.Ninja = Montage.create(Component, { | |||
34 | 34 | ||
35 | templateDidLoad: { | 35 | templateDidLoad: { |
36 | value: function() { | 36 | value: function() { |
37 | this.ninjaVersion = window.ninjaVersion.ninja.version; | ||
37 | this.eventManager.addEventListener( "preloadFinish", this, false); | 38 | this.eventManager.addEventListener( "preloadFinish", this, false); |
38 | } | 39 | } |
39 | }, | 40 | }, |