filesize error alert

5 files changed, 14 insertions, 3 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){
+	},
 
 })
diff --git a/server/lib/api/media.js b/server/lib/api/media.js
index 4e2fad5..85cbdd6 100644
--- a/server/lib/api/media.js
+++ b/server/lib/api/media.js
@@ -49,7 +49,7 @@ var media = {
 		upload.put("media", req.files.image, {
 			username: req.user.username,
 			unacceptable: function(err){
-				res.json({ error: { errors: { avatar: { message: "Problem saving image: " + err } } } })
+				res.json({ error: { errors: { media: { message: "Problem saving image: " + err } } } })
 			},
 			success: function(url){
 				data.url = url
diff --git a/server/lib/upload.js b/server/lib/upload.js
index e206f7c..f6e22da 100644
--- a/server/lib/upload.js
+++ b/server/lib/upload.js
@@ -41,7 +41,7 @@ module.exports.put = function (key, file, opt) {
 		err = "file too small"
 	}
 	else if (file.size > 2097152) { // 2mb limit
-		err = "file too large"
+		err = "file too large. Uploads can be a maximum of 2 mb."
 	}
 
 	if (err) {