Changeset 10846

Timestamp:

03/27/2009 04:45:55 PM (15 years ago)

Author:

ryan

Message:

Use Jcrop for cropping. see #9375

Location:

trunk

Files:

• wp-admin/custom-header.php (modified) (4 diffs)
• wp-includes/js/jcrop (added)
• wp-includes/js/jcrop/Jcrop.gif (added)
• wp-includes/js/jcrop/jquery.Jcrop.css (added)
• wp-includes/js/jcrop/jquery.Jcrop.dev.js (added)
• wp-includes/js/jcrop/jquery.Jcrop.js (added)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/custom-header.php

@@ -80 +80 @@
             wp_enqueue_script('farbtastic');
         elseif ( 2 == $step )
-            wp_enqueue_script('cropper');
+            wp_enqueue_script('jcrop');
     }
 
@@ -91 +91 @@
         $step = $this->step();
 
-        if ( 1 == $step ) {
+        if ( 1 == $step )
             wp_enqueue_style('farbtastic');
-        }
+        elseif ( 2 == $step )
+            wp_enqueue_style('jcrop');
     }
 
@@ -216 +217 @@
     function js_2() { ?>
 <script type="text/javascript">
-    function onEndCrop( coords, dimensions ) {
-        jQuery( '#x1' ).val(coords.x1);
-        jQuery( '#y1' ).val(coords.y1);
+    function onEndCrop( coords ) {
+        jQuery( '#x1' ).val(coords.x);
+        jQuery( '#y1' ).val(coords.y);
         jQuery( '#x2' ).val(coords.x2);
         jQuery( '#y2' ).val(coords.y2);
-        jQuery( '#width' ).val(dimensions.width);
-        jQuery( '#height' ).val(dimensions.height);
+        jQuery( '#width' ).val(coords.w);
+        jQuery( '#height' ).val(coords.h);
     }
 
@@ -241 +242 @@
             }
         }
-        new Cropper.Img(
-            'upload',
-            {
-                ratioDim: { x: xinit, y: yinit },
-                displayOnInit: true,
-                onEndCrop: onEndCrop
-            }
-        )
+
+        $('#upload').Jcrop({
+            aspectRatio: ratio,
+            setSelect: [ 0, 0, xinit, yinit ],
+            onSelect: onEndCrop
+        });
     });
 </script>

trunk/wp-includes/script-loader.php

@@ -168 +168 @@
     $scripts->add_data( 'thickbox', 'group', 1 );
 
-
+    $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.5');
+    
     if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) {
         $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2.2.0-20081031');
@@ -449 +450 @@
     $styles->add( 'theme-install', '/wp-admin/css/theme-install.css', array(), '20090319' );
     $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' );
+    $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.5' );
 
     foreach ( $rtl_styles as $rtl_style )