WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 #16276. 

Built from https://develop.svn.wordpress.org/trunk@25031


git-svn-id: http://core.svn.wordpress.org/trunk@25018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2013-08-15 21:44:09 +00:00
parent 564d80e29f
commit 8c67a2917a
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wp-includes/js/wplink.js
View File

@ -279,26 +279,28 @@ var wpLink;
inputs.url.focus();
},
setDefaultValues : function() {
var selectedText,
textarea = wpLink.textarea;
// Set URL and description to defaults.
// Leave the new tab setting as-is.
inputs.url.val('http://');
inputs.title.val('');
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 );
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 );
}
}
if ( selectedText && ( selectedText = selectedText.replace( /^\s+|\s+$/g, '' ) ) ) {
inputs.search.val( selectedText ).trigger('keyup');
}
}
if ( selectedText && ( selectedText = selectedText.replace( /^\s+|\s+$/g, '' ) ) ) {
if ( ! $('#search-panel').is(':visible') )
$('#internal-toggle').trigger('click');
inputs.search.val( selectedText ).trigger('keyup');
}
// Update save prompt.

2
wp-includes/js/wplink.min.js vendored
View File

File diff suppressed because one or more lines are too long