summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/MediaUpload.js
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-06-20 01:00:35 -0400
committerJulie Lala <jules@okfoc.us>2014-06-20 01:00:35 -0400
commitbefeb2ed9b7f7086ec0861cbfe4ab6450e1987af (patch)
tree9a1c3259d07261e2209cfdc4aa7511bc80b0cf84 /public/assets/javascripts/ui/editor/MediaUpload.js
parent4ee6b7e7faab5ed1e5bc295ee5c4ca0540c10da8 (diff)
disarm delete after upload
Diffstat (limited to 'public/assets/javascripts/ui/editor/MediaUpload.js')
-rw-r--r--public/assets/javascripts/ui/editor/MediaUpload.js2
1 files changed, 2 insertions, 0 deletions
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;