loading progress bar for main window

[tt-rss.git] / viewfeed.js

diff --git a/viewfeed.js b/viewfeed.js
index c896036c756fc9a79761c1178cc06d858ccb2fe4..24f3636fb4080a4c88468f5bda5feeecab82b282 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -65,6 +65,8 @@ function clean_feed_selections() {
 function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
        try {
 
+               loading_set_progress(100);
+
                debug("headlines_callback2 [page=" + feed_cur_page + "]");
 
                clean_feed_selections();
@@ -168,7 +170,7 @@ function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
                                        debug("headlines_callback: returned no data");
                                        notify_error("Error while trying to load more headlines");      
                                }
-       
+
                        }
        
                        if (articles) {
@@ -228,6 +230,9 @@ function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
                _infscroll_request_sent = 0;
 
                notify("");
+
+               remove_splash();
+
        } catch (e) {
                exception_error("headlines_callback2", e);
        }
@@ -319,7 +324,7 @@ function article_callback2(transport, id, feed_id) {
                        active_real_feed_id = feed_id;
                        active_post_id = id; 
 
-                       showArticleInHeadlines(id);     
+                       //showArticleInHeadlines(id);   
 
                        var reply = transport.responseXML.firstChild.firstChild;
 
@@ -1836,7 +1841,6 @@ function fixHeadlinesOrder(ids) {
 }
 
 function subtoolbarSearch() {
-
        try {
 
                var q = document.getElementById("subtoolbar_search_box");
@@ -1871,7 +1875,7 @@ function subtoolbarSearch() {
 
        } catch (e) {
                exception_error("subtoolbarSearch", e);
-       }
+       } 
 }
 
 function getArticleUnderPointer() {