diff options
| author | Ananya Sen | 2012-01-31 07:00:49 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-01-31 07:00:49 -0800 |
| commit | 61ff730a1897890f71403cbfac4d15269e2d271f (patch) | |
| tree | 4a2893e935c259ec9fbe9446d64af5172ec6299d /js/preloader/Preloader.js | |
| parent | 906776893138257f96a0530674eda456ca3d817b (diff) | |
| parent | 6dc03672707a91085954359d82c14bd876f85b12 (diff) | |
| download | ninja-61ff730a1897890f71403cbfac4d15269e2d271f.tar.gz | |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
_scss/imports/scss/_Stage.scss
js/io/system/coreioapi.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/preloader/Preloader.js')
| -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 41768cfa..63778b82 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 | ||