diff options
| author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
| commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
| tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /js/preloader | |
| parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
| parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
| download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
Diffstat (limited to 'js/preloader')
| -rwxr-xr-x | js/preloader/Preloader.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index f137f4b6..93d71e8f 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js | |||
| @@ -136,7 +136,6 @@ exports.Preloader = Montage.create(Component, { | |||
| 136 | 136 | ||
| 137 | deserializedFromTemplate: { | 137 | deserializedFromTemplate: { |
| 138 | value: function() { | 138 | value: function() { |
| 139 | console.log("Start Preloading"); | ||
| 140 | 139 | ||
| 141 | this.filesTotal = this.ninjaJsRequire.length + this.ninjaCssRequire.length; | 140 | this.filesTotal = this.ninjaJsRequire.length + this.ninjaCssRequire.length; |
| 142 | 141 | ||