<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[31704] trunk/src: Customizer: Add title attributes to iframes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31704">31704</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31704","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-10 21:19:14 +0000 (Tue, 10 Mar 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customizer: Add title attributes to iframes.
props afercia.
fixes <a href="https://core.trac.wordpress.org/ticket/31202">#31202</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-install.php</a></li>
<li><a href="#trunksrcwpincludesjscustomizeloaderjs">trunk/src/wp-includes/js/customize-loader.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js 2015-03-10 20:27:48 UTC (rev 31703)
+++ trunk/src/wp-admin/js/customize-controls.js 2015-03-10 21:19:14 UTC (rev 31704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2023,7 +2023,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> response = response.slice( 0, index ) + response.slice( index + signature.length );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create the iframe and inject the html content.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self.iframe = $('<iframe />').appendTo( self.container );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self.iframe = $( '<iframe />', { 'title': api.l10n.previewIframeTitle } ).appendTo( self.container );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bind load event after the iframe has been added to the page;
</span><span class="cx" style="display: block; padding: 0 10px"> // otherwise it will fire when injected into the DOM.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2055,8 +2055,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> deferred.rejectWith( self, [ 'logged out' ] );
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( this.triedLogin )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( this.triedLogin ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return reject();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if we have an admin cookie.
</span><span class="cx" style="display: block; padding: 0 10px"> $.get( api.settings.url.ajax, {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2064,10 +2065,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }).fail( reject ).done( function( response ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var iframe;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '1' !== response )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '1' !== response ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> reject();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- iframe = $('<iframe src="' + self.previewUrl() + '" />').hide();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ iframe = $( '<iframe />', { 'src': self.previewUrl(), 'title': api.l10n.previewIframeTitle } ).hide();
</ins><span class="cx" style="display: block; padding: 0 10px"> iframe.appendTo( self.container );
</span><span class="cx" style="display: block; padding: 0 10px"> iframe.load( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> self.triedLogin = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2327,7 +2329,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> url: api.settings.url.login
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- iframe = $('<iframe src="' + api.settings.url.login + '" />').appendTo( this.container );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ iframe = $( '<iframe />', { 'src': api.settings.url.login, 'title': api.l10n.loginIframeTitle } ).appendTo( this.container );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> messenger.targetWindow( iframe[0].contentWindow );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminthemeinstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-install.php 2015-03-10 20:27:48 UTC (rev 31703)
+++ trunk/src/wp-admin/theme-install.php 2015-03-10 21:19:14 UTC (rev 31704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +260,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-full-overlay-main">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <iframe src="{{ data.preview_url }}" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <iframe src="{{ data.preview_url }}" title="<?php esc_attr_e( 'Preview' ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesjscustomizeloaderjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/customize-loader.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/customize-loader.js 2015-03-10 20:27:48 UTC (rev 31703)
+++ trunk/src/wp-includes/js/customize-loader.js 2015-03-10 21:19:14 UTC (rev 31704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Dirty state of Customizer in iframe
</span><span class="cx" style="display: block; padding: 0 10px"> this.saved = new api.Value( true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.iframe = $( '<iframe />', { src: src }).appendTo( this.element );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.iframe = $( '<iframe />', { 'src': src, 'title': Loader.settings.l10n.mainIframeTitle } ).appendTo( this.element );
</ins><span class="cx" style="display: block; padding: 0 10px"> this.iframe.one( 'load', this.loaded );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a postMessage connection with the iframe.
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2015-03-10 20:27:48 UTC (rev 31703)
+++ trunk/src/wp-includes/script-loader.php 2015-03-10 21:19:14 UTC (rev 31704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,13 +389,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'customize-views', "/wp-includes/js/customize-views.js", array( 'jquery', 'underscore', 'imgareaselect', 'customize-models' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize( 'customize-controls', '_wpCustomizeControlsL10n', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '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?' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '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' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Used for overriding the file types allowed in plupload.
</span><span class="cx" style="display: block; padding: 0 10px"> 'allowedFiles' => __( 'Allowed Files' ),
</span></span></pre></div>
<a id="trunksrcwpincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2015-03-10 20:27:48 UTC (rev 31703)
+++ trunk/src/wp-includes/theme.php 2015-03-10 21:19:14 UTC (rev 31704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1963,7 +1963,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'isCrossDomain' => $cross_domain,
</span><span class="cx" style="display: block; padding: 0 10px"> 'browser' => $browser,
</span><span class="cx" style="display: block; padding: 0 10px"> 'l10n' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
+ 'mainIframeTitle' => __( 'Customizer' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>