3 files changed, 12 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
index 8ada237..1f18910 100644
--- a/public/assets/javascripts/ui/editor/HelpCursor.js
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -19,6 +19,7 @@ var HelpCursor = View.extend({
 		this.helpButton = $('#help-button')
 		
 		this.helpButton.click(this.toggle.bind(this))
+    this.$el.html(this.messages['start'])
   },
   
   toggle: function(){
@@ -28,7 +29,6 @@ var HelpCursor = View.extend({
   start: function(){
     if (this.active) return
     this.active = true
-    this.message('start')
     this.helpButton.addClass('active')
     this.$el.show()
     this.move({ pageX: -1000, pageY: -10000 })
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index b3f4ac3..65778dd 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -62,6 +62,11 @@ var MediaUpload = UploadView.extend({
 		this.parent.mediaViewer.addUploadedMedia(media)
 	},
 	
+	error: function(error){
+	console.log(error)
+    alert(error.errors.media.message)
+	},
+	
 	beforeUpload: function(){
 		this.parent.mediaViewer.deleteArmed(false)
 	}
diff --git a/public/assets/javascripts/ui/lib/UploadView.js b/public/assets/javascripts/ui/lib/UploadView.js
index 2d2c2c7..4b56828 100644
--- a/public/assets/javascripts/ui/lib/UploadView.js
+++ b/public/assets/javascripts/ui/lib/UploadView.js
@@ -77,6 +77,9 @@ var UploadView = View.extend({
 	
 	success: function(media){
 		if (media.error) {
+		  // console.log(media.error)
+      this.$upload.removeClass('uploading')
+		  this.error(media.error)
 			return
 		}
 		this.$upload.removeClass('uploading')
@@ -86,5 +89,8 @@ var UploadView = View.extend({
 	add: function(media){
 	  console.log(media)
 	},
+	
+	error: function(error){
+	},
 
 })