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.

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

Jump to bottom

Fix isAjaxMode to also recognize angular ajax #12921

Merged
merged 1 commit into from
Nov 6, 2018
Merged

Fix isAjaxMode to also recognize angular ajax #12921

merged 1 commit into from
Nov 6, 2018

Conversation

colemanw
Copy link
Member

@colemanw colemanw commented Oct 10, 2018 •
edited
Loading

Overview

CRM_Core_Resources was not recognizing the angular template callback as ajax.

Before

Some scripts load twice

After

Scripts not meant to load during ajax, don't.

@civibot
Copy link

civibot bot commented Oct 10, 2018

(Standard links)

@civibot civibot bot added the master label Oct 10, 2018
@colemanw
Copy link
Member Author

@totten - probably should have named this callback civicrm/ajax/anglartemplate for consistency. So we can either rename it, or do this. Preference?

@seamuslee001
Copy link
Contributor

Jenkins re test this please

@eileenmcnaughton eileenmcnaughton added the sig:extension support Supports being able to integrate extensions with CiviCRM label Oct 11, 2018
@seamuslee001
Copy link
Contributor

Jenkins re test this please

@eileenmcnaughton
Copy link
Contributor

test this please

@eileenmcnaughton
Copy link
Contributor

@totten this is pending input from you

@colemanw
Copy link
Member Author

colemanw commented Nov 5, 2018

@totten This is holding back the CiviTutorial extension from working properly on Angular pages so it'd be nice to merge soon (although for now I've added a shim to the extension so it will function).

@eileenmcnaughton
Copy link
Contributor

This looks pretty safe & @totten hasn't gotten to it - let's get it into the 5.8 rc - merging

@eileenmcnaughton eileenmcnaughton merged commit 9ea9527 into civicrm:master Nov 6, 2018
@eileenmcnaughton eileenmcnaughton deleted the ajaxMode branch November 6, 2018 04:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@totten totten

Labels
has-test master sig:extension support Supports being able to integrate extensions with CiviCRM
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@colemanw @seamuslee001 @eileenmcnaughton @totten