From befeb2ed9b7f7086ec0861cbfe4ab6450e1987af Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Fri, 20 Jun 2014 01:00:35 -0400 Subject: disarm delete after upload --- public/assets/javascripts/ui/editor/MediaUpload.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'public/assets/javascripts/ui/editor/MediaUpload.js') diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js index 30287a5..b7fea07 100644 --- a/public/assets/javascripts/ui/editor/MediaUpload.js +++ b/public/assets/javascripts/ui/editor/MediaUpload.js @@ -60,6 +60,8 @@ var MediaUpload = View.extend({ handleFileSelect: function(e) { e.stopPropagation(); e.preventDefault(); + + this.parent.mediaViewer.deleteArmed(false) var files = e.dataTransfer ? e.dataTransfer.files : e.target.files; -- cgit v1.2.3-70-g09d2