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

feed tree: only run animation for appearing unread counters to prevent clashes with aux counter updating and animations ending up in wrong state

This commit is contained in:
Andrew Dolgov 2017-01-22 20:20:35 +03:00
parent 3bc1b53772
commit 70c5b2bfcc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.php
View File

@ -1583,7 +1583,7 @@
$cv = array("id" => $i, $cv = array("id" => $i,
"counter" => (int) $count, "counter" => (int) $count,
"auxcounter" => $auxctr); "auxcounter" => (int) $auxctr);
// if (get_pref('EXTENDED_FEEDLIST')) // if (get_pref('EXTENDED_FEEDLIST'))
// $cv["xmsg"] = getFeedArticles($i)." ".__("total"); // $cv["xmsg"] = getFeedArticles($i)." ".__("total");

2
js/FeedTree.js
View File

@ -238,8 +238,10 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"]
ctr = node.counterNode; ctr = node.counterNode;
ctr.innerHTML = item.unread > 0 ? item.unread : item.auxcounter; ctr.innerHTML = item.unread > 0 ? item.unread : item.auxcounter;
item.unread > 0 || item.auxcounter > 0 ? item.unread > 0 || item.auxcounter > 0 ?
item.unread > 0 ?
Effect.Appear(ctr, {duration : 0.3, Effect.Appear(ctr, {duration : 0.3,
queue: { position: 'end', scope: 'CAPPEAR-' + item.id, limit: 1 }}) : queue: { position: 'end', scope: 'CAPPEAR-' + item.id, limit: 1 }}) :
Element.show(ctr) :
Element.hide(ctr); Element.hide(ctr);
item.unread == 0 && item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux"); item.unread == 0 && item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");