Changeset 12036

Timestamp:

10/15/2009 12:57:16 PM (15 years ago)

Author:

markjaquith

Message:

Post thumbnail removal functionality (only allowed for replacement before). props scribu. see #10928

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/js/set-post-thumbnail-handler.dev.js (modified) (2 diffs)
• wp-admin/js/set-post-thumbnail-handler.js (modified) (1 diff)
• wp-content/themes/default/index.php (modified) (1 diff)
• wp-content/themes/default/style.css (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -1396 +1396 @@
         die( '-1' );
     $thumbnail_id = intval( $_POST['thumbnail_id'] );
+
+    if ( $thumbnail_id == '-1' ) {
+        delete_post_meta( $post_id, '_thumbnail_id' );
+        die( _wp_post_thumbnail_html() );
+    }
+
     if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
         $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'thumbnail' );

trunk/wp-admin/includes/media.php

@@ -116 +116 @@
 
 function _wp_post_thumbnail_html( $thumbnail_id = NULL ) {
+    $content = '<p class="hide-if-no-js"><a href="#" id="set-post-thumbnail" onclick="jQuery(\'#add_image\').click();return false;">' . esc_html__( 'Set thumbnail' ) . '</a></p>';
+
     if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
         $thumbnail_html = wp_get_attachment_image($thumbnail_id, array( 266, 266 ) );
-        if ( !empty( $thumbnail_html ) )
-            return apply_filters( 'admin_post_thumbnail_html', '<a href="#" id="cws-post-thumbnail" onclick="jQuery(\'#add_image\').click();return false;">' . $thumbnail_html . '</a>' );
-    }
-    return apply_filters( 'admin_post_thumbnail_html', '<a href="#" id="cws-post-thumbnail" onclick="jQuery(\'#add_image\').click();return false;">' . esc_html__( 'Set thumbnail' ) . '</a>' );
+        if ( !empty( $thumbnail_html ) ) {
+            $content = '<a href="#" id="set-post-thumbnail" onclick="jQuery(\'#add_image\').click();return false;">' . $thumbnail_html . '</a>';
+            $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail();return false;">' . esc_html__( 'Remove thumbnail' ) . '</a></p>';
+        }
+    }
+
+    return apply_filters( 'admin_post_thumbnail_html', $content );
 }
 

trunk/wp-admin/js/set-post-thumbnail-handler.dev.js

@@ -2 +2 @@
     jQuery('#postthumbnaildiv .inside').html(html);
 }
+
 function WPSetThumbnailID(id){
     if ( jQuery('input[value=_thumbnail_id]').size() > 0 ) {
@@ -7 +8 @@
     }
 }
+
+function WPRemoveThumbnail(){
+    jQuery.post(ajaxurl, {
+        action:"set-post-thumbnail", post_id: jQuery('#post_ID').val(), thumbnail_id: -1, cookie: encodeURIComponent(document.cookie)
+    }, function(str){
+        if ( str == '0' ) {
+            alert( setPostThumbnailL10n.error );
+        } else {
+            WPSetThumbnailHTML(str);
+        }
+    }
+    );
+}

trunk/wp-admin/js/set-post-thumbnail-handler.js

@@ -1 @@
-function WPSetThumbnailHTML(html){jQuery("#postthumbnaildiv .inside").html(html)}function WPSetThumbnailID(id){if(jQuery("input[value=_thumbnail_id]").size()>0){jQuery("#meta\\["+jQuery("input[value=_thumbnail_id]").attr("id").match(/[0-9]+/)+"\\]\\[value\\]").text(id)}};
+function WPSetThumbnailHTML(html){jQuery("#postthumbnaildiv .inside").html(html)}function WPSetThumbnailID(id){if(jQuery("input[value=_thumbnail_id]").size()>0){jQuery("#meta\\["+jQuery("input[value=_thumbnail_id]").attr("id").match(/[0-9]+/)+"\\]\\[value\\]").text(id)}}function WPRemoveThumbnail(){jQuery.post(ajaxurl,{action:"set-post-thumbnail",post_id:jQuery("#post_ID").val(),thumbnail_id:-1,cookie:encodeURIComponent(document.cookie)},function(str){if(str=="0"){alert(setPostThumbnailL10n.error)}else{WPSetThumbnailHTML(str)}})};

trunk/wp-content/themes/default/index.php

@@ -18 +18 @@
 
                 <div class="entry">
+                    <?php if ( has_post_image() ) : ?>
+                        <p class="post-thumbnail"><?php the_post_image( array( '150', '150') ) ?></p>
+                    <?php endif; ?>
                     <?php the_content('Read the rest of this entry &raquo;'); ?>
                 </div>

trunk/wp-content/themes/default/style.css

@@ -713 +713 @@
 /* End captions */
 
+p.post-thumbnail {
+    float: left;
+    margin: 0 10px 10px 0;
+}
 
 /* "Daisy, Daisy, give me your answer do. I'm half crazy all for the love of you.

trunk/wp-includes/script-loader.php

@@ -384 +384 @@
         ) );
 
-        $scripts->add( 'set-post-thumbnail-handler', "/wp-admin/js/set-post-thumbnail-handler$suffix.js", array( 'jquery' ), '20091014' );
+        $scripts->add( 'set-post-thumbnail-handler', "/wp-admin/js/set-post-thumbnail-handler$suffix.js", array( 'jquery' ), '20091015' );
         $scripts->add_data( 'set-post-thumbnail-handler', 'group', 1 );