Changeset 12773

Timestamp:

10/30/2020 11:57:03 PM (4 years ago)

Author:

imath

Message:

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 #8383

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress/members/single/settings/delete-account.php (modified) (2 diffs)
• common-styles/_bp_buttons.scss (modified) (1 diff)
• css/buddypress-rtl.css (modified) (1 diff)
• css/buddypress.css (modified) (1 diff)
• js/buddypress-nouveau.js (modified) (2 diffs)

trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/delete-account.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 4.0.0
+ * @version 7.0.0
  */
 
@@ -15 +15 @@
 <?php bp_nouveau_user_feedback( 'member-delete-account' ); ?>
 
-<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">
+<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">
 
     <label id="delete-account-understand" class="warn" for="delete-account-understand">
-        <input class="disabled" type="checkbox" name="delete-account-understand" value="1" data-bp-disable-input="#delete-account-button" />
+        <input class="disabled" type="checkbox" name="delete-account-understand" value="1" data-bp-disable-input="delete-account-button" />
         <?php esc_html_e( 'I understand the consequences.', 'buddypress' ); ?>
     </label>

trunk/src/bp-templates/bp-nouveau/common-styles/_bp_buttons.scss

@@ -84 +84 @@
         input[type="reset"].disabled,
         input[type="submit"][disabled="disabled"],
+        input[type="submit"]:disabled,
         button.pending,
         button.disabled,

trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css

@@ -4106 +4106 @@
 .buddypress .buddypress-wrap input[type="reset"].disabled,
 .buddypress .buddypress-wrap input[type="submit"][disabled="disabled"],
+.buddypress .buddypress-wrap input[type="submit"]:disabled,
 .buddypress .buddypress-wrap button.pending,
 .buddypress .buddypress-wrap button.disabled,

trunk/src/bp-templates/bp-nouveau/css/buddypress.css

@@ -4106 +4106 @@
 .buddypress .buddypress-wrap input[type="reset"].disabled,
 .buddypress .buddypress-wrap input[type="submit"][disabled="disabled"],
+.buddypress .buddypress-wrap input[type="submit"]:disabled,
 .buddypress .buddypress-wrap button.pending,
 .buddypress .buddypress-wrap button.disabled,

trunk/src/bp-templates/bp-nouveau/js/buddypress-nouveau.js

@@ -2 +2 @@
 /* jshint devel: true */
 /* jshint browser: true */
-/* @version 3.2.0 */
+/* @since 3.0.0 */
+/* @version 7.0.0 */
 window.wp = window.wp || {};
 window.bp = window.bp || {};
@@ -465 +466 @@
 
         /**
-         * [enableDisabledInput description]
-         * @param  {[type]} event [description]
-         * @param  {[type]} data  [description]
-         * @return {[type]}       [description]
-         */
-        toggleDisabledInput: function() {
-
-            // 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');
-
-            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' );
+         * Toggle the availability of Delete My account button.
+         *
+         * @param  {Object} event The change event.
+         */
+        toggleDisabledInput: function( event ) {
+            var target = $( event.currentTarget ), disabledControl = '#' + target.data( 'bp-disable-input' ),
+                isChecked = target.prop( 'checked' );
+
+            target.removeClass( 'enabled disabled' );
+
+            if ( isChecked ) {
+                target.addClass( 'enabled' );
+                $( disabledControl ).prop( 'disabled', false );
+            } else {
+                $( disabledControl ).prop( 'disabled', true );
+                target.addClass( 'disabled' );
             }
         },