From ce597d5cc5b6dd89065645599e6a4e31297eb172 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 29 Aug 2017 15:09:36 +0200 Subject: [PATCH] js linting --- .eslintrc | 5 ++++- _src/_assets/js/_dnt.js | 29 ++++++++++++----------------- _src/_assets/js/ipdb.js | 2 ++ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.eslintrc b/.eslintrc index b4eb4b6..27ca9e8 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,3 +1,6 @@ { - "extends": "ascribe" + "extends": "ascribe", + "rules": { + "no-unused-vars": 0 + } } diff --git a/_src/_assets/js/_dnt.js b/_src/_assets/js/_dnt.js index 55006d6..78b8992 100644 --- a/_src/_assets/js/_dnt.js +++ b/_src/_assets/js/_dnt.js @@ -1,5 +1,3 @@ -/* eslint-disable */ - /** * Returns true or false based on whether doNotTack is enabled. It also takes into account the * anomalies, such as !bugzilla 887703, which effect versions of Fx 31 and lower. It also handles @@ -10,39 +8,36 @@ * @returns {boolean} true if enabled else false */ function _dntEnabled(dnt, userAgent) { - - 'use strict'; - // for old version of IE we need to use the msDoNotTrack property of navigator // on newer versions, and newer platforms, this is doNotTrack but, on the window object // Safari also exposes the property on the window object. - var dntStatus = dnt || navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack; - var ua = userAgent || navigator.userAgent; + let dntStatus = dnt || navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack + const ua = userAgent || navigator.userAgent // List of Windows versions known to not implement DNT according to the standard. - var anomalousWinVersions = ['Windows NT 6.1', 'Windows NT 6.2', 'Windows NT 6.3']; + const anomalousWinVersions = ['Windows NT 6.1', 'Windows NT 6.2', 'Windows NT 6.3'] - var fxMatch = ua.match(/Firefox\/(\d+)/); - var ieRegEx = /MSIE|Trident/i; - var isIE = ieRegEx.test(ua); + const fxMatch = ua.match(/Firefox\/(\d+)/) + const ieRegEx = /MSIE|Trident/i + const isIE = ieRegEx.test(ua) // Matches from Windows up to the first occurance of ; un-greedily // http://www.regexr.com/3c2el - var platform = ua.match(/Windows.+?(?=;)/g); + const platform = ua.match(/Windows.+?(?=;)/g) // With old versions of IE, DNT did not exist so we simply return false; if (isIE && typeof Array.prototype.indexOf !== 'function') { - return false; + return false } else if (fxMatch && parseInt(fxMatch[1], 10) < 32) { // Can't say for sure if it is 1 or 0, due to Fx bug 887703 - dntStatus = 'Unspecified'; + dntStatus = 'Unspecified' } else if (isIE && platform && anomalousWinVersions.indexOf(platform.toString()) !== -1) { // default is on, which does not honor the specification - dntStatus = 'Unspecified'; + dntStatus = 'Unspecified' } else { // sets dntStatus to Disabled or Enabled based on the value returned by the browser. // If dntStatus is undefined, it will be set to Unspecified - dntStatus = { '0': 'Disabled', '1': 'Enabled' }[dntStatus] || 'Unspecified'; + dntStatus = { '0': 'Disabled', '1': 'Enabled' }[dntStatus] || 'Unspecified' } - return dntStatus === 'Enabled' ? true : false; + return dntStatus === 'Enabled' } diff --git a/_src/_assets/js/ipdb.js b/_src/_assets/js/ipdb.js index 1f187ec..80fdd33 100644 --- a/_src/_assets/js/ipdb.js +++ b/_src/_assets/js/ipdb.js @@ -1,3 +1,5 @@ +/* global SmoothScroll */ + // =include _dnt.js // =include smooth-scroll/dist/js/smooth-scroll.js