diff options
| author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-03-04 05:11:18 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-03-04 05:11:18 +0000 |
| commit | dcdf47cff2dc62996df042aa0e5d19948b265686 (patch) | |
| tree | fc3597f0d48b1c1cddb1a03e4f5963e38831f219 | |
| parent | 8408e82f928d1b159a6c9f2dd8fabd269590be61 (diff) | |
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.
| -rw-r--r-- | actions/avatarsettings.php | 8 | ||||
| -rw-r--r-- | js/jcrop/jquery.Jcrop.go.js | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 6545d9489..c2bb35a39 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -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(); diff --git a/js/jcrop/jquery.Jcrop.go.js b/js/jcrop/jquery.Jcrop.go.js index b2737407b..a0399d540 100644 --- a/js/jcrop/jquery.Jcrop.go.js +++ b/js/jcrop/jquery.Jcrop.go.js @@ -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; - }; - |