Changeset 25031

Timestamp:

08/15/2013 09:43:29 PM (12 years ago)

Author:

helen

Message:

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.

File:

• trunk/src/wp-includes/js/wplink.js (modified) (1 diff)

trunk/src/wp-includes/js/wplink.js

@@ -280 +280 @@
         },
         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, '' ) ) ) {
-                if ( ! $('#search-panel').is(':visible') )
-                    $('#internal-toggle').trigger('click');
-                inputs.search.val( selectedText ).trigger('keyup');
+
+                if ( selectedText && ( selectedText = selectedText.replace( /^\s+|\s+$/g, '' ) ) ) {
+                    inputs.search.val( selectedText ).trigger('keyup');
+                }
             }