summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/MediaUpload.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-10-10 13:03:34 -0400
committerJules Laplace <jules@okfoc.us>2014-10-10 13:03:34 -0400
commit478361d2fe51e24e45ddb683118c6a0fe4eec895 (patch)
treee2e569457f83bce4160ee1c18bb0ba9d5e283fe1 /public/assets/javascripts/ui/editor/MediaUpload.js
parentd6d78ddf16e9cb6555e92089dfa77ba5648f686b (diff)
parent81f10a23c2ab2bca5ee7a8d4bcc12c881cb04734 (diff)
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor/MediaUpload.js')
-rw-r--r--public/assets/javascripts/ui/editor/MediaUpload.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index 971fb15..3f425c3 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -42,7 +42,6 @@ var MediaUpload = UploadView.extend({
}
media._csrf = $("[name=_csrf]").val()
- console.log(media)
var request = $.ajax({
type: "post",
@@ -55,7 +54,7 @@ var MediaUpload = UploadView.extend({
add: function(media){
console.log(media)
- this.parent.mediaViewer.add(media)
+ this.parent.mediaViewer.add(media, this.parent.mediaViewer.$myMedia)
this.parent.mediaViewer.$deleteMedia.show()
},