mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-12 15:34:26 +02:00
Code Issues Releases Wiki Activity

Make replyAction into a promise. closes #100

Browse Source
This commit is contained in:
Toby Zerner
2015-06-01 10:29:01 +09:30
parent 56981c1297
commit 7362aff345
3 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/forum/src/components/discussion-page.js
View File

@@ -88,7 +88,7 @@ export default class DiscussionPage extends mixin(Component, evented) {
this.stream.on('positionChanged', this.positionChanged.bind(this));
this.stream.goToNumber(m.route.param('near') || 1, true);
this.trigger('loaded');
this.trigger('loaded', discussion);
}
onload(element, isInitialized, context) {

2
js/forum/src/components/login-modal.js
View File

@@ -60,7 +60,7 @@ export default class LoginModal extends FormModal {
app.session.login(email, password).then(() => {
this.hide();
this.props.callback && this.props.callback();
this.props.onlogin && this.props.onlogin();
}, response => {
this.loading(false);
if (response && response.code === 'confirm_email') {