valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/fox/public_html/testbox/tt-rss

This commit is contained in:
Andrew Dolgov 2009-10-22 15:47:00 +04:00
parent b9c8f9dff2 95d0edcc4e
commit 58af152b7a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
functions.js
View File

@ -691,11 +691,11 @@ function get_feed_entry_name(elem) {
} }
function resort_category(node) { function resort_category(node, cat_mode) {
try { try {
debug("resort_category: " + node); debug("resort_category: " + node + " CM=" + cat_mode);
var by_unread = feedsSortByUnread(); var by_unread = feedsSortByUnread();
@ -711,7 +711,10 @@ function resort_category(node) {
var tmp_name = get_feed_entry_name(list[i]); var tmp_name = get_feed_entry_name(list[i]);
var cur_name = get_feed_entry_name(list[j]); var cur_name = get_feed_entry_name(list[j]);
if ((by_unread && (cur_val > tmp_val)) || (!by_unread && (cur_name < tmp_name))) { var valid_pair = cat_mode || (list[i].id.match(/FEEDR-[0-9]/) &&
list[j].id.match(/FEEDR-[0-9]/));
if (valid_pair && ((by_unread && (cur_val > tmp_val)) || (!by_unread && (cur_name < tmp_name)))) {
tempnode_i = list[i].cloneNode(true); tempnode_i = list[i].cloneNode(true);
tempnode_j = list[j].cloneNode(true); tempnode_j = list[j].cloneNode(true);
node.replaceChild(tempnode_i, list[j]); node.replaceChild(tempnode_i, list[j]);
@ -735,12 +738,12 @@ function resort_feedlist() {
for (var i = 0; i < lists.length; i++) { for (var i = 0; i < lists.length; i++) {
if (lists[i].id && lists[i].id.match("FCATLIST-")) { if (lists[i].id && lists[i].id.match("FCATLIST-")) {
resort_category(lists[i]); resort_category(lists[i], true);
} }
} }
} else { } else {
//resort_category($("feedList")); resort_category($("feedList"), false);
} }
} }