replace some theme-specific frontend hooks with theme options

[tt-rss.git] / feedlist.js

diff --git a/feedlist.js b/feedlist.js
index 93861bbd8d3e8a4f0b0450318eec3666ba49312d..bb3f3bf75be4c0b814f2000d9eb2750287371267 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -157,7 +157,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                }
 
                enableHotkeys();
-
+               hideAuxDlg();
                closeInfoBox();
 
                Form.enable("main_toolbar_form");
@@ -172,12 +172,13 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                        toolbar_form.query.value = "";
                }
 
-               var query = "backend.php?op=viewfeed&feed=" + feed + "&" +
+               var query = "?op=viewfeed&feed=" + feed + "&" +
                        toolbar_query + "&subop=" + param_escape(subop);
 
                if ($("search_form")) {
                        var search_query = Form.serialize("search_form");
                        query = query + "&" + search_query;
+                       $("search_form").query.value = "";
                        closeInfoBox(true);
                        force_nocache = true;
                }
@@ -314,10 +315,42 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                } else {
 
                        if (!page_offset) {
-                               notify_progress("Loading, please wait...", true);
+                               var feedr;
+
+                               if (is_cat) {
+                                       feedr = $('FCAP-' + feed);
+                               } else {
+                                       feedr = $('FEEDR-' + feed);
+                               }
+
+                               if (feedr && !$('FLL-' + feed)) {
+
+                                       var img = $('FIMG-' + feed);
+
+                                       if (!is_cat && img) {
+
+                                               if (!img.src.match("indicator_white")) {
+                                                       img.alt = img.src;
+                                                       img.src = getInitParam("sign_progress");
+                                               }
+
+                                       } else {
+
+                                               if (!$('FLL-' + feed)) {
+                                                       var ll = document.createElement('img');
+
+                                                       ll.src = getInitParam("sign_progress_tiny");
+                                                       ll.className = 'hlLoading';
+                                                       ll.id = 'FLL-' + feed;
+       
+                                                       feedr.appendChild(ll);
+                                               }
+                                       }
+                               }
                        }
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        headlines_callback2(transport, page_offset); 
                                } });
@@ -357,50 +390,12 @@ function toggleCollapseCat(cat) {
                var cat_list = $("FCATLIST-" + cat).parentNode;
                var caption = $("FCAP-" + cat);
                
-/*             if (cat_list.className.match("invisible")) {
-                       cat_list.className = "";
-                       caption.innerHTML = caption.innerHTML.replace("...", "");
-                       if (cat == 0) {
-                               setCookie("ttrss_vf_uclps", "0");
-                       }
-               } else {
-                       cat_list.className = "invisible";
-                       caption.innerHTML = caption.innerHTML + "...";
-                       if (cat == 0) {
-                               setCookie("ttrss_vf_uclps", "1");
-                       } 
-
-               } */
-
-               if (cat == 0) {
-                       if (Element.visible("FCATLIST-" + cat)) {
-                               setCookie("ttrss_vf_uclps", "1");
-                       } else {
-                               setCookie("ttrss_vf_uclps", "0");
-                       }
-               } 
-
-               if (cat == -2) {
-                       if (Element.visible("FCATLIST-" + cat)) {
-                               setCookie("ttrss_vf_lclps", "1");
-                       } else {
-                               setCookie("ttrss_vf_lclps", "0");
-                       }
-               } 
-
-               if (cat == -1) {
-                       if (Element.visible("FCATLIST-" + cat)) {
-                               setCookie("ttrss_vf_vclps", "1");
-                       } else {
-                               setCookie("ttrss_vf_vclps", "0");
-                       }
-               } 
-
                Effect.toggle('FCATLIST-' + cat, 'blind', { duration: 0.5,
                        afterFinish: toggleCollapseCat_af });
 
-               new Ajax.Request("backend.php?op=feeds&subop=collapse&cid=" + 
-                       param_escape(cat));
+               new Ajax.Request("backend.php", 
+                       { parameters: "backend.php?op=feeds&subop=collapse&cid=" + 
+                               param_escape(cat) } );
 
                local_collapse_cat(cat);
 
@@ -424,12 +419,12 @@ function feedlist_dragsorted(ctr) {
 
                if (ordered_cats.length > 0) {
 
-                       var query = "backend.php?op=feeds&subop=catsort&corder=" + 
+                       var query = "?op=feeds&subop=catsort&corder=" + 
                                param_escape(ordered_cats.toString());
 
                        debug(query);
 
-                       new Ajax.Request(query);
+                       new Ajax.Request("backend.php", { parameters: query });
                }
 
        } catch (e) {
@@ -454,6 +449,8 @@ function feedlist_init() {
 
                if (!offline_mode) setTimeout("timeout()", 1);
 
+               setTimeout("hotkey_prefix_timeout()", 5*1000);
+
                if (typeof correctPNG != 'undefined') {
                        correctPNG();
                }
@@ -470,7 +467,8 @@ function feedlist_init() {
                        }
                }
 
-               if (getInitParam("theme") == "") {
+               if (getInitParam("theme") == "" || 
+                               getInitParam("theme_options").match("hide_footer")) {
                        setTimeout("hide_footer()", 5000);
                }
 
@@ -568,7 +566,7 @@ function init_collapsable_feedlist(theme) {
 
                if (fbtn) Element.show(fbtn);
 
-               if (getCookie("ttrss_vf_fclps") == 1) {
+               if (getInitParam("collapsed_feedlist") == 1) {
                        collapse_feedlist();
                }
 
@@ -621,7 +619,7 @@ function mouse_down_handler(e) {
        try {
 
                /* do not prevent right click */
-               if (e.button && e.button == 2) return;
+               if (e && e.button && e.button == 2) return;
 
                if (resize_enabled) { 
                        mouse_is_down = true;
@@ -637,7 +635,7 @@ function mouse_down_handler(e) {
                }
 
        } catch (e) {
-               exception_error("mouse_move_handler", e);
+               exception_error("mouse_down_handler", e);
        }
 }
 
@@ -656,7 +654,7 @@ function mouse_up_handler(e) {
                }
 
        } catch (e) {
-               exception_error("mouse_move_handler", e);
+               exception_error("mouse_up_handler", e);
        }
 }
 
@@ -668,7 +666,7 @@ function request_counters_real() {
 
                debug("requesting counters...");
 
-               var query = "backend.php?op=rpc&subop=getAllCounters";
+               var query = "?op=rpc&subop=getAllCounters";
 
                if (tagsAreDisplayed()) {
                        query = query + "&omode=tl";
@@ -676,7 +674,8 @@ function request_counters_real() {
                        query = query + "&omode=flc";
                }
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
                                try {
                                        all_counters_callback2(transport, true);