<!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>[10743] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/functions.php: Make: Properly hide the "Welcome" box on make o2's for logged out users.</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/10743">10743</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/10743","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>2021-03-04 08:12:11 +0000 (Thu, 04 Mar 2021)</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'>Make: Properly hide the "Welcome" box on make o2's for logged out users.
The welcome box functionality is based on cookies, but the logic was server-side and the page output was cached for logged out users without respecting that cookie.
This change moves the logic for showing/hiding it client-side and cleans up the JS a bit.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgbreathefunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgbreathefunctionsphp"></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-breathe/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-breathe/functions.php 2021-03-04 06:16:10 UTC (rev 10742)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/functions.php 2021-03-04 08:12:11 UTC (rev 10743)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,22 +82,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var el = document.getElementById( 'make-welcome-toggle' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( el ) {
</span><span class="cx" style="display: block; padding: 0 10px"> el.addEventListener( 'click', function( e ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( jQuery( '.make-welcome .entry-content' ).is( ':hidden' ) ) {
- document.cookie = el.dataset.cookie + '=' +
- '; expires=Thu, 01 Jan 1970 00:00:00 GMT' +
- '; domain=<?php echo esc_js( $current_site->domain ); ?>' +
- '; path=<?php echo esc_js( $current_site->path ); ?>';
- jQuery( '#make-welcome-toggle' ).text( '<?php esc_attr_e( 'Hide welcome box', 'wporg' ); ?>' );
- } else {
- document.cookie = el.dataset.cookie + '=' + el.dataset.hash +
- '; expires=Fri, 31 Dec 9999 23:59:59 GMT' +
- '; domain=<?php echo esc_js( $current_site->domain ); ?>' +
- '; path=<?php echo esc_js( $current_site->path ); ?>';
- jQuery( '#make-welcome-toggle' ).text( '<?php esc_attr_e( 'Show welcome box', 'wporg' ); ?>' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $welcome = jQuery( '.make-welcome' ),
+ $toggle = $welcome.find( '#make-welcome-toggle'),
+ $content = $welcome.find( '#make-welcome-content'),
+ isHide = ! $content.is( ':hidden' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- jQuery( '.make-welcome .entry-content' ).slideToggle();
- jQuery( '.make-welcome .post-edit-link' ).toggle();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Toggle it
+ $toggle.text( $toggle.data( isHide ? 'show' : 'hide' ) );
+ $content.slideToggle();
+ $welcome.find('.post-edit-link' ).toggle( ! isHide );
+
+ // Remember it
+ document.cookie = $content.data( 'cookie' ) + '=' +
+ ( isHide ? $content.data( 'hash' ) : '' ) +
+ '; expires=Fri, 31 Dec 9999 23:59:59 GMT' +
+ '; domain=<?php echo esc_js( $current_site->domain ); ?>' +
+ '; path=<?php echo esc_js( $current_site->path ); ?>';
</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"> </script>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,14 +115,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- if ( ! $hash || $content_hash !== $hash ) {
- $class = '';
- $label = __( 'Hide welcome box', 'wporg' );
- } else {
- $class = 'hidden';
- $label = __( 'Show welcome box', 'wporg' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $columns = preg_split( '|<hr\s*/?>|', $welcome->post_content );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( count( $columns ) === 2 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome->post_content = "<div class='content-area'>\n\n{$columns[0]}</div><div class='widget-area'>\n\n{$columns[1]}</div>";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,10 +130,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="make-welcome">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( __( 'Edit', 'wporg' ), '', '', $welcome->ID, 'post-edit-link ' . $class ); ?>
- <button type="button" id="make-welcome-toggle" data-hash="<?php echo $content_hash; ?>" data-cookie="<?php echo $cookie; ?>"><?php echo $label; ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'wporg' ), '', '', $welcome->ID, 'post-edit-link make-welcome-edit-post-link' ); ?>
+ <button
+ type="button"
+ id="make-welcome-toggle"
+ data-show="<?php esc_attr_e( 'Show welcome box', 'wporg' ); ?>"
+ data-hide="<?php esc_attr_e( 'Hide welcome box', 'wporg' ); ?>"
+ ><?php _e( 'Hide welcome box', 'wporg' ); ?></button>
</ins><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="entry-content clear <?php echo $class; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="entry-content clear" id="make-welcome-content" data-cookie="<?php echo $cookie; ?>" data-hash="<?php echo $content_hash; ?>">
+ <script type="text/javascript">
+ var elContent = document.getElementById( 'make-welcome-content' );
+ if ( elContent ) {
+ if ( -1 !== document.cookie.indexOf( elContent.dataset.cookie + '=' + elContent.dataset.hash ) ) {
+ var elToggle = document.getElementById( 'make-welcome-toggle' ),
+ elEditLink = document.getElementsByClassName( 'make-welcome-edit-post-link' )
+
+ // It's hidden, hide it ASAP.
+ elContent.className += " hidden";
+ elToggle.innerText = elToggle.dataset.show;
+
+ if ( elEditLink.length ) {
+ elEditLink[0].className += " hidden";
+ }
+ }
+ }
+ </script>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +296,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"> // Noindex empty/short pages
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_singular() && ( strlen( get_the_content() ) < 100 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_singular() && strlen( get_the_content() ) < 100 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $noindex = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>