govuk_frontend_toolkit 3.2.0 → 3.2.1

data/app/assets/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.2.1
+
+- Fix: Analytics - don't run error and print plugins on load
+
 # 3.2.0
 
 - Add: Analytics API https://github.com/alphagov/govuk_frontend_toolkit/pull/162 https://github.com/alphagov/govuk_frontend_toolkit/blob/master/docs/analytics.md

data/app/assets/VERSION.txt

@@ -1 +1 @@
-3.2.0
+3.2.1

data/app/assets/docs/analytics.md

@@ -45,6 +45,10 @@ The minimum you need to use the analytics function is:
   // Set custom dimensions before tracking pageviews
   // GOVUK.analytics.setDimension(…)
 
+  // Activate any event plugins eg. print intent, error tracking
+  // GOVUK.analyticsPlugins.error();
+  // GOVUK.analyticsPlugins.printIntent();
+
   // Track initial pageview
   GOVUK.analytics.trackPageview();
 })();
@@ -151,8 +155,8 @@ function setPixelDensityDimension(pixelDensity) {
 
 ## Print tracking
 
-Pull `print-intent.js` into your project, after analytics has been initialised, to track when users are attempting to print content.
+Pull `print-intent.js` into your project, and initialise it after analytics (see [Create an analytics tracker, above](#create-an-analytics-tracker)), to track when users are attempting to print content.
 
 ## Error tracking
 
-Pull `error-tracking.js` into your project, after analytics has been initialised, to track JavaScript errors.
+Pull `error-tracking.js` into your project, and initialise it after analytics (see [Create an analytics tracker, above](#create-an-analytics-tracker)), to track JavaScript errors.

data/app/assets/javascripts/govuk/analytics/error-tracking.js

@@ -2,21 +2,26 @@
 (function() {
 
   "use strict";
-  var trackJavaScriptError = function (e) {
-    var errorSource = e.filename + ': ' + e.lineno;
-    GOVUK.analytics.trackEvent('JavaScript Error', e.message, {
-      label: errorSource,
-      value: 1,
-      nonInteraction: true
-    });
-  };
 
-  if (window.addEventListener) {
-    window.addEventListener('error', trackJavaScriptError, false);
-  } else if (window.attachEvent) {
-    window.attachEvent('onerror', trackJavaScriptError);
-  } else {
-    window.onerror = trackJavaScriptError;
+  GOVUK.analyticsPlugins = GOVUK.analyticsPlugins || {};
+
+  GOVUK.analyticsPlugins.error = function () {
+    var trackJavaScriptError = function (e) {
+      var errorSource = e.filename + ': ' + e.lineno;
+      GOVUK.analytics.trackEvent('JavaScript Error', e.message, {
+        label: errorSource,
+        value: 1,
+        nonInteraction: true
+      });
+    };
+
+    if (window.addEventListener) {
+      window.addEventListener('error', trackJavaScriptError, false);
+    } else if (window.attachEvent) {
+      window.attachEvent('onerror', trackJavaScriptError);
+    } else {
+      window.onerror = trackJavaScriptError;
+    }
   }
 
 }());

data/app/assets/javascripts/govuk/analytics/print-intent.js

@@ -1,31 +1,36 @@
 // Extension to monitor attempts to print pages.
 (function () {
-
   "use strict";
-  var printAttempt = (function () {
-    GOVUK.analytics.trackEvent('Print Intent', document.location.pathname);
-  });
 
-  // Most browsers
-  if (window.matchMedia) {
-    var mediaQueryList = window.matchMedia('print'),
-      mqlListenerCount = 0;
-    mediaQueryList.addListener(function (mql) {
-      if (!mql.matches && mqlListenerCount === 0) {
-        printAttempt();
-        mqlListenerCount++;
-        // If we try and print again in 3 seconds, don't log it
-        window.setTimeout(function () {
-          mqlListenerCount = 0;
-          // printing will be tracked again now
-        }, 1e3);
-      }
+  GOVUK.analyticsPlugins = GOVUK.analyticsPlugins || {};
+
+  GOVUK.analyticsPlugins.printIntent = function () {
+    var printAttempt = (function () {
+      GOVUK.analytics.trackEvent('Print Intent', document.location.pathname);
     });
-  }
 
-  // IE < 10
-  if (window.onafterprint) {
-    window.onafterprint = printAttempt;
-  }
+    // Most browsers
+    if (window.matchMedia) {
+      var mediaQueryList = window.matchMedia('print'),
+        mqlListenerCount = 0;
+      mediaQueryList.addListener(function (mql) {
+        if (!mql.matches && mqlListenerCount === 0) {
+          printAttempt();
+          mqlListenerCount++;
+          // If we try and print again in 3 seconds, don't log it
+          window.setTimeout(function () {
+            mqlListenerCount = 0;
+            // printing will be tracked again now
+          }, 1e3);
+        }
+      });
+    }
+
+    // IE < 10
+    if (window.onafterprint) {
+      window.onafterprint = printAttempt;
+    }
+
+  };
 
 }());

data/app/assets/stylesheets/_css3.scss

@@ -20,13 +20,17 @@
           box-shadow: $shadow;
 }
 
-@mixin scale($x, $y) {
+@mixin scale($x, $y, $transform-origin: 50% 50% 0) {
   // $x and $y should be numeric values without units
   -webkit-transform: scale($x, $y); // Still in use now, started at: Chrome 4.0, Safari 3.1, Mobile Safari 3.2, Android 2.1
      -moz-transform: scale($x, $y); // Firefox 3.5 to 15.0
       -ms-transform: scale($x, $y); // IE9 only
-       -o-transform: scale($x, $y); // Opera 10.5 to 12.0
           transform: scale($x, $y);
+
+  -webkit-transform-origin: $transform-origin; // Chrome, Safari 3.1
+     -moz-transform-origin: $transform-origin; // Firefox 10 to 15.0
+      -ms-transform-origin: $transform-origin; // IE9
+          transform-origin: $transform-origin;
 }
 
 @mixin translate($x, $y) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -288,7 +288,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1949845834061421958
+      hash: 3608935864278764479
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -297,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1949845834061421958
+      hash: 3608935864278764479
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23