From a02408b229bf9ac0c3eaaa85d148aeb43d5cf33f Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Thu, 14 May 2015 15:24:05 +0100 Subject: [PATCH 1/2] Remove classic analytics --- _assets_pipeline/javascripts/analytics-init.js | 9 ++++----- _assets_pipeline/javascripts/app.js | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/_assets_pipeline/javascripts/analytics-init.js b/_assets_pipeline/javascripts/analytics-init.js index 35166fd..45a3bf2 100644 --- a/_assets_pipeline/javascripts/analytics-init.js +++ b/_assets_pipeline/javascripts/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/_assets_pipeline/javascripts/app.js b/_assets_pipeline/javascripts/app.js index f6bd1ae..1dde4f4 100644 --- a/_assets_pipeline/javascripts/app.js +++ b/_assets_pipeline/javascripts/app.js @@ -2,9 +2,8 @@ //= require ./vendor/jquery/jquery-migrate-1.2.1.js //= require ./vendor/jquery/jquery-ui-1.10.4.js //= require ../govuk_toolkit/javascripts/vendor/jquery/jquery.player.min.js -//= require ../govuk_toolkit/javascripts/govuk/analytics/google-analytics-classic-tracker.js //= require ../govuk_toolkit/javascripts/govuk/analytics/google-analytics-universal-tracker.js -//= require ../govuk_toolkit/javascripts/govuk/analytics/tracker.js +//= require ../govuk_toolkit/javascripts/govuk/analytics/analytics.js //= require analytics-init.js // Avoid `console` errors in browsers that lack a console. From a0a1543b8bd0193571189734a00d7045009b3878 Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Tue, 26 May 2015 16:32:09 +0100 Subject: [PATCH 2/2] Update frontend_toolkit to 4.0.0 --- _assets_pipeline/govuk_toolkit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_assets_pipeline/govuk_toolkit b/_assets_pipeline/govuk_toolkit index 5199b77..6f9febc 160000 --- a/_assets_pipeline/govuk_toolkit +++ b/_assets_pipeline/govuk_toolkit @@ -1 +1 @@ -Subproject commit 5199b77ee98f74c9815725ba8aafdbad699bc6df +Subproject commit 6f9febc4204f0ffbf83738c0c65af55f5f795faa