Changeset 11965 for trunk/wp-admin/includes/media.php

Timestamp:

09/24/2009 01:54:07 AM (15 years ago)

Author:

azaozz

Message:

Image Editor improvements, see #10528

File:

• trunk/wp-admin/includes/media.php (modified) (7 diffs)

trunk/wp-admin/includes/media.php

@@ -250 +250 @@
 function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) {
     $overrides = array('test_form'=>false);
-    
+
     $file = wp_handle_sideload($file_array, $overrides);
     if ( isset($file['error']) )
@@ -523 +523 @@
         // Download file to temp location
         $tmp = download_url($file);
-        
+
         // Set variables for storage
         // fix file filename for query strings
@@ -535 +535 @@
             $file_array['tmp_name'] = '';
         }
-        
+
         // do the validation and storage stuff
         $id = media_handle_sideload($file_array, $post_id, @$desc);
         $src = $id;
-        
+
         // If error storing permanently, unlink
         if ( is_wp_error($id) ) {
@@ -546 +546 @@
         }
     }
-    
+
     // Finally check to make sure the file has been saved, then return the html
     if ( !empty($src) ) {
@@ -1168 +1168 @@
     if ( gd_edit_image_support($post->post_mime_type) ) {
         $nonce = wp_create_nonce("image_editor-$post->ID");
-        $image_edit_button = "<tr><td class='A1B1'><input type='button' id='imgedit-open-btn-{$post->ID}' onclick='imageEdit.open($post->ID, \"$nonce\")' class='button' value='" . esc_attr__( 'Edit image' ) . "' /> <img src='images/wpspin_light.gif' class='imgedit-wait-spin' alt='' /></td></tr>";
+        $image_edit_button = "<input type='button' id='imgedit-open-btn-{$post->ID}' onclick='imageEdit.open($post->ID, \"$nonce\")' class='button' value='" . esc_attr__( 'Edit image' ) . "' /> <img src='images/wpspin_light.gif' class='imgedit-wait-spin' alt='' />";
     }
 
@@ -1179 +1179 @@
         <thead class='media-item-info' id='media-head-$post->ID'>
         <tr>
-            <td class='A1B1' rowspan='5'><img class='thumbnail' src='$thumb_url' alt='' /></td>
+            <td class='A1B1' id='thumbnail-head-$post->ID' rowspan='5'><img class='thumbnail' src='$thumb_url' alt='' /></td>
             <td>$filename</td>
         </tr>
@@ -1185 +1185 @@
         <tr><td>" . mysql2date($post->post_date, get_option('time_format')) . "</td></tr>
         <tr><td>" . apply_filters('media_meta', $media_dims, $post) . "</td></tr>
-        $image_edit_button
+        <tr><td class='A1B1'>$image_edit_button</td></tr>
         </thead>
         <tbody>
-        <tr><td style='display:none' colspan='2' id='image-editor-$post->ID'></td></tr>\n";
+        <tr><td colspan='2' class='imgedit-response' id='imgedit-response-$post->ID'></td></tr>
+        <tr><td style='display:none' colspan='2' class='image-editor' id='image-editor-$post->ID'></td></tr>\n";
 
     $defaults = array(