From 70c5b2bfcc766c82c697e431371be308ebad11dc Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 22 Jan 2017 20:20:35 +0300 Subject: [PATCH] feed tree: only run animation for appearing unread counters to prevent clashes with aux counter updating and animations ending up in wrong state --- include/functions.php | 2 +- js/FeedTree.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/functions.php b/include/functions.php index 17bd9f37..30b9b293 100644 --- 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 a78537fe..336f2b5f 100644 --- 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"); -- 2.39.5