IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: remove upload placeholder when cancelling the upload

Browse Source
This commit is contained in:
Régis Hanol 2015-09-22 17:58:12 +02:00
parent a6934a200e
commit 6a4b9a3d38
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/views/composer.js.es6
View File

@ -340,14 +340,12 @@ const ComposerView = Ember.View.extend(Ember.Evented, {
var cancelledByTheUser;
this.messageBus.subscribe("/uploads/composer", upload => {
if (!cancelledByTheUser) {
if (upload && upload.url) {
const old = Discourse.Utilities.getUploadPlaceholder(),
markdown = Discourse.Utilities.getUploadMarkdown(upload);
this.replaceMarkdown(old, markdown);
} else {
Discourse.Utilities.displayErrorForUpload(upload);
}
if (upload && upload.url) {
const old = Discourse.Utilities.getUploadPlaceholder(),
markdown = cancelledByTheUser ? "" : Discourse.Utilities.getUploadMarkdown(upload);
this.replaceMarkdown(old, markdown);
} else {
Discourse.Utilities.displayErrorForUpload(upload);
}
// reset upload state
reset();