github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Don't show more notifications message when there is none.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-07-07 17:42:18 +08:00
parent 21684c98be
commit 6684e4ab87
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/widgets/user-menu.js.es6
View File

@ -75,7 +75,6 @@ export default createWidget('user-menu', {
return [this.attach('user-menu-links', { path }), return [this.attach('user-menu-links', { path }),
this.attach('user-notifications', { path }), this.attach('user-notifications', { path }),
h('div.logout-link', [ h('div.logout-link', [
h('hr'),
h('ul.menu-links', h('ul.menu-links',
h('li', this.attach('link', { action: 'logout', h('li', this.attach('link', { action: 'logout',
className: 'logout', className: 'logout',

16
app/assets/javascripts/discourse/widgets/user-notifications.js.es6
View File

@ -67,13 +67,17 @@ export default createWidget('user-notifications', {
const href = `${attrs.path}/notifications`; const href = `${attrs.path}/notifications`;
result.push(h('hr')); result.push(h('hr'));
result.push(h('ul', [
notificationItems,
h('li.read.last.heading',
h('a', { attributes: { href } }, [I18n.t('notifications.more'), '...'])
)
]));
const items = [notificationItems]
if (notificationItems.length > 0) {
items.push(
h('li.read.last.heading', h('a', { attributes: { href } }, [I18n.t('notifications.more'), '...'])),
h('hr')
);
}
result.push(h('ul', items));
} }
return result; return result;