]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
graycube, compat: make compatible with grabber
[tt-rss.git] / tt-rss.js
index aea274095d897483f4cad62fad0383febe9bd377..aff147cb082c8c09872ab5850e3c6dd42b9aa22a 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -8,7 +8,6 @@ var daemon_enabled = false;
 var daemon_refresh_only = false;
 //var _qfd_deleted_feed = 0;
 var firsttime_update = true;
-var cookie_lifetime = 0;
 var active_feed_id = 0;
 var active_feed_is_cat = false;
 var number_of_feeds = 0;
@@ -16,6 +15,7 @@ var sanity_check_done = false;
 var _hfd_scrolltop = 0;
 var hotkey_prefix = false;
 var init_params = new Object();
+var ver_reflow_delta = 0;
 
 function tagsAreDisplayed() {
        return display_tags;
@@ -338,12 +338,14 @@ function init() {
                        return;
 
                if (getURLParam('debug')) {
-                       document.getElementById('debug_output').style.display = 'block';
+                       Element.show("debug_output");
                        debug('debug mode activated');
                }
 
                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);
@@ -354,12 +356,22 @@ function init() {
        }
 }
 
-function resize_headlines() {
+function resize_headlines(delta_x, delta_y) {
+
+       ver_reflow_delta = delta_y;
+
+       if (getInitParam("cookie_lifetime") != 0) {
+               setCookie("ttrss_reflow_ver", ver_reflow_delta, 
+                       getInitParam("cookie_lifetime"));
+       } else {
+               setCookie("ttrss_reflow_ver", ver_reflow_delta);
+       }
 
        var h_frame = document.getElementById("headlines-frame");
        var c_frame = document.getElementById("content-frame");
        var f_frame = document.getElementById("footer");
        var feeds_frame = document.getElementById("feeds-holder");
+       var resize_grab = document.getElementById("resize-grabber");
 
        if (!c_frame || !h_frame) return;
 
@@ -377,9 +389,19 @@ function resize_headlines() {
                debug("resize_headlines: VER-mode");
 
                if (!is_msie()) {
-                       h_frame.style.height = 30 + "%";
-                       c_frame.style.top = h_frame.offsetTop + h_frame.offsetHeight + 1 + "px";
+                       h_frame.style.height = (300 - ver_reflow_delta) + "px";
+
+                       c_frame.style.top = (h_frame.offsetTop + h_frame.offsetHeight + 1) + "px";
                        h_frame.style.height = h_frame.offsetHeight + "px";
+
+                       var theme_c = 0;
+
+                       if (getInitParam("theme") == "graycube") theme_c = 1;
+
+                       resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 
+                               4 - theme_c) + "px";
+                       resize_grab.style.display = "block";
+
                } else {
                        h_frame.style.height = document.documentElement.clientHeight * 0.3 + "px";
                        c_frame.style.top = h_frame.offsetTop + h_frame.offsetHeight + 1 + "px";
@@ -393,7 +415,7 @@ function resize_headlines() {
                        c_frame.style.height = c_bottom - (h_frame.offsetTop + 
                                h_frame.offsetHeight + 1) + "px";
                        h_frame.style.height = h_frame.offsetHeight + "px";
-       
+
                }
 
        }
@@ -404,8 +426,6 @@ function init_second_stage() {
 
        try {
 
-               cookie_lifetime = getCookie("ttrss_cltime");
-
                delCookie("ttrss_vf_test");
 
 //             document.onresize = resize_headlines;
@@ -422,7 +442,13 @@ function init_second_stage() {
                setTimeout('updateFeedList(false, false)', 50);
 
                debug("second stage ok");
-       
+
+               loading_set_progress(60);
+
+               ver_reflow_delta = getCookie("ttrss_reflow_ver");
+
+               if (!ver_reflow_delta) ver_reflow_delta = 0;
+
        } catch (e) {
                exception_error("init_second_stage", e);
        }
@@ -931,7 +957,7 @@ function hotkey_handler(e) {
                        keycode = e.which;
                }
 
-               keychar = String.fromCharCode(keycode);
+               var keychar = String.fromCharCode(keycode);
 
                if (keycode == 27) { // escape
                        if (Element.visible("hotkey_help_overlay")) {
@@ -950,7 +976,7 @@ function hotkey_handler(e) {
 
                if ((keycode == 70 || keycode == 67 || keycode == 71) && !hotkey_prefix) {
                        hotkey_prefix = keycode;
-                       debug("KP: PREFIX=" + keycode);
+                       debug("KP: PREFIX=" + keycode + " CHAR=" + keychar);
                        return;
                }
 
@@ -963,38 +989,40 @@ function hotkey_handler(e) {
                if (!hotkey_prefix) {
 
                        if (keycode == 68 && shift_key) { // d
-                               if (!debug_mode_enabled) {
-                                       document.getElementById('debug_output').style.display = 'block';
+                               if (!Element.visible("debug_output")) {
+                                       Element.show("debug_output");
                                        debug('debug mode activated');
                                } else {
-                                       document.getElementById('debug_output').style.display = 'none';
+                                       Element.hide("debug_output");
                                }
        
-                               debug_mode_enabled = !debug_mode_enabled;
                                return;
                        }
        
-                       if (keycode == 191 && shift_key) { // ?
+                       if ((keycode == 191 || keychar == '?') && shift_key) { // ?
                                if (!Element.visible("hotkey_help_overlay")) {
                                        //Element.show("hotkey_help_overlay");
                                        Effect.Appear("hotkey_help_overlay", {duration : 0.3});
                                } else {
                                        Element.hide("hotkey_help_overlay");
                                }
-                               return;
+                               return false;
                        }
        
-                       if (keycode == 191 || (is_opera() && keycode == 47)) { // /
-                               return displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+                       if (keycode == 191 || keychar == '/') { // /
+                               displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+                               return false;
                        }
 
                        if (keycode == 82 && shift_key) { // R
-                               return scheduleFeedUpdate(true);
+                               scheduleFeedUpdate(true);
+                               return;
                        }
 
                        if (keycode == 82) { // r
                                if (getActiveFeedId()) {
-                                       return viewfeed(getActiveFeedId(), "ForceUpdate");
+                                       viewfeed(getActiveFeedId(), "ForceUpdate", activeFeedIsCat());
+                                       return;
                                }
                        }
 
@@ -1014,25 +1042,25 @@ function hotkey_handler(e) {
 
                        if (shift_key && (keycode == 78 || keycode == 40)) { // shift - n, down
                                catchupRelativeToArticle(1);
-                               return false;
+                               return;
                        }
 
                        if (shift_key && (keycode == 80 || keycode == 38)) { // shift - p, up
                                catchupRelativeToArticle(0);
-                               return false;
+                               return;
                        }
 
                        if (keycode == 78 || keycode == 40) { // n, down
                                if (typeof moveToPost != 'undefined') {
                                        moveToPost('next');
-                                       return false;
+                                       return;
                                }
                        }
        
                        if (keycode == 80 || keycode == 38) { // p, up
                                if (typeof moveToPost != 'undefined') {
                                        moveToPost('prev');
-                                       return false;
+                                       return;
                                }
                        }
 
@@ -1065,6 +1093,7 @@ function hotkey_handler(e) {
                                var id = getActiveArticleId();
                                if (id) {
                                        editArticleTags(id, getActiveFeedId(), isCdmMode());
+                                       return;
                                }
                        }
 
@@ -1076,18 +1105,44 @@ function hotkey_handler(e) {
                                        if (cb) {
                                                cb.checked = !cb.checked;
                                                toggleSelectRowById(cb, "RROW-" + id);
+                                               return false;
                                        }
-
-                                       return false;
                                }
                        }
 
                        if (keycode == 79) { // o
                                if (getActiveArticleId()) {
                                        openArticleInNewWindow(getActiveArticleId());
+                                       return;
+                               }
+                       }
+
+                       if (keycode == 81 && shift_key) { // Q
+                               if (typeof catchupAllFeeds != 'undefined') {
+                                       catchupAllFeeds();
+                                       return;
+                               }
+                       }
+
+                       if (keycode == 81) { // q
+                               if (getActiveFeedId()) {
+                                       catchupCurrentFeed();
+                                       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 */
@@ -1097,36 +1152,43 @@ function hotkey_handler(e) {
                        hotkey_prefix = false;
 
                        if (keycode == 65) { // a
-                               return toggleDispRead();
+                               toggleDispRead();
+                               return false;
                        }
 
                        if (keycode == 85 && shift_key) { // U
-                               return scheduleFeedUpdate(true);
+                               scheduleFeedUpdate(true);
+                               return false;
                        }
 
                        if (keycode == 85) { // u
                                if (getActiveFeedId()) {
-                                       return viewfeed(getActiveFeedId(), "ForceUpdate");
+                                       viewfeed(getActiveFeedId(), "ForceUpdate");
+                                       return false;
                                }
                        }
 
                        if (keycode == 69) { // e
-                               return editFeedDlg(getActiveFeedId());
+                               editFeedDlg(getActiveFeedId());
+                               return false;
                        }
 
                        if (keycode == 83) { // s
-                               return displayDlg("quickAddFeed");
+                               displayDlg("quickAddFeed");
+                               return false;
                        }
 
                        if (keycode == 67 && shift_key) { // C
                                if (typeof catchupAllFeeds != 'undefined') {
-                                       return catchupAllFeeds();
+                                       catchupAllFeeds();
+                                       return false;
                                }
                        }
 
                        if (keycode == 67) { // c
                                if (getActiveFeedId()) {
-                                       return catchupCurrentFeed();
+                                       catchupCurrentFeed();
+                                       return false;
                                }
                        }
 
@@ -1138,12 +1200,14 @@ function hotkey_handler(e) {
                        hotkey_prefix = false;
 
                        if (keycode == 70) { // f
-                               return displayDlg("quickAddFilter", getActiveFeedId()); 
+                               displayDlg("quickAddFilter", getActiveFeedId());
+                               return false;
                        }
 
                        if (keycode == 83) { // s
                                if (typeof collapse_feedlist != 'undefined') {
-                                       return collapse_feedlist();
+                                       collapse_feedlist();
+                                       return false;
                                }
                        }
 
@@ -1156,23 +1220,28 @@ function hotkey_handler(e) {
                        hotkey_prefix = false;
 
                        if (keycode == 83) { // s
-                               return viewfeed(-1);
+                               viewfeed(-1);
+                               return false;
                        }
 
                        if (keycode == 80 && shift_key) { // P
-                               return gotoPreferences();
+                               gotoPreferences();
+                               return false;
                        }
 
                        if (keycode == 80) { // p
-                               return viewfeed(-2);
+                               viewfeed(-2);
+                               return false;
                        }
 
                        if (keycode == 70) { // f
-                               return viewfeed(-3);
+                               viewfeed(-3);
+                               return false;
                        }
 
                        if (keycode == 84 && shift_key) { // T
                                toggleTags();
+                               return false;
                        }
 
                }
@@ -1360,4 +1429,3 @@ function hotkey_handler(e) {
                exception_error("hotkey_handler", e);
        }
 }
-