50479: Google analytics only loaded when tracking id present

dafe30f3 · Kristof De Langhe · 062f0f1a · dafe30f3 · dafe30f3 · dafe30f3
Commit dafe30f3 authored 7 years ago by Kristof De Langhe
--- a/src/index.csr.html
+++ b/src/index.csr.html
@@ -10,12 +10,6 @@
 </head>

 <body>
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-  </script>
  <ds-app></ds-app>
 </body>


--- a/src/index.html
+++ b/src/index.html
@@ -10,12 +10,6 @@
 </head>

 <body>
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-  </script>
  <ds-app></ds-app>
 </body>


--- a/src/main.browser.ts
+++ b/src/main.browser.ts
@@ -25,14 +25,25 @@ export function main() {
    }
  });

-  // Add google analytics key
-  const script = document.createElement('script');
-  script.innerHTML = 'ga(\'create\', \'' + ENV_CONFIG.gaTrackingId + '\', \'auto\');';
-  document.body.appendChild(script);
+  addGoogleAnalytics();

  return platformBrowserDynamic().bootstrapModule(BrowserAppModule);
 }

+function addGoogleAnalytics() {
+  // Add google analytics if key is present in config
+  const trackingId = ENV_CONFIG.gaTrackingId;
+  if (trackingId !== '' && trackingId !== null) {
+    const keyScript = document.createElement('script');
+    keyScript.innerHTML =   `(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+                            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+                            })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');`
+      + 'ga(\'create\', \'' + ENV_CONFIG.gaTrackingId + '\', \'auto\');';
+    document.body.appendChild(keyScript);
+  }
+}
+
 // support async tag or hmr
 if (hasValue(ENV_CONFIG.universal) && ENV_CONFIG.universal.preboot === false) {
  bootloader(main);