Skip to content
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.

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

Conditionally use Drupal's jQuery only if available #14442

Merged
merged 1 commit into from
Jun 6, 2019

Conversation

colemanw
Copy link
Member

@colemanw colemanw commented Jun 6, 2019

Overview

Fixes dev/drupal#68 and guards against javascript errors.

Before

Javascript error if Drupal's jQuery not loaded.

After

No error.

@civibot
Copy link

civibot bot commented Jun 6, 2019

(Standard links)

@civibot civibot bot added the master label Jun 6, 2019
@adixon
Copy link
Contributor

adixon commented Jun 6, 2019

Thanks, this looks right. How about updating the comment above the change to the effect that jQuery may not be loaded (in which case, we don't need to worry about the toolbar).

@colemanw
Copy link
Member Author

colemanw commented Jun 6, 2019

@adixon done.

Copy link
Contributor

@adixon adixon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Readable and functional, who could ask for more?

@eileenmcnaughton eileenmcnaughton merged commit 04656e8 into civicrm:master Jun 6, 2019
@colemanw colemanw deleted the drupal8jquery branch January 30, 2020 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants