aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-09 11:12:44 -0800
committerJose Antonio Marquez2012-02-09 11:12:44 -0800
commitea6ec16e91740211a517db72f56108a033a521fe (patch)
tree786dccc2c3f35270899891444ddb27913f9c8ac0 /js
parent9140a5bb6e7ecc24e6b4e540308042e10165e604 (diff)
parentb7a9235b2374d6a22ea0eff0630da7cf475b5203 (diff)
downloadninja-ea6ec16e91740211a517db72f56108a033a521fe.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: index.html
Diffstat (limited to 'js')
-rwxr-xr-xjs/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 3b9fc1c5..6c82cf30 100755
--- 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 },