Merge pull request #8167 from ruKurz/bugfix-8166

[FIX] Issue #8166 where empty analytics setting breaks to load Piwik script
pull/8689/head
Rodrigo Nascimento 8 years ago
parent 541af144cb
commit adc895a6a8
No known key found for this signature in database
GPG Key ID: CFCE33B7B01AC335
  1. 16
      packages/rocketchat-analytics/client/loadScript.js

@ -38,10 +38,18 @@ Template.body.onRendered(() => {
window._paq.push(['setDomains', domains]);
}
(() => {
const addTrackers = JSON.parse(piwikAdditionalTracker);
for (let i = 0; i < addTrackers.length; i++) {
const tracker = addTrackers[i];
window._paq.push(['addTracker', `${ tracker['trackerURL'] }piwik.php`, tracker['siteId']]);
try {
if (/\S/.test(piwikAdditionalTracker)) {
// piwikAdditionalTracker is not empty or whitespace only
const addTrackers = JSON.parse(piwikAdditionalTracker);
for (let i = 0; i < addTrackers.length; i++) {
const tracker = addTrackers[i];
window._paq.push(['addTracker', `${ tracker['trackerURL'] }piwik.php`, tracker['siteId']]);
}
}
} catch (e) {
// parsing JSON faild
console.log('Error while parsing JSON value of "piwikAdditionalTracker": ', e);
}
window._paq.push(['setTrackerUrl', `${ piwikUrl }piwik.php`]);
window._paq.push(['setSiteId', Number.parseInt(piwikSiteId)]);

Loading…
Cancel
Save