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

Make sure to load Piwik JS tracker synchronously when requested to be loaded sync #10557

Merged
merged 2 commits into from Sep 29, 2016

Conversation

tsteur
Copy link
Member

@tsteur tsteur commented Sep 25, 2016

In https://github.com/piwik/piwik/pull/10502/files we added a property to load the tracker sync. However, we can only make sure it is actually loaded sync when loading it as a separate <script> and not by setting .defer= false; .async = false;

Migrated the template partially to twig. First I moved pretty all the jsCodeImpl variables to twig but then I noticed it is way to risky as some ${...} are defined in the TrackingCode generator class and some in the template, some are escaped while some others are not, the whole template is partially escaped and I don't want to cause any regression here. Therefore for now only partially migrated it to twig.

@tsteur tsteur added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Needs Review PRs that need a code review labels Sep 25, 2016
@tsteur tsteur added this to the 2.16.3 milestone Sep 25, 2016
@mattab
Copy link
Member

mattab commented Sep 29, 2016

@tsteur

otherwise LGTM!

@tsteur
Copy link
Member Author

tsteur commented Sep 29, 2016

done, done & done :)

@mattab mattab merged commit 5427698 into 2.x-dev Sep 29, 2016
@mattab mattab deleted the synctracker branch September 29, 2016 20:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants