diff options
| author | Andrew Dolgov <[email protected]> | 2005-12-16 06:37:18 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2005-12-16 06:37:18 +0100 |
| commit | 65f8581478a3fff9b39d9c9a6011f8b0d3225655 (patch) | |
| tree | 92e7c9a3833bafedfb693cc5c7b846363e3a8dcf | |
| parent | 83f043bb941b40ba0e5c6b29d01776e92db5936c (diff) | |
workaround for Uncategorized collapse state, fix pre-collapsed category display in outputFeedList
| -rw-r--r-- | backend.php | 12 | ||||
| -rw-r--r-- | feedlist.js | 6 |
2 files changed, 16 insertions, 2 deletions
diff --git a/backend.php b/backend.php index 024eab305..ec1ffcc20 100644 --- a/backend.php +++ b/backend.php @@ -450,11 +450,19 @@ $collapsed = $line["collapsed"]; + // workaround for NULL category + if ($category == "Uncategorized") { + if ($_COOKIE["ttrss_vf_uclps"] == 1) { + $collapsed = "t"; + } + } + if ($collapsed == "t" || $collapsed == "1") { $holder_class = "invisible"; - $tmp_category .= "..."; + $ellipsis = "..."; } else { $holder_class = ""; + $ellipsis = ""; } if ($cat_id) { @@ -476,7 +484,7 @@ print "<li class=\"feedCat\" id=\"FCAT-$cat_id\"> <a href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category <span id=\"FCATCTR-$cat_id\" - class=\"$catctr_class\">($cat_unread unread)</span></a></li>"; + class=\"$catctr_class\">($cat_unread unread)$ellipsis</span></a></li>"; // !!! NO SPACE before <ul...feedCatList - breaks firstChild DOM function // -> keyboard navigation, etc. diff --git a/feedlist.js b/feedlist.js index e93108379..526526643 100644 --- a/feedlist.js +++ b/feedlist.js @@ -170,9 +170,15 @@ function toggleCollapseCat(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"); + } } xmlhttp_rpc.open("GET", "backend.php?op=feeds&subop=collapse&cid=" + |