]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
make f a hotkey persistent; obsolete option HIDE_READ_FEEDS
[tt-rss.git] / tt-rss.js
index 49db3aea02bc22fd6e7e4510e5568f7508d1a27e..04671c04893b1e343e28201401fc8f5a31370e08 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -15,6 +15,7 @@ var number_of_feeds = 0;
 var sanity_check_done = false;
 var _hfd_scrolltop = 0;
 var hotkey_prefix = false;
+var hotkey_prefix_pressed = false;
 var init_params = new Object();
 var ver_offset = 0;
 var hor_offset = 0;
@@ -26,7 +27,6 @@ function activeFeedIsCat() {
 }
 
 function getActiveFeedId() {
-//     return getCookie("ttrss_vf_actfeed");
        try {
                debug("gAFID: " + _active_feed_id);
                return _active_feed_id;
@@ -36,7 +36,6 @@ function getActiveFeedId() {
 }
 
 function setActiveFeedId(id, is_cat) {
-//     return setCookie("ttrss_vf_actfeed", id);
        try {
                debug("sAFID(" + id + ", " + is_cat + ")");
                _active_feed_id = id;
@@ -65,7 +64,7 @@ function toggleTags(show_all) {
 
        debug("toggleTags: " + show_all + "; " + display_tags);
 
-       var p = document.getElementById("dispSwitchPrompt");
+       var p = $("dispSwitchPrompt");
 
        if (!show_all && !display_tags) {
                displayDlg("printTagCloud");
@@ -89,7 +88,7 @@ function toggleTags(show_all) {
 
 function dlg_frefresh_callback(transport, deleted_feed) {
        if (getActiveFeedId() == deleted_feed) {
-               var h = document.getElementById("headlines-frame");
+               var h = $("headlines-frame");
                if (h) {
                        h.innerHTML = "<div class='whiteBox'>" + __('No feed selected.') + "</div>";
                }
@@ -132,12 +131,14 @@ function backend_sanity_check_callback(transport) {
                }
 
                if (!transport.responseXML) {
-                       if (!window.google && !google.gears) {
-                               fatalError(3, "Sanity check: Received reply is not XML", transport.responseText);
+                       if (!store) {
+                               fatalError(3, "Sanity check: Received reply is not XML", 
+                                       transport.responseText);
+                               return;
                        } else {
                                init_offline();
+                               return;
                        }
-                       return;
                }
 
                if (getURLParam("offline")) {
@@ -228,7 +229,8 @@ function scheduleFeedUpdate(force) {
 
        debug("REFETCH query: " + query_str);
 
-       new Ajax.Request(query_str, {
+       new Ajax.Request("backend.php", {
+               parameters: query_str,
                onComplete: function(transport) { 
                                refetch_callback2(transport); 
                        } });
@@ -260,12 +262,13 @@ function updateFeedList(silent, fetch) {
        
        if (fetch) query_str = query_str + "&fetch=yes";
 
-//     var feeds_frame = document.getElementById("feeds-frame");
+//     var feeds_frame = $("feeds-frame");
 //     feeds_frame.src = query_str;
 
        debug("updateFeedList Q=" + query_str);
 
-       new Ajax.Request(query_str, {
+       new Ajax.Request("backend.php", {
+               parameters: query_str,
                onComplete: function(transport) { 
                        feedlist_callback2(transport); 
                } });
@@ -284,7 +287,8 @@ function catchupAllFeeds() {
 
                debug("catchupAllFeeds Q=" + query_str);
 
-               new Ajax.Request(query_str, {
+               new Ajax.Request("backend.php", {
+                       parameters: query_str,
                        onComplete: function(transport) { 
                                feedlist_callback2(transport); 
                        } });
@@ -324,7 +328,7 @@ function timeout() {
 }
 
 function resetSearch() {
-       var searchbox = document.getElementById("searchbox")
+       var searchbox = $("searchbox")
 
        if (searchbox.value != "" && getActiveFeedId()) {       
                searchbox.value = "";
@@ -369,9 +373,9 @@ function genericSanityCheck() {
 
 //     if (!Ajax.getTransport()) fatalError(1);
 
-       setCookie("ttrss_vf_test", "TEST");
+       setCookie("ttrss_test", "TEST");
        
-       if (getCookie("ttrss_vf_test") != "TEST") {
+       if (getCookie("ttrss_test") != "TEST") {
                fatalError(2);
        }
 
@@ -382,11 +386,6 @@ function init() {
 
        try {
 
-               // this whole shebang is based on http://www.birnamdesigns.com/misc/busted2.html
-
-               if (arguments.callee.done) return;
-               arguments.callee.done = true;           
-
                init_gears();
 
                disableContainerChildren("headlinesToolbar", true);
@@ -405,7 +404,8 @@ function init() {
 
                loading_set_progress(30);
 
-               new Ajax.Request("backend.php?op=rpc&subop=sanityCheck" + params,       {
+               new Ajax.Request("backend.php", {
+                       parameters: "backend.php?op=rpc&subop=sanityCheck" + params,
                        onComplete: function(transport) {
                                        backend_sanity_check_callback(transport);
                                } });
@@ -421,12 +421,12 @@ 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");
-               var resize_handle = document.getElementById("resize-handle");
+               var h_frame = $("headlines-frame");
+               var c_frame = $("content-frame");
+               var f_frame = $("footer");
+               var feeds_frame = $("feeds-holder");
+               var resize_grab = $("resize-grabber");
+               var resize_handle = $("resize-handle");
 
                if (!c_frame || !h_frame) return;
        
@@ -506,32 +506,34 @@ function init_second_stage() {
 
        try {
 
-               delCookie("ttrss_vf_test");
+               delCookie("ttrss_test");
 
 //             document.onresize = resize_headlines;
+               window.onresize=resize_headlines;
 
                var toolbar = document.forms["main_toolbar_form"];
 
                dropboxSelect(toolbar.view_mode, getInitParam("default_view_mode"));
-               dropboxSelect(toolbar.limit, getInitParam("default_view_limit"));
                dropboxSelect(toolbar.order_by, getInitParam("default_view_order_by"));
 
                daemon_enabled = getInitParam("daemon_enabled") == 1;
                daemon_refresh_only = getInitParam("daemon_refresh_only") == 1;
                feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
-               var fl = cache_find_param("FEEDLIST", getInitParam("num_feeds"));
+/*             var fl = cache_find_param("FEEDLIST", getInitParam("num_feeds"));
 
                if (fl) {
                        render_feedlist(fl);
-                       if (document.getElementById("feedList")) {
+                       if ($("feedList")) {
                                request_counters();
                        } else {
                                setTimeout('updateFeedList(false, false)', 50);
                        }
                } else {
                        setTimeout('updateFeedList(false, false)', 50);
-               }
+               } */
+
+               setTimeout('updateFeedList(false, false)', 50);
 
                debug("second stage ok");
 
@@ -551,13 +553,15 @@ function init_second_stage() {
 
                resize_headlines();
 
+               enable_offline_reading();
+
        } catch (e) {
                exception_error("init_second_stage", e);
        }
 }
 
 function quickMenuChange() {
-       var chooser = document.getElementById("quickMenuChooser");
+       var chooser = $("quickMenuChooser");
        var opid = chooser[chooser.selectedIndex].value;
 
        chooser.selectedIndex = 0;
@@ -672,20 +676,16 @@ function quickMenuGo(opid) {
                        resize_headlines();
                }
 
-/*             if (opid == "qmcDownload") {
-                       displayDlg("offlineDownload");
-                       return;
-               } */
-
                if (opid == "qmcResetCats") {
 
                        if (confirm(__("Reset category order?"))) {
 
-                               var query = "backend.php?op=feeds&subop=catsortreset";
+                               var query = "?op=feeds&subop=catsortreset";
 
                                notify_progress("Loading, please wait...", true);
 
-                               new Ajax.Request(query, {
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
                                        onComplete: function(transport) { 
                                                window.setTimeout('updateFeedList(false, false)', 50);
                                        } });
@@ -705,9 +705,10 @@ function unsubscribeFeed(feed_id, title) {
        if (title == undefined || confirm(msg)) {
                notify_progress("Removing feed...");
 
-               var query = "backend.php?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id;
+               var query = "?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id;
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        dlg_frefresh_callback(transport, feed_id);
                                } });
@@ -725,15 +726,18 @@ function updateFeedTitle(t) {
 function toggleDispRead() {
        try {
 
-               var hide_read_feeds = (getInitParam("hide_read_feeds") == "1");
-
-               hide_read_feeds = !hide_read_feeds;
+               var hide = !(getInitParam("hide_read_feeds") == "1");
 
-               debug("toggle_disp_read => " + hide_read_feeds);
+               hideOrShowFeeds(hide);
 
-               hideOrShowFeeds(hide_read_feeds);
+               var query = "?op=rpc&subop=setpref&key=HIDE_READ_FEEDS&value=" + 
+                       param_escape(hide);
 
-               storeInitParam("hide_read_feeds", hide_read_feeds, true);
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+                               setInitParam("hide_read_feeds", hide);
+                       } });
                                
        } catch (e) {
                exception_error("toggleDispRead", e);
@@ -761,7 +765,7 @@ function parse_runtime_info(elem) {
                }
 
                if (k == "new_version_available") {
-                       var icon = document.getElementById("newVersionIcon");
+                       var icon = $("newVersionIcon");
                        if (icon) {
                                if (v == "1") {
                                        icon.style.display = "inline";
@@ -787,7 +791,7 @@ function parse_runtime_info(elem) {
                        notify('');
                }
 
-/*             var w = document.getElementById("noDaemonWarning");
+/*             var w = $("noDaemonWarning");
                
                if (w) {
                        if (k == "daemon_is_running" && v != 1) {
@@ -844,14 +848,17 @@ function editFeedDlg(feed) {
                var query = "";
        
                if (feed > 0) {
-                       query = "backend.php?op=pref-feeds&subop=editfeed&id=" +        param_escape(feed);
+                       query = "?op=pref-feeds&subop=editfeed&id=" +   param_escape(feed);
                } else {
-                       query = "backend.php?op=pref-labels&subop=edit&id=" +   param_escape(-feed-11);
+                       query = "?op=pref-labels&subop=edit&id=" +      param_escape(-feed-11);
                }
 
                disableHotkeys();
 
-               new Ajax.Request(query, {
+               notify_progress("Loading, please wait...", true);
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
                                infobox_callback2(transport); 
                        } });
@@ -899,9 +906,10 @@ function clearFeedArticles(feed_id) {
 
        notify_progress("Clearing feed...");
 
-       var query = "backend.php?op=pref-feeds&quiet=1&subop=clear&id=" + feed_id;
+       var query = "?op=pref-feeds&quiet=1&subop=clear&id=" + feed_id;
 
-       new Ajax.Request(query, {
+       new Ajax.Request("backend.php", {
+               parameters: query,
                onComplete: function(transport) {
                                dlg_frefresh_callback(transport, feed_id);
                        } });
@@ -917,13 +925,13 @@ function collapse_feedlist() {
                if (theme != "" && theme != "compact" && theme != "graycube" &&
                                theme != "compat") return;
 
-               var fl = document.getElementById("feeds-holder");
-               var fh = document.getElementById("headlines-frame");
-               var fc = document.getElementById("content-frame");
-               var ft = document.getElementById("toolbar");
-               var ff = document.getElementById("footer");
-               var fhdr = document.getElementById("header");
-               var fbtn = document.getElementById("collapse_feeds_btn");
+               var fl = $("feeds-holder");
+               var fh = $("headlines-frame");
+               var fc = $("content-frame");
+               var ft = $("toolbar");
+               var ff = $("footer");
+               var fhdr = $("header");
+               var fbtn = $("collapse_feeds_btn");
 
                if (!Element.visible(fl)) {
                        Element.show(fl);
@@ -943,7 +951,9 @@ function collapse_feedlist() {
                                if (fc) fc.style.left = fl.offsetWidth + 40 + "px";
                        }
 
-                       setCookie("ttrss_vf_fclps", "0");
+                       query = "?op=rpc&subop=setpref&key=_COLLAPSED_FEEDLIST&value=false";
+
+                       new Ajax.Request("backend.php", { parameters: query });
 
                } else {
                        Element.hide(fl);
@@ -965,7 +975,10 @@ function collapse_feedlist() {
 
                        }
 
-                       setCookie("ttrss_vf_fclps", "1");
+                       query = "?op=rpc&subop=setpref&key=_COLLAPSED_FEEDLIST&value=true";
+
+                       new Ajax.Request("backend.php", { parameters: query });
+
                }
        } catch (e) {
                exception_error("toggle_feedlist", e);
@@ -988,9 +1001,10 @@ function viewLimitChanged() {
                var pr = prompt(__("Assign score to article:"), score);
 
                if (pr != undefined) {
-                       var query = "backend.php?op=rpc&subop=setScore&id=" + id + "&score=" + pr;
+                       var query = "?op=rpc&subop=setScore&id=" + id + "&score=" + pr;
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        viewCurrentFeed();
                                } });
@@ -1021,12 +1035,13 @@ function rescoreCurrentFeed() {
        if (confirm(pr)) {
                notify_progress("Rescoring articles...");
 
-               var query = "backend.php?op=pref-feeds&subop=rescore&quiet=1&ids=" + actid;
+               var query = "?op=pref-feeds&subop=rescore&quiet=1&ids=" + actid;
 
-               new Ajax.Request(query, {
-               onComplete: function(transport) {
-                       viewCurrentFeed();
-               } });
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                               viewCurrentFeed();
+                       } });
        }
 }
 
@@ -1037,7 +1052,8 @@ function hotkey_handler(e) {
                var keycode;
                var shift_key = false;
 
-               var feedlist = document.getElementById('feedList');
+               var cmdline = $('cmdline');
+               var feedlist = $('feedList');
 
                try {
                        shift_key = e.shiftKey;
@@ -1071,8 +1087,16 @@ function hotkey_handler(e) {
                if ((keycode == 70 || keycode == 67 || keycode == 71) 
                                && !hotkey_prefix) {
 
+                       var date = new Date();
+                       var ts = Math.round(date.getTime() / 1000);
+
                        hotkey_prefix = keycode;
-                       debug("KP: PREFIX=" + keycode + " CHAR=" + keychar);
+                       hotkey_prefix_pressed = ts;
+
+                       cmdline.innerHTML = keychar;
+                       Element.show(cmdline);
+
+                       debug("KP: PREFIX=" + keycode + " CHAR=" + keychar + " TS=" + ts);
                        return true;
                }
 
@@ -1082,6 +1106,8 @@ function hotkey_handler(e) {
 
                /* Global hotkeys */
 
+               Element.hide(cmdline);
+
                if (!hotkey_prefix) {
 
                        if (keycode == 68 && shift_key) { // d
@@ -1218,7 +1244,7 @@ function hotkey_handler(e) {
                        if (keycode == 9) { // tab
                                var id = getArticleUnderPointer();
                                if (id) {                               
-                                       var cb = document.getElementById("RCHK-" + id);
+                                       var cb = $("RCHK-" + id);
 
                                        if (cb) {
                                                cb.checked = !cb.checked;
@@ -1310,16 +1336,6 @@ function hotkey_handler(e) {
                                }
                        }
 
-/*                     if (keycode == 68 && shift_key) { // D
-                               initiate_offline_download();
-                               return false;
-                       }
-
-                       if (keycode == 68) { // d
-                               displayDlg("offlineDownload");
-                               return false;
-                       } */
-
                        if (keycode == 87) { // w
                                feeds_sort_by_unread = !feeds_sort_by_unread;
                                return resort_feedlist();
@@ -1452,12 +1468,13 @@ function addLabel() {
                                return false;
                        }
 
-                       var query = "backend.php?op=pref-labels&subop=add&caption=" + 
+                       var query = "?op=pref-labels&subop=add&caption=" + 
                                param_escape(caption);
 
                        notify_progress("Loading, please wait...", true);
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        updateFeedList();
                        } });
@@ -1479,15 +1496,20 @@ function feedBrowserSubscribe() {
 
                var selected = getSelectedFeedsFromBrowser();
 
+               var mode = document.forms['feed_browser'].mode;
+
+               mode = mode[mode.selectedIndex].value;
+
                if (selected.length > 0) {
                        closeInfoBox();
 
                        notify_progress("Loading, please wait...", true);
 
-                       var query =  "backend.php?op=pref-feeds&subop=massSubscribe&ids="+
-                               param_escape(selected.toString());
+                       var query = "?op=pref-feeds&subop=massSubscribe&ids="+
+                               param_escape(selected.toString()) + "&mode=" + param_escape(mode);
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        updateFeedList();
                                } });