diff options
author | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
commit | 04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch) | |
tree | d0041abc7379ef38b20cce148e5dea6f531b8569 /node_modules/montage/ui/loader.reel/loader.js | |
parent | 4d8306b638c53899403a4f0328c02bf1ab893e8f (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
.gitignore
js/ninja.reel/ninja.js
Diffstat (limited to 'node_modules/montage/ui/loader.reel/loader.js')
-rwxr-xr-x | node_modules/montage/ui/loader.reel/loader.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/node_modules/montage/ui/loader.reel/loader.js b/node_modules/montage/ui/loader.reel/loader.js index 3809d334..b392c915 100755 --- a/node_modules/montage/ui/loader.reel/loader.js +++ b/node_modules/montage/ui/loader.reel/loader.js | |||
@@ -403,6 +403,13 @@ exports.Loader = Montage.create(Component, /** @lends module:montage/ui/loader.L | |||
403 | } | 403 | } |
404 | self._revealMainComponent(); | 404 | self._revealMainComponent(); |
405 | }, remainingBootstrappingDelay); | 405 | }, remainingBootstrappingDelay); |
406 | } else { | ||
407 | setTimeout(function () { | ||
408 | if (logger.isDebug) { | ||
409 | logger.debug(this, "ok, showing bootstrapper now"); | ||
410 | } | ||
411 | self._revealMainComponent(); | ||
412 | }, 0); | ||
406 | } | 413 | } |
407 | } | 414 | } |
408 | 415 | ||