Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Do the draft conflict check async. (#6895)

This commit is contained in:
Bianca Nenciu 2019-01-18 06:51:56 +02:00 committed by Sam
parent 1d0ee6fa8d
commit cf6223226d
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/assets/javascripts/discourse/controllers/composer.js.es6
View File

@ -835,9 +835,8 @@ export default Ember.Controller.extend({
}
}
// check if there is another draft saved on server
// or get a draft sequence number
if (!opts.draft || opts.draftSequence === undefined) {
// we need a draft sequence for the composer to work
if (opts.draftSequence === undefined) {
return Draft.get(opts.draftKey)
.then(data => {
if (opts.skipDraftCheck) {
@ -848,17 +847,26 @@ export default Ember.Controller.extend({
return self.confirmDraftAbandon(data);
})
.then(data => {
opts.draft = opts.draft || data.draft;
// we need a draft sequence for the composer to work
if (opts.draft_sequence === undefined) {
opts.draftSequence = data.draft_sequence;
if (!opts.draft && data.draft) {
opts.draft = data.draft;
}
opts.draftSequence = data.draft_sequence;
self._setModel(composerModel, opts);
})
.then(resolve, reject);
}
// otherwise, do the draft check async
else if (!opts.draft && !opts.skipDraftCheck) {
Draft.get(opts.draftKey)
.then(data => self.confirmDraftAbandon(data))
.then(data => {
if (data.draft) {
opts.draft = data.draft;
opts.draftSequence = data.draft_sequence;
self.open(opts);
}
});
}
self._setModel(composerModel, opts);
resolve();