Utils: Default to empty object for previous defined utils #6077
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
youknowriad
added
the
[Type] Bug
aduth
reviewed
Apr 9, 2018
lib/client-assets.php
Outdated
| @@ -97,7 +97,7 @@ function gutenberg_register_scripts_and_styles() { | |||
| filemtime( gutenberg_dir_path() . 'utils/build/index.js' ), | |||
| true | |||
| ); | |||
| wp_add_inline_script( 'wp-utils', 'var originalUtils = wp.utils;', 'before' ); | |||
| wp_add_inline_script( 'wp-utils', 'window.wp = window.wp || {}; var originalUtils = wp && wp.utils ? wp.utils : {};', 'before' ); | |||
There was a problem hiding this comment.
Do we need the first part of this line? window.wp = window.wp || {};
There was a problem hiding this comment.
Well since the error is ReferenceError: Can't find variable: wp I believe so. If the wp-utils is the first script to be loaded, there will be no wp global defined at all before the script.
There was a problem hiding this comment.
Oh, right. Though then it begs the question do we need the second part, wp &&, since we know it'll be defined since we just defined it if it wasn't.
Maybe we just test against the property on window:
var originalUtils = window.wp && window.wp.utils ? window.wp.utils : {};
youknowriad
force-pushed
the
fix/wp-utils-deps
branch
from
081dbc2
to
0d23020
Compare
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.
closes #6063
Depending on the order of the loaded scripts (which can change depending on the plugins used), we can see an error like this
ReferenceError: Can't find variable: wpwhile depending on thewp-utilsscript because the globalwpandwp.utilsare not defined if this is the first script to be loaded.This PR default to an empty object if one of these variables are not defined.