diff --git a/web/pgadmin/browser/templates/browser/index.html b/web/pgadmin/browser/templates/browser/index.html index 32ece15..eddfe13 100644 --- a/web/pgadmin/browser/templates/browser/index.html +++ b/web/pgadmin/browser/templates/browser/index.html @@ -15,8 +15,84 @@ console.log(arguments); /* Show proper error dialog */ console.log(err); } + +/* + * Show loading spinner till every js module is loaded completely + * Referenced url: + * http://stackoverflow.com/questions/15581563/requirejs-load-script-progress + * Little bit tweaked as per need + */ +require.onResourceLoad = function (context, map, depMaps) { + var loadingStatusEl = panel = document.getElementById('pg-spinner'); + if (loadingStatusEl) { + if (!context) { + // we will call onResourceLoad(false) by ourselves when requirejs + // is not loading anything hide the indicator and exit + setTimeout(function() { + if (panel != null) { + panel.remove(); + return; + } + }, 500); + } + + // show indicator when any module is loaded and + // shedule requirejs status (loading/idle) check + panel.style.display = ""; + clearTimeout(panel.ttimer); + panel.ttimer = setTimeout(function () { + var context = require.s.contexts._; + var inited = true; + for (name in context.registry) { + var m = context.registry[name]; + if (m.inited !== true) { + inited = false; + break; + } + } + + // here the "inited" variable will be true, if requirejs is "idle", + // false if "loading" + if (inited) { + // will fire if module loads in 400ms. TODO: reset this timer + // for slow module loading + require.onResourceLoad(false); + } + }, 400) + } +}; {% endblock %} {% block body %} + +
+ + {{ 'Loading {0} {1}...'.format(config.APP_NAME, config.APP_VERSION) }} +