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 CRM_Utils_JS::dedupeClosures to ignore comments #17717

Merged
merged 1 commit into from
Jun 30, 2020
Merged

Fix CRM_Utils_JS::dedupeClosures to ignore comments #17717

merged 1 commit into from
Jun 30, 2020

Conversation

colemanw
Copy link
Member

Overview

This runs stripComments BEFORE dedupeClosures so that comments don't interfere with the deduping.
Also fixes stripComments to remove the line break as well as the comment line.

Before

Duplicate closures and stray line breaks in rendered angular js module file.

After

Cleaner.

@colemanw
Fix CRM_Utils_JS::dedupeClosures to ignore comments
0290b3e 
This runs stripComments BEFORE dedupeClosures so that comments don't interfere with the deduping.
Also fixes stripComments to remove the line break as well as the comment line.
@civibot
Copy link

civibot bot commented Jun 30, 2020

(Standard links)

@civibot civibot bot added the master label Jun 30, 2020
@colemanw colemanw mentioned this pull request Jun 30, 2020
Closed
@seamuslee001
Copy link
Contributor

This seems fine to me merging

@seamuslee001 seamuslee001 merged commit 7f222e1 into civicrm:master Jun 30, 2020
@seamuslee001 seamuslee001 deleted the jsComments branch June 30, 2020 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
has-test master
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@colemanw @seamuslee001