<!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>[37596] trunk/src/wp-admin: Editor: better resizing for text editor</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/37596">37596</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/37596","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iseulde</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-05-30 20:31:57 +0000 (Mon, 30 May 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Editor: better resizing for text editor
* Use `scrollHeight` to resize the text editor.
* Don't scroll the cursor into view when under the text editor's toolbar, it
involves cloning the content which is quite slow.
Props iseulde, azaozz.
See <a href="https://core.trac.wordpress.org/ticket/36482">#36482</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsseditcss">trunk/src/wp-admin/css/edit.css</a></li>
<li><a href="#trunksrcwpadminjseditorexpandjs">trunk/src/wp-admin/js/editor-expand.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsseditcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/edit.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/edit.css 2016-05-30 04:37:57 UTC (rev 37595)
+++ trunk/src/wp-admin/css/edit.css 2016-05-30 20:31:57 UTC (rev 37596)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,16 +377,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#content-textarea-clone {
- z-index: -1;
- position: absolute;
- top: 0;
- visibility: hidden;
- overflow: hidden;
- max-width: 100%;
- border: 1px solid transparent;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .wp-editor-expand #wp-content-editor-tools {
</span><span class="cx" style="display: block; padding: 0 10px"> z-index: 1000;
</span><span class="cx" style="display: block; padding: 0 10px"> border-bottom: 1px solid #e5e5e5;
</span></span></pre></div>
<a id="trunksrcwpadminjseditorexpandjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/editor-expand.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/editor-expand.js 2016-05-30 04:37:57 UTC (rev 37595)
+++ trunk/src/wp-admin/js/editor-expand.js 2016-05-30 20:31:57 UTC (rev 37596)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $visualEditor = $(),
</span><span class="cx" style="display: block; padding: 0 10px"> $textTop = $( '#ed_toolbar' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $textEditor = $( '#content' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $textEditorClone = $( '<div id="content-textarea-clone" class="wp-exclude-emoji"></div>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ textEditor = $textEditor[0],
+ textEditorLength = 0,
</ins><span class="cx" style="display: block; padding: 0 10px"> $bottom = $( '#post-status-info' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $menuBar = $(),
</span><span class="cx" style="display: block; padding: 0 10px"> $statusBar = $(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,16 +53,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sideSortablesHeight: 0
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $textEditorClone.insertAfter( $textEditor );
-
- $textEditorClone.css( {
- 'font-family': $textEditor.css( 'font-family' ),
- 'font-size': $textEditor.css( 'font-size' ),
- 'line-height': $textEditor.css( 'line-height' ),
- 'white-space': 'pre-wrap',
- 'word-wrap': 'break-word'
- } );
-
</del><span class="cx" style="display: block; padding: 0 10px"> function getHeights() {
</span><span class="cx" style="display: block; padding: 0 10px"> var windowWidth = $window.width();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,70 +75,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function textEditorKeyup( event ) {
- var VK = jQuery.ui.keyCode,
- key = event.keyCode,
- range = document.createRange(),
- selStart = $textEditor[0].selectionStart,
- selEnd = $textEditor[0].selectionEnd,
- textNode = $textEditorClone[0].firstChild,
- buffer = 10,
- offset, cursorTop, cursorBottom, editorTop, editorBottom;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function textEditorResize() {
+ var reduce, scrollHeight;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( selStart && selEnd && selStart !== selEnd ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( mceEditor && ! mceEditor.isHidden() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // These are not TinyMCE ranges.
- try {
- range.setStart( textNode, selStart );
- range.setEnd( textNode, selEnd + 1 );
- } catch ( ex ) {}
-
- offset = range.getBoundingClientRect();
-
- if ( ! offset.height ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! mceEditor && initialMode === 'tinymce' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cursorTop = offset.top - buffer;
- cursorBottom = cursorTop + offset.height + buffer;
- editorTop = heights.adminBarHeight + heights.toolsHeight + heights.textTopHeight;
- editorBottom = heights.windowHeight - heights.bottomHeight;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ reduce = textEditorLength > ( textEditorLength = textEditor.value.length );
+ scrollHeight = textEditor.scrollHeight;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( cursorTop < editorTop && ( key === VK.UP || key === VK.LEFT || key === VK.BACKSPACE ) ) {
- window.scrollTo( window.pageXOffset, cursorTop + window.pageYOffset - editorTop );
- } else if ( cursorBottom > editorBottom ) {
- window.scrollTo( window.pageXOffset, cursorBottom + window.pageYOffset - editorBottom );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( reduce ) {
+ textEditor.style.height = 'auto';
+ textEditor.style.height = scrollHeight + 'px';
+ adjust();
+ } else if ( parseInt( textEditor.style.height, 10 ) < scrollHeight ) {
+ textEditor.style.height = scrollHeight + 'px';
+ adjust();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function textEditorResize() {
- if ( ( mceEditor && ! mceEditor.isHidden() ) || ( ! mceEditor && initialMode === 'tinymce' ) ) {
- return;
- }
-
- var textEditorHeight = $textEditor.height(),
- hiddenHeight;
-
- $textEditorClone.width( $textEditor.width() - 22 );
- $textEditorClone.text( $textEditor.val() + ' ' );
-
- hiddenHeight = $textEditorClone.height();
-
- if ( hiddenHeight < autoresizeMinHeight ) {
- hiddenHeight = autoresizeMinHeight;
- }
-
- if ( hiddenHeight === textEditorHeight ) {
- return;
- }
-
- $textEditor.height( hiddenHeight );
-
- adjust();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // We need to wait for TinyMCE to initialize.
</span><span class="cx" style="display: block; padding: 0 10px"> $document.on( 'tinymce-editor-init.editor-expand', function( event, editor ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var VK = window.tinymce.util.VK,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,7 +425,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( event && event.deltaHeight > 0 && event.deltaHeight < 100 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> window.scrollBy( 0, event.deltaHeight );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( advanced ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( visual && advanced ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> fixedBottom = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $statusBar.css( {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -603,8 +554,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $textEditor.css( {
</span><span class="cx" style="display: block; padding: 0 10px"> marginTop: heights.textTopHeight
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $textEditorClone.width( contentWrapWidth - 20 - ( borderWidth * 2 ) );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -660,7 +609,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $textEditor.on( 'focus.editor-expand input.editor-expand propertychange.editor-expand', textEditorResize );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $textEditor.on( 'keyup.editor-expand', textEditorKeyup );
</del><span class="cx" style="display: block; padding: 0 10px"> mceBind();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Adjust when entering/exiting fullscreen mode.
</span></span></pre>
</div>
</div>
</body>
</html>