<!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>[25031] trunk/src/wp-includes/js/wplink.js: Only set and run internal search for linking selected text if the panel is open.</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/25031">25031</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2013-08-15 21:43:29 +0000 (Thu, 15 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Only set and run internal search for linking selected text if the panel is open. Make sure the focus is in the URL field whenever opening the linking modal to preserve previous behavior. props greuben. fixes <a href="http://core.trac.wordpress.org/ticket/16276">#16276</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjswplinkjs">trunk/src/wp-includes/js/wplink.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjswplinkjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/wplink.js (25030 => 25031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/wplink.js 2013-08-15 20:08:06 UTC (rev 25030)
+++ trunk/src/wp-includes/js/wplink.js 2013-08-15 21:43:29 UTC (rev 25031)
</span><span class="lines">@@ -279,27 +279,29 @@
</span><span class="cx"> inputs.url.focus();
</span><span class="cx"> },
</span><span class="cx"> setDefaultValues : function() {
</span><del>- var selectedText,
- textarea = wpLink.textarea;
-
</del><span class="cx"> // Set URL and description to defaults.
</span><span class="cx"> // Leave the new tab setting as-is.
</span><span class="cx"> inputs.url.val('http://');
</span><span class="cx"> inputs.title.val('');
</span><del>- if ( wpLink.isMCE() ) {
- selectedText = tinyMCEPopup.editor.selection.getContent( { format: 'text' } );
- } else {
- if ( document.selection && wpLink.range ) {
- selectedText = wpLink.range.text;
- } else if ( typeof textarea.selectionStart !== 'undefined' ) {
- selectedText = textarea.value.substring( textarea.selectionStart, textarea.selectionEnd );
</del><ins>+
+ if ( $('#search-panel').is(':visible') ) {
+ var selectedText,
+ textarea = wpLink.textarea;
+
+ if ( wpLink.isMCE() ) {
+ selectedText = tinyMCEPopup.editor.selection.getContent( { format: 'text' } );
+ } else {
+ if ( document.selection && wpLink.range ) {
+ selectedText = wpLink.range.text;
+ } else if ( 'undefined' !== typeof textarea.selectionStart ) {
+ selectedText = textarea.value.substring( textarea.selectionStart, textarea.selectionEnd );
+ }
</ins><span class="cx"> }
</span><ins>+
+ if ( selectedText && ( selectedText = selectedText.replace( /^\s+|\s+$/g, '' ) ) ) {
+ inputs.search.val( selectedText ).trigger('keyup');
+ }
</ins><span class="cx"> }
</span><del>- if ( selectedText && ( selectedText = selectedText.replace( /^\s+|\s+$/g, '' ) ) ) {
- if ( ! $('#search-panel').is(':visible') )
- $('#internal-toggle').trigger('click');
- inputs.search.val( selectedText ).trigger('keyup');
- }
</del><span class="cx">
</span><span class="cx"> // Update save prompt.
</span><span class="cx"> inputs.submit.val( wpLinkL10n.save );
</span></span></pre>
</div>
</div>
</body>
</html>