diff options
| author | jejacks0n <jjackson@gitlab.com> | 2019-08-21 14:20:21 -0600 |
|---|---|---|
| committer | jejacks0n <jjackson@gitlab.com> | 2019-08-22 10:54:21 -0600 |
| commit | 93f33b57d5afcfd1cb1a0d602af4156f3e598085 (patch) | |
| tree | 6b249d868f1626a4f70c669e0f783ad695ca9b6b | |
| parent | 059d16cb7088f5f4b5e6099c98a0395a837fd46b (diff) | |
| download | gitlab-ce-respect-user-do-not-track.tar.gz | |
Remove support for legacy IE versionsrespect-user-do-not-track
| -rw-r--r-- | app/assets/javascripts/tracking.js | 12 | ||||
| -rw-r--r-- | spec/frontend/tracking_spec.js | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/app/assets/javascripts/tracking.js b/app/assets/javascripts/tracking.js index ee38c44c2fa..a852f937eec 100644 --- a/app/assets/javascripts/tracking.js +++ b/app/assets/javascripts/tracking.js @@ -16,15 +16,9 @@ const extractData = (el, opts = {}) => { export default class Tracking { static trackable() { - const dnt = window.doNotTrack || navigator.doNotTrack; - if (dnt) return !(dnt === '1' || dnt === 'yes'); - - // legacy IE support - if (navigator.msDoNotTrack || 'msTrackingProtectionEnabled' in window.external) { - return !(navigator.msDoNotTrack === '1' || window.external.msTrackingProtectionEnabled()); - } - - return true; + return !['1', 'yes'].includes( + window.doNotTrack || navigator.doNotTrack || navigator.msDoNotTrack, + ); } static enabled() { diff --git a/spec/frontend/tracking_spec.js b/spec/frontend/tracking_spec.js index 70351d0c981..0e862c683d3 100644 --- a/spec/frontend/tracking_spec.js +++ b/spec/frontend/tracking_spec.js @@ -52,7 +52,7 @@ describe('Tracking', () => { expect(snowplowSpy).not.toHaveBeenCalled(); }); - it('skips tracking if the user does not want to be tracked (IE 10 legacy)', () => { + it('skips tracking if the user does not want to be tracked (IE legacy)', () => { navigator.msDoNotTrack = '1'; Tracking.event('_category_', '_eventName_'); |