diff options
| author | Libing Wang <libingw@ca.ibm.com> | 2015-08-17 11:50:18 -0400 |
|---|---|---|
| committer | Libing Wang <libingw@ca.ibm.com> | 2015-08-17 11:50:18 -0400 |
| commit | 6b57994abeef3aa3d38f94ff093fbcb38094747f (patch) | |
| tree | 89a65fd168add75f60de66d56bf55bd7bc23c094 | |
| parent | 536bbca4b2c68c9cff4e43be8d9a9d0481fd312f (diff) | |
| download | org.eclipse.orion.client-origin/stable_20150817.zip org.eclipse.orion.client-origin/stable_20150817.tar.gz org.eclipse.orion.client-origin/stable_20150817.tar.bz2 | |
Bug 475001 - Orion pages get requirejs module timeout issue and pages get blank - improved error message for timeout.origin/stable_20150817_d2bm_loggingorigin/stable_20150817
| -rw-r--r-- | bundles/org.eclipse.orion.client.core/web/orion/require-config.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/require-config.js b/bundles/org.eclipse.orion.client.core/web/orion/require-config.js index c1e5e35..5b03850 100644 --- a/bundles/org.eclipse.orion.client.core/web/orion/require-config.js +++ b/bundles/org.eclipse.orion.client.core/web/orion/require-config.js @@ -18,8 +18,13 @@ define(function() { doctrine: 'doctrine/doctrine' } }); - function errback(error) { - alert("The following error happens. Please try again later.\n" + error); + function errback(err) { + if (err.requireType === 'timeout') { + alert("RequireJS error: Timeout occured loading module " + err.requireModules + ".\n\nPlease try refreshing the page."); + } else { + alert("RequireJS error: " + err); + } + throw err; } return { errback: errback |