loading progress bar for main window

[tt-rss.git] / tt-rss.js

diff --git a/tt-rss.js b/tt-rss.js
index 587ea198e1c9ad29d32e6a5f4bdfd47b3add6bd8..538a318d9cdcfffa3601a45673fc280b2b6d655a 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -325,6 +325,8 @@ 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;
@@ -423,6 +425,8 @@ function init_second_stage() {
 
                debug("second stage ok");
        
+               loading_set_progress(60);
+
        } catch (e) {
                exception_error("init_second_stage", e);
        }
@@ -996,8 +1000,8 @@ function hotkey_handler(e) {
 
                        if (keycode == 82) { // r
                                if (getActiveFeedId()) {
-                                       viewfeed(getActiveFeedId(), "ForceUpdate");
-                                       return false;
+                                       viewfeed(getActiveFeedId(), "ForceUpdate", activeFeedIsCat());
+                                       return;
                                }
                        }
 
@@ -1095,17 +1099,29 @@ function hotkey_handler(e) {
                        if (keycode == 81 && shift_key) { // Q
                                if (typeof catchupAllFeeds != 'undefined') {
                                        catchupAllFeeds();
-                                       return false;
+                                       return;
                                }
                        }
 
                        if (keycode == 81) { // q
                                if (getActiveFeedId()) {
                                        catchupCurrentFeed();
-                                       return false;
+                                       return;
                                }
                        }
 
+                       if (keycode == 220 && shift_key) { // shift + |
+                               if (document.getElementById("subtoolbar_search")) {
+                                       if (Element.visible("subtoolbar_search")) {
+                                               Element.hide("subtoolbar_search");
+                                               Element.show("subtoolbar_ftitle");
+                                               setTimeout("Element.focus('subtoolbar_search_box')", 100);
+                                       } else {
+                                                       Element.show("subtoolbar_search");
+                                               Element.hide("subtoolbar_ftitle");
+                                       }
+                               }
+                       }
                }
 
                /* Prefix f */