diff options
| author | Valerio Virgillito | 2012-02-09 13:41:45 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-09 13:41:45 -0800 |
| commit | f5193cd04a2597051d88fced878efbc4802ea64c (patch) | |
| tree | dc343dc98fa9f99133d9882bd9b92cfe81296d1a /js/ninja.reel/ninja.js | |
| parent | e2539230b8a297fa972af6d53fe9de3ef2ad43fa (diff) | |
| parent | 666ae3e9119410cbf7fa974274d95336aaff091c (diff) | |
| download | ninja-f5193cd04a2597051d88fced878efbc4802ea64c.tar.gz | |
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/ninja.reel/ninja.js')
| -rw-r--r-- | js/ninja.reel/ninja.js | 3 |
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 | }, |