diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-06-20 14:13:29 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-06-20 14:13:29 -0400 |
| commit | 712387da2f75c845807ad4489b29fec34bfe9a56 (patch) | |
| tree | 2fab35671b730b7305b920ba1b63299fd8fa4922 /public/assets/javascripts/ui/editor/MediaUpload.js | |
| parent | 9151023c978bd3aed20ad00d5d3301dfe7ed2a2a (diff) | |
| parent | 1668d6e2e20c9bd53f3f6a299541c582da9742b4 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor/MediaUpload.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/MediaUpload.js | 2 |
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; |