restyle resizer

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

diff --git a/tt-rss.js b/tt-rss.js
index a9a3b3f1b43fe9d92c02f162e96cd6b0c64e6cdd..71ebf13bc72d7efee2538d109c6b5e336499c72c 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -259,6 +259,8 @@ function viewfeed(feed, subop) {
 }
 
 function timeout() {
+       if (getInitParam("bw_limit") == "1") return;
+
        scheduleFeedUpdate(false);
 
        var refresh_time = getInitParam("feeds_frame_refresh");
@@ -369,7 +371,8 @@ function resize_headlines(delta_x, delta_y) {
                var f_frame = document.getElementById("footer");
                var feeds_frame = document.getElementById("feeds-holder");
                var resize_grab = document.getElementById("resize-grabber");
-       
+               var resize_handle = document.getElementById("resize-handle");
+
                if (!c_frame || !h_frame) return;
        
                if (feeds_frame && getInitParam("theme") == "compat") {
@@ -393,6 +396,9 @@ function resize_headlines(delta_x, delta_y) {
                        resize_grab.style.left = (h_frame.offsetLeft + h_frame.offsetWidth - 
                                4) + "px";
                        resize_grab.style.display = "block";
+
+                       resize_handle.src = "themes/3pane/images/resize_handle_vert.png";
+                       resize_handle.style.paddingTop = (resize_grab.offsetHeight / 2 - 7) + "px";
        
                } else {
        
@@ -411,11 +417,17 @@ function resize_headlines(delta_x, delta_y) {
        
                        var theme_c = 0;
        
-                       if (getInitParam("theme") == "graycube") theme_c = 1;
+                       if (getInitParam("theme") == "graycube") {
+                               theme_c = 1;
+                       }
+
+                       if (getInitParam("theme") == "graycube" || getInitParam("theme") == "compat") {
+                               resize_handle.src = "themes/graycube/images/resize_handle_horiz.png";
+                       }
        
-                       resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 
+/*                     resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 
                                4 - theme_c) + "px";
-                       resize_grab.style.display = "block";
+                       resize_grab.style.display = "block"; */
        
                }
        
@@ -1001,10 +1013,12 @@ function hotkey_handler(e) {
 
                if (keycode == 16) return; // ignore lone shift
 
-               if ((keycode == 70 || keycode == 67 || keycode == 71) && !hotkey_prefix) {
+               if ((keycode == 70 || keycode == 67 || keycode == 71 || 
+                               keycode == 224 || keycode == 91) && !hotkey_prefix) {
+
                        hotkey_prefix = keycode;
                        debug("KP: PREFIX=" + keycode + " CHAR=" + keychar);
-                       return;
+                       return true;
                }
 
                if (Element.visible("hotkey_help_overlay")) {
@@ -1055,15 +1069,33 @@ function hotkey_handler(e) {
 
                        if (keycode == 74) { // j
                                var feed = getActiveFeedId();
-                               var new_feed = getRelativeFeedId(feedlist, feed, 'prev');
-                               if (new_feed) viewfeed(new_feed, '');
+                               var new_feed = getRelativeFeedId2(feed, activeFeedIsCat(), 'prev');
+//                             alert(feed + " IC: " + activeFeedIsCat() + " => " + new_feed);
+                               if (new_feed) {
+                                       var is_cat = new_feed.match("CAT:");
+                                       if (is_cat) {
+                                               new_feed = new_feed.replace("CAT:", "");
+                                               viewCategory(new_feed);
+                                       } else {
+                                               viewfeed(new_feed, '', false);
+                                       }
+                               }
                                return;
                        }
        
                        if (keycode == 75) { // k
                                var feed = getActiveFeedId();
-                               var new_feed = getRelativeFeedId(feedlist, feed, 'next');
-                               if (new_feed) viewfeed(new_feed, '');
+                               var new_feed = getRelativeFeedId2(feed, activeFeedIsCat(), 'next');
+//                             alert(feed + " IC: " + activeFeedIsCat() + " => " + new_feed);
+                               if (new_feed) {
+                                       var is_cat = new_feed.match("CAT:");
+                                       if (is_cat == "CAT:") {
+                                               new_feed = new_feed.replace("CAT:", "");
+                                               viewCategory(new_feed);
+                                       } else {
+                                               viewfeed(new_feed, '', false);
+                                       }
+                               }
                                return;
                        }
 
@@ -1171,9 +1203,10 @@ function hotkey_handler(e) {
                                }
                        }
 
-                       if (keycode == 187) { // =
-                               hideReadHeadlines();
-                               return;
+                       if (keycode == 88) { // x
+                               if (activeFeedIsCat()) {
+                                       toggleCollapseCat(getActiveFeedId());
+                               }
                        }
                }
 
@@ -1229,6 +1262,11 @@ function hotkey_handler(e) {
                                return resort_feedlist();
                        }
 
+                       if (keycode == 72) { // h
+                               hideReadHeadlines();
+                               return;
+                       }
+
                }
 
                /* Prefix c */
@@ -1280,7 +1318,13 @@ function hotkey_handler(e) {
                                toggleTags();
                                return false;
                        }
+               }
 
+               /* Cmd */
+
+               if (hotkey_prefix == 224 || hotkey_prefix == 91) { // f 
+                       hotkey_prefix = false;
+                       return;
                }
 
                if (hotkey_prefix) {