Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4073 from adrapereira/ap_fixSidebarLinkCount 

Fix: Link count on the topic sidebar
This commit is contained in:
Robin Ward 2016-03-14 12:32:20 -04:00
parent 9fc9f029ea 3e3aa91934
commit 1ba65765e4
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/discourse/widgets/post-gutter.js.es6
View File

@ -21,14 +21,13 @@ export default createWidget('post-gutter', {
const seenTitles = {}; const seenTitles = {};
let titleCount = 0;
let i = 0; links.forEach(function(l) {
while (i < links.length && result.length < toShow) {
const l = links[i++];
let title = l.title; let title = l.title;
if (title && !seenTitles[title]) { if (title && !seenTitles[title]) {
seenTitles[title] = true; seenTitles[title] = true;
titleCount++;
if (result.length < toShow) {
const linkBody = [new RawHtml({html: `<span>${Discourse.Emoji.unescape(title)}</span>`})]; const linkBody = [new RawHtml({html: `<span>${Discourse.Emoji.unescape(title)}</span>`})];
if (l.clicks) { if (l.clicks) {
linkBody.push(h('span.badge.badge-notification.clicks', l.clicks.toString())); linkBody.push(h('span.badge.badge-notification.clicks', l.clicks.toString()));
@ -39,9 +38,11 @@ export default createWidget('post-gutter', {
result.push(h('li', link)); result.push(h('li', link));
} }
} }
});
if (state.collapsed) { if (state.collapsed) {
const remaining = links.length - MAX_GUTTER_LINKS; const remaining = titleCount - MAX_GUTTER_LINKS;
if (remaining > 0) { if (remaining > 0) {
result.push(h('li', h('a.toggle-more', I18n.t('post.more_links', {count: remaining})))); result.push(h('li', h('a.toggle-more', I18n.t('post.more_links', {count: remaining}))));
} }