image upload error msgs, file size limit

v1.18.x
Baris Soner Usakli 12 years ago
parent 9df65da7d4
commit e476e27807

@ -50,7 +50,9 @@
<input id="userPhotoInput" type="file" name="userPhoto" > <input id="userPhotoInput" type="file" name="userPhoto" >
</form> </form>
<span id="status" /> <div id="alert-status" class="alert hide"></div>
<div id="alert-success" class="alert alert-success hide"></div>
<div id="alert-error" class="alert alert-error hide"></div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
@ -142,12 +144,12 @@ $(document).ready(function() {
$(this).ajaxSubmit({ $(this).ajaxSubmit({
error: function(xhr) { error: function(xhr) {
status('Error: ' + xhr.status); error('Error: ' + xhr.status);
}, },
success: function(response) { success: function(response) {
if(response.error) { if(response.error) {
status('Opps, something bad happened'); error(response.error);
return; return;
} }
@ -158,18 +160,38 @@ $(document).ready(function() {
$('#user-data-uploadedpicture').html(imageUrlOnServer); $('#user-data-uploadedpicture').html(imageUrlOnServer);
setTimeout(function() {
hideAlerts();
$('#upload-picture-modal').modal('hide'); $('#upload-picture-modal').modal('hide');
}, 750);
socket.emit('api:updateHeader', { fields: ['username', 'picture'] }); socket.emit('api:updateHeader', { fields: ['username', 'picture'] });
status(''); success('File uploaded successfully!');
} }
}); });
return false; return false;
}); });
function hideAlerts() {
$('#alert-status').hide();
$('#alert-success').hide();
$('#alert-error').hide();
}
function status(message) { function status(message) {
$('#status').text(message); hideAlerts();
$('#alert-status').text(message).show();
}
function success(message) {
hideAlerts();
$('#alert-success').text(message).show();
}
function error(message) {
hideAlerts();
$('#alert-error').text(message).show();
} }
}); });

@ -205,6 +205,13 @@ var express = require('express'),
if(!req.user) if(!req.user)
return res.redirect('/403'); return res.redirect('/403');
if(req.files.userPhoto.size > 65536) {
res.send({
error: 'Images must be smaller than 64kb!'
});
return;
}
user.getUserField(req.user.uid, 'uploadedpicture', function(uploadedpicture) { user.getUserField(req.user.uid, 'uploadedpicture', function(uploadedpicture) {
var index = uploadedpicture.lastIndexOf('/'); var index = uploadedpicture.lastIndexOf('/');
@ -234,7 +241,7 @@ var express = require('express'),
function(error) { function(error) {
if(error) { if(error) {
res.send({ res.send({
error: 'Ah crap! Something bad happened' error: 'Error uploading file! Error : '+ JSON.stringify(error)
}); });
return; return;
} }

Loading…
Cancel
Save