diff options
| -rw-r--r-- | functions.js | 4 | ||||
| -rw-r--r-- | tt-rss.js | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/functions.js b/functions.js index b0665b174..6fe449239 100644 --- a/functions.js +++ b/functions.js @@ -1674,7 +1674,9 @@ function focus_element(id) { function loading_set_progress(p) { try { - if (!Element.visible("overlay")) return; + if (p < last_progress_point || !Element.visible("overlay")) return; + + debug("<b>loading_set_progress : " + p + " (" + last_progress_point + ")</b>"); var o = document.getElementById("l_progress_i"); @@ -325,8 +325,6 @@ function init() { try { - loading_set_progress(30); - // this whole shebang is based on http://www.birnamdesigns.com/misc/busted2.html if (arguments.callee.done) return; @@ -346,6 +344,8 @@ function init() { var params = "&ua=" + param_escape(navigator.userAgent); + loading_set_progress(30); + new Ajax.Request("backend.php?op=rpc&subop=sanityCheck" + params, { onComplete: function(transport) { backend_sanity_check_callback(transport); @@ -424,7 +424,7 @@ function init_second_stage() { setTimeout('updateFeedList(false, false)', 50); debug("second stage ok"); - + loading_set_progress(60); } catch (e) { |