Switch to universal analytics

readthedocs/core/static-src/core/js/doc-embed/sphinx.js

@@ -12,13 +12,18 @@ function init() {
 
     /// Click tracking on flyout
     $(document).on('click', "[data-toggle='rst-current-version']", function() {
-      var flyout_state = $("[data-toggle='rst-versions']").hasClass('shift-up') ? 'was_open' : 'was_closed'
-      if (_gaq) {
-        _gaq.push(
-            ['rtfd._setAccount', 'UA-17997319-1'],
-            ['rtfd._trackEvent', 'Flyout', 'Click', flyout_state]
-        );
-      }
+        var flyout_state = $("[data-toggle='rst-versions']").hasClass('shift-up') ? 'was_open' : 'was_closed';
+
+        // This needs to handle both old style legacy analytics for previously built docs
+        // as well as the newer universal analytics
+        if (typeof ga !== 'undefined') {
+            ga('rtfd.send', 'event', 'Flyout', 'Click', flyout_state);
+        } else if (typeof _gaq !== 'undefined') {
+            _gaq.push(
+                ['rtfd._setAccount', 'UA-17997319-1'],
+                ['rtfd._trackEvent', 'Flyout', 'Click', flyout_state]
+            );
+        }
     });
 
     /// Read the Docs Sphinx theme code

readthedocs/core/static-src/core/js/sponsorship.js

@@ -18,7 +18,11 @@ function Promo (id, text, link, image, theme, display_type, pixel) {
 
     // Handler when a promo receives a click
     this.click_handler = function () {
-        if (_gaq) {
+        // This needs to handle both old style legacy analytics for previously built docs
+        // as well as the newer universal analytics
+        if (typeof ga !== 'undefined') {
+            ga('rtfd.send', 'event', 'Promo', 'Click', self.id);
+        } else if (typeof _gaq !== 'undefined') {
             _gaq.push(
                 ['rtfd._setAccount', 'UA-17997319-1'],
                 ['rtfd._trackEvent', 'Promo', 'Click', self.id]

readthedocs/doc_builder/templates/doc_builder/include.js.tmpl

@@ -1,21 +1,19 @@
 // RTD Analytics Code
 
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', '{{ global_analytics_code }}']);
-_gaq.push(['_trackPageview']);
+(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', '{{ global_analytics_code }}', 'auto', 'rtfd');
+ga('rtfd.send', 'pageview');
 
 {% if user_analytics_code %}
 // User Analytics Code
-_gaq.push(['user._setAccount', '{{ user_analytics_code }}']);
-_gaq.push(['user._trackPageview']);
+ga('create', '{{ user_analytics_code }}', 'auto', 'user');
+ga('user.send', 'pageview');
 // End User Analytics Code
 {% endif %}
 
-(function() {
-var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
-
 // end RTD Analytics Code
 

readthedocs/templates/base.html

@@ -13,6 +13,25 @@
   <!-- title -->
   <title>{% block title %}{% endblock %}{% block head_title %}{% endblock %} | {% block branding %}Read the Docs {% endblock %}</title>
 
+  <!-- Google Analytics -->
+  <script type="text/javascript">
+    (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', '{{ GLOBAL_ANALYTICS_CODE }}', 'auto', 'rtfd');
+    ga('rtfd.send', 'pageview');
+
+    {% if DASHBOARD_ANALYTICS_CODE %}
+      // Dashboard Analytics Code
+      ga('create', '{{ DASHBOARD_ANALYTICS_CODE }}', 'auto', 'user');
+      ga('user.send', 'pageview');
+      // End Dashboard Analytics Code
+    {% endif %}
+  </script>
+  <!-- End Google Analytics -->
+
   <!-- css -->
   <link rel="stylesheet" href="{{ MEDIA_URL }}css/core.css">
   {% block extra_links %}{% endblock %}
@@ -187,31 +206,8 @@ <h4>{%  trans "Read the Docs" %}</h4>
 
 </body>
 
-{% if GLOBAL_ANALYTICS_CODE %}
-<!-- BEGIN google analytics -->
 <script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '{{ GLOBAL_ANALYTICS_CODE }}']);
-  _gaq.push(['_trackPageview']);
-
-  {% if DASHBOARD_ANALYTICS_CODE %}
-  // Dashboard Analytics Code
-  _gaq.push(['user._setAccount', '{{ DASHBOARD_ANALYTICS_CODE }}']);
-  _gaq.push(['user._trackPageview']);
-  // End Dashboard Analytics Code
-  {% endif %}
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
   {% block footerjs %}{% endblock %}
-
 </script>
-<!-- END google analytics -->
-{% endif %}
 
 </html>