block HIDE_FEEDLIST (refs #196)

diff --git a/feedlist.js b/feedlist.js
index 88220ccf6a7fc8d78293045a5fcd0019d8afbcc3..782cb3a1925f6e6dcc6e230b9687a12562b7e8bf 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -40,11 +40,11 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                        cache_invalidate("F:" + feed);
                }
 
-               if (getInitParam("theme") == "" || getInitParam("theme") == "compact") {
+/*             if (getInitParam("theme") == "" || getInitParam("theme") == "compact") {
                        if (getInitParam("hide_feedlist") == 1) {
                                Element.hide("feeds-holder");
                        }               
-               }
+               } */
 
                var force_nocache = false;
 
@@ -346,11 +346,13 @@ function feedlist_init() {
                        setTimeout("hide_footer()", 5000);
                }
 
-               if (getInitParam("hide_feedlist") == 1) {
+/*             if (getInitParam("hide_feedlist") == 1) {
                        init_hidden_feedlist(getInitParam("theme"));
                } else {
                        init_collapsable_feedlist(getInitParam("theme"));
-               }
+               } */
+
+               init_collapsable_feedlist(getInitParam("theme"));
 
        } catch (e) {
                exception_error("feedlist/init", e);
@@ -386,6 +388,7 @@ function hide_footer() {
        }
 }
 
+/*
 function init_hidden_feedlist(theme) {
        try {
                debug("init_hidden_feedlist");
@@ -421,7 +424,7 @@ function init_hidden_feedlist(theme) {
        } catch (e) {
                exception_error("init_hidden_feedlist", e);
        }
-}
+} */
 
 function init_collapsable_feedlist(theme) {
        try {

diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index e3e4cb4d53688640e0c0bb2826b3463324670a68..72191134705b9dc1b548122ee5c7013239bedc8b 100644 (file)
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -10,8 +10,7 @@
        function module_pref_prefs($link) {
                $subop = $_REQUEST["subop"];
 
-               $prefs_blacklist = array();
-               //$prefs_blacklist = array("HIDE_FEEDLIST");
+               $prefs_blacklist = array("HIDE_FEEDLIST");
 
                if ($subop == "change-password") {
 

diff --git a/tt-rss.js b/tt-rss.js
index 86467ca22f353de95e516af4b1895f054ddc2c04..c1a812aa5a2e03b72b051009937885f70dc81410 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -740,6 +740,7 @@ function clearFeedArticles(feed_id) {
        return false;
 }
 
+/*
 function toggle_feedlist() {
        try {
                debug("toggle_feedlist");
@@ -759,7 +760,7 @@ function toggle_feedlist() {
        } catch (e) {
                exception_error(e, "toggle_feedlist");
        }
-}
+} */
 
 function collapse_feedlist() {
        try {