Ticket #23992: 23992.6.diff

wp-admin/edit-form-advanced.php

@@ -460 +460 @@
 ?>
 <div id="postdivrich" class="postarea edit-form-section">
 
-<?php wp_editor($post->post_content, 'content', array('dfw' => true, 'tabfocus_elements' => 'insert-media-button,save-post', 'editor_height' => 360) ); ?>
-
+<?php wp_editor( $post->post_content, 'content', array(
+        'dfw' => true,
+        'tabfocus_elements' => 'insert-media-button,save-post',
+        'editor_height' => in_array( $post_format, array( 'status', 'aside' ) ) ? 120 : 360
+) ); ?>
 <table id="post-status-info" cellspacing="0"><tbody><tr>
         <td id="wp-word-count"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></td>
         <td class="autosave-info">

wp-admin/js/post-formats.js

@@ -1 +1 @@
 window.wp = window.wp || {};
 
 (function($) {
-        var container, mediaFrame, lastMimeType, mediaPreview, lastHeight, content,
-                $container = $( '.post-formats-fields' ),
+        var container, $container, mediaFrame, lastMimeType, mediaPreview, lastHeight = 360, content,
+                initialFormat = 'standard',
                 shortClass = 'short-format',
                 shortContentFormats = ['status', 'aside'],
                 noUIFormats = ['standard', 'chat', 'status', 'aside', 'gallery'],
@@ -16 +16 @@
                 $screenIcon.addClass('wp-format-' + format);
         }
 
-        function resizeContent( shorter ) {
-                content = content || $('#content, #content_ifr');
-                if ( shorter ) {
+        function resizeContent( format, noAnimate ) {
+                var height;
+
+                content = $('#content, #content_ifr');
+
+                height = content.height();
+                if ( 120 < height ) {
+                        lastHeight = height;
+                }
+
+                if ( -1 < $.inArray( format, shortContentFormats ) ) {
                         if ( ! content.hasClass(shortClass) ) {
-                                lastHeight = content.height();
-                                content.addClass(shortClass).animate({ height : 120 });
+                                content.addClass(shortClass);
+                                if ( noAnimate ) {
+                                        content.each(function () {
+                                                $(this).css({ height : 120 });
+                                        });
+                                } else {
+                                        content.each(function () {
+                                                $(this).animate({ height : 120 });
+                                        });
+                                }
                         }
-                } else if ( lastHeight ) {
+                } else {
                         content.removeClass(shortClass).animate({ height : lastHeight });
                 }
         }
@@ -53 +69 @@
                         });
                 }
 
-                resizeContent( -1 < $.inArray( format, shortContentFormats ) );
+                resizeContent( format );
 
                 postTitle.focus();
 
@@ -79 +95 @@
                 postFormats.currentPostFormat = format;
         }
 
-        $(function(){
+        $(function() {
+                $container = $( '.post-formats-fields' );
+
+                initialFormat = $( '.post-format-options .active' ).data( 'wp-format' );
+                if ( -1 < $.inArray( initialFormat, shortContentFormats ) ) {
+                        resizeContent( initialFormat, true );
+                }
 
                 $('.post-format-change a').click(function() {
                         $('.post-formats-fields, .post-format-change').slideUp();