Changeset 32992

Timestamp:

06/28/2015 11:06:14 PM (10 years ago)

Author:

azaozz

Message:

wpLink: always attempt to correct the URL before getting the URL field value. Fixes an edge case where the URL was not corrected when the user submitted the form by pressing Enter.
Props andfinally. Fixes #32412.

File:

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

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

@@ -78 +78 @@
             });
 
-            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 );
+                setTimeout( wpLink.correctURL, 0 );
             } );
 
-            inputs.url.on( 'blur', correctURL );
+            inputs.url.on( 'blur', wpLink.correctURL );
+        },
+
+        // If URL wasn't corrected last time and doesn't start with http:, https:, ? # or /, prepend http://
+        correctURL: function () {
+            var url = $.trim( inputs.url.val() );
+
+            if ( url && correctedURL !== url && ! /^(?:[a-z]+:|#|\?|\.|\/)/.test( url ) ) {
+                inputs.url.val( 'http://' + url );
+                correctedURL = url;
+            }
         },
 
@@ -268 +269 @@
 
         getAttrs: function() {
+            wpLink.correctURL();
+
             return {
                 href: $.trim( inputs.url.val() ),