Ticket #24046: 24046-omnipresent-fades.2.diff

wp-admin/css/wp-admin.css

@@ -4113 +4113 @@
         position: relative;
         text-decoration: none;
         text-align: center;
+        transition: opacity 0.2s linear;
+        opacity: 0.4;
+}
+
+.post-format-options:hover a,
+.post-format-options a.active {
+        opacity: 1.0;
 }
 
 .post-format-options a div {

wp-admin/edit-form-advanced.php

@@ -135 +135 @@
         wp_enqueue_script( 'wp-mediaelement' );
         wp_enqueue_style( 'wp-mediaelement' );
         $post_format = get_post_format();
-        $post_format_set_class = 'post-format-set';
 
         if ( ! $post_format ) {
                 $post_format = 'standard';
 
                 if ( ! empty( $_REQUEST['format'] ) && in_array( $_REQUEST['format'], get_post_format_slugs() ) )
                         $post_format = $_REQUEST['format'];
-                elseif ( 'auto-draft' == $post->post_status )
-                        $post_format_set_class = '';
         }
 
         $user_wants = get_user_option( 'post_formats_' . $post_type );

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="post-format-change"><span class="icon <?php echo esc_attr( $post_format ); ?>"></span> <span class="post-format-description"><?php echo $all_post_formats[$post_format]['description']; ?></span> <a href="#"><?php _e('Change format'); ?></a></div>
+        <div class="post-format-change"><span class="icon <?php echo esc_attr( $post_format ); ?>"></span> <span class="post-format-description"><?php echo $all_post_formats[$post_format]['description']; ?></span></div>
         <div class="post-formats-fields">
 
                 <input type="hidden" name="post_format" id="post_format" value="<?php echo esc_attr( $post_format ); ?>" />
@@ -144 +144 @@
                         </div>
                 </div>
         </div>
-</div>
- No newline at end of file
+</div>

wp-admin/js/post-formats.js

@@ -4 +4 @@
         var container, $container, mediaFrame, lastMimeType, mediaPreview, lastHeight = 360, content, insertMediaButton,
                 initialFormat = 'standard',
                 shortClass = 'short-format',
+                noTitleFormats = ['status'],
+                noMediaFormats = ['status', 'aside'],
                 shortContentFormats = ['status', 'aside'],
                 noUIFormats = ['standard', 'chat', 'status', 'aside', 'gallery'],
                 $screenIcon = $( '.icon32' );
 
 
         function switchFormatClass( format ) {
+                $('#post_format').val(format);
+                $('.post-format-change').show().find('span.icon').removeClass(postFormats.currentPostFormat).addClass(format);
                 container.get(0).className = container.get(0).className.replace( /\s?\bwp-format-[^ ]+/g, '' );
                 container.addClass('wp-format-' + format);
                 $screenIcon.get(0).className = $screenIcon.get(0).className.replace( /\s?\bwp-format-[^ ]+/g, '' );
@@ -45 +49 @@
         }
 
         function switchFormat($this) {
-                var editor, body,
+                var editor, body, formatTo, formatFrom,
                         parent = $this.parent(),
                         format = $this.data('wp-format'),
                         description = $('.post-format-description'),
                         postTitle = $('#title');
 
+                if ( format === postFormats.currentPostFormat )
+                        return;
+
                 if ( typeof container === 'undefined' )
                         container = $('#post-body-content');
 
-                parent.slideUp().find('a.active').removeClass('active');
+                parent.find('a.active').removeClass('active');
                 $this.addClass('active');
-                $('#post_format').val(format);
-                $('.post-format-change').show().find('span.icon').removeClass(postFormats.currentPostFormat).addClass(format);
 
-                if ( -1 < $.inArray( format, noUIFormats ) ) {
+                // Animate the media button going away or coming back
+                formatTo = -1 < $.inArray( format, noMediaFormats );
+                formatFrom = -1 < $.inArray( postFormats.currentPostFormat, noMediaFormats );
+                if ( formatFrom ? !formatTo : formatTo ) // XOR
+                        insertMediaButton.fadeToggle( 200 );
+
+                // Animate the title going away or coming back
+                formatTo = -1 < $.inArray( format, noTitleFormats );
+                formatFrom = -1 < $.inArray( postFormats.currentPostFormat, noTitleFormats );
+                if ( formatFrom ? !formatTo : formatTo ) // XOR
+                        $('#titlewrap').fadeToggle( 200 );
+
+                console.log( format );
+                console.log( postFormats.currentPostFormat );
+                console.log( noUIFormats );
+
+                if ( -1 < $.inArray( format, noUIFormats ) && -1 < $.inArray( postFormats.currentPostFormat, noUIFormats ) ) {
                         switchFormatClass( format ); // No slide
-                        $container.hide();
+                        $container.slideUp();
                 } else {
-                        $container.slideUp( 200, function(){
+                        $container.slideUp( 400, function(){
                                 switchFormatClass( format );
-                                $container.slideDown( 400 );
+                                if ( -1 == $.inArray( format, noUIFormats ) )
+                                        $container.slideDown( 400 );
                         });
                 }
 
@@ -119 +141 @@
                         });
                 });
 
-                $('.post-format-change a').click(function() {
-                        $('.post-formats-fields, .post-format-change').slideUp();
-                        $('.post-format-options').slideDown();
-                        return false;
-                });
-
                 // Post formats selection
                 $('.post-format-options').on( 'click', 'a', function (e) {
                         e.preventDefault();