<!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>[6475] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins: Plugins: Remove remaining read-more links.</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="http://meta.trac.wordpress.org/changeset/6475">6475</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6475","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-30 22:13:50 +0000 (Tue, 30 Jan 2018)</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'>Plugins: Remove remaining read-more links.
Props SergeyBiryukov.
Fixes <a href="http://meta.trac.wordpress.org/ticket/3032">#3032</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginstemplatepartspluginsinglephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-single.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginstemplatepartssectionphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsjssectionaccordionjs">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/section-accordion.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php 2018-01-30 20:08:35 UTC (rev 6474)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php 2018-01-30 22:13:50 UTC (rev 6475)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'wporg-plugins-popover', get_template_directory_uri() . '/js/popover.js', array(), '20171002', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_singular( 'plugin' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_enqueue_script( 'wporg-plugins-accordion', get_template_directory_uri() . '/js/section-accordion.js', array(), '20161121', true );
</del><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'wporg-plugins-faq', get_template_directory_uri() . '/js/section-faq.js', array(), '20171218', true );
</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">@@ -140,7 +139,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wporg-plugins-popover',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wporg-plugins-locale-banner',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wporg-plugins-stats',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wporg-plugins-accordion',
</del><span class="cx" style="display: block; padding: 0 10px"> 'wporg-plugins-client',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wporg-plugins-faq',
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsjssectionaccordionjs"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/section-accordion.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/section-accordion.js 2018-01-30 20:08:35 UTC (rev 6474)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/section-accordion.js 2018-01-30 22:13:50 UTC (rev 6475)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,69 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* global _gaq */
-( function( $, wporg ) {
- wporg.plugins = {
- toggle: function( section ) {
- var sectionId = '#' + section,
- $section = $( sectionId ),
- $button = $( 'button.section-toggle[aria-controls="' + section + '"]' );
-
- $section.toggleClass( 'toggled' );
-
- $( '.read-more:not(' + sectionId + ',.short-content)' ).removeClass( 'toggled' )
- .next( '.section-toggle' ).attr( 'aria-expanded', false ).text( $button.data( 'read-more' ) );
-
- $button.text(
- $section.hasClass( 'toggled' ) ? $button.data( 'show-less' ) : $button.data( 'read-more' )
- ).attr( 'aria-expanded', function( index, attribute ) {
- var notExpanded = 'false' === attribute;
-
- if ( notExpanded ) {
- _gaq.push([ '_trackPageview', window.location.pathname + sectionId + '/' ]);
- }
-
- return notExpanded;
- } );
- },
- initial_size: function( section ) {
- $( section ).each( function( index, element ) {
- var $section = $( element ),
- $button = $( '.section-toggle[aria-controls="' + element.id + '"]' );
-
- if ( $section.height() / element.scrollHeight > 0.8 ) {
- // Force the section to expand, and hide its button.
- $section.toggleClass( 'toggled' ).addClass( 'short-content' );
- $button.hide();
- } else {
- // If the description starts with an embed/video, set the min-height to include it.
- if ( 'description' === element.id && $section.children().next( 'p, div' ).first().find( 'video, iframe' ).length ) {
- var height = $section.children().next( 'p,div' ).first().outerHeight( true ) /* embed */ + $section.children().first().outerHeight( true ) /* h2 */;
-
- if ( height > parseInt( $section.css( 'max-height' ) ) ) {
- $section.css( 'min-height', height + 'px' );
- }
- }
-
- // Contract the section and make sure its button is visible.
- $section.removeClass( 'short-content' );
- $button.show();
- }
- } );
- }
- };
-
- $( function() {
- // Must always run first, else expand/contract buttons will get hidden incorrectly.
- wporg.plugins.initial_size( '.read-more' );
-
- if ( document.location.hash ) {
- wporg.plugins.toggle( document.location.hash.substr(1) );
- }
-
- $( window ).on( 'hashchange', function() {
- wporg.plugins.toggle( document.location.hash.substr(1) );
- } );
-
- $( '#main' ).on( 'click', '.section-toggle', function( event ) {
- wporg.plugins.toggle( $( event.target ).attr( 'aria-controls' ) );
- } );
- } );
-} )( window.jQuery, window.wporg || {} );
</del></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginstemplatepartspluginsinglephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-single.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-single.php 2018-01-30 20:08:35 UTC (rev 6474)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-single.php 2018-01-30 22:13:50 UTC (rev 6475)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Plugin_Directory;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Template;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-global $section, $section_slug, $section_content, $section_read_more, $post;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+global $section, $section_slug, $section_content, $post;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = Plugin_Directory::instance()->split_post_content_into_pages( get_the_content() );
</span><span class="cx" style="display: block; padding: 0 10px"> $is_closed = in_array( get_post_status(), [ 'closed', 'disabled' ], true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,14 +99,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $section = wp_list_filter( $plugin_sections, array( 'slug' => $section_slug ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $section = array_pop( $section );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $section_no_read_mores = array( 'description', 'screenshots', 'installation', 'faq', 'reviews' );
- // If the FAQ section is the newer `<dl>` form, no need to do read-more for it.
- if ( false !== stripos( $section_content, '<dl>' ) ) {
- $section_no_read_mores[] = 'faq';
- }
-
- $section_read_more = ! in_array( $section_slug, $section_no_read_mores, true );
-
</del><span class="cx" style="display: block; padding: 0 10px"> get_template_part( 'template-parts/section' );
</span><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // plugin_advanced.
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginstemplatepartssectionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section.php 2018-01-30 20:08:35 UTC (rev 6474)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section.php 2018-01-30 22:13:50 UTC (rev 6475)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,14 +7,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @package WordPressdotorg\Plugin_Directory\Theme
</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">-global $section, $section_slug, $section_content, $section_read_more;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+global $section, $section_slug, $section_content;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prefix = in_array( $section_slug, array( 'screenshots', 'faq' ), true ) ? '' : 'tab-';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = [ 'plugin-' . $section_slug, 'section' ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $section_read_more ) {
- $classes[] = 'read-more';
-}
</del><span class="cx" style="display: block; padding: 0 10px"> $classes = implode( ' ', $classes );
</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">@@ -22,16 +19,3 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 id="<?php echo esc_attr( $section_slug . '-header' ); ?>"><?php echo esc_html( $section['title'] ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $section_content; ?>
</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">-<?php if ( $section_read_more ) : ?>
- <button
- type="button"
- class="button-link section-toggle"
- aria-controls="<?php echo esc_attr( $prefix . $section_slug ); ?>"
- aria-describedby="<?php echo esc_attr( $section_slug . '-header' ); ?>"
- aria-expanded="false"
- data-show-less="<?php esc_attr_e( 'Show less', 'wporg-plugins' ); ?>"
- data-read-more="<?php esc_attr_e( 'Read more', 'wporg-plugins' ); ?>"
- >
- <?php esc_html_e( 'Read more', 'wporg-plugins' ); ?>
- </button>
-<?php endif; ?>
</del></span></pre>
</div>
</div>
</body>
</html>