diff options
author | Eric Guzman | 2012-02-13 10:30:26 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-13 10:30:26 -0800 |
commit | 672e6f61647b1b8a5f6f5831284fa44bcb7be883 (patch) | |
tree | 0c15656f1f82f194bfcab68634a88f68fd3d42cb /js/ninja.reel/ninja.js | |
parent | 586c3f7bbea04e62638e5ed8cdce9933e88c0b67 (diff) | |
parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
download | ninja-672e6f61647b1b8a5f6f5831284fa44bcb7be883.tar.gz |
Merge branch 'refs/heads/master' into PresetsPanel
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 | }, |