Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 9

FIX: Composer being abandoned when transiting between routes.

Browse source
This commit is contained in:
Guo Xiang Tan 2015-09-16 18:17:57 +08:00
parent afdb15f99f
commit 28f0a012ca
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/discourse/controllers/composer.js.es6
View file

@ -457,8 +457,7 @@ export default Ember.Controller.extend({
// If we're already open, we don't have to do anything // If we're already open, we don't have to do anything
if (composerModel.get('composeState') === Discourse.Composer.OPEN && if (composerModel.get('composeState') === Discourse.Composer.OPEN &&
composerModel.get('draftKey') === opts.draftKey && composerModel.get('draftKey') === opts.draftKey && !opts.action) {
self._isComposerReply(composerModel, opts)) {
return resolve(); return resolve();
} }
@ -466,7 +465,7 @@ export default Ember.Controller.extend({
if (composerModel.get('composeState') === Discourse.Composer.DRAFT && if (composerModel.get('composeState') === Discourse.Composer.DRAFT &&
composerModel.get('draftKey') === opts.draftKey) { composerModel.get('draftKey') === opts.draftKey) {
composerModel.set('composeState', Discourse.Composer.OPEN); composerModel.set('composeState', Discourse.Composer.OPEN);
if (self._isComposerReply(composerModel, opts)) return resolve(); if (!opts.action) return resolve();
} }
// If it's a different draft, cancel it and try opening again. // If it's a different draft, cancel it and try opening again.
@ -489,11 +488,6 @@ export default Ember.Controller.extend({
}); });
}, },
_isComposerReply(composerModel, opts) {
return (composerModel.get('action') === Discourse.Composer.REPLY &&
composerModel.get('action') === opts.action);
},
// Given a potential instance and options, set the model for this composer. // Given a potential instance and options, set the model for this composer.
_setModel(composerModel, opts) { _setModel(composerModel, opts) {
if (opts.draft) { if (opts.draft) {