]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
feedlist-related code cleanup
[tt-rss.git] / tt-rss.js
index b8ee2bb14bd1673ec914c7498b86aa90aaa1448b..e81987ef7e69e828e8f7b9d71c82d6fd5d4e197a 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -15,7 +15,8 @@ var sanity_check_done = false;
 var _hfd_scrolltop = 0;
 var hotkey_prefix = false;
 var init_params = new Object();
-var ver_reflow_delta = 0;
+var ver_offset = 0;
+var hor_offset = 0;
 
 function tagsAreDisplayed() {
        return display_tags;
@@ -342,6 +343,8 @@ function init() {
                        debug('debug mode activated');
                }
 
+               new Draggable('debug_output');
+
                var params = "&ua=" + param_escape(navigator.userAgent);
 
                loading_set_progress(30);
@@ -358,61 +361,77 @@ function init() {
 
 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;
-
-       if (feeds_frame && getInitParam("theme") == "compat") {
-                       feeds_frame.style.bottom = f_frame.offsetHeight + "px";         
-       }
-
-       if (getInitParam("theme") == "3pane") {
-               debug("resize_headlines: HOR-mode");
-
-               c_frame.style.width = '35%';
-               h_frame.style.right = c_frame.offsetWidth - 1 + "px";
-
-       } else {
-               debug("resize_headlines: VER-mode");
-
-               if (!is_msie()) {
-                       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";
+       try {
 
-                       resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 4) + "px";
+               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") {
+       
+                       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";
-
-               } else {
-                       h_frame.style.height = document.documentElement.clientHeight * 0.3 + "px";
-                       c_frame.style.top = h_frame.offsetTop + h_frame.offsetHeight + 1 + "px";
        
-                       var c_bottom = document.documentElement.clientHeight;
+               } else {
        
-                       if (f_frame) {
-                               c_bottom = f_frame.offsetTop;
+                       if (delta_y != undefined) {
+                               if (c_frame.offsetHeight + delta_y > 100 && h_frame.offsetHeight - delta_y > 100) {
+                                       ver_offset = ver_offset + delta_y;
+                               }
                        }
        
-                       c_frame.style.height = c_bottom - (h_frame.offsetTop + 
-                               h_frame.offsetHeight + 1) + "px";
+                       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);
        }
 
 }
@@ -424,7 +443,6 @@ function init_second_stage() {
                delCookie("ttrss_vf_test");
 
 //             document.onresize = resize_headlines;
-               resize_headlines();
 
                var toolbar = document.forms["main_toolbar_form"];
 
@@ -440,9 +458,17 @@ function init_second_stage() {
 
                loading_set_progress(60);
 
-               ver_reflow_delta = getCookie("ttrss_reflow_ver");
+               ver_offset = parseInt(getCookie("ttrss_offset_ver"));
+               hor_offset = parseInt(getCookie("ttrss_offset_hor"));
+
+               /* fuck IE */
+
+               if (isNaN(hor_offset)) hor_offset = 0;
+               if (isNaN(ver_offset)) ver_offset = 0;
 
-               if (!ver_reflow_delta) ver_reflow_delta = 0;
+               debug("offsets from cookies [x:y]: " + hor_offset + ":" + ver_offset);
+
+               resize_headlines();
 
        } catch (e) {
                exception_error("init_second_stage", e);
@@ -555,6 +581,12 @@ function quickMenuGo(opid) {
                        Effect.Appear("hotkey_help_overlay", {duration : 0.3});
                }
 
+               if (opid == "qmcResetUI") {
+                       hor_offset = 0;
+                       ver_offset = 0;
+                       resize_headlines();
+               }
+
        } catch (e) {
                exception_error("quickMenuGo", e);
        }
@@ -590,7 +622,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);
                                
@@ -1003,7 +1035,7 @@ function hotkey_handler(e) {
                                }
                                return false;
                        }
-       
+
                        if (keycode == 191 || keychar == '/') { // /
                                displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
                                return false;
@@ -1187,6 +1219,10 @@ function hotkey_handler(e) {
                                }
                        }
 
+                       if (keycode == 87) { // w
+                               return resort_feedlist();
+                       }
+
                }
 
                /* Prefix c */
@@ -1241,178 +1277,6 @@ function hotkey_handler(e) {
 
                }
 
-/*
-               if (keycode == 48) { // 0
-                       return setHotkeyZone(0);
-               }
-
-               if (keycode == 49) { // 1
-                       return setHotkeyZone(1);
-               }
-
-               if (keycode == 50) { // 2
-                       return setHotkeyZone(2);
-               }
-
-               if (keycode == 51) { // 3
-                       return setHotkeyZone(3);
-               }
-
-               if (keycode == 82) { // r
-                       return scheduleFeedUpdate(true);
-               }
-
-               if (keycode == 83) { // s
-                       return displayDlg("search", getActiveFeedId());
-               }
-
-               if (keycode == 85) { // u
-                       if (getActiveFeedId()) {
-                               return viewfeed(getActiveFeedId(), "ForceUpdate");
-                       }
-               }
-       
-               if (keycode == 65) { // a
-                       return toggleDispRead();
-               }
-       
-               var feedlist = document.getElementById('feedList');
-       
-               if (keycode == 74) { // j
-                       var feed = getActiveFeedId();
-                       var new_feed = getRelativeFeedId(feedlist, feed, 'prev');
-                       if (new_feed) viewfeed(new_feed, '');
-               }
-       
-               if (keycode == 75) { // k
-                       var feed = getActiveFeedId();
-                       var new_feed = getRelativeFeedId(feedlist, feed, 'next');
-                       if (new_feed) viewfeed(new_feed, '');
-               }
-
-               if (shift_key && (keycode == 78 || keycode == 40)) { // shift - n, down
-                       return catchupRelativeToArticle(1);
-               }
-
-               if (shift_key && (keycode == 80 || keycode == 38)) { // shift - p, up
-                       return catchupRelativeToArticle(0);                     
-               }
-
-               if (keycode == 78 || keycode == 40) { // n, down
-                       if (typeof moveToPost != 'undefined') {
-                               return moveToPost('next');
-                       }
-               }
-       
-               if (keycode == 80 || keycode == 38) { // p, up
-                       if (typeof moveToPost != 'undefined') {
-                               return moveToPost('prev');
-                       }
-               }
-               
-               if (keycode == 68 && shift_key) { // d
-                       if (!debug_mode_enabled) {
-                               document.getElementById('debug_output').style.display = 'block';
-                               debug('debug mode activated');
-                       } else {
-                               document.getElementById('debug_output').style.display = 'none';
-                       }
-
-                       debug_mode_enabled = !debug_mode_enabled;
-               }
-
-               if (keycode == 191 && shift_key) { // ?
-                       if (!Element.visible("hotkey_help_overlay")) {
-                               Element.show("hotkey_help_overlay");
-                       } else {
-                               Element.hide("hotkey_help_overlay");
-                       }
-               }
-
-               if (keycode == 69 && shift_key) { // e
-                       return editFeedDlg(getActiveFeedId());
-               }
-
-               if (keycode == 70 && shift_key) { // f
-                       if (getActiveFeedId()) {
-                               return catchupCurrentFeed();
-                       }
-               }
-
-               if (keycode == 80 && shift_key) { // p 
-                       if (getActiveFeedId()) {
-                               return catchupPage();
-                       }
-               }
-
-               if (keycode == 86) { // v
-                       if (getActiveArticleId()) {
-                               openArticleInNewWindow(getActiveArticleId());
-                       }
-               }
-
-               if (keycode == 84) { // t
-
-                       var id = getActiveArticleId();
-
-                       if (id) {                               
-
-                               var cb = document.getElementById("RCHK-" + id);
-
-                               if (cb) {
-                                       cb.checked = !cb.checked;
-                                       toggleSelectRowById(cb, "RROW-" + id);
-                               }
-                       }
-               }
-
-               if (keycode == 67) { // c
-                       var id = getActiveArticleId();
-
-                       if (id) {                               
-                               toggleUnread(id, 0);
-                       }
-               }
-
-               if (keycode == 67 && shift_key) { // c
-                       if (typeof collapse_feedlist != 'undefined') {
-                               return collapse_feedlist();
-                       }
-               }
-
-               if (keycode == 81 && shift_key) { // shift + q
-                       if (typeof catchupAllFeeds != 'undefined') {
-                               return catchupAllFeeds();
-                       }
-               }
-
-               if (keycode == 73 && shift_key) { // shift + i
-                       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");
-                               }
-                       }
-               }
-
-               if (keycode == 27) { // escape
-                       if (Element.visible("hotkey_help_overlay")) {
-                               Element.hide("hotkey_help_overlay");
-                       }
-               } 
-
-               if (typeof localHotkeyHandler != 'undefined') {
-                       try {
-                               return localHotkeyHandler(e);
-                       } catch (e) {
-                               exception_error("hotkey_handler, local:", e);
-                       }
-               } */
-
                if (hotkey_prefix) {
                        debug("KP: PREFIX=" + hotkey_prefix + " CODE=" + keycode + " CHAR=" + keychar);
                } else {