<!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>[30817] trunk/src/wp-admin/js/editor-expand.js: Editor focus: Don't trigger when typing while the mouse is outside the 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/30817">30817</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/30817","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>nacin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-11 09:33:46 +0000 (Thu, 11 Dec 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 focus: Don't trigger when typing while the mouse is outside the editor.
props avryl.
fixes <a href="https://core.trac.wordpress.org/ticket/20668">#20668</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-12-11 09:31:45 UTC (rev 30816)
+++ trunk/src/wp-admin/js/editor-expand.js 2014-12-11 09:33:46 UTC (rev 30817)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -803,6 +803,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> mouseY = event.pageY;
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function recalcEditorRect() {
+ editorRect = $editor.offset();
+ editorRect.right = editorRect.left + $editor.outerWidth();
+ editorRect.bottom = editorRect.top + $editor.outerHeight();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function activate() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! _isActive ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _isActive = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -909,9 +915,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $overlay
</span><span class="cx" style="display: block; padding: 0 10px"> // Always recalculate the editor area entering the overlay with the mouse.
</span><span class="cx" style="display: block; padding: 0 10px"> .on( 'mouseenter.focus', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editorRect = $editor.offset();
- editorRect.right = editorRect.left + $editor.outerWidth();
- editorRect.bottom = editorRect.top + $editor.outerHeight();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ recalcEditorRect();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $window.on( 'scroll.focus', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var nScrollY = window.pageYOffset;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,24 +941,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } )
</span><span class="cx" style="display: block; padding: 0 10px"> // Fade in when the mouse moves away form the editor area.
</span><span class="cx" style="display: block; padding: 0 10px"> .on( 'mousemove.focus', function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var nx = event.pageX,
- ny = event.pageY;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var nx = event.clientX,
+ ny = event.clientY,
+ pageYOffset = window.pageYOffset,
+ pageXOffset = window.pageXOffset;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( x && y && ( nx !== x || ny !== y ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( ny <= y && ny < editorRect.top ) ||
- ( ny >= y && ny > editorRect.bottom ) ||
- ( nx <= x && nx < editorRect.left ) ||
- ( nx >= x && nx > editorRect.right )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( ny <= y && ny < editorRect.top - pageYOffset ) ||
+ ( ny >= y && ny > editorRect.bottom - pageYOffset ) ||
+ ( nx <= x && nx < editorRect.left - pageXOffset ) ||
+ ( nx >= x && nx > editorRect.right - pageXOffset )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> traveledX += Math.abs( x - nx );
</span><span class="cx" style="display: block; padding: 0 10px"> traveledY += Math.abs( y - ny );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ny <= editorRect.top - buffer ||
- ny >= editorRect.bottom + buffer ||
- nx <= editorRect.left - buffer ||
- nx >= editorRect.right + buffer
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ny <= editorRect.top - buffer - pageYOffset ||
+ ny >= editorRect.bottom + buffer - pageYOffset ||
+ nx <= editorRect.left - buffer - pageXOffset ||
+ nx >= editorRect.right + buffer - pageXOffset
</ins><span class="cx" style="display: block; padding: 0 10px"> ) && (
</span><span class="cx" style="display: block; padding: 0 10px"> traveledX > 10 ||
</span><span class="cx" style="display: block; padding: 0 10px"> traveledY > 10
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1151,6 +1157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'blur', maybeFadeIn );
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'focus', focus );
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'blur', blur );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.on( 'wp-autoresize', recalcEditorRect );
</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"> mceUnbind = function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1158,6 +1165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editor.off( 'blur', maybeFadeIn );
</span><span class="cx" style="display: block; padding: 0 10px"> editor.off( 'focus', focus );
</span><span class="cx" style="display: block; padding: 0 10px"> editor.off( 'blur', blur );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.off( 'wp-autoresize', recalcEditorRect );
</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"> if ( _isOn ) {
</span></span></pre>
</div>
</div>
</body>
</html>