Changeset 12031

Timestamp:

10/14/2009 08:42:32 AM (15 years ago)

Author:

markjaquith

Message:

Do not close media thickbox after thumbnail is selected, in case uploads are in progress. see #10928

Location:

trunk

Files:

• wp-admin/js/set-post-thumbnail-handler.dev.js (modified) (1 diff)
• wp-admin/js/set-post-thumbnail-handler.js (modified) (1 diff)
• wp-admin/js/set-post-thumbnail.dev.js (modified) (1 diff)
• wp-admin/js/set-post-thumbnail.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

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

@@ -7 +7 @@
     }
 }
-function WPCloseTB(){
-    tb_remove();
-}

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 WPCloseTB(){tb_remove()};
+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)}};

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

@@ -13 +13 @@
             win.WPSetThumbnailID(id);
             win.WPSetThumbnailHTML(str);
-            win.WPCloseTB();
         }
     }

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

@@ -1 @@
-function WPSetAsThumbnail(id){jQuery("#media-item-"+id+" > a.wp-post-thumbnail").text(setPostThumbnailL10n.saving).attr("href","#");jQuery.post(ajaxurl,{action:"set-post-thumbnail",post_id:post_id,thumbnail_id:id,cookie:encodeURIComponent(document.cookie)},function(str){var win=window.dialogArguments||opener||parent||top;if(str=="0"){alert(setPostThumbnailL10n.error);win.cwsCloseTB()}else{jQuery("a.wp-post-thumbnail").text(setPostThumbnailL10n.setThumbnail);jQuery("#media-item-"+id+" > a.wp-post-thumbnail").hide();win.WPSetThumbnailID(id);win.WPSetThumbnailHTML(str);win.WPCloseTB()}})};
+function WPSetAsThumbnail(id){jQuery("#media-item-"+id+" > a.wp-post-thumbnail").text(setPostThumbnailL10n.saving).attr("href","#");jQuery.post(ajaxurl,{action:"set-post-thumbnail",post_id:post_id,thumbnail_id:id,cookie:encodeURIComponent(document.cookie)},function(str){var win=window.dialogArguments||opener||parent||top;if(str=="0"){alert(setPostThumbnailL10n.error);win.cwsCloseTB()}else{jQuery("a.wp-post-thumbnail").text(setPostThumbnailL10n.setThumbnail);jQuery("#media-item-"+id+" > a.wp-post-thumbnail").hide();win.WPSetThumbnailID(id);win.WPSetThumbnailHTML(str)}})};

trunk/wp-includes/script-loader.php

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