<!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>[29628] trunk/src: Editor scrolling: reduce the amount of height jumping on load.</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/29628">29628</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-08-26 18:38:26 +0000 (Tue, 26 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Editor scrolling: reduce the amount of height jumping on load.
props avryl.
fixes <a href="http://core.trac.wordpress.org/ticket/29307">#29307</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadminjseditorexpandjs">trunk/src/wp-admin/js/editor-expand.js</a></li>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpautoresizepluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpautoresize/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/edit-form-advanced.php (29627 => 29628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/edit-form-advanced.php 2014-08-26 17:06:51 UTC (rev 29627)
+++ trunk/src/wp-admin/edit-form-advanced.php 2014-08-26 18:38:26 UTC (rev 29628)
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> 'dfw' => true,
</span><span class="cx"> 'drag_drop_upload' => true,
</span><span class="cx"> 'tabfocus_elements' => 'insert-media-button-1,save-post',
</span><del>- 'editor_height' => 360,
</del><ins>+ 'editor_height' => 300,
</ins><span class="cx"> 'tinymce' => array(
</span><span class="cx"> 'resize' => false,
</span><span class="cx"> 'wp_autoresize_on' => ( ! empty( $_wp_autoresize_on ) && get_user_setting( 'editor_expand', 'on' ) === 'on' ),
</span></span></pre></div>
<a id="trunksrcwpadminjseditorexpandjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/editor-expand.js (29627 => 29628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/editor-expand.js 2014-08-26 17:06:51 UTC (rev 29627)
+++ trunk/src/wp-admin/js/editor-expand.js 2014-08-26 18:38:26 UTC (rev 29628)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> pageYOffsetAtTop = 130,
</span><span class="cx"> pinnedToolsTop = 56,
</span><span class="cx"> autoresizeMinHeight = 300,
</span><ins>+ initialMode = window.getUserSetting( 'editor' ),
</ins><span class="cx"> // These are corrected when adjust() runs, except on scrolling if already set.
</span><span class="cx"> heights = {
</span><span class="cx"> windowHeight: 0,
</span><span class="lines">@@ -119,7 +120,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function textEditorResize() {
</span><del>- if ( mceEditor && ! mceEditor.isHidden() ) {
</del><ins>+ if ( ( mceEditor && ! mceEditor.isHidden() ) || ( ! mceEditor && initialMode === 'tinymce' ) ) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-editor.php (29627 => 29628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-editor.php 2014-08-26 17:06:51 UTC (rev 29627)
+++ trunk/src/wp-includes/class-wp-editor.php 2014-08-26 18:38:26 UTC (rev 29628)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> if ( empty( $set['editor_height'] ) )
</span><span class="cx"> return $set;
</span><span class="cx">
</span><del>- if ( 'content' === $editor_id ) {
</del><ins>+ if ( 'content' === $editor_id && empty( $set['tinymce']['wp_autoresize_on'] ) ) {
</ins><span class="cx"> // A cookie (set when a user resizes the editor) overrides the height.
</span><span class="cx"> $cookie = (int) get_user_setting( 'ed_size' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpautoresizepluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpautoresize/plugin.js (29627 => 29628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpautoresize/plugin.js 2014-08-26 17:06:51 UTC (rev 29627)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpautoresize/plugin.js 2014-08-26 18:38:26 UTC (rev 29628)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> */
</span><span class="cx"> tinymce.PluginManager.add( 'wpautoresize', function( editor ) {
</span><span class="cx"> var settings = editor.settings,
</span><del>- oldSize = 0,
</del><ins>+ oldSize = 300,
</ins><span class="cx"> isActive = false;
</span><span class="cx">
</span><span class="cx"> function isFullscreen() {
</span></span></pre>
</div>
</div>
</body>
</html>