Changeset 28828

Timestamp:

06/25/2014 12:36:24 AM (12 years ago)

Author:

azaozz

Message:

wpLink: support whole URLs including query/fragment when pre-filling the URL field. Fixes #19992

File:

• trunk/src/wp-includes/js/wplink.js (modified) (2 diffs)

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

@@ -271 +271 @@
                         var selection = editor && editor.selection.getContent(),
                                 emailRegexp = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
-                                urlRegexp = /^(https?|ftp):\/\/[A-Z0-9.-]+\.[A-Z]{2,4}$/i;
+                                urlRegexp = /^(https?|ftp):\/\/[A-Z0-9.-]+\.[A-Z]{2,4}[^ "]*$/i;
 
                         if ( selection && emailRegexp.test( selection ) ) {
@@ -278 +278 @@
                         } else if ( selection && urlRegexp.test( selection ) ) {
                                 // Selection is URL
-                                inputs.url.val( selection );
+                                inputs.url.val( selection.replace( /&|&#0?38;/gi, '&' ) );
                         } else {
                                 // Set URL to default.