govuk_frontend_toolkit 6.0.2 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 526290e0d6a639b3fb8050860e0a182aebaff1dc
-  data.tar.gz: 58d711eecec56c5dc538fa8cfadcef312a7a0a2a
+  metadata.gz: 2123d895ea1f087dab79dce5c997cb67583752a0
+  data.tar.gz: 2f9363cec91c82e7395e03e344ff1e86ae6e998d
 SHA512:
-  metadata.gz: 595690d09b02873b1b475f649e19211c3f47ab8b0f7326281f16eea4d4ca6ec4507e0ef9705d1038717013d4b9e027dae4e78454628826fbc5ff13885814d6e4
-  data.tar.gz: 205865d691b8d3fea0c54be6e0e0d2b136853f30d46f0e045b1b19b0363ccec048bbcf8007cd4814dcd35cb139f0061acd7b9691116e0f342c0ac4b5c1761a5a
+  metadata.gz: ce55114817c07322bf2d62f5ff38109088db66785680899091f5fce56d0f424e0c7b03316b7bfd42018b9c8c540ee18263d8f7a0bc58e469db18a1b1778b077d
+  data.tar.gz: 70978bf4e28e49aa25a7b825e8bc68eae044579ca262666dcd257c35983a178ee8212daf8bc45ffbfacaa4deb59a9559cb7486c2987f412247ac9f57119e9b24

data/app/assets/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 6.0.3
+
+- Allow the passing of a [fields object](https://developers.google.com/analytics/devguides/collection/analyticsjs/field-reference)
+  to the `trackShare` method in analytics, in line with the Google Analytics
+  [social interactions API](https://developers.google.com/analytics/devguides/collection/analyticsjs/social-interactions)
+- Add documentation for new version releases
+
 # 6.0.2
 
 - Increase button focus specificity to avoid being overridden by govuk_template ([PR #409](https://github.com/alphagov/govuk_frontend_toolkit/pull/409))

data/app/assets/CONTRIBUTING.md

@@ -9,8 +9,13 @@ guidelines:
 
 ## Versioning
 
-We use [semantic versioning](http://semver.org/), and bump the version
-on master only. Please don't submit your own proposed version numbers.
+We use [Semantic Versioning](http://semver.org/).
+
+## Releasing a new version 
+
+1. Create a branch that proposes a new [version number](https://github.com/alphagov/govuk_frontend_toolkit/blob/master/VERSION.txt) and update the [`CHANGELOG`](https://github.com/alphagov/govuk_frontend_toolkit/blob/master/CHANGELOG.md). To see the commits to be summarised in the changelog since the last release, [compare the latest-release branch with master](https://github.com/alphagov/govuk_frontend_toolkit/compare/latest-release...master).
+2. Open a Pull Request - here is a [good example](https://github.com/alphagov/govuk_frontend_toolkit/pull/396).
+3. Once merged into master a new version will be built and [downstream jobs triggered by Travis CI](https://github.com/alphagov/govuk_frontend_toolkit/blob/master/.travis.yml) for [govuk_frontend_toolkit_gem](https://github.com/alphagov/govuk_frontend_toolkit_gem) and [govuk_frontend_toolkit_npm](https://github.com/alphagov/govuk_frontend_toolkit_npm).
 
 ## Commit hygiene
 

data/app/assets/VERSION.txt

@@ -1 +1 @@
-6.0.2
+6.0.3

data/app/assets/javascripts/govuk/analytics/analytics.js

@@ -50,8 +50,8 @@
     this.sendToTrackers('trackEvent', arguments)
   }
 
-  Analytics.prototype.trackShare = function (network) {
-    this.sendToTrackers('trackSocial', [network, 'share', global.location.pathname])
+  Analytics.prototype.trackShare = function (network, options) {
+    this.sendToTrackers('trackSocial', [network, 'share', global.location.pathname, options])
   }
 
   /*

data/app/assets/javascripts/govuk/analytics/google-analytics-universal-tracker.js

@@ -112,13 +112,17 @@
     target – Specifies the target of a social interaction.
              This value is typically a URL but can be any text.
   */
-  GoogleAnalyticsUniversalTracker.prototype.trackSocial = function (network, action, target) {
-    sendToGa('send', {
+  GoogleAnalyticsUniversalTracker.prototype.trackSocial = function (network, action, target, options) {
+    var trackingOptions = {
       'hitType': 'social',
       'socialNetwork': network,
       'socialAction': action,
       'socialTarget': target
-    })
+    }
+
+    $.extend(trackingOptions, options)
+
+    sendToGa('send', trackingOptions)
   }
 
   /*

data/app/assets/javascripts/govuk/analytics/govuk-tracker.js

@@ -61,12 +61,16 @@
     this.sendToTracker('event', evt)
   }
 
-  GOVUKTracker.prototype.trackSocial = function (network, action, target) {
-    this.sendToTracker('social', {
+  GOVUKTracker.prototype.trackSocial = function (network, action, target, options) {
+    var trackingOptions = {
       'socialNetwork': network,
       'socialAction': action,
       'socialTarget': target
-    })
+    }
+
+    $.extend(trackingOptions, options)
+
+    this.sendToTracker('social', trackingOptions)
   }
 
   GOVUKTracker.prototype.addLinkedTrackerDomain = function () { /* noop */ }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.3
 platform: ruby
 authors:
 - Government Digital Service
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails