Merge pull request #558 from alphagov/remove-classic-analytics

Remove Google Analytics classic
alphagov · Jun 1, 2015 · cd072b2 · cd072b2
2 parents d31bfd9 + 7d3a9f1
commit cd072b2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/_includes/layouts/_body.html b/_includes/layouts/_body.html
@@ -1,9 +1,8 @@
 <script src="/service-manual/assets/javascript/jquery-1.7.2.js"></script>
 <script src="/service-manual/assets/javascript/jquery-ui-1.10.2.custom.js?cache={{ site.time | date: "%s" }}"></script>
 <script src="/service-manual/assets/toolkit/javascripts/vendor/jquery/jquery.player.min.js?cache={{ site.time | date: "%s" }}"></script>
-<script src="/service-manual/assets/toolkit/javascripts/govuk/analytics/google-analytics-classic-tracker.js?cache={{ site.time | date: "%s" }}"></script>
 <script src="/service-manual/assets/toolkit/javascripts/govuk/analytics/google-analytics-universal-tracker.js?cache={{ site.time | date: "%s" }}"></script>
-<script src="/service-manual/assets/toolkit/javascripts/govuk/analytics/tracker.js?cache={{ site.time | date: "%s" }}"></script>
+<script src="/service-manual/assets/toolkit/javascripts/govuk/analytics/analytics.js?cache={{ site.time | date: "%s" }}"></script>
 <script src="/service-manual/assets/javascript/analytics-init.js?cache={{ site.time | date: "%s" }}"></script>
 <script src="/service-manual/assets/javascript/toggler.js?cache={{ site.time | date: "%s" }}"></script>
 <script src="/service-manual/assets/javascript/media-player-loader.js?cache={{ site.time | date: "%s" }}"></script>

diff --git a/service-manual/assets/javascript/analytics-init.js b/service-manual/assets/javascript/analytics-init.js
@@ -1,17 +1,16 @@
 (function() {
   "use strict";
 
-  GOVUK.Tracker.load();
+  GOVUK.Analytics.load();
   var cookieDomain = (document.domain === 'www.gov.uk') ? '.www.gov.uk' : document.domain;
 
-  GOVUK.analytics = new GOVUK.Tracker({
-    universalId: 'UA-26179049-7',
-    classicId: 'UA-26179049-1',
+  GOVUK.analytics = new GOVUK.Analytics({
+    universalId: 'UA-26179049-1',
     cookieDomain: cookieDomain
   });
 
   if (window.devicePixelRatio) {
-    GOVUK.analytics.setDimension(11, window.devicePixelRatio, 'Pixel Ratio', 2);
+    GOVUK.analytics.setDimension(11, window.devicePixelRatio);
   }
 
   GOVUK.analytics.trackPageview();

diff --git a/service-manual/assets/toolkit b/service-manual/assets/toolkit
+1 −1		.gitignore
+40 −0		CHANGELOG.md
+1 −2		Gruntfile.js
+1 −1		VERSION.txt
+26 −29		docs/analytics.md
+58 −5		docs/javascript.md
+64 −0		javascripts/govuk/analytics/analytics.js
+0 −127		javascripts/govuk/analytics/google-analytics-classic-tracker.js
+23 −0		javascripts/govuk/analytics/google-analytics-universal-tracker.js
+0 −50		javascripts/govuk/analytics/tracker.js
+28 −11		javascripts/govuk/multivariate-test.js
+7 −2		spec/manifest.js
+4 −4		spec/support/LocalTestRunner.html
+3 −11		spec/support/load.js
+38 −31		spec/unit/MultivariateTestSpec.js
+63 −0		spec/unit/analytics/AnalyticsSpec.js
+0 −124		spec/unit/analytics/GoogleAnalyticsClassicTrackerSpec.js
+0 −74		spec/unit/analytics/TrackerSpec.js
+4 −1		stylesheets/_colours.scss