GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Avatar crop fix for shrinking/stretching of images when user doesn't 

scale it with the Jcrop tool (but hits Crop). This will use the lower
value from width/height.
This commit is contained in:
Sarven Capadisli 2009-03-04 05:11:18 +00:00
parent 8408e82f92
commit dcdf47cff2
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actions/avatarsettings.php
View File

@ -324,11 +324,13 @@ class AvatarsettingsAction extends AccountSettingsAction
return;
}
// If image is not being cropped assume pos & dimensions of original.
$file_d = ($filedata['width'] > $filedata['height'])
? $filedata['height'] : $filedata['width'];
$dest_x = $this->arg('avatar_crop_x') ? $this->arg('avatar_crop_x'):0;
$dest_y = $this->arg('avatar_crop_y') ? $this->arg('avatar_crop_y'):0;
$dest_w = $this->arg('avatar_crop_w') ? $this->arg('avatar_crop_w'):$filedata['width'];
$dest_h = $this->arg('avatar_crop_h') ? $this->arg('avatar_crop_h'):$filedata['height'];
$dest_w = $this->arg('avatar_crop_w') ? $this->arg('avatar_crop_w'):$file_d;
$dest_h = $this->arg('avatar_crop_h') ? $this->arg('avatar_crop_h'):$file_d;
$size = min($dest_w, $dest_h, MAX_ORIGINAL);
$user = common_current_user();

7
js/jcrop/jquery.Jcrop.go.js
View File

@ -37,10 +37,3 @@
$('#avatar_crop_w').val(c.w);
$('#avatar_crop_h').val(c.h);
};
function checkCoords() {
if (parseInt($('#avatar_crop_w').val())) return true;
alert('Please select a crop region then press submit.');
return false;
};