feed tree: only run animation for appearing unread counters to prevent clashes with...

diff --git a/include/functions.php b/include/functions.php
index 17bd9f371ca89ece3ca20015f8aef26ea16af1fa..30b9b293a9e33a75a61b169899350071ef49541a 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1583,7 +1583,7 @@
 
                        $cv = array("id" => $i,
                                "counter" => (int) $count,
-                               "auxcounter" => $auxctr);
+                               "auxcounter" => (int) $auxctr);
 
 //                     if (get_pref('EXTENDED_FEEDLIST'))
 //                             $cv["xmsg"] = getFeedArticles($i)." ".__("total");

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