<!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>[29333] trunk/src/wp-includes: wpLink:</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/29333">29333</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-07-31 23:27:14 +0000 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>wpLink:
- Fix adding a link on pressing Enter.
- Don't auto-focus the URL field after selecting a local link.
- Don't auto-focus the URL field when opening on touch devices. Toggle focus/blur on it to close the onscreen keyboard so the modal is positioned properly.
See <a href="http://core.trac.wordpress.org/ticket/28897">#28897</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesjswplinkjs">trunk/src/wp-includes/js/wplink.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-editor.php (29332 => 29333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-editor.php 2014-07-30 17:48:21 UTC (rev 29332)
+++ trunk/src/wp-includes/class-wp-editor.php 2014-07-31 23:27:14 UTC (rev 29333)
</span><span class="lines">@@ -1376,7 +1376,7 @@
</span><span class="cx"> <?php wp_nonce_field( 'internal-linking', '_ajax_linking_nonce', false ); ?>
</span><span class="cx"> <div id="link-modal-title">
</span><span class="cx"> <?php _e( 'Insert/edit link' ) ?>
</span><del>- <button id="wp-link-close"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
</del><ins>+ <button type="button" id="wp-link-close"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
</ins><span class="cx"> </div>
</span><span class="cx"> <div id="link-selector">
</span><span class="cx"> <div id="link-options">
</span></span></pre></div>
<a id="trunksrcwpincludesjswplinkjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/wplink.js (29332 => 29333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/wplink.js 2014-07-30 17:48:21 UTC (rev 29332)
+++ trunk/src/wp-includes/js/wplink.js 2014-07-31 23:27:14 UTC (rev 29333)
</span><span class="lines">@@ -2,7 +2,10 @@
</span><span class="cx"> var wpLink;
</span><span class="cx">
</span><span class="cx"> ( function( $ ) {
</span><del>- var inputs = {}, rivers = {}, editor, searchTimer, River, Query;
</del><ins>+ var editor, searchTimer, River, Query,
+ inputs = {},
+ rivers = {},
+ isTouch = ( 'ontouchend' in document );
</ins><span class="cx">
</span><span class="cx"> wpLink = {
</span><span class="cx"> timeToTriggerRiver: 150,
</span><span class="lines">@@ -53,7 +56,7 @@
</span><span class="cx"> rivers.elements.on( 'river-select', wpLink.updateFields );
</span><span class="cx">
</span><span class="cx"> // Display 'hint' message when search field or 'query-results' box are focused
</span><del>- inputs.search.add( rivers.elements ).on( 'focus.wplink', function() {
</del><ins>+ inputs.search.on( 'focus.wplink', function() {
</ins><span class="cx"> inputs.queryNoticeTextDefault.hide();
</span><span class="cx"> inputs.queryNoticeTextHint.removeClass( 'screen-reader-text' ).show();
</span><span class="cx"> } ).on( 'blur.wplink', function() {
</span><span class="lines">@@ -120,18 +123,26 @@
</span><span class="cx"> rivers.search.refresh();
</span><span class="cx"> rivers.recent.refresh();
</span><span class="cx">
</span><del>- if ( wpLink.isMCE() )
</del><ins>+ if ( wpLink.isMCE() ) {
</ins><span class="cx"> wpLink.mceRefresh();
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> wpLink.setDefaultValues();
</span><ins>+ }
</ins><span class="cx">
</span><del>- // Focus the URL field and highlight its contents.
- // If this is moved above the selection changes,
- // IE will show a flashing cursor over the dialog.
- inputs.url.focus()[0].select();
</del><ins>+ if ( isTouch ) {
+ // Close the onscreen keyboard
+ inputs.url.focus().blur();
+ } else {
+ // Focus the URL field and highlight its contents.
+ // If this is moved above the selection changes,
+ // IE will show a flashing cursor over the dialog.
+ inputs.url.focus()[0].select();
+ }
+
</ins><span class="cx"> // Load the most recent results if this is the first time opening the panel.
</span><del>- if ( ! rivers.recent.ul.children().length )
</del><ins>+ if ( ! rivers.recent.ul.children().length ) {
</ins><span class="cx"> rivers.recent.ajax();
</span><ins>+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> mceRefresh: function() {
</span><span class="lines">@@ -274,11 +285,9 @@
</span><span class="cx"> editor.selection.collapse();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- updateFields: function( e, li, originalEvent ) {
</del><ins>+ updateFields: function( e, li ) {
</ins><span class="cx"> inputs.url.val( li.children( '.item-permalink' ).val() );
</span><span class="cx"> inputs.title.val( li.hasClass( 'no-title' ) ? '' : li.children( '.item-title' ).text() );
</span><del>- if ( originalEvent && originalEvent.type == 'click' )
- inputs.url.focus();
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> setDefaultValues: function() {
</span><span class="lines">@@ -364,7 +373,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( inputs.url.is( ':focus' ) || inputs.title.is( ':focus' ) ) {
</del><ins>+ if ( document.activeElement &&
+ ( document.activeElement.id === 'link-title-field' || document.activeElement.id === 'url-field' ) ) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>