<!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>[35708] trunk: Embeds: Remove `&` characters from the inline embed JS.</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/35708">35708</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/35708","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-19 23:05:39 +0000 (Thu, 19 Nov 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'>Embeds: Remove `&` characters from the inline embed JS.
Older versions of WordPress will convert those `&` characters to `&<a href="https://core.trac.wordpress.org/ticket/038">#038</a>;`, which makes for some non-functional JS. If folks are running an older release, let's not make their lives more difficult than it already is.
Props pento, peterwilsoncc.
See <a href="https://core.trac.wordpress.org/ticket/34698">#34698</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunksrcwpincludesjswpembedjs">trunk/src/wp-includes/js/wp-embed.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2015-11-19 17:10:47 UTC (rev 35707)
+++ trunk/Gruntfile.js 2015-11-19 23:05:39 UTC (rev 35708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -435,9 +435,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '!wp-includes/js/masonry.min.js',
</span><span class="cx" style="display: block; padding: 0 10px"> '!wp-includes/js/swfobject.js',
</span><span class="cx" style="display: block; padding: 0 10px"> '!wp-includes/js/underscore.*',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '!wp-includes/js/zxcvbn.min.js'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '!wp-includes/js/zxcvbn.min.js',
+ '!wp-includes/js/wp-embed.js' // We have extra options for this, see uglify:embed
</ins><span class="cx" style="display: block; padding: 0 10px"> ]
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ embed: {
+ options: {
+ compress: {
+ conditionals: false
+ }
+ },
+ expand: true,
+ cwd: SOURCE_DIR,
+ dest: BUILD_DIR,
+ ext: '.min.js',
+ src: ['wp-includes/js/wp-embed.js']
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> media: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><span class="cx" style="display: block; padding: 0 10px"> cwd: SOURCE_DIR,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,6 +660,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'cssmin:rtl',
</span><span class="cx" style="display: block; padding: 0 10px"> 'cssmin:colors',
</span><span class="cx" style="display: block; padding: 0 10px"> 'uglify:core',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'uglify:embed',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'uglify:jqueryui',
</span><span class="cx" style="display: block; padding: 0 10px"> 'concat:tinymce',
</span><span class="cx" style="display: block; padding: 0 10px"> 'compress:tinymce',
</span></span></pre></div>
<a id="trunksrcwpincludesjswpembedjs"></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/wp-embed.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wp-embed.js 2015-11-19 17:10:47 UTC (rev 35707)
+++ trunk/src/wp-includes/js/wp-embed.js 2015-11-19 23:05:39 UTC (rev 35708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> (function ( window, document ) {
</span><span class="cx" style="display: block; padding: 0 10px"> 'use strict';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var supportedBrowser = ( document.querySelector && window.addEventListener ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var supportedBrowser = false,
</ins><span class="cx" style="display: block; padding: 0 10px"> loaded = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( document.querySelector ) {
+ if ( window.addEventListener ) {
+ supportedBrowser = true;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> window.wp = window.wp || {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !! window.wp.receiveEmbedMessage ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,8 +56,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> targetURL.href = data.value;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Only continue if link hostname matches iframe's hostname. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( targetURL.host === sourceURL.host && document.activeElement === source ) {
- window.top.location.href = data.value;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( targetURL.host === sourceURL.host ) {
+ if ( document.activeElement === source ) {
+ window.top.location.href = data.value;
+ }
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,15 +85,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> source = iframes[ i ];
</span><span class="cx" style="display: block; padding: 0 10px"> source.style.display = '';
</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 ( !source.getAttribute( 'data-secret' ) ) {
- /* Add secret to iframe */
- secret = Math.random().toString( 36 ).substr( 2, 10 );
- source.src += '#?secret=' + secret;
- source.setAttribute( 'data-secret', secret );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( source.getAttribute( 'data-secret' ) ) {
+ continue;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* Add secret to iframe */
+ secret = Math.random().toString( 36 ).substr( 2, 10 );
+ source.src += '#?secret=' + secret;
+ source.setAttribute( 'data-secret', secret );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Remove security attribute from iframes in IE10 and IE11. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( isIE10 || isIE11 ) && !!source.getAttribute( 'security' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( isIE10 || isIE11 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> iframeClone = source.cloneNode( true );
</span><span class="cx" style="display: block; padding: 0 10px"> iframeClone.removeAttribute( 'security' );
</span><span class="cx" style="display: block; padding: 0 10px"> source.parentNode.replaceChild( iframeClone, source );
</span></span></pre>
</div>
</div>
</body>
</html>