<!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>[12296] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-code-blocks-expand-contract: Support Forums: Code Expand/Contract: Allow for Block Editor Code sections that may have multiple `<code>`s within a single `<pre>`.</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 { white-space: pre-line; 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/12296">12296</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/12296","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-12-05 03:28:15 +0000 (Mon, 05 Dec 2022)</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'>Support Forums: Code Expand/Contract: Allow for Block Editor Code sections that may have multiple `<code>`s within a single `<pre>`.
See <a href="http://meta.trac.wordpress.org/ticket/6608">#6608</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpcodeblocksexpandcontractwporgbbpcodeblocksexpandcontractcss">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-code-blocks-expand-contract/wporg-bbp-code-blocks-expand-contract.css</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpcodeblocksexpandcontractwporgbbpcodeblocksexpandcontractjs">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-code-blocks-expand-contract/wporg-bbp-code-blocks-expand-contract.js</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpcodeblocksexpandcontractwporgbbpcodeblocksexpandcontractphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-code-blocks-expand-contract/wporg-bbp-code-blocks-expand-contract.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpcodeblocksexpandcontractwporgbbpcodeblocksexpandcontractcss"></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/plugins/wporg-bbp-code-blocks-expand-contract/wporg-bbp-code-blocks-expand-contract.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-code-blocks-expand-contract/wporg-bbp-code-blocks-expand-contract.css 2022-12-05 02:24:05 UTC (rev 12295)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-code-blocks-expand-contract/wporg-bbp-code-blocks-expand-contract.css 2022-12-05 03:28:15 UTC (rev 12296)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,3 +24,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .wporg-bbp-code-expand.wporg-bbp-code-expanded:before {
</span><span class="cx" style="display: block; padding: 0 10px"> content: "\f343";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/* force-disable overflow on the <code> elements. */
+#bbpress-forums div.bbp-topic-content pre code,
+#bbpress-forums div.bbp-reply-content pre code {
+ overflow: unset !important;
+ overflow-x: inherit;
+}
+
+#bbpress-forums div.bbp-topic-content pre.wporg-bbp-code-expander-code-wrapper,
+#bbpress-forums div.bbp-reply-content pre.wporg-bbp-code-expander-code-wrapper {
+ white-space: pre-wrap;
+}
+
+#bbpress-forums div.bbp-topic-content pre.wporg-bbp-code-expander-code-wrapper code,
+#bbpress-forums div.bbp-reply-content pre.wporg-bbp-code-expander-code-wrapper code {
+ display: unset;
+// max-height: unset;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpcodeblocksexpandcontractwporgbbpcodeblocksexpandcontractjs"></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/plugins/wporg-bbp-code-blocks-expand-contract/wporg-bbp-code-blocks-expand-contract.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/plugins/wporg-bbp-code-blocks-expand-contract/wporg-bbp-code-blocks-expand-contract.js 2022-12-05 02:24:05 UTC (rev 12295)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-code-blocks-expand-contract/wporg-bbp-code-blocks-expand-contract.js 2022-12-05 03:28:15 UTC (rev 12296)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,19 +1,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery(document).ready( function($) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '.bbp-topic-content > pre > code, .bbp-reply-content > pre > code' ).each( function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The block editor may have multiple `<code>` within a `<pre>`.
+ $( '.bbp-topic-content > pre, .bbp-reply-content > pre' ).each( function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var $el = $( this );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( typeof this.scrollHeight !== 'undefined' && $el.height() < this.scrollHeight ) {
- var btn = $( '<div class="wporg-bbp-code-tools"><a class="wporg-bbp-code-expand" href="#"></a></div>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ typeof this.scrollHeight === 'undefined' ||
+ $el.outerHeight( true ) >= this.scrollHeight
+ ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- btn.find( 'a' ).text( bbpCodeBlocksExpandContract.expand );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add a CSS selector.
+ $el.addClass( 'wporg-bbp-code-expander-code-wrapper' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- btn.insertAfter( $el.closest( 'pre' ) )
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var btn = $( '<div class="wporg-bbp-code-tools"><a class="wporg-bbp-code-expand" href="#"></a></div>' );
+
+ btn.find( 'a' ).text( bbpCodeBlocksExpandContract.expand );
+
+ btn.insertAfter( $el );
</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">- $( '.wporg-bbp-code-expand' ).on( 'click', function(el) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.wporg-bbp-code-expand' ).on( 'click', function(e) {
+ e.preventDefault();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> var pre = $( this ).closest( 'div' ).prev( 'pre' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- code = pre.find( 'code' ),
</del><span class="cx" style="display: block; padding: 0 10px"> heightGoal,
</span><span class="cx" style="display: block; padding: 0 10px"> maxHeightGoal,
</span><span class="cx" style="display: block; padding: 0 10px"> scrollGoal;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,28 +31,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $( this ).hasClass( 'wporg-bbp-code-expanded' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> maxHeightGoal = pre.data( 'bbpInitHeight' );
</span><span class="cx" style="display: block; padding: 0 10px"> scrollGoal = pre.offset().top - 45;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Account for the WordPress.org headers.
+ scrollGoal -= jQuery( 'header.wp-block-group.global-header' ).height() || 0;
+ scrollGoal -= jQuery( '#wpadminbar' ).height() || 0;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> pre.data( 'bbpInitHeight', pre.css( 'max-height' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- heightGoal = code.get( 0 ).scrollHeight;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ heightGoal = pre.get(0).scrollHeight + 2 * pre.css('padding-top');
</ins><span class="cx" style="display: block; padding: 0 10px"> maxHeightGoal = 'none';
</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 ( typeof heightGoal !== 'undefined' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> pre.css( 'max-height', maxHeightGoal );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- code.css( 'max-height', maxHeightGoal );
- code.animate( { height: heightGoal });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ pre.animate( { height: heightGoal } );
</ins><span class="cx" style="display: block; padding: 0 10px"> $( this ).text( bbpCodeBlocksExpandContract.contract );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $( [document.documentElement, document.body] ).animate({
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- scrollTop: scrollGoal
- },
- 600,
- 'swing',
- function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ scrollTop: scrollGoal
+ },
+ 300,
+ 'swing',
+ function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> pre.css( 'max-height', maxHeightGoal );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- code.css( 'max-height', maxHeightGoal );
- }
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( this ).text( bbpCodeBlocksExpandContract.expand );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpcodeblocksexpandcontractwporgbbpcodeblocksexpandcontractphp"></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/plugins/wporg-bbp-code-blocks-expand-contract/wporg-bbp-code-blocks-expand-contract.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/plugins/wporg-bbp-code-blocks-expand-contract/wporg-bbp-code-blocks-expand-contract.php 2022-12-05 02:24:05 UTC (rev 12295)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-code-blocks-expand-contract/wporg-bbp-code-blocks-expand-contract.php 2022-12-05 03:28:15 UTC (rev 12296)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,11 +25,22 @@
</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"> function wp_head() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_enqueue_script( 'wporg-bbp-code-blocks-expand-contract', plugins_url( 'wporg-bbp-code-blocks-expand-contract.js', __FILE__ ), [ 'jquery' ], 1, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_enqueue_script(
+ 'wporg-bbp-code-blocks-expand-contract',
+ plugins_url( 'wporg-bbp-code-blocks-expand-contract.js', __FILE__ ),
+ [ 'jquery' ],
+ filemtime( __DIR__ . '/wporg-bbp-code-blocks-expand-contract.js' ),
+ true
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script( 'wporg-bbp-code-blocks-expand-contract', 'bbpCodeBlocksExpandContract', [
</span><span class="cx" style="display: block; padding: 0 10px"> 'expand' => __( 'Expand', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'contract' => __( 'Contract', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_enqueue_style( 'wporg-bbp-code-blocks-expand-contract', plugins_url( 'wporg-bbp-code-blocks-expand-contract.css', __FILE__ ), [], 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_enqueue_style(
+ 'wporg-bbp-code-blocks-expand-contract',
+ plugins_url( 'wporg-bbp-code-blocks-expand-contract.css', __FILE__ ),
+ [],
+ filemtime( __DIR__ . '/wporg-bbp-code-blocks-expand-contract.css' ),
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', __NAMESPACE__ . '\wp_head' );
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>