Mailchimp Widget: avoid conflicts with jQuery UI#8547
Merged
jeherve merged 3 commits intoAutomattic:masterfrom Jan 25, 2018
Merged
Mailchimp Widget: avoid conflicts with jQuery UI#8547jeherve merged 3 commits intoAutomattic:masterfrom
jeherve merged 3 commits intoAutomattic:masterfrom
Conversation
…rom global scope after using a require definition
…ndow.define from global scope and thus breaking mailchimp script, set window.define.amd to fool just real amd modules. Mailchimp script seem to expect usable definitions of require and define, once we remove them it breaks. Since the purpose of this commit is to fix scripts like jquery-ui that will resort to define() if define.amd is defined - it is enough to unset define.amd. This is a very ugly solution, but it works.
Contributor
|
Makes sense, but it looks like your change is breaking some tests that require the script to match a certain string verbatim. Can you please take a look at these? |
…ttic#8546 - test for updated script string.
zinigor
pushed a commit
that referenced
this pull request
Jan 30, 2018
* Changelog 5.8: create base for changelog. * Update 5.8 release post link * fix 5.8 release date * Updates to plugin description * Changelog: add #8499 * Changelog: add #8506 * Changelog: add #8509 * Changelog: add #8516 * Changelog: add #8517 * Changelog: add #8523 * Changelog: add #8547 * Changelog: add #8496 * Changelog: add #8584 * Changelog: add #8595 * Changelog: add #8445 * Changelog: add #8431 * Changelog: add #8284 * Changelog: add #8270 * Changelog: add #8124 * Changelog: add #8581 * Changelog: add #8463 * Changelog: add #8568 (#8646) * Updates to testing list and changelog * Changelog: add #8443 * Changelog: add #8459 * Changelog: add #8469 * Changelog: add #8464 * Changelog: add #8478 and #8479 * Changelog: add #8483 * Changelog: add #8488 * Changelog: add #8513 * Changelog: add #8555 * Changelog: add #8565 * Changelog: add #8601 * Changelog: add #8612 * Changelog: add first pass at Search items. * Changelog: add more info to help test Search. * Changelog: add #8144 * Changelog: add #8313 * Changelog: add #8419 * Changelog: add #8465 * Changelog: add #8515 * Changelog: add #8587 * Changelog: add #8591 * Changelog: add #8659 * Changelog: add #8661 * Changelog: add #8671 * Changelog: add 5.7.1 to archived changelog too. * Reverted changes to readme, removed entry about backups.
jeherve
added a commit
that referenced
this pull request
Sep 6, 2018
Fixes #10104 Mailchimp updated their newsletter embed code, and the old one does not work anymore. This change matches the new format, and updates our test accordingly. Note that this also reverts the changes introduced in #8547, since they do not appear necessary anymore. Mailchimp fixed that issue on their end.
jeherve
added a commit
that referenced
this pull request
Sep 20, 2018
Fixes #10104 Mailchimp updated their newsletter embed code, and the old one does not work anymore. This change matches the new format, and updates our test accordingly. Note that this also reverts the changes introduced in #8547, since they do not appear necessary anymore. Mailchimp fixed that issue on their end.
kraftbj
pushed a commit
that referenced
this pull request
Sep 21, 2018
* Shortcodes: update Mailchimp shortcode to match new format. Fixes #10104 Mailchimp updated their newsletter embed code, and the old one does not work anymore. This change matches the new format, and updates our test accordingly. Note that this also reverts the changes introduced in #8547, since they do not appear necessary anymore. Mailchimp fixed that issue on their end. * Update testing list to include steps for #10105
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Fixes #8546
Changes proposed in this Pull Request:
Testing instructions:
Proposed changelog entry for your changes:
window.requireandwindow.defineto undefined after using them in MailChimp shortcode, but MailChimp script needsrequireanddefinefunctions to remain in the global scope. Scripts like jquery will not usedefineifwindow.define.amdis undefined so we can at least do that.