Mute file uploads

1 files changed, 13 insertions, 7 deletions

diff --git a/static/js/pichat.js b/static/js/pichat.js
index d52212d..dc91a51 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -244,7 +244,8 @@ function submitMessage() {
 
     var onSuccess = function(json) {
 	if (typeof pageTracker !== 'undefined') {
-            pageTracker._trackEvent('Message', 'Submit', typeof Room !== 'undefined' ? Room : 'UnknownRoom');
+            pageTracker._trackEvent('Message', 'Submit',
+                                    typeof Room !== 'undefined' ? Room : 'UnknownRoom');
         }
         div.attr('id', 'message-' + json)
             .removeClass('loading').addClass('loaded');
@@ -628,21 +629,26 @@ function setupUpload(elementId, roomKey) {
 	}
     };
     var onComplete = function(file, response) {
-        if (response.match(/FILE_TOO_BIG/)) {
-            var maxSize = response.split(" ")[1] / 1024;
+        r = $.trim(response);
+        if (r.match(/FILE_TOO_BIG/)) {
+            var maxSize = r.split(" ")[1] / 1024;
             alert("Sorry. Your file is just too fucking big. "
                   + maxSize + "KB or less please.");
             return;
-        } else if (response.match(/FILE_NOT_IMAGE/)) {
+        } else if (r.match(/FILE_NOT_IMAGE/)) {
             alert("What did you upload? Doesn't seem like an image. Sorry.");
             return;
-        } else if (response.match(/INVALID_RESOLUTION/)) {
-            var maxWidth = response.split(" ")[1];
-            var maxHeight = response.split(" ")[2];
+        } else if (r.match(/INVALID_RESOLUTION/)) {
+            var maxWidth = r.split(" ")[1];
+            var maxHeight = r.split(" ")[2];
             alert("Sorry, the maximum image resolution is "
                   + maxWidth + "x" + maxHeight);
             return;
+        } else if (r != "OK") {
+            alert(r);
+            return;
         }
+
     	if (typeof pageTracker !== 'undefined') {
             var r = typeof Room !== 'undefined' ? Room : 'UnknownRoom';
             pageTracker._trackEvent('Message', 'Upload', r);