github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-02 01:18:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed error when user is not logged in; fixed notification count not updating when clicking home link (added m.redraw)

Browse Source
This commit is contained in:
David Sevilla Martin 2016-08-30 10:35:31 -04:00
parent f0e96a0002
commit e33c33a58f
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framework/core/js/forum/dist/app.js vendored
View File

@ -22689,9 +22689,11 @@ System.register('flarum/components/IndexPage', ['flarum/extend', 'flarum/compone
className: 'Button Button--icon', className: 'Button Button--icon',
onclick: function onclick() { onclick: function onclick() {
app.cache.discussionList.refresh(); app.cache.discussionList.refresh();
if (app.session.user) {
app.store.find('users', app.session.user.id()); app.store.find('users', app.session.user.id());
m.redraw(); m.redraw();
} }
}
})); }));
if (app.session.user) { if (app.session.user) {
@ -28730,8 +28732,11 @@ System.register('flarum/initializers/boot', ['flarum/utils/ScrollListener', 'fla
$('#home-link').click(function (e) { $('#home-link').click(function (e) {
if (e.ctrlKey || e.metaKey || e.which === 2) return; if (e.ctrlKey || e.metaKey || e.which === 2) return;
e.preventDefault(); e.preventDefault();
app.store.find('users', app.session.user.id());
app.history.home(); app.history.home();
if (app.session.user) {
app.store.find('users', app.session.user.id());
m.redraw();
}
}); });
// Add a class to the body which indicates that the page has been scrolled // Add a class to the body which indicates that the page has been scrolled

2
framework/core/js/forum/src/components/IndexPage.js
View File

@ -238,9 +238,11 @@ export default class IndexPage extends Page {
className: 'Button Button--icon', className: 'Button Button--icon',
onclick: () => { onclick: () => {
app.cache.discussionList.refresh(); app.cache.discussionList.refresh();
if (app.session.user) {
app.store.find('users', app.session.user.id()); app.store.find('users', app.session.user.id());
m.redraw(); m.redraw();
} }
}
}) })
); );

5
framework/core/js/forum/src/initializers/boot.js
View File

@ -61,8 +61,11 @@ export default function boot(app) {
$('#home-link').click(e => { $('#home-link').click(e => {
if (e.ctrlKey || e.metaKey || e.which === 2) return; if (e.ctrlKey || e.metaKey || e.which === 2) return;
e.preventDefault(); e.preventDefault();
app.store.find('users', app.session.user.id());
app.history.home(); app.history.home();
if (app.session.user) {
app.store.find('users', app.session.user.id());
m.redraw();
}
}); });
// Add a class to the body which indicates that the page has been scrolled // Add a class to the body which indicates that the page has been scrolled