<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[24264] trunk/wp-admin: Fix showing and hiding of UI elements when disabling the Post Formats UI, props kovshenin, see #24327</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24264">24264</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-05-15 20:43:09 +0000 (Wed, 15 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix showing and hiding of UI elements when disabling the Post Formats UI, props kovshenin, see <a href="http://core.trac.wordpress.org/ticket/24327">#24327</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadminincludespostformatsphp">trunk/wp-admin/includes/post-formats.php</a></li>
<li><a href="#trunkwpadminjspostformatsjs">trunk/wp-admin/js/post-formats.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (24263 => 24264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2013-05-15 19:09:39 UTC (rev 24263)
+++ trunk/wp-admin/admin-header.php 2013-05-15 20:43:09 UTC (rev 24264)
</span><span class="lines">@@ -95,6 +95,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $admin_body_class .= ' wp-format-' . $post_format;
</span><ins>+
+ $show_post_format_ui = false;
+
+ if ( apply_filters( 'enable_post_format_ui', true, $post ) ) {
+
+ // If the user has explicitly set a screen option, use it, otherwise the UI is shown
+ // when the theme supports formats, or if the site has formats assigned to posts.
+ $post_format_user_option = get_user_option( 'post_formats_' . $post->post_type );
+ if ( false !== $post_format_user_option )
+ $show_post_format_ui = (bool) $post_format_user_option;
+ else
+ $show_post_format_ui = current_theme_supports( 'post-formats' ) || (bool) get_terms( 'post_format', array( 'number' => 1 ) );
+ }
+
+ if ( $show_post_format_ui )
+ $admin_body_class .= ' wp-post-format-show-ui';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( wp_is_mobile() )
</span></span></pre></div>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (24263 => 24264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2013-05-15 19:09:39 UTC (rev 24263)
+++ trunk/wp-admin/css/wp-admin.css 2013-05-15 20:43:09 UTC (rev 24264)
</span><span class="lines">@@ -3995,10 +3995,14 @@
</span><span class="cx"> padding-bottom: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.no-ui {
</del><ins>+.wp-post-format-ui {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.wp-post-format-show-ui .wp-post-format-ui {
+ display: block;
+}
+
</ins><span class="cx"> .post-formats-fields {
</span><span class="cx"> display: none;
</span><span class="cx"> margin-bottom: 15px;
</span><span class="lines">@@ -4111,13 +4115,13 @@
</span><span class="cx"> text-align: center;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.wp-format-image .attachment-display-settings,
-body.wp-format-status #titlewrap,
-body.wp-format-image .wp-media-buttons .insert-media,
-body.wp-format-audio .wp-media-buttons .insert-media,
-body.wp-format-video .wp-media-buttons .insert-media,
-body.wp-format-aside .wp-media-buttons .insert-media,
-body.wp-format-status .wp-media-buttons .insert-media {
</del><ins>+.wp-post-format-show-ui.wp-format-image .attachment-display-settings,
+.wp-post-format-show-ui.wp-format-status #titlewrap,
+.wp-post-format-show-ui.wp-format-image #insert-media-button,
+.wp-post-format-show-ui.wp-format-audio #insert-media-button,
+.wp-post-format-show-ui.wp-format-video #insert-media-button,
+.wp-post-format-show-ui.wp-format-aside #insert-media-button,
+.wp-post-format-show-ui.wp-format-status #insert-media-button {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (24263 => 24264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2013-05-15 19:09:39 UTC (rev 24263)
+++ trunk/wp-admin/edit-form-advanced.php 2013-05-15 20:43:09 UTC (rev 24264)
</span><span class="lines">@@ -130,7 +130,6 @@
</span><span class="cx"> $format_class = '';
</span><span class="cx"> $post_format = '';
</span><span class="cx"> $post_format_options = '';
</span><del>-$show_post_format_ui = false;
</del><span class="cx"> if ( post_type_supports( $post_type, 'post-formats' ) && apply_filters( 'enable_post_format_ui', true, $post ) ) {
</span><span class="cx"> wp_enqueue_script( 'post-formats' );
</span><span class="cx"> wp_enqueue_script( 'wp-mediaelement' );
</span><span class="lines">@@ -144,15 +143,6 @@
</span><span class="cx"> $post_format = $_REQUEST['format'];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $user_wants = get_user_option( 'post_formats_' . $post_type );
- if ( false !== $user_wants ) {
- // User wants what user gets.
- $show_post_format_ui = (bool) $user_wants;
- } else {
- // UI is shown when the theme supports formats, or if the site has formats assigned to posts.
- $show_post_format_ui = current_theme_supports( 'post-formats' ) || get_terms( 'post_format', array( 'number' => 1 ) );
- }
-
</del><span class="cx"> $format_class = " class='wp-format-{$post_format}'";
</span><span class="cx">
</span><span class="cx"> $all_post_formats = array(
</span><span class="lines">@@ -389,7 +379,7 @@
</span><span class="cx"> <p><?php _e("You have lost your connection with the server, and saving has been disabled. This message will vanish once you've reconnected."); ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> <?php if ( ! empty( $post_format_options ) ) : ?>
</span><del>-<div class="wp-post-format-ui<?php if ( ! $show_post_format_ui ) echo ' no-ui' ?>">
</del><ins>+<div class="wp-post-format-ui">
</ins><span class="cx"> <div class="post-format-options">
</span><span class="cx"> <?php echo $post_format_options; ?>
</span><span class="cx"> </div>
</span><span class="lines">@@ -422,7 +412,7 @@
</span><span class="cx"> <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
</span><span class="cx"> <div id="post-body-content"<?php echo $format_class; ?>>
</span><span class="cx"> <?php if ( ! empty( $all_post_formats ) ) : ?>
</span><del>-<div class="wp-post-format-ui<?php if ( ! $show_post_format_ui ) echo ' no-ui' ?>">
</del><ins>+<div class="wp-post-format-ui">
</ins><span class="cx"> <div class="post-format-change"><span class="icon <?php echo esc_attr( 'wp-format-' . $post_format ); ?>"></span> <span class="post-format-description"><?php echo $all_post_formats[$post_format]['description']; ?></span></div>
</span><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunkwpadminincludespostformatsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post-formats.php (24263 => 24264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post-formats.php 2013-05-15 19:09:39 UTC (rev 24263)
+++ trunk/wp-admin/includes/post-formats.php 2013-05-15 20:43:09 UTC (rev 24264)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> wp_nonce_field( 'show-post-format-ui_' . $post_type, 'show_post_format_ui_nonce', false );
</span><span class="cx">
</span><span class="cx"> ?>
</span><del>-<div class="wp-post-format-ui<?php if ( ! $show_post_format_ui ) echo ' no-ui' ?>">
</del><ins>+<div class="wp-post-format-ui">
</ins><span class="cx"> <div class="post-formats-fields">
</span><span class="cx">
</span><span class="cx"> <input type="hidden" name="post_format" id="post_format" value="<?php echo esc_attr( $post_format ); ?>" />
</span></span></pre></div>
<a id="trunkwpadminjspostformatsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/post-formats.js (24263 => 24264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post-formats.js 2013-05-15 19:09:39 UTC (rev 24263)
+++ trunk/wp-admin/js/post-formats.js 2013-05-15 20:43:09 UTC (rev 24264)
</span><span class="lines">@@ -210,7 +210,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $( '#show_post_format_ui' ).on( 'change', function () {
</span><del>- $( '.wp-post-format-ui' ).toggleClass( 'no-ui', ! this.checked );
</del><ins>+ body.toggleClass( 'wp-post-format-show-ui', this.checked );
+
+ // Reset the display properties of possibly hidden items.
+ insertMediaButton.css( 'display', '' );
+ $( '#titlewrap' ).css( 'display', '' );
+
</ins><span class="cx"> $.post( ajaxurl, {
</span><span class="cx"> action: 'show-post-format-ui',
</span><span class="cx"> post_type: $( '#post_type' ).val(),
</span></span></pre>
</div>
</div>
</body>
</html>