aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-09 10:51:55 -0800
committerValerio Virgillito2012-02-09 10:51:55 -0800
commitb7a9235b2374d6a22ea0eff0630da7cf475b5203 (patch)
tree6656d0ebaa77f7474b159887419eb7cfd52234ab /js
parent35ad4d6d2fac4432046141c63c0209cf3d00be5c (diff)
parent42192a0ca726b1e6ef086090551693a1be1521a8 (diff)
downloadninja-b7a9235b2374d6a22ea0eff0630da7cf475b5203.tar.gz
Merge pull request #29 from mayhewinator/WorkingBranch
Updates for Splash screen, icon, license page and credits page
Diffstat (limited to 'js')
-rw-r--r--js/ninja.reel/ninja.js3
1 files changed, 2 insertions, 1 deletions
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 },