diff options
Diffstat (limited to 'static/js/pichat.js')
| -rw-r--r-- | static/js/pichat.js | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/static/js/pichat.js b/static/js/pichat.js index d1769b7..d7728cc 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'); @@ -631,21 +632,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); |