]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
add updated triple-pane theme
[tt-rss.git] / tt-rss.js
index d6a95eddda41e1d3b1ed81572feca6f2824e772e..6d3cc73778139bad149da76ebce2d44a507ae2bd 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;
@@ -99,27 +98,6 @@ function dlg_frefresh_callback(transport, deleted_feed) {
        closeInfoBox();
 }
 
-function refetch_callback2(transport) {
-       try {
-
-               var date = new Date();
-
-               parse_counters_reply(transport, true);
-
-               debug("refetch_callback2: done");
-
-/*             if (!daemon_enabled && !daemon_refresh_only) {
-                       notify_info("All feeds updated.");
-                       updateTitle("");
-               } else {
-                       //notify("");
-               } */
-       } catch (e) {
-               exception_error("refetch_callback", e);
-               updateTitle("");
-       }
-}
-
 function backend_sanity_check_callback(transport) {
 
        try {
@@ -132,12 +110,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")) {
@@ -222,15 +202,12 @@ function scheduleFeedUpdate(force) {
        query_str = query_str + "&omode=" + omode;
        query_str = query_str + "&uctr=" + global_unread;
 
-       var date = new Date();
-       var timestamp = Math.round(date.getTime() / 1000);
-       query_str = query_str + "&ts=" + timestamp
-
        debug("REFETCH query: " + query_str);
 
-       new Ajax.Request(query_str, {
+       new Ajax.Request("backend.php", {
+               parameters: query_str,
                onComplete: function(transport) { 
-                               refetch_callback2(transport); 
+                               parse_counters_reply(transport, true);
                        } });
 }
 
@@ -253,10 +230,6 @@ function updateFeedList(silent, fetch) {
        if (getActiveFeedId() && !activeFeedIsCat()) {
                query_str = query_str + "&actid=" + getActiveFeedId();
        }
-
-       var date = new Date();
-       var timestamp = Math.round(date.getTime() / 1000);
-       query_str = query_str + "&ts=" + timestamp
        
        if (fetch) query_str = query_str + "&fetch=yes";
 
@@ -265,7 +238,8 @@ function updateFeedList(silent, fetch) {
 
        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 +258,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); 
                        } });
@@ -300,7 +275,6 @@ function viewCurrentFeed(subop) {
        if (getActiveFeedId() != undefined) {
                viewfeed(getActiveFeedId(), subop, activeFeedIsCat());
        } else {
-               disableContainerChildren("headlinesToolbar", false, document);
 //             viewfeed(-1, subop); // FIXME
        }
        return false; // block unneeded form submits
@@ -332,10 +306,6 @@ function resetSearch() {
        }
 }
 
-function searchCancel() {
-       closeInfoBox(true);
-}
-
 function search() {
        closeInfoBox(); 
        viewCurrentFeed(0, "");
@@ -369,9 +339,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,15 +352,8 @@ 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);
-
                Form.disable("main_toolbar_form");
 
                if (!genericSanityCheck()) 
@@ -405,7 +368,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);
                                } });
@@ -430,11 +394,11 @@ function resize_headlines(delta_x, delta_y) {
 
                if (!c_frame || !h_frame) return;
        
-               if (feeds_frame && getInitParam("theme") == "compat") {
+               if (feeds_frame && getInitParam("theme") == "old-skool") {
                                feeds_frame.style.bottom = f_frame.offsetHeight + "px";         
                }
        
-               if (getInitParam("theme") == "3pane") {
+               if (getInitParam("theme_options").match("horiz_resize")) {
        
                        if (delta_x != undefined) {
                                if (c_frame.offsetLeft - delta_x > feeds_frame.offsetWidth + feeds_frame.offsetLeft + 100 && c_frame.offsetWidth + delta_x > 100) {
@@ -452,7 +416,7 @@ function resize_headlines(delta_x, delta_y) {
                                4) + "px";
                        resize_grab.style.display = "block";
 
-                       resize_handle.src = "themes/3pane/images/resize_handle_vert.png";
+                       //resize_handle.src = "themes/"+getInitParam('theme')+"/images/resize_handle_vert.png";
                        resize_handle.style.paddingTop = (resize_grab.offsetHeight / 2 - 7) + "px";
        
                } else {
@@ -469,21 +433,7 @@ function resize_headlines(delta_x, delta_y) {
        
                        c_frame.style.top = (h_frame.offsetTop + h_frame.offsetHeight + 0) + "px";
                        h_frame.style.height = h_frame.offsetHeight + "px";
-       
-                       var theme_c = 0;
-       
-                       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 - 
-                               4 - theme_c) + "px";
-                       resize_grab.style.display = "block"; */
-       
                }
        
                if (getInitParam("cookie_lifetime") != 0) {
@@ -506,14 +456,14 @@ 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;
@@ -576,12 +526,15 @@ function quickMenuGo(opid) {
                }
        
                if (opid == "qmcSearch") {
-                       displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+                       displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
+                               function() { 
+                                       document.forms['search_form'].query.focus();
+                               });
                        return;
                }
        
                if (opid == "qmcAddFeed") {
-                       displayDlg("quickAddFeed");
+                       quickAddFeed();
                        return;
                }
 
@@ -613,31 +566,6 @@ function quickMenuGo(opid) {
                        return;
                }
 
-               if (opid == "qmcClearFeed") {
-                       var actid = getActiveFeedId();
-
-                       if (!actid) {
-                               alert(__("Please select some feed first."));
-                               return;
-                       }
-
-                       if (activeFeedIsCat() || actid < 0) {
-                               alert(__("You can't clear this type of feed."));
-                               return;
-                       }       
-
-                       var fn = getFeedName(actid);
-
-                       var pr = __("Erase all non-starred articles in %s?").replace("%s", fn);
-
-                       if (confirm(pr)) {
-                               clearFeedArticles(actid);
-                       }
-               
-                       return;
-               }
-       
-
                if (opid == "qmcUpdateFeeds") {
                        scheduleFeedUpdate(true);
                        return;
@@ -654,7 +582,8 @@ function quickMenuGo(opid) {
                }
        
                if (opid == "qmcAddFilter") {
-                       displayDlg("quickAddFilter", getActiveFeedId());
+                       displayDlg('quickAddFilter', '',
+                          function () {document.forms['filter_add_form'].reg_exp.focus();});
                }
 
                if (opid == "qmcAddLabel") {
@@ -680,11 +609,12 @@ function quickMenuGo(opid) {
 
                        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);
                                        } });
@@ -696,26 +626,6 @@ function quickMenuGo(opid) {
        }
 }
 
-function unsubscribeFeed(feed_id, title) {
-
-
-       var msg = __("Unsubscribe from %s?").replace("%s", title);
-
-       if (title == undefined || confirm(msg)) {
-               notify_progress("Removing feed...");
-
-               var query = "backend.php?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id;
-
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                                       dlg_frefresh_callback(transport, feed_id);
-                               } });
-       }
-
-       return false;
-}
-
-
 function updateFeedTitle(t) {
        active_title_text = t;
        updateTitle();
@@ -724,15 +634,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);
@@ -843,16 +756,20 @@ 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); 
+                               document.forms["edit_feed_form"].title.focus();
                        } });
 
        } catch (e) {
@@ -884,7 +801,7 @@ function feedEditSave() {
                                dlg_frefresh_callback(transport); 
                        } });
 
-
+               cache_flush();
                closeInfoBox();
 
                return false;
@@ -894,27 +811,13 @@ function feedEditSave() {
        } 
 }
 
-function clearFeedArticles(feed_id) {
-
-       notify_progress("Clearing feed...");
-
-       var query = "backend.php?op=pref-feeds&quiet=1&subop=clear&id=" + feed_id;
-
-       new Ajax.Request(query, {
-               onComplete: function(transport) {
-                               dlg_frefresh_callback(transport, feed_id);
-                       } });
-
-       return false;
-}
-
 function collapse_feedlist() {
        try {
-               debug("toggle_feedlist");
+               debug("collapse_feedlist");
                
                var theme = getInitParam("theme");
-               if (theme != "" && theme != "compact" && theme != "graycube" &&
-                               theme != "compat") return;
+               if (theme != "" && 
+                               !getInitParam("theme_options").match("collapse_feedlist")) return;
 
                var fl = $("feeds-holder");
                var fh = $("headlines-frame");
@@ -926,7 +829,7 @@ function collapse_feedlist() {
 
                if (!Element.visible(fl)) {
                        Element.show(fl);
-                       fbtn.value = "<<";
+                       fbtn.innerHTML = "<<";
 
                        if (theme != "graycube") {
 
@@ -942,11 +845,13 @@ 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);
-                       fbtn.value = ">>";
+                       fbtn.innerHTML = ">>";
 
                        if (theme != "graycube") {
 
@@ -964,20 +869,23 @@ 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);
+               exception_error("collapse_feedlist", e);
        }
 }
 
 function viewModeChanged() {
-       cache_empty();
+       cache_flush();
        return viewCurrentFeed(0, '')
 }
 
 function viewLimitChanged() {
-       cache_empty();
+       cache_flush();
        return viewCurrentFeed(0, '')
 }
 
@@ -987,9 +895,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();
                                } });
@@ -1020,12 +929,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();
+                       } });
        }
 }
 
@@ -1036,6 +946,7 @@ function hotkey_handler(e) {
                var keycode;
                var shift_key = false;
 
+               var cmdline = $('cmdline');
                var feedlist = $('feedList');
 
                try {
@@ -1070,8 +981,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;
                }
 
@@ -1081,6 +1000,8 @@ function hotkey_handler(e) {
 
                /* Global hotkeys */
 
+               Element.hide(cmdline);
+
                if (!hotkey_prefix) {
 
                        if (keycode == 68 && shift_key) { // d
@@ -1105,7 +1026,10 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 191 || keychar == '/') { // /
-                               displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+                               displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
+                                       function() { 
+                                               document.forms['search_form'].query.focus();
+                                       });
                                return false;
                        }
 
@@ -1291,7 +1215,7 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 83) { // s
-                               displayDlg("quickAddFeed");
+                               quickAddFeed();
                                return false;
                        }
 
@@ -1327,7 +1251,8 @@ function hotkey_handler(e) {
                        hotkey_prefix = false;
 
                        if (keycode == 70) { // f
-                               displayDlg("quickAddFilter", getActiveFeedId());
+                               displayDlg('quickAddFilter', '',
+                                  function () {document.forms['filter_add_form'].reg_exp.focus();});
                                return false;
                        }
 
@@ -1428,66 +1353,6 @@ function feedsSortByUnread() {
        return feeds_sort_by_unread;
 }
 
-function addLabel() {
-
-       try {
-
-               var caption = prompt(__("Please enter label caption:"), "");
-
-               if (caption != undefined) {
-       
-                       if (caption == "") {
-                               alert(__("Can't create label: missing caption."));
-                               return false;
-                       }
-
-                       var query = "backend.php?op=pref-labels&subop=add&caption=" + 
-                               param_escape(caption);
-
-                       notify_progress("Loading, please wait...", true);
-
-                       new Ajax.Request(query, {
-                               onComplete: function(transport) { 
-                                       updateFeedList();
-                       } });
-
-               }
-
-       } catch (e) {
-               exception_error("addLabel", e);
-       }
-}
-
-function visitOfficialSite() {
-       window.open("http://tt-rss.org/");
-}
-
-
-function feedBrowserSubscribe() {
-       try {
-
-               var selected = getSelectedFeedsFromBrowser();
-
-               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());
-
-                       new Ajax.Request(query, {
-                               onComplete: function(transport) { 
-                                       updateFeedList();
-                               } });
-
-               } else {
-                       alert(__("No feeds are selected."));
-               }
-
-       } catch (e) {
-               exception_error("feedBrowserSubscribe", e);
-       }
+function inPreferences() {
+       return false;
 }
-
-