diff options
| author | Andrew Dolgov <[email protected]> | 2008-05-19 13:00:35 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2008-05-19 13:00:35 +0100 |
| commit | 08827aafd72ccc84d8856e3a7a07abd7d93fad33 (patch) | |
| tree | bb92ccac64676dde0087ae0602a259268f71eaac | |
| parent | d9e4bba015b7095673fe8d35315bff41bb1f6bcd (diff) | |
prefs: add loading progressbar
| -rw-r--r-- | feedlist.js | 8 | ||||
| -rw-r--r-- | functions.js | 8 | ||||
| -rw-r--r-- | prefs.js | 14 | ||||
| -rw-r--r-- | prefs.php | 18 |
4 files changed, 39 insertions, 9 deletions
diff --git a/feedlist.js b/feedlist.js index 0020de179..ac2985a2f 100644 --- a/feedlist.js +++ b/feedlist.js @@ -460,10 +460,4 @@ function init_collapsable_feedlist(theme) { } -function remove_splash() { - if (Element.visible("overlay")) { - debug("about to remove splash, OMG!"); - Element.hide("overlay"); - debug("removed splash!"); - } -} + diff --git a/functions.js b/functions.js index 01de05b22..83e24bf09 100644 --- a/functions.js +++ b/functions.js @@ -1697,3 +1697,11 @@ function loading_set_progress(p) { exception_error("loading_set_progress", e); } } + +function remove_splash() { + if (Element.visible("overlay")) { + debug("about to remove splash, OMG!"); + Element.hide("overlay"); + debug("removed splash!"); + } +} @@ -87,6 +87,8 @@ function feedlist_callback() { correctPNG(); } notify(""); + remove_splash(); + } catch (e) { exception_error("feedlist_callback", e); } @@ -128,6 +130,7 @@ function filterlist_callback() { correctPNG(); } notify(""); + remove_splash(); } } @@ -153,6 +156,7 @@ function labellist_callback() { correctPNG(); } notify(""); + remove_splash(); } } @@ -161,6 +165,7 @@ function feed_browser_callback() { if (xmlhttp.readyState == 4) { container.innerHTML=xmlhttp.responseText; notify(""); + remove_splash(); } } @@ -169,16 +174,16 @@ function userlist_callback() { if (xmlhttp.readyState == 4) { container.innerHTML=xmlhttp.responseText; notify(""); + remove_splash(); } } function prefslist_callback() { var container = document.getElementById('prefContent'); if (xmlhttp.readyState == 4) { - container.innerHTML=xmlhttp.responseText; - notify(""); + remove_splash(); } } @@ -1434,6 +1439,9 @@ function init_second_stage() { selectTab(active_tab); } notify(""); + + loading_set_progress(60); + } catch (e) { exception_error("init_second_stage", e); } @@ -1459,6 +1467,8 @@ function init() { return; } + loading_set_progress(30); + xmlhttp.open("GET", "backend.php?op=rpc&subop=sanityCheck", true); xmlhttp.onreadystatechange=backend_sanity_check_callback; xmlhttp.send(null); @@ -69,6 +69,24 @@ <body> +<div id="overlay"> + <div id="overlay_inner"> + <?php echo __("Loading, please wait...") ?> + + <div id="l_progress_o"> + <div id="l_progress_i"></div> + </div> + + <noscript> + <div class="error"><?php echo + __("Your browser doesn't support Javascript, which is required + for this application to function properly. Please check your + browser settings.") ?></div> + </noscript> + </div> +</div> + + <div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)"> <?php rounded_table_start("hho"); ?> <?php include "help/4.php" ?> |