Changeset 31606

Timestamp:

03/03/2015 09:20:35 PM (9 years ago)

Author:

azaozz

Message:

wpLink: fix the logic for prepending http:// and trim the input.
Props iseulde. See #18149.

File:

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

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

@@ -74 +74 @@
             });
 
-            inputs.url.on( 'paste blur', function() {
-                setTimeout( function() {
-                    var url = $.trim( inputs.url.val() );
-
-                    if ( url && correctedURL !== url && ! /^(?:[a-z]+:|#|\?|\.|\/)/.test( url ) ) {
-                        inputs.url.val( 'http://' + url );
-                        correctedURL = url;
-                    }
-                }, 0 );
+            function correctURL() {
+                var url = $.trim( inputs.url.val() );
+
+                if ( url && correctedURL !== url && ! /^(?:[a-z]+:|#|\?|\.|\/)/.test( url ) ) {
+                    inputs.url.val( 'http://' + url );
+                    correctedURL = url;
+                }
+            }
+
+            inputs.url.on( 'paste', function() {
+                setTimeout( correctURL, 0 );
             } );
+
+            inputs.url.on( 'blur', correctURL );
         },
 
@@ -158 +162 @@
                 rivers.recent.ajax();
             }
+
+            correctedURL = inputs.url.val().replace( /^http:\/\//, '' );
         },
 
@@ -203 +209 @@
         getAttrs: function() {
             return {
-                href: inputs.url.val(),
-                title: inputs.title.val(),
+                href: $.trim( inputs.url.val() ),
+                title: $.trim( inputs.title.val() ),
                 target: inputs.openInNewTab.prop( 'checked' ) ? '_blank' : ''
             };