updated google analytics

davidlyons · Jan 29, 2018 · e493710 · e493710
1 parent c9f2a2c
commit e493710
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 45 deletions.
diff --git a/index.html b/index.html
@@ -1,6 +1,18 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-113300143-1"></script>
+  <script>
+    if (document.location.hostname != 'localhost') {
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'UA-113300143-1');
+    }
+  </script>
+
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=1280, user-scalable=no">
@@ -31,20 +43,6 @@
   <!-- Required Modernizr file -->
   <script src="deck.js/modernizr.custom.js"></script>
 
-  <!-- Google Analytics -->
-  <script>
-  if (document.location.hostname != 'localhost') {
-    (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','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-34432087-1', 'auto');
-    ga('send', 'pageview');
-  }
-  </script>
-  <!-- End Google Analytics -->
-
 </head>
 <body class="language-javascript">
   <div class="deck-container">

diff --git a/offline-extended.html b/offline-extended.html
@@ -1,6 +1,18 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-113300143-1"></script>
+  <script>
+    if (document.location.hostname != 'localhost') {
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'UA-113300143-1');
+    }
+  </script>
+
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=1280, user-scalable=no">
@@ -33,20 +45,6 @@
   <!-- Required Modernizr file -->
   <script src="deck.js/modernizr.custom.js"></script>
 
-  <!-- Google Analytics -->
-  <script>
-  if (document.location.hostname != 'localhost') {
-    (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','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-34432087-1', 'auto');
-    ga('send', 'pageview');
-  }
-  </script>
-  <!-- End Google Analytics -->
-
 </head>
 <body class="language-javascript">
   <div class="deck-container">

diff --git a/offline.html b/offline.html
@@ -1,6 +1,18 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-113300143-1"></script>
+  <script>
+    if (document.location.hostname != 'localhost') {
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'UA-113300143-1');
+    }
+  </script>
+
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=1280, user-scalable=no">
@@ -33,20 +45,6 @@
   <!-- Required Modernizr file -->
   <script src="deck.js/modernizr.custom.js"></script>
 
-  <!-- Google Analytics -->
-  <script>
-  if (document.location.hostname != 'localhost') {
-    (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','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-34432087-1', 'auto');
-    ga('send', 'pageview');
-  }
-  </script>
-  <!-- End Google Analytics -->
-
 </head>
 <body class="language-javascript">
   <div class="deck-container">

diff --git a/resources/slides.js b/resources/slides.js
@@ -114,9 +114,11 @@ $(function() {
     });
 
     // Google Analytics
-    if('ga' in window) {
-      var path = location.pathname.replace('index.html','') + '-slide-' + (to+1);
-      ga('send', 'pageview', path);
+    if (window.gtag) {
+      gtag('event', 'page_view', {
+        // todo: this is the same for all 3 .html files
+        'page_path': '/slide-' + to
+      });
     }
 
   });