Skip to content

Decouple the localised script data from PDF_TEMPLATE_LOCATION #1701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jakejackson1 wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Decouple the localised script data from PDF_TEMPLATE_LOCATION #1701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Helper/Helper_Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,14 @@ public function addon_license_responses( $addon_name ) {
*
* @param Helper_Abstract_Options $options
* @param Helper_Abstract_Form $gform
* @param Helper_Templates $templates
*
* @return array
*
* @since 4.0
* @since 6.17.0 Added the $templates parameter
*/
public function get_localised_script_data( Helper_Abstract_Options $options, Helper_Abstract_Form $gform ) {
public function get_localised_script_data( Helper_Abstract_Options $options, Helper_Abstract_Form $gform, Helper_Templates $templates ) {

$custom_fonts = array_values( $options->get_custom_fonts() );
$user_data = get_userdata( get_current_user_id() );
Expand All @@ -228,7 +230,7 @@ public function get_localised_script_data( Helper_Abstract_Options $options, Hel
'restUrl' => rest_url( 'gravity-pdf/v1/' ),
'restNonce' => wp_create_nonce( 'wp_rest' ),
'currentVersion' => PDF_EXTENDED_VERSION,
'pdfWorkingDir' => PDF_TEMPLATE_LOCATION,
'pdfWorkingDir' => $templates->get_template_path(),
'pluginUrl' => PDF_PLUGIN_URL,
'pluginPath' => PDF_PLUGIN_DIR,
'customFontData' => wp_json_encode( $custom_fonts ),
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ public function load_admin_assets() {
add_filter( 'tiny_mce_before_init', [ $this, 'tinymce_styles' ] );

/* Localise admin script */
$data = $this->data->get_localised_script_data( $this->options, $this->gform );
$data = $this->data->get_localised_script_data( $this->options, $this->gform, $this->templates );

wp_localize_script( 'gfpdf_js_entrypoint', 'GFPDF', $data );
wp_localize_script( 'gfpdf_js_settings', 'GFPDF', $data );
Expand Down
6 changes: 5 additions & 1 deletion tests/phpunit/integration/Helper/Test_Helper_Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function provider_setter(): array {
public function test_localised_script() {
global $gfpdf;

$localised_data = $this->data->get_localised_script_data( $gfpdf->options, $gfpdf->gform );
$localised_data = $this->data->get_localised_script_data( $gfpdf->options, $gfpdf->gform, $gfpdf->templates );
$required_keys = [
'ajaxUrl',
'ajaxNonce',
Expand All @@ -168,6 +168,10 @@ public function test_localised_script() {
foreach ( $required_keys as $key ) {
$this->assertArrayHasKey( $key, $localised_data );
}

/* The React Template Manager compares this against each template path to decide if it can be deleted */
$working_dir = is_multisite() ? $gfpdf->data->multisite_template_location : $gfpdf->data->template_location;
$this->assertSame( $working_dir, $localised_data['pdfWorkingDir'] );
}

public function test_get_conditional_logic_options() {
Expand Down
Loading