<!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>[24084] trunk/wp-admin: Fix some issues related to status/aside editor height changing.</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/24084">24084</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-04-25 04:06:06 +0000 (Thu, 25 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix some issues related to status/aside editor height changing.
props wonderboymusic. fixes <a href="http://core.trac.wordpress.org/ticket/23992">#23992</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.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="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (24083 => 24084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2013-04-25 03:52:05 UTC (rev 24083)
+++ trunk/wp-admin/edit-form-advanced.php 2013-04-25 04:06:06 UTC (rev 24084)
</span><span class="lines">@@ -460,8 +460,11 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div id="postdivrich" class="postarea edit-form-section">
</span><span class="cx">
</span><del>-<?php wp_editor($post->post_content, 'content', array('dfw' => true, 'tabfocus_elements' => 'insert-media-button,save-post', 'editor_height' => 360) ); ?>
-
</del><ins>+<?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
+) ); ?>
</ins><span class="cx"> <table id="post-status-info" cellspacing="0"><tbody><tr>
</span><span class="cx"> <td id="wp-word-count"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></td>
</span><span class="cx"> <td class="autosave-info">
</span></span></pre></div>
<a id="trunkwpadminjspostformatsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/post-formats.js (24083 => 24084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post-formats.js 2013-04-25 03:52:05 UTC (rev 24083)
+++ trunk/wp-admin/js/post-formats.js 2013-04-25 04:06:06 UTC (rev 24084)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> window.wp = window.wp || {};
</span><span class="cx">
</span><span class="cx"> (function($) {
</span><del>- var container, mediaFrame, lastMimeType, mediaPreview, lastHeight, content,
- $container = $( '.post-formats-fields' ),
</del><ins>+ var container, $container, mediaFrame, lastMimeType, mediaPreview, lastHeight = 360, content,
+ initialFormat = 'standard',
</ins><span class="cx"> shortClass = 'short-format',
</span><span class="cx"> shortContentFormats = ['status', 'aside'],
</span><span class="cx"> noUIFormats = ['standard', 'chat', 'status', 'aside', 'gallery'],
</span><span class="lines">@@ -16,14 +16,30 @@
</span><span class="cx"> $screenIcon.addClass('wp-format-' + format);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function resizeContent( shorter ) {
- content = content || $('#content, #content_ifr');
- if ( shorter ) {
</del><ins>+ function resizeContent( format, noAnimate ) {
+ var height;
+
+ content = $('#content, #content_ifr');
+
+ height = content.height();
+ if ( 120 < height ) {
+ lastHeight = height;
+ }
+
+ if ( -1 < $.inArray( format, shortContentFormats ) ) {
</ins><span class="cx"> if ( ! content.hasClass(shortClass) ) {
</span><del>- lastHeight = content.height();
- content.addClass(shortClass).animate({ height : 120 });
</del><ins>+ content.addClass(shortClass);
+ if ( noAnimate ) {
+ content.each(function () {
+ $(this).css({ height : 120 });
+ });
+ } else {
+ content.each(function () {
+ $(this).animate({ height : 120 });
+ });
+ }
</ins><span class="cx"> }
</span><del>- } else if ( lastHeight ) {
</del><ins>+ } else {
</ins><span class="cx"> content.removeClass(shortClass).animate({ height : lastHeight });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -53,7 +69,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- resizeContent( -1 < $.inArray( format, shortContentFormats ) );
</del><ins>+ resizeContent( format );
</ins><span class="cx">
</span><span class="cx"> postTitle.focus();
</span><span class="cx">
</span><span class="lines">@@ -79,8 +95,14 @@
</span><span class="cx"> postFormats.currentPostFormat = format;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $(function(){
</del><ins>+ $(function() {
+ $container = $( '.post-formats-fields' );
</ins><span class="cx">
</span><ins>+ initialFormat = $( '.post-format-options .active' ).data( 'wp-format' );
+ if ( -1 < $.inArray( initialFormat, shortContentFormats ) ) {
+ resizeContent( initialFormat, true );
+ }
+
</ins><span class="cx"> $('.post-format-change a').click(function() {
</span><span class="cx"> $('.post-formats-fields, .post-format-change').slideUp();
</span><span class="cx"> $('.post-format-options').slideDown();
</span></span></pre>
</div>
</div>
</body>
</html>