<!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>[BuddyPress][12773] trunk/src/bp-templates/bp-nouveau: BP Nouveau: make sure users can delete their account from front end</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://buddypress.trac.wordpress.org/changeset/12773">12773</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12773","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-30 23:57:03 +0000 (Fri, 30 Oct 2020)</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'>BP Nouveau: make sure users can delete their account from front end
- Avoid using hashtags into tag attributes.
- Improve the function to toggle the availability of the "delete my account" submit button.
Props dragoeco
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8383">#8383</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypressmemberssinglesettingsdeleteaccountphp">trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/delete-account.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaucommonstyles_bp_buttonsscss">trunk/src/bp-templates/bp-nouveau/common-styles/_bp_buttons.scss</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaucssbuddypressrtlcss">trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaucssbuddypresscss">trunk/src/bp-templates/bp-nouveau/css/buddypress.css</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaujsbuddypressnouveaujs">trunk/src/bp-templates/bp-nouveau/js/buddypress-nouveau.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveaubuddypressmemberssinglesettingsdeleteaccountphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/delete-account.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/delete-account.php 2020-10-30 22:13:38 UTC (rev 12772)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/delete-account.php 2020-10-30 23:57:03 UTC (rev 12773)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * BuddyPress - Members Settings ( Delete Account )
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 4.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 7.0.0
</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"> bp_nouveau_member_hook( 'before', 'settings_template' ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,10 +14,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bp_nouveau_user_feedback( 'member-delete-account' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/delete-account' ); ?>" name="account-delete-form" id="#account-delete-form" class="standard-form" method="post">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/delete-account' ); ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <label id="delete-account-understand" class="warn" for="delete-account-understand">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input class="disabled" type="checkbox" name="delete-account-understand" value="1" data-bp-disable-input="#delete-account-button" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input class="disabled" type="checkbox" name="delete-account-understand" value="1" data-bp-disable-input="delete-account-button" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php esc_html_e( 'I understand the consequences.', 'buddypress' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaucommonstyles_bp_buttonsscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/common-styles/_bp_buttons.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/common-styles/_bp_buttons.scss 2020-10-30 22:13:38 UTC (rev 12772)
+++ trunk/src/bp-templates/bp-nouveau/common-styles/_bp_buttons.scss 2020-10-30 23:57:03 UTC (rev 12773)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,6 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> input[type="button"].disabled,
</span><span class="cx" style="display: block; padding: 0 10px"> input[type="reset"].disabled,
</span><span class="cx" style="display: block; padding: 0 10px"> input[type="submit"][disabled="disabled"],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ input[type="submit"]:disabled,
</ins><span class="cx" style="display: block; padding: 0 10px"> button.pending,
</span><span class="cx" style="display: block; padding: 0 10px"> button.disabled,
</span><span class="cx" style="display: block; padding: 0 10px"> div.pending a,
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaucssbuddypressrtlcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css 2020-10-30 22:13:38 UTC (rev 12772)
+++ trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css 2020-10-30 23:57:03 UTC (rev 12773)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4105,6 +4105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .buddypress .buddypress-wrap input[type="button"].disabled,
</span><span class="cx" style="display: block; padding: 0 10px"> .buddypress .buddypress-wrap input[type="reset"].disabled,
</span><span class="cx" style="display: block; padding: 0 10px"> .buddypress .buddypress-wrap input[type="submit"][disabled="disabled"],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.buddypress .buddypress-wrap input[type="submit"]:disabled,
</ins><span class="cx" style="display: block; padding: 0 10px"> .buddypress .buddypress-wrap button.pending,
</span><span class="cx" style="display: block; padding: 0 10px"> .buddypress .buddypress-wrap button.disabled,
</span><span class="cx" style="display: block; padding: 0 10px"> .buddypress .buddypress-wrap div.pending a,
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaucssbuddypresscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/css/buddypress.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/css/buddypress.css 2020-10-30 22:13:38 UTC (rev 12772)
+++ trunk/src/bp-templates/bp-nouveau/css/buddypress.css 2020-10-30 23:57:03 UTC (rev 12773)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4105,6 +4105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .buddypress .buddypress-wrap input[type="button"].disabled,
</span><span class="cx" style="display: block; padding: 0 10px"> .buddypress .buddypress-wrap input[type="reset"].disabled,
</span><span class="cx" style="display: block; padding: 0 10px"> .buddypress .buddypress-wrap input[type="submit"][disabled="disabled"],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.buddypress .buddypress-wrap input[type="submit"]:disabled,
</ins><span class="cx" style="display: block; padding: 0 10px"> .buddypress .buddypress-wrap button.pending,
</span><span class="cx" style="display: block; padding: 0 10px"> .buddypress .buddypress-wrap button.disabled,
</span><span class="cx" style="display: block; padding: 0 10px"> .buddypress .buddypress-wrap div.pending a,
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaujsbuddypressnouveaujs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/js/buddypress-nouveau.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/js/buddypress-nouveau.js 2020-10-30 22:13:38 UTC (rev 12772)
+++ trunk/src/bp-templates/bp-nouveau/js/buddypress-nouveau.js 2020-10-30 23:57:03 UTC (rev 12773)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global wp, bp, BP_Nouveau, JSON */
</span><span class="cx" style="display: block; padding: 0 10px"> /* jshint devel: true */
</span><span class="cx" style="display: block; padding: 0 10px"> /* jshint browser: true */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* @version 3.2.0 */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* @since 3.0.0 */
+/* @version 7.0.0 */
</ins><span class="cx" style="display: block; padding: 0 10px"> window.wp = window.wp || {};
</span><span class="cx" style="display: block; padding: 0 10px"> window.bp = window.bp || {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,26 +465,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** Event Callbacks ***********************************************************/
</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">- * [enableDisabledInput description]
- * @param {[type]} event [description]
- * @param {[type]} data [description]
- * @return {[type]} [description]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Toggle the availability of Delete My account button.
+ *
+ * @param {Object} event The change event.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- toggleDisabledInput: function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ toggleDisabledInput: function( event ) {
+ var target = $( event.currentTarget ), disabledControl = '#' + target.data( 'bp-disable-input' ),
+ isChecked = target.prop( 'checked' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Fetch the data attr value (id)
- // This a pro tem approach due to current conditions see
- // https://github.com/buddypress/next-template-packs/issues/180.
- var disabledControl = $(this).attr('data-bp-disable-input');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ target.removeClass( 'enabled disabled' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $( disabledControl ).prop( 'disabled', true ) && !$(this).hasClass('enabled') ) {
- $(this).addClass('enabled').removeClass('disabled');
- $( disabledControl ).removeProp( 'disabled' );
-
- } else if( $( disabledControl ).prop( 'disabled', false ) && $(this).hasClass('enabled') ) {
- $(this).removeClass('enabled').addClass('disabled');
- // Set using attr not .prop else DOM renders as 'disable=""' CSS needs 'disable="disable"'.
- $( disabledControl ).attr( 'disabled', 'disabled' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isChecked ) {
+ target.addClass( 'enabled' );
+ $( disabledControl ).prop( 'disabled', false );
+ } else {
+ $( disabledControl ).prop( 'disabled', true );
+ target.addClass( 'disabled' );
</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></pre>
</div>
</div>
</body>
</html>