Changeset 24264

Timestamp:

05/15/2013 08:43:09 PM (13 years ago)

Author:

azaozz

Message:

Fix showing and hiding of UI elements when disabling the Post Formats UI, props kovshenin, see #24327

Location:

trunk/wp-admin

Files:

• admin-header.php (modified) (1 diff)
• css/wp-admin.css (modified) (2 diffs)
• edit-form-advanced.php (modified) (4 diffs)
• includes/post-formats.php (modified) (1 diff)
• js/post-formats.js (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -96 +96 @@
 
     $admin_body_class .= ' wp-format-' . $post_format;
+
+    $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';
 }
 

trunk/wp-admin/css/wp-admin.css

@@ -3996 +3996 @@
 }
 
-.no-ui {
+.wp-post-format-ui {
     display: none;
+}
+
+.wp-post-format-show-ui .wp-post-format-ui {
+    display: block;
 }
 
@@ -4112 +4116 @@
 }
 
-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 {
+.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 {
     display: none;
 }

trunk/wp-admin/edit-form-advanced.php

@@ -131 +131 @@
 $post_format = '';
 $post_format_options = '';
-$show_post_format_ui = false;
 if ( post_type_supports( $post_type, 'post-formats' ) && apply_filters( 'enable_post_format_ui', true, $post ) ) {
     wp_enqueue_script( 'post-formats' );
@@ -143 +142 @@
         if ( ! empty( $_REQUEST['format'] ) && in_array( $_REQUEST['format'], get_post_format_slugs() ) )
             $post_format = $_REQUEST['format'];
-    }
-
-    $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 ) );
     }
 
@@ -390 +380 @@
 </div>
 <?php if ( ! empty( $post_format_options ) ) : ?>
-<div class="wp-post-format-ui<?php if ( ! $show_post_format_ui ) echo ' no-ui' ?>">
+<div class="wp-post-format-ui">
     <div class="post-format-options">
         <?php echo $post_format_options; ?>
@@ -423 +413 @@
 <div id="post-body-content"<?php echo $format_class; ?>>
 <?php if ( ! empty( $all_post_formats ) ) : ?>
-<div class="wp-post-format-ui<?php if ( ! $show_post_format_ui ) echo ' no-ui' ?>">
+<div class="wp-post-format-ui">
     <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>
 </div>

trunk/wp-admin/includes/post-formats.php

@@ -10 +10 @@
 
 ?>
-<div class="wp-post-format-ui<?php if ( ! $show_post_format_ui ) echo ' no-ui' ?>">
+<div class="wp-post-format-ui">
     <div class="post-formats-fields">
 

trunk/wp-admin/js/post-formats.js

@@ -211 +211 @@
 
         $( '#show_post_format_ui' ).on( 'change', function () {
-            $( '.wp-post-format-ui' ).toggleClass( 'no-ui', ! this.checked );
+            body.toggleClass( 'wp-post-format-show-ui', this.checked );
+
+            // Reset the display properties of possibly hidden items.
+            insertMediaButton.css( 'display', '' );
+            $( '#titlewrap' ).css( 'display', '' );
+
             $.post( ajaxurl, {
                 action: 'show-post-format-ui',