]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
restyle resizer
[tt-rss.git] / tt-rss.js
index d27a94af62db56d98456c01fec7263342df1b6a7..71ebf13bc72d7efee2538d109c6b5e336499c72c 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -17,6 +17,7 @@ var hotkey_prefix = false;
 var init_params = new Object();
 var ver_offset = 0;
 var hor_offset = 0;
+var feeds_sort_by_unread = false;
 
 function tagsAreDisplayed() {
        return display_tags;
@@ -258,6 +259,8 @@ function viewfeed(feed, subop) {
 }
 
 function timeout() {
+       if (getInitParam("bw_limit") == "1") return;
+
        scheduleFeedUpdate(false);
 
        var refresh_time = getInitParam("feeds_frame_refresh");
@@ -343,8 +346,6 @@ function init() {
                        debug('debug mode activated');
                }
 
-               new Draggable('debug_output');
-
                var params = "&ua=" + param_escape(navigator.userAgent);
 
                loading_set_progress(30);
@@ -361,71 +362,87 @@ function init() {
 
 function resize_headlines(delta_x, delta_y) {
 
-       debug("resize_headlines: " + delta_x + ":" + delta_y);
-
-       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;
-
-       if (feeds_frame && getInitParam("theme") == "compat") {
-                       feeds_frame.style.bottom = f_frame.offsetHeight + "px";         
-       }
-
-       if (getInitParam("theme") == "3pane") {
+       try {
 
-               if (delta_x != undefined) {
-                       if (c_frame.offsetLeft - delta_x > feeds_frame.offsetWidth + feeds_frame.offsetLeft + 100 && c_frame.offsetWidth + delta_x > 100) {
-                               hor_offset = hor_offset + delta_x;
-                       }
+               debug("resize_headlines: " + delta_x + ":" + delta_y);
+       
+               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");
+               var resize_handle = document.getElementById("resize-handle");
+
+               if (!c_frame || !h_frame) return;
+       
+               if (feeds_frame && getInitParam("theme") == "compat") {
+                               feeds_frame.style.bottom = f_frame.offsetHeight + "px";         
                }
+       
+               if (getInitParam("theme") == "3pane") {
+       
+                       if (delta_x != undefined) {
+                               if (c_frame.offsetLeft - delta_x > feeds_frame.offsetWidth + feeds_frame.offsetLeft + 100 && c_frame.offsetWidth + delta_x > 100) {
+                                       hor_offset = hor_offset + delta_x;
+                               }
+                       }
+       
+                       debug("resize_headlines: HOR-mode: " + hor_offset);
+       
+                       c_frame.style.width = (400 + hor_offset) + "px";
+                       h_frame.style.right = c_frame.offsetWidth - 1 + "px";
+       
+                       resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 60) + "px";
+                       resize_grab.style.left = (h_frame.offsetLeft + h_frame.offsetWidth - 
+                               4) + "px";
+                       resize_grab.style.display = "block";
 
-               debug("resize_headlines: HOR-mode: " + hor_offset);
-
-               c_frame.style.width = (400 + hor_offset) + "px";
-               h_frame.style.right = c_frame.offsetWidth - 1 + "px";
-
-               resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 60) + "px";
-               resize_grab.style.left = (h_frame.offsetLeft + h_frame.offsetWidth - 
-                       4) + "px";
-               resize_grab.style.display = "block";
-
-       } else {
+                       resize_handle.src = "themes/3pane/images/resize_handle_vert.png";
+                       resize_handle.style.paddingTop = (resize_grab.offsetHeight / 2 - 7) + "px";
+       
+               } else {
+       
+                       if (delta_y != undefined) {
+                               if (c_frame.offsetHeight + delta_y > 100 && h_frame.offsetHeight - delta_y > 100) {
+                                       ver_offset = ver_offset + delta_y;
+                               }
+                       }
+       
+                       debug("resize_headlines: VER-mode: " + ver_offset);
+       
+                       h_frame.style.height = (300 - ver_offset) + "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;
+                       }
 
-               if (delta_y != undefined) {
-                       if (c_frame.offsetHeight + delta_y > 100 && h_frame.offsetHeight - delta_y > 100) {
-                               ver_offset = ver_offset + delta_y;
+                       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 - 
+                               4 - theme_c) + "px";
+                       resize_grab.style.display = "block"; */
+       
+               }
+       
+               if (getInitParam("cookie_lifetime") != 0) {
+                       setCookie("ttrss_offset_ver", ver_offset, 
+                               getInitParam("cookie_lifetime"));
+                       setCookie("ttrss_offset_hor", hor_offset, 
+                               getInitParam("cookie_lifetime"));
+               } else {
+                       setCookie("ttrss_offset_ver", ver_offset);
+                       setCookie("ttrss_offset_hor", hor_offset);
                }
 
-               debug("resize_headlines: VER-mode: " + ver_offset);
-
-               h_frame.style.height = (300 - ver_offset) + "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";
-
-       }
-
-       if (getInitParam("cookie_lifetime") != 0) {
-               setCookie("ttrss_offset_ver", ver_offset, 
-                       getInitParam("cookie_lifetime"));
-               setCookie("ttrss_offset_hor", hor_offset, 
-                       getInitParam("cookie_lifetime"));
-       } else {
-               setCookie("ttrss_offset_ver", ver_offset);
-               setCookie("ttrss_offset_hor", hor_offset);
+       } catch (e) {
+               exception_error("resize_headlines", e);
        }
 
 }
@@ -445,6 +462,7 @@ function init_second_stage() {
 
                daemon_enabled = getInitParam("daemon_enabled") == 1;
                daemon_refresh_only = getInitParam("daemon_refresh_only") == 1;
+               feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
                setTimeout('updateFeedList(false, false)', 50);
 
@@ -616,7 +634,7 @@ function toggleDispRead() {
 
                debug("toggle_disp_read => " + hide_read_feeds);
 
-               hideOrShowFeeds(getFeedsContext().document, hide_read_feeds);
+               hideOrShowFeeds(hide_read_feeds);
 
                storeInitParam("hide_read_feeds", hide_read_feeds, true);
                                
@@ -995,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")) {
@@ -1029,7 +1049,7 @@ function hotkey_handler(e) {
                                }
                                return false;
                        }
-       
+
                        if (keycode == 191 || keychar == '/') { // /
                                displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
                                return false;
@@ -1049,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;
                        }
 
@@ -1164,6 +1202,12 @@ function hotkey_handler(e) {
                                        }
                                }
                        }
+
+                       if (keycode == 88) { // x
+                               if (activeFeedIsCat()) {
+                                       toggleCollapseCat(getActiveFeedId());
+                               }
+                       }
                }
 
                /* Prefix f */
@@ -1213,6 +1257,16 @@ function hotkey_handler(e) {
                                }
                        }
 
+                       if (keycode == 87) { // w
+                               feeds_sort_by_unread = !feeds_sort_by_unread;
+                               return resort_feedlist();
+                       }
+
+                       if (keycode == 72) { // h
+                               hideReadHeadlines();
+                               return;
+                       }
+
                }
 
                /* Prefix c */
@@ -1264,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) {
@@ -1278,3 +1338,7 @@ function hotkey_handler(e) {
                exception_error("hotkey_handler", e);
        }
 }
+
+function feedsSortByUnread() {
+       return feeds_sort_by_unread;
+}