From 7fc9fb606a8f6c73eb2827f51baef8294db4bb4f Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 15 Jun 2015 08:00:53 -0400 Subject: fixes mm-1223 gracefully handle missing analytics configs --- web/react/utils/client.jsx | 6 +++--- web/templates/head.html | 33 +++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index b83ee22e7..701d3d25b 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -4,16 +4,16 @@ module.exports.track = function(category, action, label, prop, val) { global.window.snowplow('trackStructEvent', category, action, label, prop, val); - if (global.window.analytics != null) global.window.analytics.track(action, {category: category, label: label, property: prop, value: val}); + global.window.analytics.track(action, {category: category, label: label, property: prop, value: val}); }; module.exports.trackPage = function() { global.window.snowplow('trackPageView'); - if (global.window.analytics != null) global.window.analytics.page(); + global.window.analytics.page(); }; function handleError(method_name, xhr, status, err) { - var _LTracker = global.window._LTracker || []; + var _LTracker = global.window._LTracker; var e = null; try { diff --git a/web/templates/head.html b/web/templates/head.html index 5fd3ee104..5eb7a7333 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -36,6 +36,7 @@ window._LTracker = _LTracker; _LTracker.push({'logglyKey': config.LogglyWriteKey, 'sendConsoleErrors' : config.LogglyConsoleErrors }); } else { + window._LTracker = []; console.warn("config.js missing LogglyWriteKey, Loggly analytics is not reporting"); } @@ -58,26 +59,34 @@ analytics.page(); }}(); } else { + analytics = {}; + analytics.page = function(){}; + analytics.track = function(){}; console.warn("config.js missing SegmentWriteKey, SegmentIO analytics is not tracking"); } -- cgit v1.2.3-1-g7c22 From 111dbe516c583e1b6f608d6a7d95f764a07a8e29 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 15 Jun 2015 08:01:54 -0400 Subject: don't remove null check for ltracker --- web/react/utils/client.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index 701d3d25b..e9f2108a0 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -13,7 +13,7 @@ module.exports.trackPage = function() { }; function handleError(method_name, xhr, status, err) { - var _LTracker = global.window._LTracker; + var _LTracker = global.window._LTracker | []; var e = null; try { -- cgit v1.2.3-1-g7c22 From 753b952bde9ee28311ca49c2ec0113e06a40bd4f Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 15 Jun 2015 08:02:39 -0400 Subject: fix typo --- web/react/utils/client.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index e9f2108a0..786e6dcea 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -13,7 +13,7 @@ module.exports.trackPage = function() { }; function handleError(method_name, xhr, status, err) { - var _LTracker = global.window._LTracker | []; + var _LTracker = global.window._LTracker || []; var e = null; try { -- cgit v1.2.3-1-g7c22