<!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>[35689] trunk/src/wp-includes: Embeds: Introduce `print_embed_comments_button()`, `print_embed_sharing_button()`, and `print_embed_sharing_dialog()`, which respectively output the comments button, sharing buttons, and sharing dialog elements in the embed template.</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/35689">35689</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/35689","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>DrewAPicture</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-18 20:50:53 +0000 (Wed, 18 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: Introduce `print_embed_comments_button()`, `print_embed_sharing_button()`, and `print_embed_sharing_dialog()`, which respectively output the comments button, sharing buttons, and sharing dialog elements in the embed template.
This change hooks these new output functions to existing hooks in the embed template, allowing for more straightforward display control of these elements.
Leaves the embed header and footer intact pending further modularization in a future release.
Props juliobox, swissspidy, DrewAPicture.
See <a href="https://core.trac.wordpress.org/ticket/34561">#34561</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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-11-18 20:48:24 UTC (rev 35688)
+++ trunk/src/wp-includes/default-filters.php 2015-11-18 20:50:53 UTC (rev 35689)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,6 +458,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'embed_head', 'rel_canonical' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'embed_head', 'locale_stylesheet' );
</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_action( 'embed_content_meta', 'print_embed_comments_button' );
+add_action( 'embed_content_meta', 'print_embed_sharing_button' );
+
+add_action( 'embed_footer', 'print_embed_sharing_dialog' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'embed_footer', 'print_embed_scripts' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'embed_footer', 'wp_print_footer_scripts', 20 );
</span><span class="cx" style="display: block; padding: 0 10px">
</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-11-18 20:48:24 UTC (rev 35688)
+++ trunk/src/wp-includes/embed-functions.php 2015-11-18 20:50:53 UTC (rev 35689)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -954,3 +954,94 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _oembed_filter_feed_content( $content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return str_replace( '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="display:none;"', '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"', $content );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Prints the necessary markup for the embed comments button.
+ *
+ * @since 4.4.0
+ */
+function print_embed_comments_button() {
+ if ( is_404() || ! ( get_comments_number() || comments_open() ) ) {
+ return;
+ }
+ ?>
+ <div class="wp-embed-comments">
+ <a href="<?php comments_link(); ?>" target="_top">
+ <span class="dashicons dashicons-admin-comments"></span>
+ <?php
+ printf(
+ _n(
+ '%s <span class="screen-reader-text">Comment</span>',
+ '%s <span class="screen-reader-text">Comments</span>',
+ get_comments_number()
+ ),
+ number_format_i18n( get_comments_number() )
+ );
+ ?>
+ </a>
+ </div>
+ <?php
+}
+
+/**
+ * Prints the necessary markup for the embed sharing button.
+ *
+ * @since 4.4.0
+ */
+function print_embed_sharing_button() {
+ if ( is_404() ) {
+ return;
+ }
+ ?>
+ <div class="wp-embed-share">
+ <button type="button" class="wp-embed-share-dialog-open" aria-label="<?php esc_attr_e( 'Open sharing dialog' ); ?>">
+ <span class="dashicons dashicons-share"></span>
+ </button>
+ </div>
+ <?php
+}
+
+/**
+ * Prints the necessary markup for the embed sharing dialog.
+ *
+ * @since 4.4.0
+ */
+function print_embed_sharing_dialog() {
+ if ( is_404() ) {
+ return;
+ }
+ ?>
+ <div class="wp-embed-share-dialog hidden" role="dialog" aria-label="<?php esc_attr_e( 'Sharing options' ); ?>">
+ <div class="wp-embed-share-dialog-content">
+ <div class="wp-embed-share-dialog-text">
+ <ul class="wp-embed-share-tabs" role="tablist">
+ <li class="wp-embed-share-tab-button wp-embed-share-tab-button-wordpress" role="presentation">
+ <button type="button" role="tab" aria-controls="wp-embed-share-tab-wordpress" aria-selected="true" tabindex="0"><?php esc_html_e( 'WordPress Embed' ); ?></button>
+ </li>
+ <li class="wp-embed-share-tab-button wp-embed-share-tab-button-html" role="presentation">
+ <button type="button" role="tab" aria-controls="wp-embed-share-tab-html" aria-selected="false" tabindex="-1"><?php esc_html_e( 'HTML Embed' ); ?></button>
+ </li>
+ </ul>
+ <div id="wp-embed-share-tab-wordpress" class="wp-embed-share-tab" role="tabpanel" aria-hidden="false">
+ <input type="text" value="<?php the_permalink(); ?>" class="wp-embed-share-input" aria-describedby="wp-embed-share-description-wordpress" tabindex="0" readonly/>
+
+ <p class="wp-embed-share-description" id="wp-embed-share-description-wordpress">
+ <?php _e( 'Copy and paste this URL into your WordPress site to embed' ); ?>
+ </p>
+ </div>
+ <div id="wp-embed-share-tab-html" class="wp-embed-share-tab" role="tabpanel" aria-hidden="true">
+ <textarea class="wp-embed-share-input" aria-describedby="wp-embed-share-description-html" tabindex="0" readonly><?php echo esc_textarea( get_post_embed_html( 600, 400 ) ); ?></textarea>
+
+ <p class="wp-embed-share-description" id="wp-embed-share-description-html">
+ <?php _e( 'Copy and paste this code into your site to embed' ); ?>
+ </p>
+ </div>
+ </div>
+
+ <button type="button" class="wp-embed-share-dialog-close" aria-label="<?php esc_attr_e( 'Close sharing dialog' ); ?>">
+ <span class="dashicons dashicons-no"></span>
+ </button>
+ </div>
+ </div>
+ <?php
+}
</ins></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-11-18 20:48:24 UTC (rev 35688)
+++ trunk/src/wp-includes/embed-template.php 2015-11-18 20:50:53 UTC (rev 35689)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,62 +149,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'embed_content_meta');
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( get_comments_number() || comments_open() ) : ?>
- <div class="wp-embed-comments">
- <a href="<?php comments_link(); ?>" target="_top">
- <span class="dashicons dashicons-admin-comments"></span>
- <?php
- printf(
- _n(
- '%s <span class="screen-reader-text">Comment</span>',
- '%s <span class="screen-reader-text">Comments</span>',
- get_comments_number()
- ),
- number_format_i18n( get_comments_number() )
- );
- ?>
- </a>
- </div>
- <?php endif; ?>
- <div class="wp-embed-share">
- <button type="button" class="wp-embed-share-dialog-open" aria-label="<?php esc_attr_e( 'Open sharing dialog' ); ?>">
- <span class="dashicons dashicons-share"></span>
- </button>
- </div>
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="wp-embed-share-dialog hidden" role="dialog" aria-label="<?php esc_attr_e( 'Sharing options' ); ?>">
- <div class="wp-embed-share-dialog-content">
- <div class="wp-embed-share-dialog-text">
- <ul class="wp-embed-share-tabs" role="tablist">
- <li class="wp-embed-share-tab-button wp-embed-share-tab-button-wordpress" role="presentation">
- <button type="button" role="tab" aria-controls="wp-embed-share-tab-wordpress" aria-selected="true" tabindex="0"><?php esc_html_e( 'WordPress Embed' ); ?></button>
- </li>
- <li class="wp-embed-share-tab-button wp-embed-share-tab-button-html" role="presentation">
- <button type="button" role="tab" aria-controls="wp-embed-share-tab-html" aria-selected="false" tabindex="-1"><?php esc_html_e( 'HTML Embed' ); ?></button>
- </li>
- </ul>
- <div id="wp-embed-share-tab-wordpress" class="wp-embed-share-tab" role="tabpanel" aria-hidden="false">
- <input type="text" value="<?php the_permalink(); ?>" class="wp-embed-share-input" aria-describedby="wp-embed-share-description-wordpress" tabindex="0" readonly />
-
- <p class="wp-embed-share-description" id="wp-embed-share-description-wordpress">
- <?php _e( 'Copy and paste this URL into your WordPress site to embed' ); ?>
- </p>
- </div>
- <div id="wp-embed-share-tab-html" class="wp-embed-share-tab" role="tabpanel" aria-hidden="true">
- <textarea class="wp-embed-share-input" aria-describedby="wp-embed-share-description-html" tabindex="0" readonly><?php echo esc_textarea( get_post_embed_html( 600, 400 ) ); ?></textarea>
-
- <p class="wp-embed-share-description" id="wp-embed-share-description-html">
- <?php _e( 'Copy and paste this code into your site to embed' ); ?>
- </p>
- </div>
- </div>
-
- <button type="button" class="wp-embed-share-dialog-close" aria-label="<?php esc_attr_e( 'Close sharing dialog' ); ?>">
- <span class="dashicons dashicons-no"></span>
- </button>
- </div>
- </div>
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endwhile;
</span></span></pre>
</div>
</div>
</body>
</html>