From d7ee58c7e25038f2fa822b8670fe21e66861101d Mon Sep 17 00:00:00 2001
From: Jon Cave <duck_@git.wordpress.org>
Date: Wed, 19 Oct 2011 17:48:07 +0000
Subject: [PATCH] Show the current post format in quick edit even if it's not
 supported. Props nacin, fixes #18083.

git-svn-id: https://develop.svn.wordpress.org/trunk@19011 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/class-wp-posts-list-table.php | 13 ++++++++-----
 wp-admin/js/inline-edit-post.dev.js             |  8 ++++++++
 wp-admin/js/inline-edit-post.js                 |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php
index 39545e170a..675780a66d 100644
--- a/wp-admin/includes/class-wp-posts-list-table.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -998,18 +998,21 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 	<?php if ( post_type_supports( $screen->post_type, 'post-formats' ) && current_theme_supports( 'post-formats' ) ) : 
 		$post_formats = get_theme_support( 'post-formats' );
-		if ( is_array( $post_formats[0] ) ) : ?>
+		if ( isset( $post_formats[0] ) && is_array( $post_formats[0] ) ) :
+			$all_post_formats = get_post_format_strings(); ?>
 			<div class="inline-edit-group">
 				<label class="alignleft" for="post_format">
 				<span class="title"><?php _e( 'Post Format' ); ?></span>
-				<select name="post_format" id="post_format">
+				<select name="post_format">
 				<?php if ( $bulk ) : ?>
 					<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
 				<?php endif; ?>
 					<option value="0"><?php _ex( 'Standard', 'Post format' ); ?></option>
-				<?php foreach ( $post_formats[0] as $format ): ?>
-					<option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
-				<?php endforeach; ?>
+				<?php foreach ( $all_post_formats as $slug => $format ):
+					if ( $slug != 'standard' ) : ?>
+					<option value="<?php echo esc_attr( $slug ); ?>"<?php if ( ! in_array( $slug, $post_formats[0] ) ) echo ' class="unsupported"'; ?>><?php echo esc_html( $format ); ?></option>
+					<?php endif;
+				endforeach; ?>
 				</select></label>
 			</div>
 		<?php endif; ?>
diff --git a/wp-admin/js/inline-edit-post.dev.js b/wp-admin/js/inline-edit-post.dev.js
index 91d09aa358..20d1f3b756 100644
--- a/wp-admin/js/inline-edit-post.dev.js
+++ b/wp-admin/js/inline-edit-post.dev.js
@@ -151,6 +151,14 @@ inlineEditPost = {
 			$('label.inline-edit-author', editRow).hide();
 		}
 
+		// hide unsupported formats, but leave the current format alone
+		var cur_format = $('.post_format', rowData).text();
+		$('option.unsupported', editRow).each(function() {
+			var $this = $(this);
+			if ( $this.val() != cur_format )
+				$this.remove();
+		});
+
 		for ( var f = 0; f < fields.length; f++ ) {
 			$(':input[name="' + fields[f] + '"]', editRow).val( $('.'+fields[f], rowData).text() );
 		}
diff --git a/wp-admin/js/inline-edit-post.js b/wp-admin/js/inline-edit-post.js
index fb312995ce..7d9c98847b 100644
--- a/wp-admin/js/inline-edit-post.js
+++ b/wp-admin/js/inline-edit-post.js
@@ -1 +1 @@
-(function($){inlineEditPost={init:function(){var t=this,qeRow=$("#inline-edit"),bulkRow=$("#bulk-edit");t.type=$("table.widefat").hasClass("pages")?"page":"post";t.what="#post-";qeRow.keyup(function(e){if(e.which==27){return inlineEditPost.revert()}});bulkRow.keyup(function(e){if(e.which==27){return inlineEditPost.revert()}});$("a.cancel",qeRow).click(function(){return inlineEditPost.revert()});$("a.save",qeRow).click(function(){return inlineEditPost.save(this)});$("td",qeRow).keydown(function(e){if(e.which==13){return inlineEditPost.save(this)}});$("a.cancel",bulkRow).click(function(){return inlineEditPost.revert()});$('#inline-edit .inline-edit-private input[value="private"]').click(function(){var pw=$("input.inline-edit-password-input");if($(this).prop("checked")){pw.val("").prop("disabled",true)}else{pw.prop("disabled",false)}});$("a.editinline").live("click",function(){inlineEditPost.edit(this);return false});$("#bulk-title-div").parents("fieldset").after($("#inline-edit fieldset.inline-edit-categories").clone()).siblings("fieldset:last").prepend($("#inline-edit label.inline-edit-tags").clone());$("span.catshow").click(function(){$(this).hide().next().show().parent().next().addClass("cat-hover")});$("span.cathide").click(function(){$(this).hide().prev().show().parent().next().removeClass("cat-hover")});$('select[name="_status"] option[value="future"]',bulkRow).remove();$("#doaction, #doaction2").click(function(e){var n=$(this).attr("id").substr(2);if($('select[name="'+n+'"]').val()=="edit"){e.preventDefault();t.setBulk()}else{if($("form#posts-filter tr.inline-editor").length>0){t.revert()}}});$("#post-query-submit").mousedown(function(e){t.revert();$('select[name^="action"]').val("-1")})},toggle:function(el){var t=this;$(t.what+t.getId(el)).css("display")=="none"?t.revert():t.edit(el)},setBulk:function(){var te="",type=this.type,tax,c=true;this.revert();$("#bulk-edit td").attr("colspan",$(".widefat:first thead th:visible").length);$("table.widefat tbody").prepend($("#bulk-edit"));$("#bulk-edit").addClass("inline-editor").show();$('tbody th.check-column input[type="checkbox"]').each(function(i){if($(this).prop("checked")){c=false;var id=$(this).val(),theTitle;theTitle=$("#inline_"+id+" .post_title").text()||inlineEditL10n.notitle;te+='<div id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton" title="'+inlineEditL10n.ntdeltitle+'">X</a>'+theTitle+"</div>"}});if(c){return this.revert()}$("#bulk-titles").html(te);$("#bulk-titles a").click(function(){var id=$(this).attr("id").substr(1);$('table.widefat input[value="'+id+'"]').prop("checked",false);$("#ttle"+id).remove()});if("post"==type){tax="post_tag";$('tr.inline-editor textarea[name="tags_input"]').suggest("admin-ajax.php?action=ajax-tag-search&tax="+tax,{delay:500,minchars:2,multiple:true,multipleSep:", "})}$("html, body").animate({scrollTop:0},"fast")},edit:function(id){var t=this,fields,editRow,rowData,cats,status,pageOpt,pageLevel,nextPage,pageLoop=true,nextLevel,tax;t.revert();if(typeof(id)=="object"){id=t.getId(id)}fields=["post_title","post_name","post_author","_status","jj","mm","aa","hh","mn","ss","post_password","post_format"];if(t.type=="page"){fields.push("post_parent","menu_order","page_template")}editRow=$("#inline-edit").clone(true);$("td",editRow).attr("colspan",$(".widefat:first thead th:visible").length);if($(t.what+id).hasClass("alternate")){$(editRow).addClass("alternate")}$(t.what+id).hide().after(editRow);rowData=$("#inline_"+id);if(!$(':input[name="post_author"] option[value="'+$(".post_author",rowData).text()+'"]',editRow).val()){$(':input[name="post_author"]',editRow).prepend('<option value="'+$(".post_author",rowData).text()+'">'+$("#"+t.type+"-"+id+" .author").text()+"</option>")}if($(':input[name="post_author"] option',editRow).length==1){$("label.inline-edit-author",editRow).hide()}for(var f=0;f<fields.length;f++){$(':input[name="'+fields[f]+'"]',editRow).val($("."+fields[f],rowData).text())}if($(".comment_status",rowData).text()=="open"){$('input[name="comment_status"]',editRow).prop("checked",true)}if($(".ping_status",rowData).text()=="open"){$('input[name="ping_status"]',editRow).prop("checked",true)}if($(".sticky",rowData).text()=="sticky"){$('input[name="sticky"]',editRow).prop("checked",true)}$(".post_category",rowData).each(function(){var term_ids=$(this).text();if(term_ids){taxname=$(this).attr("id").replace("_"+id,"");$("ul."+taxname+"-checklist :checkbox",editRow).val(term_ids.split(","))}});$(".tags_input",rowData).each(function(){var terms=$(this).text();if(terms){taxname=$(this).attr("id").replace("_"+id,"");$("textarea.tax_input_"+taxname,editRow).val(terms);$("textarea.tax_input_"+taxname,editRow).suggest("admin-ajax.php?action=ajax-tag-search&tax="+taxname,{delay:500,minchars:2,multiple:true,multipleSep:", "})}});status=$("._status",rowData).text();if("future"!=status){$('select[name="_status"] option[value="future"]',editRow).remove()}if("private"==status){$('input[name="keep_private"]',editRow).prop("checked",true);$("input.inline-edit-password-input").val("").prop("disabled",true)}pageOpt=$('select[name="post_parent"] option[value="'+id+'"]',editRow);if(pageOpt.length>0){pageLevel=pageOpt[0].className.split("-")[1];nextPage=pageOpt;while(pageLoop){nextPage=nextPage.next("option");if(nextPage.length==0){break}nextLevel=nextPage[0].className.split("-")[1];if(nextLevel<=pageLevel){pageLoop=false}else{nextPage.remove();nextPage=pageOpt}}pageOpt.remove()}$(editRow).attr("id","edit-"+id).addClass("inline-editor").show();$(".ptitle",editRow).focus();return false},save:function(id){var params,fields,page=$(".post_status_page").val()||"";if(typeof(id)=="object"){id=this.getId(id)}$("table.widefat .inline-edit-save .waiting").show();params={action:"inline-save",post_type:typenow,post_ID:id,edit_date:"true",post_status:page};fields=$("#edit-"+id+" :input").serialize();params=fields+"&"+$.param(params);$.post("admin-ajax.php",params,function(r){$("table.widefat .inline-edit-save .waiting").hide();if(r){if(-1!=r.indexOf("<tr")){$(inlineEditPost.what+id).remove();$("#edit-"+id).before(r).remove();$(inlineEditPost.what+id).hide().fadeIn()}else{r=r.replace(/<.[^<>]*?>/g,"");$("#edit-"+id+" .inline-edit-save .error").html(r).show()}}else{$("#edit-"+id+" .inline-edit-save .error").html(inlineEditL10n.error).show()}},"html");return false},revert:function(){var id=$("table.widefat tr.inline-editor").attr("id");if(id){$("table.widefat .inline-edit-save .waiting").hide();if("bulk-edit"==id){$("table.widefat #bulk-edit").removeClass("inline-editor").hide();$("#bulk-titles").html("");$("#inlineedit").append($("#bulk-edit"))}else{$("#"+id).remove();id=id.substr(id.lastIndexOf("-")+1);$(this.what+id).show()}}return false},getId:function(o){var id=$(o).closest("tr").attr("id"),parts=id.split("-");return parts[parts.length-1]}};$(document).ready(function(){inlineEditPost.init()})})(jQuery);
\ No newline at end of file
+(function($){inlineEditPost={init:function(){var t=this,qeRow=$("#inline-edit"),bulkRow=$("#bulk-edit");t.type=$("table.widefat").hasClass("pages")?"page":"post";t.what="#post-";qeRow.keyup(function(e){if(e.which==27){return inlineEditPost.revert()}});bulkRow.keyup(function(e){if(e.which==27){return inlineEditPost.revert()}});$("a.cancel",qeRow).click(function(){return inlineEditPost.revert()});$("a.save",qeRow).click(function(){return inlineEditPost.save(this)});$("td",qeRow).keydown(function(e){if(e.which==13){return inlineEditPost.save(this)}});$("a.cancel",bulkRow).click(function(){return inlineEditPost.revert()});$('#inline-edit .inline-edit-private input[value="private"]').click(function(){var pw=$("input.inline-edit-password-input");if($(this).prop("checked")){pw.val("").prop("disabled",true)}else{pw.prop("disabled",false)}});$("a.editinline").live("click",function(){inlineEditPost.edit(this);return false});$("#bulk-title-div").parents("fieldset").after($("#inline-edit fieldset.inline-edit-categories").clone()).siblings("fieldset:last").prepend($("#inline-edit label.inline-edit-tags").clone());$("span.catshow").click(function(){$(this).hide().next().show().parent().next().addClass("cat-hover")});$("span.cathide").click(function(){$(this).hide().prev().show().parent().next().removeClass("cat-hover")});$('select[name="_status"] option[value="future"]',bulkRow).remove();$("#doaction, #doaction2").click(function(e){var n=$(this).attr("id").substr(2);if($('select[name="'+n+'"]').val()=="edit"){e.preventDefault();t.setBulk()}else{if($("form#posts-filter tr.inline-editor").length>0){t.revert()}}});$("#post-query-submit").mousedown(function(e){t.revert();$('select[name^="action"]').val("-1")})},toggle:function(el){var t=this;$(t.what+t.getId(el)).css("display")=="none"?t.revert():t.edit(el)},setBulk:function(){var te="",type=this.type,tax,c=true;this.revert();$("#bulk-edit td").attr("colspan",$(".widefat:first thead th:visible").length);$("table.widefat tbody").prepend($("#bulk-edit"));$("#bulk-edit").addClass("inline-editor").show();$('tbody th.check-column input[type="checkbox"]').each(function(i){if($(this).prop("checked")){c=false;var id=$(this).val(),theTitle;theTitle=$("#inline_"+id+" .post_title").text()||inlineEditL10n.notitle;te+='<div id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton" title="'+inlineEditL10n.ntdeltitle+'">X</a>'+theTitle+"</div>"}});if(c){return this.revert()}$("#bulk-titles").html(te);$("#bulk-titles a").click(function(){var id=$(this).attr("id").substr(1);$('table.widefat input[value="'+id+'"]').prop("checked",false);$("#ttle"+id).remove()});if("post"==type){tax="post_tag";$('tr.inline-editor textarea[name="tags_input"]').suggest("admin-ajax.php?action=ajax-tag-search&tax="+tax,{delay:500,minchars:2,multiple:true,multipleSep:", "})}$("html, body").animate({scrollTop:0},"fast")},edit:function(id){var t=this,fields,editRow,rowData,cats,status,pageOpt,pageLevel,nextPage,pageLoop=true,nextLevel,tax;t.revert();if(typeof(id)=="object"){id=t.getId(id)}fields=["post_title","post_name","post_author","_status","jj","mm","aa","hh","mn","ss","post_password","post_format"];if(t.type=="page"){fields.push("post_parent","menu_order","page_template")}editRow=$("#inline-edit").clone(true);$("td",editRow).attr("colspan",$(".widefat:first thead th:visible").length);if($(t.what+id).hasClass("alternate")){$(editRow).addClass("alternate")}$(t.what+id).hide().after(editRow);rowData=$("#inline_"+id);if(!$(':input[name="post_author"] option[value="'+$(".post_author",rowData).text()+'"]',editRow).val()){$(':input[name="post_author"]',editRow).prepend('<option value="'+$(".post_author",rowData).text()+'">'+$("#"+t.type+"-"+id+" .author").text()+"</option>")}if($(':input[name="post_author"] option',editRow).length==1){$("label.inline-edit-author",editRow).hide()}var cur_format=$(".post_format",rowData).text();$("option.unsupported",editRow).each(function(){var $this=$(this);if($this.val()!=cur_format){$this.remove()}});for(var f=0;f<fields.length;f++){$(':input[name="'+fields[f]+'"]',editRow).val($("."+fields[f],rowData).text())}if($(".comment_status",rowData).text()=="open"){$('input[name="comment_status"]',editRow).prop("checked",true)}if($(".ping_status",rowData).text()=="open"){$('input[name="ping_status"]',editRow).prop("checked",true)}if($(".sticky",rowData).text()=="sticky"){$('input[name="sticky"]',editRow).prop("checked",true)}$(".post_category",rowData).each(function(){var term_ids=$(this).text();if(term_ids){taxname=$(this).attr("id").replace("_"+id,"");$("ul."+taxname+"-checklist :checkbox",editRow).val(term_ids.split(","))}});$(".tags_input",rowData).each(function(){var terms=$(this).text();if(terms){taxname=$(this).attr("id").replace("_"+id,"");$("textarea.tax_input_"+taxname,editRow).val(terms);$("textarea.tax_input_"+taxname,editRow).suggest("admin-ajax.php?action=ajax-tag-search&tax="+taxname,{delay:500,minchars:2,multiple:true,multipleSep:", "})}});status=$("._status",rowData).text();if("future"!=status){$('select[name="_status"] option[value="future"]',editRow).remove()}if("private"==status){$('input[name="keep_private"]',editRow).prop("checked",true);$("input.inline-edit-password-input").val("").prop("disabled",true)}pageOpt=$('select[name="post_parent"] option[value="'+id+'"]',editRow);if(pageOpt.length>0){pageLevel=pageOpt[0].className.split("-")[1];nextPage=pageOpt;while(pageLoop){nextPage=nextPage.next("option");if(nextPage.length==0){break}nextLevel=nextPage[0].className.split("-")[1];if(nextLevel<=pageLevel){pageLoop=false}else{nextPage.remove();nextPage=pageOpt}}pageOpt.remove()}$(editRow).attr("id","edit-"+id).addClass("inline-editor").show();$(".ptitle",editRow).focus();return false},save:function(id){var params,fields,page=$(".post_status_page").val()||"";if(typeof(id)=="object"){id=this.getId(id)}$("table.widefat .inline-edit-save .waiting").show();params={action:"inline-save",post_type:typenow,post_ID:id,edit_date:"true",post_status:page};fields=$("#edit-"+id+" :input").serialize();params=fields+"&"+$.param(params);$.post("admin-ajax.php",params,function(r){$("table.widefat .inline-edit-save .waiting").hide();if(r){if(-1!=r.indexOf("<tr")){$(inlineEditPost.what+id).remove();$("#edit-"+id).before(r).remove();$(inlineEditPost.what+id).hide().fadeIn()}else{r=r.replace(/<.[^<>]*?>/g,"");$("#edit-"+id+" .inline-edit-save .error").html(r).show()}}else{$("#edit-"+id+" .inline-edit-save .error").html(inlineEditL10n.error).show()}},"html");return false},revert:function(){var id=$("table.widefat tr.inline-editor").attr("id");if(id){$("table.widefat .inline-edit-save .waiting").hide();if("bulk-edit"==id){$("table.widefat #bulk-edit").removeClass("inline-editor").hide();$("#bulk-titles").html("");$("#inlineedit").append($("#bulk-edit"))}else{$("#"+id).remove();id=id.substr(id.lastIndexOf("-")+1);$(this.what+id).show()}}return false},getId:function(o){var id=$(o).closest("tr").attr("id"),parts=id.split("-");return parts[parts.length-1]}};$(document).ready(function(){inlineEditPost.init()})})(jQuery);
\ No newline at end of file