From 6a4b9a3d38912e9e9b719756d653183fe41bea2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 22 Sep 2015 17:58:12 +0200 Subject: [PATCH] FIX: remove upload placeholder when cancelling the upload --- .../javascripts/discourse/views/composer.js.es6 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6 index c44edb49232..4b140d269e2 100644 --- a/app/assets/javascripts/discourse/views/composer.js.es6 +++ b/app/assets/javascripts/discourse/views/composer.js.es6 @@ -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();