Changeset 6572

Timestamp:

12/07/2012 07:05:28 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Clean up some avatar cropper code. (1.6 branch)

File:

• branches/1.6/bp-core/bp-core-cssjs.php (modified) (3 diffs)

branches/1.6/bp-core/bp-core-cssjs.php

@@ -55 +55 @@
 
     $width  = $image[0] / 2;
-    $height = $image[1] / 2;
-?>
+    $height = $image[1] / 2; ?>
 
     <script type="text/javascript">
@@ -81 +80 @@
                 var rx = <?php echo $full_width; ?> / coords.w;
                 var ry = <?php echo $full_height; ?> / coords.h;
+                <?php if ( $image ) : ?>
+                var w  = <?php echo $image[0]; ?>;
+                var h  = <?php echo $image[1]; ?>;
+                <?php endif; ?>
 
                 jQuery('#avatar-crop-preview').css({
                 <?php if ( $image ) : ?>
-                    width: Math.round(rx * <?php echo $image[0]; ?>) + 'px',
-                    height: Math.round(ry * <?php echo $image[1]; ?>) + 'px',
+                    width: Math.round(rx * w) + 'px',
+                    height: Math.round(ry * h) + 'px',
                 <?php endif; ?>
                     marginLeft: '-' + Math.round(rx * coords.x) + 'px',
@@ -105 +108 @@
  */
 function bp_core_add_cropper_inline_css() {
-    global $bp;
 ?>
 
     <style type="text/css">
         .jcrop-holder { float: left; margin: 0 20px 20px 0; text-align: left; }
-        .jcrop-vline, .jcrop-hline { font-size: 0; position: absolute; background: white top left repeat url( <?php echo BP_PLUGIN_URL ?>/bp-core/images/Jcrop.gif ); }
+        .jcrop-vline, .jcrop-hline { font-size: 0; position: absolute; background: white top left repeat url('<?php echo BP_PLUGIN_URL ?>/bp-core/images/Jcrop.gif'); }
         .jcrop-vline { height: 100%; width: 1px !important; }
         .jcrop-hline { width: 100%; height: 1px !important; }