Changeset 40381

Timestamp:

04/06/2017 12:31:11 AM (7 years ago)

Author:

westonruter

Message:

Customize: Fix HTTPS navigation of site in preview on IE11.

Accounts for HTTPS links (port 443) where [40318] only accounted for HTTP links (port 80). Addresses issue in IE11 where the default port number is unexpectedly included on link.host for links dynamically created by scripts.

Props mattwiebe.
Amends [40318], [38890].
See #38409.
Fixes #40198.

Location:

trunk/src/wp-includes/js

Files:

• customize-base.js (modified) (1 diff)
• customize-preview.js (modified) (1 diff)

trunk/src/wp-includes/js/customize-base.js

@@ -656 +656 @@
                 urlParser.href = to;
                 // Port stripping needed by IE since it adds to host but not to event.origin.
-                return urlParser.protocol + '//' + urlParser.host.replace( /:80$/, '' );
+                return urlParser.protocol + '//' + urlParser.host.replace( /:(80|443)$/, '' );
             });
 

trunk/src/wp-includes/js/customize-preview.js

@@ -287 +287 @@
         }
 
-        elementHost = element.host.replace( /:80$/, '' );
+        elementHost = element.host.replace( /:(80|443)$/, '' );
         parsedAllowedUrl = document.createElement( 'a' );
         matchesAllowedUrl = ! _.isUndefined( _.find( api.settings.url.allowed, function( allowedUrl ) {
             parsedAllowedUrl.href = allowedUrl;
-            return parsedAllowedUrl.protocol === element.protocol && parsedAllowedUrl.host.replace( /:80$/, '' ) === elementHost && 0 === element.pathname.indexOf( parsedAllowedUrl.pathname.replace( /\/$/, '' ) );
+            return parsedAllowedUrl.protocol === element.protocol && parsedAllowedUrl.host.replace( /:(80|443)$/, '' ) === elementHost && 0 === element.pathname.indexOf( parsedAllowedUrl.pathname.replace( /\/$/, '' ) );
         } ) );
         if ( ! matchesAllowedUrl ) {