diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-10 21:07:55 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-10 21:07:55 -0400 |
| commit | 6177755e842ca3028833bc98ba0e97e6874b27fb (patch) | |
| tree | 7bbe15aa18c497e256f3bbc6e89316221659137a /public/assets/javascripts/ui/editor/MediaUpload.js | |
| parent | b35bda803440233b68389603bbaced53f8bb18ba (diff) | |
| parent | bc63a639bbd224adfc8012b100c1b277e2774afb (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 3f425c3..fddfefc 100644 --- a/public/assets/javascripts/ui/editor/MediaUpload.js +++ b/public/assets/javascripts/ui/editor/MediaUpload.js @@ -6,6 +6,7 @@ var MediaUpload = UploadView.extend({ uploadAction: "/api/media/upload", events: { + 'mousedown': "stopPropagation", "keydown .url": "enterSubmit", }, @@ -56,6 +57,7 @@ var MediaUpload = UploadView.extend({ console.log(media) this.parent.mediaViewer.add(media, this.parent.mediaViewer.$myMedia) this.parent.mediaViewer.$deleteMedia.show() + this.parent.mediaViewer.$noMedia.hide() }, beforeUpload: function(){ |