]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
replace some theme-specific frontend hooks with theme options
[tt-rss.git] / tt-rss.js
index f6eea6661ea35575aa69d71ad12cf3ebeeec03f5..8b04eae617f670b0752060f77f46c95a553a2ab0 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 {
@@ -142,6 +120,10 @@ function backend_sanity_check_callback(transport) {
                        }
                }
 
+               if (getURLParam("offline")) {
+                       return init_offline();
+               }
+
                var reply = transport.responseXML.firstChild.firstChild;
 
                if (!reply) {
@@ -226,9 +208,10 @@ 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); 
+                               parse_counters_reply(transport, true);
                        } });
 }
 
@@ -263,7 +246,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); 
                } });
@@ -282,7 +266,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); 
                        } });
@@ -367,9 +352,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);
        }
 
@@ -380,11 +365,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);
@@ -403,7 +383,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);
                                } });
@@ -428,11 +409,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) {
@@ -450,7 +431,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 {
@@ -467,21 +448,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) {
@@ -504,14 +471,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;
@@ -579,7 +546,8 @@ function quickMenuGo(opid) {
                }
        
                if (opid == "qmcAddFeed") {
-                       displayDlg("quickAddFeed");
+                       displayDlg('quickAddFeed', '',
+                                          function () {$('feed_url').focus();});
                        return;
                }
 
@@ -678,11 +646,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);
                                        } });
@@ -702,9 +671,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);
                                } });
@@ -722,15 +692,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);
@@ -841,14 +814,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); 
                        } });
@@ -896,9 +872,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);
                        } });
@@ -908,11 +885,11 @@ function clearFeedArticles(feed_id) {
 
 function collapse_feedlist() {
        try {
-               debug("toggle_feedlist");
+               debug("collapse_feedlist");
                
                var theme = getInitParam("theme");
                if (theme != "" && theme != "compact" && theme != "graycube" &&
-                               theme != "compat") return;
+                               theme != "old-skool") return;
 
                var fl = $("feeds-holder");
                var fh = $("headlines-frame");
@@ -924,7 +901,7 @@ function collapse_feedlist() {
 
                if (!Element.visible(fl)) {
                        Element.show(fl);
-                       fbtn.value = "<<";
+                       fbtn.innerHTML = "<<";
 
                        if (theme != "graycube") {
 
@@ -940,11 +917,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") {
 
@@ -962,10 +941,13 @@ 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);
        }
 }
 
@@ -985,9 +967,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();
                                } });
@@ -1018,12 +1001,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();
+                       } });
        }
 }
 
@@ -1034,6 +1018,7 @@ function hotkey_handler(e) {
                var keycode;
                var shift_key = false;
 
+               var cmdline = $('cmdline');
                var feedlist = $('feedList');
 
                try {
@@ -1068,8 +1053,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;
                }
 
@@ -1079,6 +1072,8 @@ function hotkey_handler(e) {
 
                /* Global hotkeys */
 
+               Element.hide(cmdline);
+
                if (!hotkey_prefix) {
 
                        if (keycode == 68 && shift_key) { // d
@@ -1439,12 +1434,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();
                        } });
@@ -1460,32 +1456,6 @@ 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;
 }
-
-