aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-13 13:36:52 -0800
committerArmen Kesablyan2012-02-13 13:36:52 -0800
commitda32190d5dd91fa2c26f8cabb746980c3d06035c (patch)
treed923299208c84b1071b58e7eb9c0515b2e1c844a /js/ninja.reel/ninja.js
parent36cefa3526988cb4dfea107fedaa954a2703260d (diff)
parent90d0c8c0e98d062c628c061fe5765ce991fda409 (diff)
downloadninja-da32190d5dd91fa2c26f8cabb746980c3d06035c.tar.gz
Merge branch 'refs/heads/master' into text-tool
Diffstat (limited to 'js/ninja.reel/ninja.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 },