diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-15 11:05:08 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-15 11:05:08 -0400 |
| commit | 72ea86e603793ac17a9113ab031d31b369f74a4f (patch) | |
| tree | dd69786d1d3ee5f62c107706d8186336fb9edc24 /public/assets/javascripts/ui/editor/MediaUpload.js | |
| parent | 32f5f24b8b09998a03c88f786507ba4d58397fc7 (diff) | |
| parent | f0c06d7e9fb004e840821b502a6c46214f6757fd (diff) | |
merge
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(){ |