From fa8bb48ad6b90a9353b4a1cf0518c0345fe1b436 Mon Sep 17 00:00:00 2001 From: Kelly Dwan Date: Fri, 6 Dec 2019 15:36:07 -0500 Subject: [PATCH] Rename generic "frontend" file to dialog --- .../assets/js/{frontend.js => dialog.js} | 8 +++--- plugins/wporg-5ftf/includes/pledge.php | 25 +++++++++++-------- 2 files changed, 19 insertions(+), 14 deletions(-) rename plugins/wporg-5ftf/assets/js/{frontend.js => dialog.js} (95%) diff --git a/plugins/wporg-5ftf/assets/js/frontend.js b/plugins/wporg-5ftf/assets/js/dialog.js similarity index 95% rename from plugins/wporg-5ftf/assets/js/frontend.js rename to plugins/wporg-5ftf/assets/js/dialog.js index b8f4054..8eca409 100644 --- a/plugins/wporg-5ftf/assets/js/frontend.js +++ b/plugins/wporg-5ftf/assets/js/dialog.js @@ -1,4 +1,4 @@ -/* global FiveForTheFuture, jQuery */ +/* global FFTF_Dialog, jQuery */ jQuery( document ).ready( function( $ ) { const button = document.getElementById( 'toggle-management-link-form' ); const template = wp.template( '5ftf-send-link-dialog' ); @@ -84,12 +84,12 @@ jQuery( document ).ready( function( $ ) { $( event.target.querySelector( '.message' ) ).html( '' ); $.ajax( { type: 'POST', - url: FiveForTheFuture.ajaxurl, + url: FFTF_Dialog.ajaxurl, data: { action: 'send-manage-email', - pledge_id: FiveForTheFuture.pledgeId, + pledge_id: FFTF_Dialog.pledgeId, email, - _ajax_nonce: FiveForTheFuture.ajaxNonce, + _ajax_nonce: FFTF_Dialog.ajaxNonce, }, success( response ) { if ( response.message ) { diff --git a/plugins/wporg-5ftf/includes/pledge.php b/plugins/wporg-5ftf/includes/pledge.php index e76c876..d5b350c 100755 --- a/plugins/wporg-5ftf/includes/pledge.php +++ b/plugins/wporg-5ftf/includes/pledge.php @@ -462,21 +462,26 @@ function has_existing_pledge( $key, $key_type, int $current_pledge_id = 0 ) { * @return void */ function enqueue_assets() { - wp_register_script( 'wicg-inert', plugins_url( 'assets/js/inert.min.js', __DIR__ ), [], '3.0.0', true ); + wp_register_script( 'wicg-inert', plugins_url( 'assets/js/inert.min.js', __DIR__ ), array(), '3.0.0', true ); if ( CPT_ID === get_post_type() ) { - $ver = filemtime( FiveForTheFuture\PATH . '/assets/js/frontend.js' ); - wp_enqueue_script( '5ftf-frontend', plugins_url( 'assets/js/frontend.js', __DIR__ ), [ 'jquery', 'wp-a11y', 'wp-util', 'wicg-inert' ], $ver, true ); + wp_enqueue_script( + '5ftf-dialog', + plugins_url( 'assets/js/dialog.js', __DIR__ ), + array( 'jquery', 'wp-a11y', 'wp-util', 'wicg-inert' ), + filemtime( FiveForTheFuture\PATH . '/assets/js/dialog.js' ), + true + ); - $script_data = [ - 'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ), // The global ajaxurl is not set on the frontend. - 'pledgeId' => get_the_ID(), - 'ajaxNonce' => wp_create_nonce( 'send-manage-email' ), - ]; + $script_data = array( + 'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ), // The global ajaxurl is not set on the frontend. + 'pledgeId' => get_the_ID(), + 'ajaxNonce' => wp_create_nonce( 'send-manage-email' ), + ); wp_add_inline_script( - '5ftf-frontend', + '5ftf-dialog', sprintf( - 'var FiveForTheFuture = JSON.parse( decodeURIComponent( \'%s\' ) );', + 'var FFTF_Dialog = JSON.parse( decodeURIComponent( \'%s\' ) );', rawurlencode( wp_json_encode( $script_data ) ) ), 'before'