summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-01-22 04:26:57 +0000
committerZach Copley <zach@controlyourself.ca>2009-01-22 04:26:57 +0000
commit570a7c64b1a3653a801e95b7e9834bede6ce5b9e (patch)
treec521acc4c959cc34e23bcf95cee02e5b4f10e164 /js
parent1a941d03fdcfcd1319da17c5400fe8972a755091 (diff)
parent205eb386c542502f39e0df1f4544c10a87d91b4b (diff)
Merge branch 'master' of /var/www/trunk
Diffstat (limited to 'js')
-rw-r--r--js/jcrop/jquery.Jcrop.go.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/js/jcrop/jquery.Jcrop.go.js b/js/jcrop/jquery.Jcrop.go.js
index d5176c14c..b2737407b 100644
--- a/js/jcrop/jquery.Jcrop.go.js
+++ b/js/jcrop/jquery.Jcrop.go.js
@@ -1,7 +1,12 @@
$(function(){
+ var x = ($('#avatar_crop_x').val()) ? $('#avatar_crop_x').val() : 0;
+ var y = ($('#avatar_crop_y').val()) ? $('#avatar_crop_y').val() : 0;
+ var w = ($('#avatar_crop_w').val()) ? $('#avatar_crop_w').val() : $("#avatar_original img").attr("width");
+ var h = ($('#avatar_crop_h').val()) ? $('#avatar_crop_h').val() : $("#avatar_original img").attr("height");
+
jQuery("#avatar_original img").Jcrop({
onChange: showPreview,
- setSelect: [ 0, 0, $("#avatar_original img").attr("width"), $("#avatar_original img").attr("height") ],
+ setSelect: [ x, y, w, h ],
onSelect: updateCoords,
aspectRatio: 1,
boxWidth: 480,