Changeset 31704

Timestamp:

03/10/2015 09:19:14 PM (10 years ago)

Author:

ocean90

Message:

Customizer: Add title attributes to iframes.

props afercia.
fixes #31202.

Location:

trunk/src

Files:

• wp-admin/js/customize-controls.js (modified) (4 diffs)
• wp-admin/theme-install.php (modified) (1 diff)
• wp-includes/js/customize-loader.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)

trunk/src/wp-admin/js/customize-controls.js

@@ -2024 +2024 @@
 
                 // Create the iframe and inject the html content.
-                self.iframe = $('<iframe />').appendTo( self.container );
+                self.iframe = $( '<iframe />', { 'title': api.l10n.previewIframeTitle } ).appendTo( self.container );
 
                 // Bind load event after the iframe has been added to the page;
@@ -2056 +2056 @@
             };
 
-            if ( this.triedLogin )
+            if ( this.triedLogin ) {
                 return reject();
+            }
 
             // Check if we have an admin cookie.
@@ -2065 +2066 @@
                 var iframe;
 
-                if ( '1' !== response )
+                if ( '1' !== response ) {
                     reject();
-
-                iframe = $('<iframe src="' + self.previewUrl() + '" />').hide();
+                }
+
+                iframe = $( '<iframe />', { 'src': self.previewUrl(), 'title': api.l10n.previewIframeTitle } ).hide();
                 iframe.appendTo( self.container );
                 iframe.load( function() {
@@ -2328 +2330 @@
             });
 
-            iframe = $('<iframe src="' + api.settings.url.login + '" />').appendTo( this.container );
+            iframe = $( '<iframe />', { 'src': api.settings.url.login, 'title': api.l10n.loginIframeTitle } ).appendTo( this.container );
 
             messenger.targetWindow( iframe[0].contentWindow );

trunk/src/wp-admin/theme-install.php

@@ -261 +261 @@
     </div>
     <div class="wp-full-overlay-main">
-        <iframe src="{{ data.preview_url }}" />
+        <iframe src="{{ data.preview_url }}" title="<?php esc_attr_e( 'Preview' ); ?>" />
     </div>
 </script>

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

@@ -115 +115 @@
             this.saved = new api.Value( true );
 
-            this.iframe = $( '<iframe />', { src: src }).appendTo( this.element );
+            this.iframe = $( '<iframe />', { 'src': src, 'title': Loader.settings.l10n.mainIframeTitle } ).appendTo( this.element );
             this.iframe.one( 'load', this.loaded );
 

trunk/src/wp-includes/script-loader.php

@@ -390 +390 @@
     $scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base' ), false, 1 );
     did_action( 'init' ) && $scripts->localize( 'customize-controls', '_wpCustomizeControlsL10n', array(
-        'activate'  => __( 'Save & Activate' ),
-        'save'      => __( 'Save & Publish' ),
-        'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
-        'saved'     => __( 'Saved' ),
-        'cancel'    => __( 'Cancel' ),
-        'close'     => __( 'Close' ),
-        'cheatin'   => __( 'Cheatin’ uh?' ),
+        'activate'           => __( 'Save & Activate' ),
+        'save'               => __( 'Save & Publish' ),
+        'saveAlert'          => __( 'The changes you made will be lost if you navigate away from this page.' ),
+        'saved'              => __( 'Saved' ),
+        'cancel'             => __( 'Cancel' ),
+        'close'              => __( 'Close' ),
+        'cheatin'            => __( 'Cheatin’ uh?' ),
+        'previewIframeTitle' => __( 'Site Preview' ),
+        'loginIframeTitle'   => __( 'Session expired' ),
 
         // Used for overriding the file types allowed in plupload.

trunk/src/wp-includes/theme.php

@@ -1964 +1964 @@
         'browser'       => $browser,
         'l10n'          => array(
-            'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
+            'saveAlert'       => __( 'The changes you made will be lost if you navigate away from this page.' ),
+            'mainIframeTitle' => __( 'Customizer' ),
         ),
     );