From 0b6cffa868eba2c308454c6042b4da1f605c7145 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 20 Feb 2008 13:38:38 +0100 Subject: [PATCH] block HIDE_FEEDLIST (refs #196) --- feedlist.js | 13 ++++++++----- modules/pref-prefs.php | 3 +-- tt-rss.js | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/feedlist.js b/feedlist.js index 88220ccf..782cb3a1 100644 --- 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 e3e4cb4d..72191134 100644 --- 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 86467ca2..c1a812aa 100644 --- 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 { -- 2.39.5