From adc895a6a8fdcd11977fdbbbbce727cfa4a779f0 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Mon, 18 Sep 2017 20:01:33 -0300 Subject: [PATCH] Merge pull request #8167 from ruKurz/bugfix-8166 [FIX] Issue #8166 where empty analytics setting breaks to load Piwik script --- .../rocketchat-analytics/client/loadScript.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/rocketchat-analytics/client/loadScript.js b/packages/rocketchat-analytics/client/loadScript.js index d09d67f7277..4e1ee8d7bda 100644 --- a/packages/rocketchat-analytics/client/loadScript.js +++ b/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)]);