diff options
| author | ryderr <r@okfoc.us> | 2014-10-15 11:14:22 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-15 11:14:22 -0400 |
| commit | 0b088a46f0c60169225627fa45ec903b4384a61c (patch) | |
| tree | 32853d0f0ceb27b834ac65ff0618d1296a0cb86d /public/assets/javascripts/ui/editor/MediaUpload.js | |
| parent | d047149104c82bd86b3ec430c688d7653c36767d (diff) | |
| parent | 72ea86e603793ac17a9113ab031d31b369f74a4f (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/ui/editor/MediaUpload.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/MediaUpload.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js index fddfefc..9799f99 100644 --- a/public/assets/javascripts/ui/editor/MediaUpload.js +++ b/public/assets/javascripts/ui/editor/MediaUpload.js @@ -55,9 +55,7 @@ var MediaUpload = UploadView.extend({ add: function(media){ console.log(media) - this.parent.mediaViewer.add(media, this.parent.mediaViewer.$myMedia) - this.parent.mediaViewer.$deleteMedia.show() - this.parent.mediaViewer.$noMedia.hide() + this.parent.mediaViewer.addUploadedMedia(media) }, beforeUpload: function(){ |