diff options
author | Valerio Virgillito | 2012-01-30 23:39:35 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-01-30 23:39:35 -0800 |
commit | dda0b77737991d68e4a8a5ca95154a373f8bc84e (patch) | |
tree | fdaffc1c7babe5628632c1608d8595a3bc0c2f23 /js | |
parent | ad81ae4c61eb5857cd444ef0caf5b0b33e8072ba (diff) | |
parent | e4837edab24868a7c093a2a70e8ec3585e1007d8 (diff) | |
download | ninja-dda0b77737991d68e4a8a5ca95154a373f8bc84e.tar.gz |
Merge branch 'master' into components
Diffstat (limited to 'js')
-rw-r--r-- | js/ninja.reel/ninja.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 75ec7fcc..465533cd 100644 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -13,6 +13,10 @@ exports.Ninja = Montage.create(Component, { | |||
13 | _appLoaded: { value: false }, | 13 | _appLoaded: { value: false }, |
14 | _preload: { value: false }, | 14 | _preload: { value: false }, |
15 | 15 | ||
16 | ninjaVersion: { | ||
17 | value: window.ninjaVersion.ninja.version | ||
18 | }, | ||
19 | |||
16 | toolsData: { value: null }, | 20 | toolsData: { value: null }, |
17 | appData: { value: AppData }, | 21 | appData: { value: AppData }, |
18 | 22 | ||
@@ -36,7 +40,7 @@ exports.Ninja = Montage.create(Component, { | |||
36 | 40 | ||
37 | prepareForDraw: { | 41 | prepareForDraw: { |
38 | value: function() { | 42 | value: function() { |
39 | console.log("Loading Ninja --> ", window.ninjaVersion.ninja.version); | 43 | console.log("Loading Ninja --> ", this.ninjaVersion); |
40 | 44 | ||
41 | this.application.ninja = this; | 45 | this.application.ninja = this; |
42 | 46 | ||