github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-13 07:03:35 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Return a promise from the new discussion action

Browse Source
This commit is contained in:
Toby Zerner 2015-06-12 16:40:47 +09:30
parent fe94f2a123
commit 4286243b75
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
framework/core/js/forum/src/components/index-page.js
View File

@ -339,16 +339,30 @@ export default class IndexPage extends Component {
/** /**
* Initialize the composer for a new discussion. * Initialize the composer for a new discussion.
* *
* @todo return a promise * @return {Promise}
* @return void
*/ */
newDiscussion() { newDiscussion() {
var deferred = m.deferred();
if (app.session.user()) { if (app.session.user()) {
app.composer.load(new DiscussionComposer({ user: app.session.user() })); this.composeNewDiscussion(deferred);
app.composer.show(); } else {
return true; app.modal.show(
new LoginModal({ onlogin: this.composeNewDiscussion.bind(this, deferred) })
);
} }
app.modal.show(new LoginModal({ onlogin: this.newDiscussion.bind(this) }));
return deferred.promise;
}
composeNewDiscussion(deferred) {
// @todo check global permissions
var component = new DiscussionComposer({ user: app.session.user() });
app.composer.load(component);
app.composer.show();
deferred.resolve(component);
return deferred.promise;
} }
/** /**