servers
/
ttrss
mirror of https://tt-rss.org/git/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

multiple issues fixed in vfeed_group_by_feed

This commit is contained in:
Andrew Dolgov 2012-10-28 00:41:51 +04:00
parent ed66d60d96
commit 7fdf8eca99
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/functions.php
View File

@ -2559,9 +2559,12 @@
$offset_query_part = "OFFSET $offset";
}
// proper override_order applied above
if ($vfeed_query_part && get_pref($link, 'VFEED_GROUP_BY_FEED', $owner_uid)) {
if (!$override_order) {
$order_by = "ttrss_feeds.title, $order_by";
} else {
$order_by = "ttrss_feeds.title, $override_order";
}
}

11
js/viewfeed.js
View File

@ -115,10 +115,16 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
c.domNode.removeChild(hsp);
$$("#headlines-tmp > div").each(function(row) {
if ($$("#headlines-frame DIV[id="+row.id+"]").length == 0) {
if (row.className == 'cdmFeedTitle') {
row.addClassName('new');
row.style.display = 'none';
c.domNode.appendChild(row);
++num_added;
} else if ($$("#headlines-frame DIV[id="+row.id+"]").length == 0) {
row.style.display = 'none';
row.addClassName('new');
c.domNode.appendChild(row);
++num_added;
} else {
row.parentNode.removeChild(row);
}
@ -145,8 +151,9 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
initHeadlinesMenu();
$$("#headlines-frame > div[id*=RROW]").each(
$$("#headlines-frame > div[class*=new]").each(
function(child) {
child.removeClassName('new');
if (!Element.visible(child))
new Effect.Appear(child, { duration : 0.5 });
});