Add ef_week_first_day as script data to prevent echoing script tags
#582
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This attaches the `var` definition to the script itself, so it will only output when the script tag is actually printed, rather than just enqueued.
cojennin
reviewed
Jan 23, 2020
common/php/class-module.php
Outdated
| wp_enqueue_script( 'jquery-ui-datepicker' ); | ||
|
|
||
| //Timepicker needs to come after jquery-ui-datepicker and jquery | ||
| wp_enqueue_script( 'edit_flow-timepicker', EDIT_FLOW_URL . 'common/js/jquery-ui-timepicker-addon.js', array( 'jquery', 'jquery-ui-datepicker' ), EDIT_FLOW_VERSION, true ); | ||
| wp_enqueue_script( 'edit_flow-date_picker', EDIT_FLOW_URL . 'common/js/ef_date.js', array( 'jquery', 'jquery-ui-datepicker', 'edit_flow-timepicker' ), EDIT_FLOW_VERSION, true ); | ||
| wp_add_inline_script( 'edit_flow-date_picker', sprintf( 'var ef_week_first_day = \'%s\';', esc_attr( get_option( 'start_of_week' ) ) ), 'before' ); |
There was a problem hiding this comment.
Would it make sense to use wp_json_encode here? I've got a similar PR which I based off a suggestion from some VIP documentation
Other than that, tested it and it looks good to go!
There was a problem hiding this comment.
Done! TIL that function's not just for objects 🙂
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This attaches the
vardefinition to the script itself, so it will only output when the script tag is actually printed, rather than just enqueued.If you only call
wp_enqueue_scripts, this just registers & enqueues the scripts, but doesn't necessarily print them. This was causing a conflict when the PWA plugin is active. It callsadmin_enqueue_scriptsto set up scripts for caching, but it never outputs the script. See WordPress/wordcamp.org#328 for my (hopefully temporary 😁) workaround.Steps to Test
To be honest I don't know if more testing is necessary, but that's what I did ^