From 929e5e6f88f513badddd07ef454be30cd6e1bcbb Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Tue, 2 Feb 2016 01:10:14 +0900 Subject: [PATCH] Fix mention count becomes twice or unexpected string 1. 'badge-notify' exists on navbar-toggle in mobile layout. It has also 'badge' class, so the mention count became twice. 2. [] accessor was missing in counting. --- src/browser/index.jsx | 2 +- src/browser/webview/mattermost.js | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/browser/index.jsx b/src/browser/index.jsx index 536eebd9..726690fb 100644 --- a/src/browser/index.jsx +++ b/src/browser/index.jsx @@ -170,7 +170,7 @@ var TabBar = React.createClass({ mentionCount = thisObj.props.mentionCounts[index]; } if (thisObj.props.mentionAtActiveCounts[index] > 0) { - mentionCount += thisObj.props.mentionAtActiveCounts; + mentionCount += thisObj.props.mentionAtActiveCounts[index]; } var badge; diff --git a/src/browser/webview/mattermost.js b/src/browser/webview/mattermost.js index b781480a..eecbe3ea 100644 --- a/src/browser/webview/mattermost.js +++ b/src/browser/webview/mattermost.js @@ -15,13 +15,11 @@ var unreadCountTimer = setInterval(function() { // unreadCount in sidebar // Note: the active channel doesn't have '.unread-title'. var unreadCount = document.getElementsByClassName('unread-title').length; - // mentionCount in sidebar - var elem = document.getElementsByClassName('badge') + // mentionCount in mobile navbar-toggle + var mentionBadge = document.getElementsByClassName('badge-notify'); var mentionCount = 0; - for (var i = 0; i < elem.length; i++) { - if (isElementVisible(elem[i])) { - mentionCount += Number(elem[i].innerHTML); - } + if (mentionBadge.length > 0) { // older mattermost doesn't have badges. + mentionCount = Number(mentionBadge[0].innerHTML); } var postAttrName = 'data-reactid';