Changeset 6791

Timestamp:

02/27/2018 03:37:12 AM (8 years ago)

Author:

obenland

Message:

2FA: Don't use submit and cancel buttons.

See #77.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor

Files:

• js/profile-edit.js (modified) (4 diffs)
• wporg-two-factor.php (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/js/profile-edit.js

@@ -1 +1 @@
 /* global ajaxurl:true */
 jQuery( function( $ ) {
-        $( '#two-factor-active' ).on( 'click', '[type="cancel"]', function( event ) {
+        $( '#two-factor-active' ).on( 'click', '.two-factor-disable', function( event ) {
                 event.preventDefault();
 
@@ -45 +45 @@
 
         $( 'fieldset.two-factor' )
-                .not( '#two-factor-active' ).on( 'click', '[type="cancel"]', function( event ) {
+                .not( '#two-factor-active' ).on( 'click', '.two-factor-cancel', function( event ) {
                 event.preventDefault();
 
@@ -55 +55 @@
                 $( '#two-factor-start' ).show();
         } )
-                .on( 'click', '[type="submit"]', function( event ) {
+                .on( 'click', '.two-factor-submit', function( event ) {
                         event.preventDefault();
 
@@ -118 +118 @@
 
         var $printAgreement   = $( '#print-agreement' ),
-                $backupDoneButton = $( '.two-factor-backup-codes-wrapper button[type="submit"]' );
+                $backupDoneButton = $( '.two-factor-backup-codes-wrapper .two-factor-submit' );
 
         $printAgreement.on( 'change', function() {

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/wporg-two-factor.php

@@ -397 +397 @@
                                 <fieldset class="bbp-form">
                                         <div>
-                                                <button type="cancel" class="button button-secondary alignright"><?php esc_html_e( 'Disable Two Factor Authentication', 'wporg' ); ?></button>
+                                                <button type="button" class="button button-secondary two-factor-disable alignright"><?php esc_html_e( 'Disable Two Factor Authentication', 'wporg' ); ?></button>
                                                 <p class="status"><?php echo wp_kses_post( __( '<strong>Status:</strong> <span>Active</span>', 'wporg' ) ); ?></p>
                                         </div>
@@ -424 +424 @@
                                                                 <a href="" class="button button-secondary dashicons-before dashicons-download" id="two-factor-backup-codes-download" title="<?php esc_attr_e( 'Download Codes', 'wporg' ); ?>" download="two-factor-backup-codes.txt"><span class="screen-reader-text"><?php esc_html_e( 'Download Codes', 'wporg' ); ?></span></a>
                                                         </span>
-                                                        <button type="submit" class="button button-secondary" disabled="disabled"><?php esc_html_e( 'All Finished!', 'wporg' ); ?></button>
+                                                        <button type="button" class="button two-factor-submit button-secondary" disabled="disabled"><?php esc_html_e( 'All Finished!', 'wporg' ); ?></button>
                                                 </div>
                                         </div>
@@ -461 +461 @@
                                         ?>
                                 </small>
-                                <button type="cancel" class="button button-secondary alignleft"><?php esc_html_e( 'Cancel', 'wporg' ); ?></button>
-                                <button type="submit" class="button button-primary alignright"><?php esc_html_e( 'Enable', 'wporg' ); ?></button>
+                                <button type="button" class="button button-secondary two-factor-cancel alignleft"><?php esc_html_e( 'Cancel', 'wporg' ); ?></button>
+                                <button type="button" class="button button-primary two-factor-submit alignright"><?php esc_html_e( 'Enable', 'wporg' ); ?></button>
                         </div>
                 </fieldset>
@@ -484 +484 @@
                                         ?>
                                 </small>
-                                <button type="cancel" class="button button-secondary alignleft"><?php esc_html_e( 'Cancel', 'wporg' ); ?></button>
-                                <button type="submit" class="button button-primary alignright"><?php esc_html_e( 'Enable', 'wporg' ); ?></button>
+                                <button type="button" class="button button-secondary two-factor-cancel alignleft"><?php esc_html_e( 'Cancel', 'wporg' ); ?></button>
+                                <button type="button" class="button button-primary two-factor-submit alignright"><?php esc_html_e( 'Enable', 'wporg' ); ?></button>
                         </div>
                 </fieldset>
@@ -523 +523 @@
                         }
 
-                        .two-factor-backup-codes-wrapper [type="submit"] {
+                        .two-factor-backup-codes-wrapper .two-factor-submit {
                                 vertical-align: middle;
                         }