aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorhwc4872012-01-31 09:22:56 -0800
committerhwc4872012-01-31 09:22:56 -0800
commit0b8d8b2eb595b64ef53440b949f3c5ec891daf8a (patch)
treef4cf57e6b07ae04ea01f16599a5047109cfcf68a /js
parent8e43a46e3d79323fe06dc7771bc611a2c3c85c5c (diff)
parente4837edab24868a7c093a2a70e8ec3585e1007d8 (diff)
downloadninja-0b8d8b2eb595b64ef53440b949f3c5ec891daf8a.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into working
Diffstat (limited to 'js')
-rw-r--r--js/ninja.reel/ninja.js5
-rwxr-xr-xjs/preloader/Preloader.js1
2 files changed, 5 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index bc31e0e1..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,6 +40,7 @@ exports.Ninja = Montage.create(Component, {
36 40
37 prepareForDraw: { 41 prepareForDraw: {
38 value: function() { 42 value: function() {
43 console.log("Loading Ninja --> ", this.ninjaVersion);
39 44
40 this.application.ninja = this; 45 this.application.ninja = this;
41 46
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index 4a4ac019..3daeb1b4 100755
--- a/js/preloader/Preloader.js
+++ b/js/preloader/Preloader.js
@@ -135,7 +135,6 @@ exports.Preloader = Montage.create(Component, {
135 135
136 deserializedFromTemplate: { 136 deserializedFromTemplate: {
137 value: function() { 137 value: function() {
138 console.log("Start Preloading");
139 138
140 this.filesTotal = this.ninjaJsRequire.length + this.ninjaCssRequire.length; 139 this.filesTotal = this.ninjaJsRequire.length + this.ninjaCssRequire.length;
141 140