<!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>[35235] trunk: Embeds: Rename files, functions, and hooks added in [34903] to make it more clear what is oEmbed-specific and what isn't.</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/35235">35235</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/35235","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-17 01:20:19 +0000 (Sat, 17 Oct 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: Rename files, functions, and hooks added in <a href="https://core.trac.wordpress.org/changeset/34903">[34903]</a> to make it more clear what is oEmbed-specific and what isn't.
See https://core.trac.wordpress.org/ticket/34272#comment:7 for full list of renamed functions and hooks.
Props swissspidy.
Fixes <a href="https://core.trac.wordpress.org/ticket/34272">#34272</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesembedfunctionsphp">trunk/src/wp-includes/embed-functions.php</a></li>
<li><a href="#trunksrcwpincludesembedtemplatephp">trunk/src/wp-includes/embed-template.php</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpoembedpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpoembed/plugin.js</a></li>
<li><a href="#trunktestsphpunittestsoembedtemplatephp">trunk/tests/phpunit/tests/oembed/template.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescsswpembedtemplatecss">trunk/src/wp-includes/css/wp-embed-template.css</a></li>
<li><a href="#trunksrcwpincludesjswpembedtemplatejs">trunk/src/wp-includes/js/wp-embed-template.js</a></li>
<li><a href="#trunksrcwpincludesjswpembedjs">trunk/src/wp-includes/js/wp-embed.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescsswpoembedembedcss">trunk/src/wp-includes/css/wp-oembed-embed.css</a></li>
<li><a href="#trunksrcwpincludesjswpoembedembedjs">trunk/src/wp-includes/js/wp-oembed-embed.js</a></li>
<li><a href="#trunksrcwpincludesjswpoembedjs">trunk/src/wp-includes/js/wp-oembed.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-10-17 00:44:12 UTC (rev 35234)
+++ trunk/Gruntfile.js 2015-10-17 01:20:19 UTC (rev 35235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Exceptions
</span><span class="cx" style="display: block; padding: 0 10px"> '!wp-includes/css/dashicons.css',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '!wp-includes/css/wp-oembed-embed.css'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '!wp-includes/css/wp-embed-template.css'
</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"> colors: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,7 +530,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> src: BUILD_DIR + 'wp-includes/formatting.php',
</span><span class="cx" style="display: block; padding: 0 10px"> dest: '.'
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- oembed: {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ embed: {
</ins><span class="cx" style="display: block; padding: 0 10px"> src: BUILD_DIR + 'wp-includes/embed-functions.php',
</span><span class="cx" style="display: block; padding: 0 10px"> dest: '.'
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,7 +642,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'clean:tinymce',
</span><span class="cx" style="display: block; padding: 0 10px"> 'concat:emoji',
</span><span class="cx" style="display: block; padding: 0 10px"> 'includes:emoji',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'includes:oembed',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'includes:embed',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'jsvalidate:build'
</span><span class="cx" style="display: block; padding: 0 10px"> ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludescsswpembedtemplatecssfromrev35234trunksrcwpincludescsswpoembedembedcss"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/css/wp-embed-template.css (from rev 35234, trunk/src/wp-includes/css/wp-oembed-embed.css)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/wp-embed-template.css (rev 0)
+++ trunk/src/wp-includes/css/wp-embed-template.css 2015-10-17 01:20:19 UTC (rev 35235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,358 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+html, body {
+ padding: 0;
+ margin: 0;
+}
+
+body {
+ font-family: sans-serif;
+}
+
+/* Text meant only for screen readers */
+.screen-reader-text {
+ clip: rect(1px, 1px, 1px, 1px);
+ height: 1px;
+ overflow: hidden;
+ position: absolute !important;
+ width: 1px;
+}
+
+/* Dashicons */
+.dashicons {
+ display: inline-block;
+ width: 20px;
+ height: 20px;
+ background-color: transparent;
+ background-repeat: no-repeat;
+ -webkit-background-size: 20px 20px;
+ background-size: 20px;
+ background-position: center;
+ -webkit-transition: background .1s ease-in;
+ transition: background .1s ease-in;
+ position: relative;
+ top: 5px;
+}
+
+.dashicons-no {
+ background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M15.55%2013.7l-2.19%202.06-3.42-3.65-3.64%203.43-2.06-2.18%203.64-3.43-3.42-3.64%202.18-2.06%203.43%203.64%203.64-3.42%202.05%202.18-3.64%203.43z%27%20fill%3D%27%23fff%27%2F%3E%3C%2Fsvg%3E");
+}
+
+.dashicons-admin-comments {
+ background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M5%202h9q.82%200%201.41.59T16%204v7q0%20.82-.59%201.41T14%2013h-2l-5%205v-5H5q-.82%200-1.41-.59T3%2011V4q0-.82.59-1.41T5%202z%27%20fill%3D%27%2382878c%27%2F%3E%3C%2Fsvg%3E");
+}
+
+.wp-embed-comments a:hover .dashicons-admin-comments {
+ background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M5%202h9q.82%200%201.41.59T16%204v7q0%20.82-.59%201.41T14%2013h-2l-5%205v-5H5q-.82%200-1.41-.59T3%2011V4q0-.82.59-1.41T5%202z%27%20fill%3D%27%230073aa%27%2F%3E%3C%2Fsvg%3E");
+}
+
+.dashicons-share {
+ background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.5%2012q1.24%200%202.12.88T17.5%2015t-.88%202.12-2.12.88-2.12-.88T11.5%2015q0-.34.09-.69l-4.38-2.3Q6.32%2013%205%2013q-1.24%200-2.12-.88T2%2010t.88-2.12T5%207q1.3%200%202.21.99l4.38-2.3q-.09-.35-.09-.69%200-1.24.88-2.12T14.5%202t2.12.88T17.5%205t-.88%202.12T14.5%208q-1.3%200-2.21-.99l-4.38%202.3Q8%209.66%208%2010t-.09.69l4.38%202.3q.89-.99%202.21-.99z%27%20fill%3D%27%2382878c%27%2F%3E%3C%2Fsvg%3E");
+}
+
+.wp-embed-share-dialog-open:hover .dashicons-share {
+ background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.5%2012q1.24%200%202.12.88T17.5%2015t-.88%202.12-2.12.88-2.12-.88T11.5%2015q0-.34.09-.69l-4.38-2.3Q6.32%2013%205%2013q-1.24%200-2.12-.88T2%2010t.88-2.12T5%207q1.3%200%202.21.99l4.38-2.3q-.09-.35-.09-.69%200-1.24.88-2.12T14.5%202t2.12.88T17.5%205t-.88%202.12T14.5%208q-1.3%200-2.21-.99l-4.38%202.3Q8%209.66%208%2010t-.09.69l4.38%202.3q.89-.99%202.21-.99z%27%20fill%3D%27%230073aa%27%2F%3E%3C%2Fsvg%3E");
+}
+
+.wp-embed {
+ width: 100%;
+ padding: 25px;
+ font: 400 14px/1.5 'Open Sans', sans-serif;
+ color: #82878c;
+ background: white;
+ border: 1px solid #e5e5e5;
+ -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+ box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ /* Clearfix */
+ overflow: auto;
+ zoom: 1;
+}
+
+.wp-embed a {
+ color: #82878c;
+ text-decoration: none;
+}
+
+.wp-embed a:hover {
+ text-decoration: underline;
+}
+
+.wp-embed-featured-image {
+ margin-bottom: 20px;
+}
+
+.wp-embed-featured-image img {
+ width: 100%;
+ height: auto;
+ border: none;
+}
+
+.wp-embed-featured-image.square {
+ float: left;
+ max-width: 160px;
+ margin-right: 20px;
+}
+
+.wp-embed p {
+ margin: 0;
+}
+
+p.wp-embed-heading {
+ margin: 0 0 15px;
+ font-weight: bold;
+ font-size: 22px;
+ line-height: 1.3;
+}
+
+.wp-embed-heading a {
+ color: #32373c;
+}
+
+.wp-embed .wp-embed-more {
+ color: #b4b9be;
+}
+
+.wp-embed-footer {
+ display: table;
+ width: 100%;
+ margin-top: 30px;
+}
+
+.wp-embed-site-icon {
+ position: absolute;
+ top: 50%;
+ left: 0;
+ -webkit-transform: translateY(-50%);
+ -ms-transform: translateY(-50%);
+ transform: translateY(-50%);
+ height: 25px;
+ width: 25px;
+ border: 0;
+}
+
+.wp-embed-site-title {
+ font-weight: bold;
+ line-height: 25px;
+}
+
+.wp-embed-site-title a {
+ position: relative;
+ display: inline-block;
+ padding-left: 35px;
+}
+
+.wp-embed-site-title,
+.wp-embed-meta {
+ display: table-cell;
+}
+
+.wp-embed-meta {
+ text-align: right;
+ white-space: nowrap;
+ vertical-align: middle;
+}
+
+.wp-embed-comments,
+.wp-embed-share {
+ display: inline;
+}
+
+.wp-embed-meta a:hover {
+ text-decoration: none;
+ color: #0073aa;
+}
+
+.wp-embed-comments a {
+ line-height: 25px;
+ display: inline-block;
+}
+
+.wp-embed-comments + .wp-embed-share {
+ margin-left: 10px;
+}
+
+.wp-embed-share-dialog {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: rgba(10, 10, 10, 0.9);
+ color: #fff;
+ opacity: 1;
+ -webkit-transition: opacity .25s ease-in-out;
+ transition: opacity .25s ease-in-out;
+}
+
+.wp-embed-share-dialog.hidden {
+ opacity: 0;
+ visibility: hidden;
+}
+
+.wp-embed-share-dialog-open,
+.wp-embed-share-dialog-close {
+ margin: -8px 0 0;
+ padding: 0;
+ background: transparent;
+ border: none;
+ cursor: pointer;
+ outline: none;
+}
+
+.wp-embed-share-dialog-open .dashicons,
+.wp-embed-share-dialog-close .dashicons {
+ padding: 4px;
+}
+
+.wp-embed-share-dialog-open .dashicons {
+ top: 8px;
+}
+
+.wp-embed-share-dialog-open:focus .dashicons,
+.wp-embed-share-dialog-close:focus .dashicons {
+ -webkit-box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, .8);
+ box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, .8);
+ -webkit-border-radius: 100%;
+ border-radius: 100%;
+}
+
+.wp-embed-share-dialog-close {
+ position: absolute;
+ top: 20px;
+ right: 20px;
+ font-size: 22px;
+}
+
+.wp-embed-share-dialog-close:hover {
+ text-decoration: none;
+}
+
+.wp-embed-share-dialog-close .dashicons {
+ height: 24px;
+ width: 24px;
+ -webkit-background-size: 24px 24px;
+ background-size: 24px;
+}
+
+.wp-embed-share-dialog-content {
+ height: 100%;
+ -webkit-transform-style: preserve-3d;
+ transform-style: preserve-3d;
+ overflow: hidden;
+}
+
+.wp-embed-share-dialog-text {
+ margin-top: 25px;
+ padding: 20px;
+}
+
+.wp-embed-share-tabs {
+ margin: 0 0 20px;
+ padding: 0;
+ list-style: none;
+}
+
+.wp-embed-share-tab-button {
+ display: inline;
+}
+
+.wp-embed-share-tab-button button {
+ margin: 0;
+ padding: 0;
+ border: none;
+ background: transparent;
+ font-size: 16px;
+ line-height: 1.3;
+ color: #aaa;
+ cursor: pointer;
+ -webkit-transition: color .1s ease-in;
+ transition: color .1s ease-in;
+}
+
+.wp-embed-share-tab-button [aria-selected="true"] {
+ color: #fff;
+}
+
+.wp-embed-share-tab-button button:hover {
+ color: #fff;
+}
+
+.wp-embed-share-tab-button + .wp-embed-share-tab-button {
+ margin: 0 0 0 10px;
+ padding: 0 0 0 11px;
+ border-left: 1px solid #aaa;
+}
+
+.wp-embed-share-tab[aria-hidden="true"] {
+ display: none;
+}
+
+p.wp-embed-share-description {
+ margin: 0;
+ font-size: 14px;
+ line-height: 1;
+ font-style: italic;
+ color: #aaa;
+}
+
+.wp-embed-share-input {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ width: 100%;
+ border: none;
+ height: 28px;
+ margin: 0 0 10px 0;
+ padding: 0 5px;
+ font: 400 14px/1.5 'Open Sans', sans-serif;
+ resize: none;
+ cursor: text;
+}
+
+textarea.wp-embed-share-input {
+ height: 72px;
+}
+
+html[dir="rtl"] .wp-embed-featured-image.square {
+ float: right;
+ margin-right: 0;
+
+ margin-left: 20px;
+}
+
+html[dir="rtl"] .wp-embed-site-title a {
+ padding-left: 0;
+ padding-right: 35px;
+}
+
+html[dir="rtl"] .wp-embed-site-icon {
+ margin-right: 0;
+ margin-left: 10px;
+ left: auto;
+ right: 0;
+}
+
+html[dir="rtl"] .wp-embed-meta {
+ text-align: left;
+}
+
+html[dir="rtl"] .wp-embed-footer {
+}
+
+html[dir="rtl"] .wp-embed-share {
+ margin-left: 0;
+ margin-right: 10px;
+}
+
+html[dir="rtl"] .wp-embed-share-dialog-close {
+ right: auto;
+ left: 20px;
+}
+
+html[dir="rtl"] .wp-embed-share-tab-button + .wp-embed-share-tab-button {
+ margin: 0 10px 0 0;
+ padding: 0 11px 0 0;
+ border-left: none;
+ border-right: 1px solid #aaa;
+}
</ins></span></pre></div>
<a id="trunksrcwpincludescsswpoembedembedcss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/css/wp-oembed-embed.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/wp-oembed-embed.css 2015-10-17 00:44:12 UTC (rev 35234)
+++ trunk/src/wp-includes/css/wp-oembed-embed.css 2015-10-17 01:20:19 UTC (rev 35235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,358 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-html, body {
- padding: 0;
- margin: 0;
-}
-
-body {
- font-family: sans-serif;
-}
-
-/* Text meant only for screen readers */
-.screen-reader-text {
- clip: rect(1px, 1px, 1px, 1px);
- height: 1px;
- overflow: hidden;
- position: absolute !important;
- width: 1px;
-}
-
-/* Dashicons */
-.dashicons {
- display: inline-block;
- width: 20px;
- height: 20px;
- background-color: transparent;
- background-repeat: no-repeat;
- -webkit-background-size: 20px 20px;
- background-size: 20px;
- background-position: center;
- -webkit-transition: background .1s ease-in;
- transition: background .1s ease-in;
- position: relative;
- top: 5px;
-}
-
-.dashicons-no {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M15.55%2013.7l-2.19%202.06-3.42-3.65-3.64%203.43-2.06-2.18%203.64-3.43-3.42-3.64%202.18-2.06%203.43%203.64%203.64-3.42%202.05%202.18-3.64%203.43z%27%20fill%3D%27%23fff%27%2F%3E%3C%2Fsvg%3E");
-}
-
-.dashicons-admin-comments {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M5%202h9q.82%200%201.41.59T16%204v7q0%20.82-.59%201.41T14%2013h-2l-5%205v-5H5q-.82%200-1.41-.59T3%2011V4q0-.82.59-1.41T5%202z%27%20fill%3D%27%2382878c%27%2F%3E%3C%2Fsvg%3E");
-}
-
-.wp-embed-comments a:hover .dashicons-admin-comments {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M5%202h9q.82%200%201.41.59T16%204v7q0%20.82-.59%201.41T14%2013h-2l-5%205v-5H5q-.82%200-1.41-.59T3%2011V4q0-.82.59-1.41T5%202z%27%20fill%3D%27%230073aa%27%2F%3E%3C%2Fsvg%3E");
-}
-
-.dashicons-share {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.5%2012q1.24%200%202.12.88T17.5%2015t-.88%202.12-2.12.88-2.12-.88T11.5%2015q0-.34.09-.69l-4.38-2.3Q6.32%2013%205%2013q-1.24%200-2.12-.88T2%2010t.88-2.12T5%207q1.3%200%202.21.99l4.38-2.3q-.09-.35-.09-.69%200-1.24.88-2.12T14.5%202t2.12.88T17.5%205t-.88%202.12T14.5%208q-1.3%200-2.21-.99l-4.38%202.3Q8%209.66%208%2010t-.09.69l4.38%202.3q.89-.99%202.21-.99z%27%20fill%3D%27%2382878c%27%2F%3E%3C%2Fsvg%3E");
-}
-
-.wp-embed-share-dialog-open:hover .dashicons-share {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.5%2012q1.24%200%202.12.88T17.5%2015t-.88%202.12-2.12.88-2.12-.88T11.5%2015q0-.34.09-.69l-4.38-2.3Q6.32%2013%205%2013q-1.24%200-2.12-.88T2%2010t.88-2.12T5%207q1.3%200%202.21.99l4.38-2.3q-.09-.35-.09-.69%200-1.24.88-2.12T14.5%202t2.12.88T17.5%205t-.88%202.12T14.5%208q-1.3%200-2.21-.99l-4.38%202.3Q8%209.66%208%2010t-.09.69l4.38%202.3q.89-.99%202.21-.99z%27%20fill%3D%27%230073aa%27%2F%3E%3C%2Fsvg%3E");
-}
-
-.wp-embed {
- width: 100%;
- padding: 25px;
- font: 400 14px/1.5 'Open Sans', sans-serif;
- color: #82878c;
- background: white;
- border: 1px solid #e5e5e5;
- -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
- box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- /* Clearfix */
- overflow: auto;
- zoom: 1;
-}
-
-.wp-embed a {
- color: #82878c;
- text-decoration: none;
-}
-
-.wp-embed a:hover {
- text-decoration: underline;
-}
-
-.wp-embed-featured-image {
- margin-bottom: 20px;
-}
-
-.wp-embed-featured-image img {
- width: 100%;
- height: auto;
- border: none;
-}
-
-.wp-embed-featured-image.square {
- float: left;
- max-width: 160px;
- margin-right: 20px;
-}
-
-.wp-embed p {
- margin: 0;
-}
-
-p.wp-embed-heading {
- margin: 0 0 15px;
- font-weight: bold;
- font-size: 22px;
- line-height: 1.3;
-}
-
-.wp-embed-heading a {
- color: #32373c;
-}
-
-.wp-embed .wp-embed-more {
- color: #b4b9be;
-}
-
-.wp-embed-footer {
- display: table;
- width: 100%;
- margin-top: 30px;
-}
-
-.wp-embed-site-icon {
- position: absolute;
- top: 50%;
- left: 0;
- -webkit-transform: translateY(-50%);
- -ms-transform: translateY(-50%);
- transform: translateY(-50%);
- height: 25px;
- width: 25px;
- border: 0;
-}
-
-.wp-embed-site-title {
- font-weight: bold;
- line-height: 25px;
-}
-
-.wp-embed-site-title a {
- position: relative;
- display: inline-block;
- padding-left: 35px;
-}
-
-.wp-embed-site-title,
-.wp-embed-meta {
- display: table-cell;
-}
-
-.wp-embed-meta {
- text-align: right;
- white-space: nowrap;
- vertical-align: middle;
-}
-
-.wp-embed-comments,
-.wp-embed-share {
- display: inline;
-}
-
-.wp-embed-meta a:hover {
- text-decoration: none;
- color: #0073aa;
-}
-
-.wp-embed-comments a {
- line-height: 25px;
- display: inline-block;
-}
-
-.wp-embed-comments + .wp-embed-share {
- margin-left: 10px;
-}
-
-.wp-embed-share-dialog {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- background-color: rgba(10, 10, 10, 0.9);
- color: #fff;
- opacity: 1;
- -webkit-transition: opacity .25s ease-in-out;
- transition: opacity .25s ease-in-out;
-}
-
-.wp-embed-share-dialog.hidden {
- opacity: 0;
- visibility: hidden;
-}
-
-.wp-embed-share-dialog-open,
-.wp-embed-share-dialog-close {
- margin: -8px 0 0;
- padding: 0;
- background: transparent;
- border: none;
- cursor: pointer;
- outline: none;
-}
-
-.wp-embed-share-dialog-open .dashicons,
-.wp-embed-share-dialog-close .dashicons {
- padding: 4px;
-}
-
-.wp-embed-share-dialog-open .dashicons {
- top: 8px;
-}
-
-.wp-embed-share-dialog-open:focus .dashicons,
-.wp-embed-share-dialog-close:focus .dashicons {
- -webkit-box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, .8);
- box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, .8);
- -webkit-border-radius: 100%;
- border-radius: 100%;
-}
-
-.wp-embed-share-dialog-close {
- position: absolute;
- top: 20px;
- right: 20px;
- font-size: 22px;
-}
-
-.wp-embed-share-dialog-close:hover {
- text-decoration: none;
-}
-
-.wp-embed-share-dialog-close .dashicons {
- height: 24px;
- width: 24px;
- -webkit-background-size: 24px 24px;
- background-size: 24px;
-}
-
-.wp-embed-share-dialog-content {
- height: 100%;
- -webkit-transform-style: preserve-3d;
- transform-style: preserve-3d;
- overflow: hidden;
-}
-
-.wp-embed-share-dialog-text {
- margin-top: 25px;
- padding: 20px;
-}
-
-.wp-embed-share-tabs {
- margin: 0 0 20px;
- padding: 0;
- list-style: none;
-}
-
-.wp-embed-share-tab-button {
- display: inline;
-}
-
-.wp-embed-share-tab-button button {
- margin: 0;
- padding: 0;
- border: none;
- background: transparent;
- font-size: 16px;
- line-height: 1.3;
- color: #aaa;
- cursor: pointer;
- -webkit-transition: color .1s ease-in;
- transition: color .1s ease-in;
-}
-
-.wp-embed-share-tab-button [aria-selected="true"] {
- color: #fff;
-}
-
-.wp-embed-share-tab-button button:hover {
- color: #fff;
-}
-
-.wp-embed-share-tab-button + .wp-embed-share-tab-button {
- margin: 0 0 0 10px;
- padding: 0 0 0 11px;
- border-left: 1px solid #aaa;
-}
-
-.wp-embed-share-tab[aria-hidden="true"] {
- display: none;
-}
-
-p.wp-embed-share-description {
- margin: 0;
- font-size: 14px;
- line-height: 1;
- font-style: italic;
- color: #aaa;
-}
-
-.wp-embed-share-input {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- width: 100%;
- border: none;
- height: 28px;
- margin: 0 0 10px 0;
- padding: 0 5px;
- font: 400 14px/1.5 'Open Sans', sans-serif;
- resize: none;
- cursor: text;
-}
-
-textarea.wp-embed-share-input {
- height: 72px;
-}
-
-html[dir="rtl"] .wp-embed-featured-image.square {
- float: right;
- margin-right: 0;
-
- margin-left: 20px;
-}
-
-html[dir="rtl"] .wp-embed-site-title a {
- padding-left: 0;
- padding-right: 35px;
-}
-
-html[dir="rtl"] .wp-embed-site-icon {
- margin-right: 0;
- margin-left: 10px;
- left: auto;
- right: 0;
-}
-
-html[dir="rtl"] .wp-embed-meta {
- text-align: left;
-}
-
-html[dir="rtl"] .wp-embed-footer {
-}
-
-html[dir="rtl"] .wp-embed-share {
- margin-left: 0;
- margin-right: 10px;
-}
-
-html[dir="rtl"] .wp-embed-share-dialog-close {
- right: auto;
- left: 20px;
-}
-
-html[dir="rtl"] .wp-embed-share-tab-button + .wp-embed-share-tab-button {
- margin: 0 10px 0 0;
- padding: 0 11px 0 0;
- border-left: none;
- border-right: 1px solid #aaa;
-}
</del></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></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/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2015-10-17 00:44:12 UTC (rev 35234)
+++ trunk/src/wp-includes/default-filters.php 2015-10-17 01:20:19 UTC (rev 35235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,24 +446,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'wp_oembed_add_discovery_links' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'wp_oembed_add_host_js' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'oembed_head', 'print_emoji_detection_script' );
-add_action( 'oembed_head', 'print_emoji_styles' );
-add_action( 'oembed_head', 'print_oembed_embed_styles' );
-add_action( 'oembed_head', 'print_oembed_embed_scripts' );
-add_action( 'oembed_head', 'wp_print_head_scripts', 20 );
-add_action( 'oembed_head', 'wp_print_styles', 20 );
-add_action( 'oembed_head', 'wp_no_robots' );
-add_action( 'oembed_head', 'rel_canonical' );
-add_action( 'oembed_head', 'locale_stylesheet' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'embed_head', 'print_emoji_detection_script' );
+add_action( 'embed_head', 'print_emoji_styles' );
+add_action( 'embed_head', 'print_embed_styles' );
+add_action( 'embed_head', 'print_embed_scripts' );
+add_action( 'embed_head', 'wp_print_head_scripts', 20 );
+add_action( 'embed_head', 'wp_print_styles', 20 );
+add_action( 'embed_head', 'wp_no_robots' );
+add_action( 'embed_head', 'rel_canonical' );
+add_action( 'embed_head', 'locale_stylesheet' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'oembed_footer', 'wp_print_footer_scripts', 20 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'excerpt_more', 'wp_oembed_excerpt_more', 20 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'excerpt_more', 'wp_embed_excerpt_more', 20 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_excerpt_embed', 'wptexturize' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_excerpt_embed', 'convert_chars' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_excerpt_embed', 'wpautop' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_excerpt_embed', 'shortcode_unautop' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'the_excerpt_embed', 'wp_oembed_excerpt_attachment' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'the_excerpt_embed', 'wp_embed_excerpt_attachment' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'oembed_dataparse', 'wp_filter_oembed_result', 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'oembed_response_data', 'get_oembed_response_data_rich', 10, 4 );
</span></span></pre></div>
<a id="trunksrcwpincludesembedfunctionsphp"></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/embed-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/embed-functions.php 2015-10-17 00:44:12 UTC (rev 35234)
+++ trunk/src/wp-includes/embed-functions.php 2015-10-17 01:20:19 UTC (rev 35235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,20 +464,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output = "<script type='text/javascript'>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( SCRIPT_DEBUG ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= file_get_contents( ABSPATH . WPINC . '/js/wp-oembed.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= file_get_contents( ABSPATH . WPINC . '/js/wp-embed.js' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If you're looking at a src version of this file, you'll see an "include"
</span><span class="cx" style="display: block; padding: 0 10px"> * statement below. This is used by the `grunt build` process to directly
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * include a minified version of wp-oembed.js, instead of using the
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * include a minified version of wp-embed.js, instead of using the
</ins><span class="cx" style="display: block; padding: 0 10px"> * file_get_contents() method from above.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If you're looking at a build version of this file, you'll see a string of
</span><span class="cx" style="display: block; padding: 0 10px"> * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * and edit wp-oembed.js directly.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * and edit wp-embed.js directly.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $output .=<<<JS
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- include "js/wp-oembed.min.js"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ include "js/wp-embed.min.js"
</ins><span class="cx" style="display: block; padding: 0 10px"> JS;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "\n</script>";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,7 +491,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filter the oEmbed HTML output.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filter the embed HTML output for a given post.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -500,7 +500,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $width Width of the response.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $height Height of the response.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'oembed_html', $output, $post, $width, $height );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'embed_html', $output, $post, $width, $height );
</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">@@ -748,7 +748,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $more_string The string shown within the more link.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The modified excerpt.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_oembed_excerpt_more( $more_string ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_embed_excerpt_more( $more_string ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_embed() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $more_string;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -793,7 +793,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $content The current post excerpt.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The modified post excerpt.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_oembed_excerpt_attachment( $content ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_embed_excerpt_attachment( $content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_attachment() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return prepend_attachment( '' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -806,12 +806,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function print_oembed_embed_styles() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function print_embed_styles() {
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( SCRIPT_DEBUG ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- readfile( ABSPATH . WPINC . "/css/wp-oembed-embed.css" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ readfile( ABSPATH . WPINC . "/css/wp-embed-template.css" );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If you're looking at a src version of this file, you'll see an "include"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -821,10 +821,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If you're looking at a build version of this file, you'll see a string of
</span><span class="cx" style="display: block; padding: 0 10px"> * minified CSS. If you need to debug it, please turn on SCRIPT_DEBUG
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * and edit wp-oembed-embed.css directly.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * and edit wp-embed-template.css directly.
</ins><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">- include "css/wp-oembed-embed.min.css"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ include "css/wp-embed-template.min.css"
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</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">@@ -837,25 +837,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function print_oembed_embed_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function print_embed_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( SCRIPT_DEBUG ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- readfile( ABSPATH . WPINC . "/js/wp-oembed-embed.js" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ readfile( ABSPATH . WPINC . "/js/wp-embed-template.js" );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If you're looking at a src version of this file, you'll see an "include"
</span><span class="cx" style="display: block; padding: 0 10px"> * statement below. This is used by the `grunt build` process to directly
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * include a minified version of wp-oembed-embed.js, instead of using the
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * include a minified version of wp-embed-template.js, instead of using the
</ins><span class="cx" style="display: block; padding: 0 10px"> * readfile() method from above.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If you're looking at a build version of this file, you'll see a string of
</span><span class="cx" style="display: block; padding: 0 10px"> * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * and edit wp-oembed-embed.js directly.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * and edit wp-embed-template.js directly.
</ins><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">- include "js/wp-oembed-embed.min.js"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ include "js/wp-embed-template.min.js"
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="trunksrcwpincludesembedtemplatephp"></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/embed-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/embed-template.php 2015-10-17 00:44:12 UTC (rev 35234)
+++ trunk/src/wp-includes/embed-template.php 2015-10-17 01:20:19 UTC (rev 35235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><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"> if ( ! headers_sent() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- header( 'X-WP-oembed: true' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ header( 'X-WP-embed: true' );
</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"> wp_enqueue_style( 'open-sans' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'oembed_head' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'embed_head' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="cx" style="display: block; padding: 0 10px"> <body <?php body_class(); ?>>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,10 +66,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the thumbnail image size for use in the embed template.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $image_size Thumbnail image size.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_size = apply_filters( 'oembed_thumbnail_image_size', $image_size );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_size = apply_filters( 'embed_thumbnail_image_size', $image_size );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $shape = $measurements[0] / $measurements[1] >= 1.75 ? 'rectangular' : 'square';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $shape Thumbnail image shape. Either 'rectangular' or 'square'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $shape = apply_filters( 'oembed_thumbnail_image_shape', $shape );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $shape = apply_filters( 'embed_thumbnail_image_shape', $shape );
</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"> <div <?php post_class( 'wp-embed' ); ?>>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'oembed_content' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'embed_content' );
</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"> <div class="wp-embed-footer">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $site_icon_url The site icon URL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_icon_url = apply_filters( 'oembed_site_icon_url', $site_icon_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_icon_url = apply_filters( 'embed_site_icon_url', $site_icon_url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" target="_top"><img src="%s" width="32" height="32" alt="" class="wp-embed-site-icon"/><span>%s</span></a>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'oembed_content_meta');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'embed_content_meta');
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_comments_number() || comments_open() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-embed-comments">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $site_icon_url The site icon URL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_icon_url = apply_filters( 'oembed_site_icon_url', $site_icon_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_icon_url = apply_filters( 'embed_site_icon_url', $site_icon_url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" target="_top"><img src="%s" width="32" height="32" alt="" class="wp-embed-site-icon"/><span>%s</span></a>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-do_action( 'oembed_footer' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+do_action( 'embed_footer' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </body>
</span><span class="cx" style="display: block; padding: 0 10px"> </html>
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpoembedpluginjs"></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/tinymce/plugins/wpoembed/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/tinymce/plugins/wpoembed/plugin.js 2015-10-17 00:44:12 UTC (rev 35234)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpoembed/plugin.js 2015-10-17 01:20:19 UTC (rev 35235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var scriptElm = editor.dom.create( 'script', {
</span><span class="cx" style="display: block; padding: 0 10px"> id: scriptId,
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'text/javascript',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- src: url + '/../../../wp-oembed.js'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ src: url + '/../../../wp-embed.js'
</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"> editor.getDoc().getElementsByTagName( 'head' )[ 0 ].appendChild( scriptElm );
</span></span></pre></div>
<a id="trunksrcwpincludesjswpembedtemplatejsfromrev35234trunksrcwpincludesjswpoembedembedjs"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/js/wp-embed-template.js (from rev 35234, trunk/src/wp-includes/js/wp-oembed-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-template.js (rev 0)
+++ trunk/src/wp-includes/js/wp-embed-template.js 2015-10-17 01:20:19 UTC (rev 35235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,162 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+(function ( window, document ) {
+ 'use strict';
+
+ var secret = window.location.hash.replace( /.*secret=([\d\w]{10}).*/, '$1' ),
+ resizing;
+
+ function sendEmbedMessage( message, value ) {
+ window.parent.postMessage( {
+ message: message,
+ value: value,
+ secret: secret
+ }, '*' );
+ }
+
+ function onLoad() {
+ var share_dialog = document.querySelector( '.wp-embed-share-dialog' ),
+ share_dialog_open = document.querySelector( '.wp-embed-share-dialog-open' ),
+ share_dialog_close = document.querySelector( '.wp-embed-share-dialog-close' ),
+ share_input = document.querySelectorAll( '.wp-embed-share-input' ),
+ share_dialog_tabs = document.querySelectorAll( '.wp-embed-share-tab-button button' ),
+ links = document.getElementsByTagName( 'a' ),
+ i;
+
+ if ( share_input ) {
+ for ( i = 0; i < share_input.length; i++ ) {
+ share_input[ i ].addEventListener( 'click', function ( e ) {
+ e.target.select();
+ } );
+ }
+ }
+
+ function openSharingDialog() {
+ share_dialog.className = share_dialog.className.replace( 'hidden', '' );
+ share_input[ 0 ].select();
+ }
+
+ function closeSharingDialog() {
+ share_dialog.className += ' hidden';
+ document.querySelector( '.wp-embed-share-dialog-open' ).focus();
+ }
+
+ if ( share_dialog_open ) {
+ share_dialog_open.addEventListener( 'click', function ( e ) {
+ openSharingDialog();
+ e.preventDefault();
+ } );
+ }
+
+ if ( share_dialog_close ) {
+ share_dialog_close.addEventListener( 'click', function ( e ) {
+ closeSharingDialog();
+ e.preventDefault();
+ } );
+ }
+
+ function shareClickHandler( e ) {
+ var currentTab = document.querySelector( '.wp-embed-share-tab-button [aria-selected="true"]' );
+ currentTab.setAttribute( 'aria-selected', 'false' );
+ document.querySelector( '#' + currentTab.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'true' );
+
+ e.target.setAttribute( 'aria-selected', 'true' );
+ document.querySelector( '#' + e.target.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'false' );
+ }
+
+ function shareKeyHandler( e ) {
+ var target = e.target,
+ previousSibling = target.parentElement.previousElementSibling,
+ nextSibling = target.parentElement.nextElementSibling,
+ newTab, newTabChild;
+
+ if ( 37 === e.keyCode ) {
+ newTab = previousSibling;
+ } else if ( 39 === e.keyCode ) {
+ newTab = nextSibling;
+ } else {
+ return false;
+ }
+
+ if ( 'rtl' === document.documentElement.getAttribute( 'dir' ) ) {
+ newTab = ( newTab === previousSibling ) ? nextSibling : previousSibling;
+ }
+
+ if ( newTab ) {
+ newTabChild = newTab.firstElementChild;
+
+ target.setAttribute( 'tabindex', '-1' );
+ target.setAttribute( 'aria-selected', false );
+ document.querySelector( '#' + target.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'true' );
+
+ newTabChild.setAttribute( 'tabindex', '0' );
+ newTabChild.setAttribute( 'aria-selected', 'true' );
+ newTabChild.focus();
+ document.querySelector( '#' + newTabChild.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'false' );
+ }
+ }
+
+ if ( share_dialog_tabs ) {
+ for ( i = 0; i < share_dialog_tabs.length; i++ ) {
+ share_dialog_tabs[ i ].addEventListener( 'click', shareClickHandler );
+
+ share_dialog_tabs[ i ].addEventListener( 'keydown', shareKeyHandler );
+ }
+ }
+
+ document.addEventListener( 'keydown', function ( e ) {
+ if ( e.keyCode === 27 && -1 === share_dialog.className.indexOf( 'hidden' ) ) {
+ closeSharingDialog();
+ }
+ }, false );
+
+ if ( window.self === window.top ) {
+ return;
+ }
+
+ /**
+ * Send this document's height to the parent (embedding) site.
+ */
+ sendEmbedMessage( 'height', Math.ceil( document.body.getBoundingClientRect().height ) );
+
+ /**
+ * Detect clicks to external (_top) links.
+ */
+ function linkClickHandler( e ) {
+ var target = e.target,
+ href;
+ if ( target.hasAttribute( 'href' ) ) {
+ href = target.getAttribute( 'href' );
+ } else {
+ href = target.parentElement.getAttribute( 'href' );
+ }
+
+ /**
+ * Send link target to the parent (embedding) site.
+ */
+ sendEmbedMessage( 'link', href );
+ e.preventDefault();
+ }
+
+ for ( i = 0; i < links.length; i++ ) {
+ links[ i ].addEventListener( 'click', linkClickHandler );
+ }
+ }
+
+ document.addEventListener( 'DOMContentLoaded', onLoad, false );
+
+ /**
+ * Iframe resize handler.
+ */
+ function onResize() {
+ if ( window.self === window.top ) {
+ return;
+ }
+
+ clearTimeout( resizing );
+
+ resizing = setTimeout( function () {
+ sendEmbedMessage( 'height', Math.ceil( document.body.getBoundingClientRect().height ) );
+ }, 100 );
+ }
+
+ window.addEventListener( 'resize', onResize, false );
+})( window, document );
</ins></span></pre></div>
<a id="trunksrcwpincludesjswpembedjsfromrev35234trunksrcwpincludesjswpoembedjs"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/js/wp-embed.js (from rev 35234, trunk/src/wp-includes/js/wp-oembed.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 (rev 0)
+++ trunk/src/wp-includes/js/wp-embed.js 2015-10-17 01:20:19 UTC (rev 35235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,67 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+(function ( window, document ) {
+ 'use strict';
+
+ window.wp = window.wp || {};
+
+ if ( !! window.wp.receiveEmbedMessage ) {
+ return;
+ }
+
+ window.wp.receiveEmbedMessage = function( e ) {
+ var data = e.data;
+ if ( ! ( data.secret || data.message || data.value ) ) {
+ return;
+ }
+
+ var iframes = document.querySelectorAll( '.wp-embedded-content[data-secret="' + data.secret + '"]' );
+
+ for ( var i = 0; i < iframes.length; i++ ) {
+ var source = iframes[ i ];
+
+ /* Resize the iframe on request. */
+ if ( 'height' === data.message ) {
+ var height = data.value;
+ if ( height > 1000 ) {
+ height = 1000;
+ } else if ( height < 200 ) {
+ height = 200;
+ }
+
+ source.height = (height) + 'px';
+ }
+
+ /* Link to a specific URL on request. */
+ if ( 'link' === data.message ) {
+ var sourceURL = document.createElement( 'a' ), targetURL = document.createElement( 'a' );
+ sourceURL.href = source.getAttribute( 'src' );
+ targetURL.href = data.value;
+
+ /* Only continue if link hostname matches iframe's hostname. */
+ if ( targetURL.host === sourceURL.host && document.activeElement === source ) {
+ window.top.location.href = data.value;
+ }
+ }
+ }
+ };
+
+ window.addEventListener( 'message', window.wp.receiveEmbedMessage, false );
+
+ function onLoad() {
+ var isIE10 = -1 !== navigator.appVersion.indexOf( 'MSIE 10' ),
+ isIE11 = !!navigator.userAgent.match( /Trident.*rv\:11\./ );
+
+ /* Remove security attribute from iframes in IE10 and IE11. */
+ if ( isIE10 || isIE11 ) {
+ var iframes = document.querySelectorAll( '.wp-embedded-content[security]' ), iframeClone;
+
+ for ( var i = 0; i < iframes.length; i++ ) {
+ iframeClone = iframes[ i ].cloneNode( true );
+ iframeClone.removeAttribute( 'security' );
+ iframes[ i ].parentNode.insertBefore( iframeClone, iframes[ i ].nextSibling );
+ iframes[ i ].parentNode.removeChild( iframes[ i ] );
+ }
+ }
+ }
+
+ document.addEventListener( 'DOMContentLoaded', onLoad, false );
+})( window, document );
</ins></span></pre></div>
<a id="trunksrcwpincludesjswpoembedembedjs"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/js/wp-oembed-embed.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wp-oembed-embed.js 2015-10-17 00:44:12 UTC (rev 35234)
+++ trunk/src/wp-includes/js/wp-oembed-embed.js 2015-10-17 01:20:19 UTC (rev 35235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,162 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-(function ( window, document ) {
- 'use strict';
-
- var secret = window.location.hash.replace( /.*secret=([\d\w]{10}).*/, '$1' ),
- resizing;
-
- function sendEmbedMessage( message, value ) {
- window.parent.postMessage( {
- message: message,
- value: value,
- secret: secret
- }, '*' );
- }
-
- function onLoad() {
- var share_dialog = document.querySelector( '.wp-embed-share-dialog' ),
- share_dialog_open = document.querySelector( '.wp-embed-share-dialog-open' ),
- share_dialog_close = document.querySelector( '.wp-embed-share-dialog-close' ),
- share_input = document.querySelectorAll( '.wp-embed-share-input' ),
- share_dialog_tabs = document.querySelectorAll( '.wp-embed-share-tab-button button' ),
- links = document.getElementsByTagName( 'a' ),
- i;
-
- if ( share_input ) {
- for ( i = 0; i < share_input.length; i++ ) {
- share_input[ i ].addEventListener( 'click', function ( e ) {
- e.target.select();
- } );
- }
- }
-
- function openSharingDialog() {
- share_dialog.className = share_dialog.className.replace( 'hidden', '' );
- share_input[ 0 ].select();
- }
-
- function closeSharingDialog() {
- share_dialog.className += ' hidden';
- document.querySelector( '.wp-embed-share-dialog-open' ).focus();
- }
-
- if ( share_dialog_open ) {
- share_dialog_open.addEventListener( 'click', function ( e ) {
- openSharingDialog();
- e.preventDefault();
- } );
- }
-
- if ( share_dialog_close ) {
- share_dialog_close.addEventListener( 'click', function ( e ) {
- closeSharingDialog();
- e.preventDefault();
- } );
- }
-
- function shareClickHandler( e ) {
- var currentTab = document.querySelector( '.wp-embed-share-tab-button [aria-selected="true"]' );
- currentTab.setAttribute( 'aria-selected', 'false' );
- document.querySelector( '#' + currentTab.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'true' );
-
- e.target.setAttribute( 'aria-selected', 'true' );
- document.querySelector( '#' + e.target.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'false' );
- }
-
- function shareKeyHandler( e ) {
- var target = e.target,
- previousSibling = target.parentElement.previousElementSibling,
- nextSibling = target.parentElement.nextElementSibling,
- newTab, newTabChild;
-
- if ( 37 === e.keyCode ) {
- newTab = previousSibling;
- } else if ( 39 === e.keyCode ) {
- newTab = nextSibling;
- } else {
- return false;
- }
-
- if ( 'rtl' === document.documentElement.getAttribute( 'dir' ) ) {
- newTab = ( newTab === previousSibling ) ? nextSibling : previousSibling;
- }
-
- if ( newTab ) {
- newTabChild = newTab.firstElementChild;
-
- target.setAttribute( 'tabindex', '-1' );
- target.setAttribute( 'aria-selected', false );
- document.querySelector( '#' + target.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'true' );
-
- newTabChild.setAttribute( 'tabindex', '0' );
- newTabChild.setAttribute( 'aria-selected', 'true' );
- newTabChild.focus();
- document.querySelector( '#' + newTabChild.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'false' );
- }
- }
-
- if ( share_dialog_tabs ) {
- for ( i = 0; i < share_dialog_tabs.length; i++ ) {
- share_dialog_tabs[ i ].addEventListener( 'click', shareClickHandler );
-
- share_dialog_tabs[ i ].addEventListener( 'keydown', shareKeyHandler );
- }
- }
-
- document.addEventListener( 'keydown', function ( e ) {
- if ( e.keyCode === 27 && -1 === share_dialog.className.indexOf( 'hidden' ) ) {
- closeSharingDialog();
- }
- }, false );
-
- if ( window.self === window.top ) {
- return;
- }
-
- /**
- * Send this document's height to the parent (embedding) site.
- */
- sendEmbedMessage( 'height', Math.ceil( document.body.getBoundingClientRect().height ) );
-
- /**
- * Detect clicks to external (_top) links.
- */
- function linkClickHandler( e ) {
- var target = e.target,
- href;
- if ( target.hasAttribute( 'href' ) ) {
- href = target.getAttribute( 'href' );
- } else {
- href = target.parentElement.getAttribute( 'href' );
- }
-
- /**
- * Send link target to the parent (embedding) site.
- */
- sendEmbedMessage( 'link', href );
- e.preventDefault();
- }
-
- for ( i = 0; i < links.length; i++ ) {
- links[ i ].addEventListener( 'click', linkClickHandler );
- }
- }
-
- document.addEventListener( 'DOMContentLoaded', onLoad, false );
-
- /**
- * Iframe resize handler.
- */
- function onResize() {
- if ( window.self === window.top ) {
- return;
- }
-
- clearTimeout( resizing );
-
- resizing = setTimeout( function () {
- sendEmbedMessage( 'height', Math.ceil( document.body.getBoundingClientRect().height ) );
- }, 100 );
- }
-
- window.addEventListener( 'resize', onResize, false );
-})( window, document );
</del></span></pre></div>
<a id="trunksrcwpincludesjswpoembedjs"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/js/wp-oembed.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wp-oembed.js 2015-10-17 00:44:12 UTC (rev 35234)
+++ trunk/src/wp-includes/js/wp-oembed.js 2015-10-17 01:20:19 UTC (rev 35235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,67 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-(function ( window, document ) {
- 'use strict';
-
- window.wp = window.wp || {};
-
- if ( !! window.wp.receiveEmbedMessage ) {
- return;
- }
-
- window.wp.receiveEmbedMessage = function( e ) {
- var data = e.data;
- if ( ! ( data.secret || data.message || data.value ) ) {
- return;
- }
-
- var iframes = document.querySelectorAll( '.wp-embedded-content[data-secret="' + data.secret + '"]' );
-
- for ( var i = 0; i < iframes.length; i++ ) {
- var source = iframes[ i ];
-
- /* Resize the iframe on request. */
- if ( 'height' === data.message ) {
- var height = data.value;
- if ( height > 1000 ) {
- height = 1000;
- } else if ( height < 200 ) {
- height = 200;
- }
-
- source.height = (height) + 'px';
- }
-
- /* Link to a specific URL on request. */
- if ( 'link' === data.message ) {
- var sourceURL = document.createElement( 'a' ), targetURL = document.createElement( 'a' );
- sourceURL.href = source.getAttribute( 'src' );
- targetURL.href = data.value;
-
- /* Only continue if link hostname matches iframe's hostname. */
- if ( targetURL.host === sourceURL.host && document.activeElement === source ) {
- window.top.location.href = data.value;
- }
- }
- }
- };
-
- window.addEventListener( 'message', window.wp.receiveEmbedMessage, false );
-
- function onLoad() {
- var isIE10 = -1 !== navigator.appVersion.indexOf( 'MSIE 10' ),
- isIE11 = !!navigator.userAgent.match( /Trident.*rv\:11\./ );
-
- /* Remove security attribute from iframes in IE10 and IE11. */
- if ( isIE10 || isIE11 ) {
- var iframes = document.querySelectorAll( '.wp-embedded-content[security]' ), iframeClone;
-
- for ( var i = 0; i < iframes.length; i++ ) {
- iframeClone = iframes[ i ].cloneNode( true );
- iframeClone.removeAttribute( 'security' );
- iframes[ i ].parentNode.insertBefore( iframeClone, iframes[ i ].nextSibling );
- iframes[ i ].parentNode.removeChild( iframes[ i ] );
- }
- }
- }
-
- document.addEventListener( 'DOMContentLoaded', onLoad, false );
-})( window, document );
</del></span></pre></div>
<a id="trunktestsphpunittestsoembedtemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/template.php 2015-10-17 00:44:12 UTC (rev 35234)
+++ trunk/tests/phpunit/tests/oembed/template.php 2015-10-17 01:20:19 UTC (rev 35235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,22 +186,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( false !== strpos( $actual, 'Hello World' ) );
</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">- function test_wp_oembed_excerpt_more_no_embed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_wp_embed_excerpt_more_no_embed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_query'] = new WP_Query();
</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->assertEquals( 'foo bar', wp_oembed_excerpt_more( 'foo bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'foo bar', wp_embed_excerpt_more( 'foo bar' ) );
</ins><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">- function test_wp_oembed_excerpt_more() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_wp_embed_excerpt_more() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Foo Bar',
</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">- $this->assertEquals( '', wp_oembed_excerpt_more( '' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '', wp_embed_excerpt_more( '' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_post_embed_url( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = wp_oembed_excerpt_more( '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = wp_embed_excerpt_more( '' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '… <a class="wp-embed-more" href="%s" target="_top">Read more</a>',
</span></span></pre>
</div>
</div>
</body>
</html>