github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-06-04 06:44:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add third state to flags header icon

Browse Source 
closes flarum/core#500
This commit is contained in:
Toby Zerner
2015-10-19 16:20:00 +10:30
parent 8a1c5cf24c
commit e357d2b535
3 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/flags/js/forum/src/components/FlagList.js
View File

@ -63,7 +63,7 @@ export default class FlagList extends Component {
* been loaded.
*/
load() {
if (app.cache.flags && !app.forum.attribute('unreadFlagsCount')) {
if (app.cache.flags && !app.session.user.attribute('newFlagsCount')) {
return;
}
@ -71,7 +71,7 @@ export default class FlagList extends Component {
m.redraw();
app.store.find('flags').then(flags => {
app.forum.pushAttributes({unreadFlagsCount: 0});
app.session.user.pushAttributes({newFlagsCount: 0});
app.cache.flags = flags.sort((a, b) => b.time() - a.time());
this.loading = false;

4
extensions/flags/js/forum/src/components/FlagsDropdown.js
View File

@ -21,10 +21,10 @@ export default class FlagsDropdown extends NotificationsDropdown {
}
getUnreadCount() {
return app.forum.attribute('unreadFlagsCount');
return app.cache.flags ? app.cache.flags.length : app.forum.attribute('flagsCount');
}
getNewCount() {
return app.forum.attribute('newFlagsCount');
return app.session.user.attribute('newFlagsCount');
}
}