diff options
author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /node_modules/montage/ui/loader.reel/loader.js | |
parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.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 | ||