merge

1 files changed, 14 insertions, 5 deletions

diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index 92cf2bd..d09e38c 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -1,11 +1,12 @@
 
 var MediaUpload = UploadView.extend({
-	el: ".fileUpload",
+	el: "#fileUpload",
 
 	createAction: "/api/media/new",
 	uploadAction: "/api/media/upload",
 	
 	events: {
+    'mousedown': "stopPropagation",
 		"keydown .url": "enterSubmit",
 	},
 	
@@ -25,6 +26,7 @@ var MediaUpload = UploadView.extend({
 	},
 	
 	enterSubmit: function(e){
+		e.stopPropagation()
 		if (e.keyCode == 13) {
 			e.preventDefault()
 			this.parse()
@@ -34,7 +36,10 @@ var MediaUpload = UploadView.extend({
 	parse: function(){
 		var url = this.$url.val()
 		this.$url.val("")
-		
+		this.parseUrl(url)
+	},
+	
+	parseUrl: function(url){
 		Parser.parse(url, function(media){
 			if (! media) {
 				alert("Not a valid image/video link")
@@ -42,7 +47,6 @@ var MediaUpload = UploadView.extend({
 			}
 			
 			media._csrf = $("[name=_csrf]").val()
-			console.log(media)
 			
 			var request = $.ajax({
 				type: "post",
@@ -52,10 +56,15 @@ var MediaUpload = UploadView.extend({
 			request.done(this.add.bind(this))
 		}.bind(this))
 	},
-	
+
 	add: function(media){
 		console.log(media)
-		this.parent.mediaViewer.add(media)
+		this.parent.mediaViewer.addUploadedMedia(media)
+	},
+	
+	error: function(error){
+	  console.log(error)
+    alert(error.errors.media.message)
 	},
 	
 	beforeUpload: function(){