<!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>[29929] trunk/src/wp-admin/js/editor-expand.js: Editor-expand:</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/29929">29929</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/29929","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-16 21:31:00 +0000 (Thu, 16 Oct 2014)</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-expand:
- Better calculation for the caret position when auto-scrolling while typing.
- Fix auto-scrolling for non-WebKit browsers when the caret is above the top of the editor.
Fixes <a href="https://core.trac.wordpress.org/ticket/29954">#29954</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjseditorexpandjs">trunk/src/wp-admin/js/editor-expand.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2014-10-16 20:51:11 UTC (rev 29928)
+++ trunk/src/wp-admin/js/editor-expand.js 2014-10-16 21:31:00 UTC (rev 29929)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,12 +172,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function mceGetCursorOffset() {
</span><span class="cx" style="display: block; padding: 0 10px"> var node = editor.selection.getNode(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- view, offset;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ range, view, offset;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( editor.plugins.wpview && ( view = editor.plugins.wpview.getView( node ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> offset = view.getBoundingClientRect();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- offset = node.getBoundingClientRect();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ range = editor.selection.getRng();
+
+ try {
+ offset = range.getClientRects()[0];
+ } catch( er ) {}
+
+ if ( ! offset ) {
+ offset = node.getBoundingClientRect();
+ }
</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"> return offset.height ? offset : false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +199,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // others to the top/bottom of the *window* when moving the cursor out of the viewport.
</span><span class="cx" style="display: block; padding: 0 10px"> function mceKeyup( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var VK = tinymce.util.VK,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- key = event.keyCode,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ key = event.keyCode;
+
+ // Bail on special keys.
+ if ( key <= 47 && ! ( key === VK.SPACEBAR || key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE ||
+ key === VK.UP || key === VK.RIGHT || key === VK.DOWN || key === VK.LEFT ) ) {
+
+ return;
+ // OS keys, function keys, num lock, scroll lock
+ } else if ( ( key >= 91 && key <= 93 ) || ( key >= 112 && key <= 123 ) || key === 144 || key === 145 ) {
+ return;
+ }
+
+ mceScroll( key );
+ }
+
+ function mceScroll( key ) {
+ var VK = tinymce.util.VK,
</ins><span class="cx" style="display: block; padding: 0 10px"> offset = mceGetCursorOffset(),
</span><span class="cx" style="display: block; padding: 0 10px"> buffer = 10,
</span><span class="cx" style="display: block; padding: 0 10px"> cursorTop, cursorBottom, editorTop, editorBottom;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,18 +224,9 @@
</span><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">- // Bail on special keys.
- if ( key <= 47 && ! ( key === VK.SPACEBAR || key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE || key === VK.UP || key === VK.LEFT || key === VK.DOWN || key === VK.UP ) ) {
- return;
- // OS keys, function keys, num lock, scroll lock
- } else if ( ( key >= 91 && key <= 93 ) || ( key >= 112 && key <= 123 ) || key === 144 || key === 145 ) {
- return;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> cursorTop = offset.top + editor.iframeElement.getBoundingClientRect().top;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cursorBottom = cursorTop + offset.height;
- cursorTop = cursorTop - buffer;
- cursorBottom = cursorBottom + buffer;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cursorBottom = cursorTop + offset.height + buffer;
+ cursorTop -= buffer;
</ins><span class="cx" style="display: block; padding: 0 10px"> editorTop = heights.adminBarHeight + heights.toolsHeight + heights.menuBarHeight + heights.visualTopHeight;
</span><span class="cx" style="display: block; padding: 0 10px"> editorBottom = heights.windowHeight - heights.bottomHeight - heights.statusBarHeight;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +235,11 @@
</span><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">- if ( cursorTop < editorTop && ( key === VK.UP || key === VK.LEFT || key === VK.BACKSPACE ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // WebKit browsers scroll-into-view to the middle of the window but not for arrow keys/backspace.
+ // The others scroll to the top of the window, we need to account for the adminbar and editor toolbar(s).
+ if ( cursorTop < editorTop && ( ! tinymce.Env.webkit ||
+ ( key === VK.UP || key === VK.RIGHT || key === VK.DOWN || key === VK.LEFT || key === VK.BACKSPACE ) ) ) {
+
</ins><span class="cx" style="display: block; padding: 0 10px"> window.scrollTo( window.pageXOffset, cursorTop + window.pageYOffset - editorTop );
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( cursorBottom > editorBottom ) {
</span><span class="cx" style="display: block; padding: 0 10px"> window.scrollTo( window.pageXOffset, cursorBottom + window.pageYOffset - editorBottom );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,6 +279,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'hide', mceHide );
</span><span class="cx" style="display: block; padding: 0 10px"> // Adjust when the editor resizes.
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'setcontent wp-autoresize wp-toolbar-toggle', adjust );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Scroll to the caret or selection after undo/redo
+ editor.on( 'undo redo', mceScroll );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $window.off( 'scroll.mce-float-panels' ).on( 'scroll.mce-float-panels', hideFloatPanels );
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,6 +290,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editor.off( 'show', mceShow );
</span><span class="cx" style="display: block; padding: 0 10px"> editor.off( 'hide', mceHide );
</span><span class="cx" style="display: block; padding: 0 10px"> editor.off( 'setcontent wp-autoresize wp-toolbar-toggle', adjust );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.off( 'undo redo', mceScroll );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $window.off( 'scroll.mce-float-panels' );
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span></span></pre>
</div>
</div>
</body>
</html>