From 60a82ef4245708fdb25cc8e6e71d8bc2798debb8 Mon Sep 17 00:00:00 2001 From: mzabriskie Date: Wed, 18 Mar 2015 17:21:15 -0600 Subject: [PATCH] Changing to file level use strict statement --- .eslintrc | 3 ++- lib/adapters/http.js | 4 ++-- lib/adapters/xhr.js | 4 ++-- lib/axios.js | 9 ++------- lib/core/InterceptorManager.js | 6 ++---- lib/core/dispatchRequest.js | 2 ++ lib/defaults.js | 4 ++-- lib/helpers/buildUrl.js | 4 ++-- lib/helpers/cookies.js | 5 ++--- lib/helpers/deprecatedMethod.js | 5 ++--- lib/helpers/parseHeaders.js | 3 ++- lib/helpers/spread.js | 3 ++- lib/helpers/transformData.js | 3 ++- lib/helpers/urlIsSameOrigin.js | 4 ++-- lib/utils.js | 17 +++-------------- 15 files changed, 31 insertions(+), 45 deletions(-) diff --git a/.eslintrc b/.eslintrc index 6a94633..6793b89 100644 --- a/.eslintrc +++ b/.eslintrc @@ -5,7 +5,8 @@ "require": true }, "env": { - "browser": true + "browser": true, + "node": true }, "rules": { "quotes": "single" diff --git a/lib/adapters/http.js b/lib/adapters/http.js index 0f6266d..b091dc4 100644 --- a/lib/adapters/http.js +++ b/lib/adapters/http.js @@ -1,3 +1,5 @@ +'use strict'; + var defaults = require('./../defaults'); var utils = require('./../utils'); var buildUrl = require('./../helpers/buildUrl'); @@ -9,8 +11,6 @@ var pkg = require('./../../package.json'); var Buffer = require('buffer').Buffer; module.exports = function httpAdapter(resolve, reject, config) { - 'use strict'; - // Transform request data var data = transformData( config.data, diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js index 5ae63ce..bb9d273 100644 --- a/lib/adapters/xhr.js +++ b/lib/adapters/xhr.js @@ -1,3 +1,5 @@ +'use strict'; + /*global ActiveXObject:true*/ var defaults = require('./../defaults'); @@ -9,8 +11,6 @@ var transformData = require('./../helpers/transformData'); var urlIsSameOrigin = require('./../helpers/urlIsSameOrigin'); module.exports = function xhrAdapter(resolve, reject, config) { - 'use strict'; - // Transform request data var data = transformData( config.data, diff --git a/lib/axios.js b/lib/axios.js index ca70bc9..0996d4d 100644 --- a/lib/axios.js +++ b/lib/axios.js @@ -1,3 +1,5 @@ +'use strict'; + var defaults = require('./defaults'); var utils = require('./utils'); var deprecatedMethod = require('./helpers/deprecatedMethod'); @@ -6,8 +8,6 @@ var InterceptorManager = require('./core/InterceptorManager'); // Polyfill ES6 Promise if needed (function () { - 'use strict'; - // webpack is being used to set es6-promise to the native Promise // for the standalone build. It's necessary to make sure polyfill exists. var P = require('es6-promise'); @@ -17,8 +17,6 @@ var InterceptorManager = require('./core/InterceptorManager'); })(); var axios = module.exports = function axios(config) { - 'use strict'; - config = utils.merge({ method: 'get', headers: {}, @@ -73,7 +71,6 @@ axios.defaults = defaults; // Expose all/spread axios.all = function (promises) { - 'use strict'; return Promise.all(promises); }; axios.spread = require('./helpers/spread'); @@ -86,8 +83,6 @@ axios.interceptors = { // Provide aliases for supported request methods (function () { - 'use strict'; - function createShortMethods() { utils.forEach(arguments, function (method) { axios[method] = function (url, config) { diff --git a/lib/core/InterceptorManager.js b/lib/core/InterceptorManager.js index e3f0cc6..4425a7d 100644 --- a/lib/core/InterceptorManager.js +++ b/lib/core/InterceptorManager.js @@ -1,7 +1,8 @@ +'use strict'; + var utils = require('./../utils'); function InterceptorManager() { - 'use strict'; this.handlers = []; } @@ -14,7 +15,6 @@ function InterceptorManager() { * @return {Number} An ID used to remove interceptor later */ InterceptorManager.prototype.use = function (fulfilled, rejected) { - 'use strict'; this.handlers.push({ fulfilled: fulfilled, rejected: rejected @@ -28,7 +28,6 @@ InterceptorManager.prototype.use = function (fulfilled, rejected) { * @param {Number} id The ID that was returned by `use` */ InterceptorManager.prototype.eject = function (id) { - 'use strict'; if (this.handlers[id]) { this.handlers[id] = null; } @@ -43,7 +42,6 @@ InterceptorManager.prototype.eject = function (id) { * @param {Function} fn The function to call for each interceptor */ InterceptorManager.prototype.forEach = function (fn) { - 'use strict'; utils.forEach(this.handlers, function (h) { if (h !== null) { fn(h); diff --git a/lib/core/dispatchRequest.js b/lib/core/dispatchRequest.js index b33f1ae..814c925 100644 --- a/lib/core/dispatchRequest.js +++ b/lib/core/dispatchRequest.js @@ -1,3 +1,5 @@ +'use strict'; + /** * Dispatch a request to the server using whichever adapter * is supported by the current environment. diff --git a/lib/defaults.js b/lib/defaults.js index 93fe132..ef5dcb2 100644 --- a/lib/defaults.js +++ b/lib/defaults.js @@ -1,3 +1,5 @@ +'use strict'; + var utils = require('./utils'); var JSON_START = /^\s*(\[|\{[^\{])/; @@ -9,7 +11,6 @@ var DEFAULT_CONTENT_TYPE = { module.exports = { transformRequest: [function (data, headers) { - 'use strict'; if (utils.isArrayBuffer(data)) { return data; } @@ -27,7 +28,6 @@ module.exports = { }], transformResponse: [function (data) { - 'use strict'; if (typeof data === 'string') { data = data.replace(PROTECTION_PREFIX, ''); if (JSON_START.test(data) && JSON_END.test(data)) { diff --git a/lib/helpers/buildUrl.js b/lib/helpers/buildUrl.js index afcfd4a..f624cbe 100644 --- a/lib/helpers/buildUrl.js +++ b/lib/helpers/buildUrl.js @@ -1,7 +1,8 @@ +'use strict'; + var utils = require('./../utils'); function encode(val) { - 'use strict'; return encodeURIComponent(val). replace(/%40/gi, '@'). replace(/%3A/gi, ':'). @@ -18,7 +19,6 @@ function encode(val) { * @returns {string} The formatted url */ module.exports = function buildUrl(url, params) { - 'use strict'; if (!params) { return url; } diff --git a/lib/helpers/cookies.js b/lib/helpers/cookies.js index 42e2138..c42b177 100644 --- a/lib/helpers/cookies.js +++ b/lib/helpers/cookies.js @@ -1,8 +1,9 @@ +'use strict'; + var utils = require('./../utils'); module.exports = { write: function write(name, value, expires, path, domain, secure) { - 'use strict'; var cookie = []; cookie.push(name + '=' + encodeURIComponent(value)); @@ -26,13 +27,11 @@ module.exports = { }, read: function read(name) { - 'use strict'; var match = document.cookie.match(new RegExp('(^|;\\s*)(' + name + ')=([^;]*)')); return (match ? decodeURIComponent(match[3]) : null); }, remove: function remove(name) { - 'use strict'; this.write(name, '', Date.now() - 86400000); } }; diff --git a/lib/helpers/deprecatedMethod.js b/lib/helpers/deprecatedMethod.js index f357c7b..dcf93af 100644 --- a/lib/helpers/deprecatedMethod.js +++ b/lib/helpers/deprecatedMethod.js @@ -1,3 +1,5 @@ +'use strict'; + /** * Supply a warning to the developer that a method they are using * has been deprecated. @@ -7,9 +9,6 @@ * @param {string} [docs] The documentation URL to get further details */ module.exports = function deprecatedMethod(method, instead, docs) { - /*eslint-env node*/ - 'use strict'; - try { console.warn( 'DEPRECATED method `' + method + '`.' + diff --git a/lib/helpers/parseHeaders.js b/lib/helpers/parseHeaders.js index f7510e0..b7d0249 100644 --- a/lib/helpers/parseHeaders.js +++ b/lib/helpers/parseHeaders.js @@ -1,3 +1,5 @@ +'use strict'; + var utils = require('./../utils'); /** @@ -14,7 +16,6 @@ var utils = require('./../utils'); * @returns {Object} Headers parsed into an object */ module.exports = function parseHeaders(headers) { - 'use strict'; var parsed = {}, key, val, i; if (!headers) { return parsed; } diff --git a/lib/helpers/spread.js b/lib/helpers/spread.js index 7894ebb..64005df 100644 --- a/lib/helpers/spread.js +++ b/lib/helpers/spread.js @@ -1,3 +1,5 @@ +'use strict'; + /** * Syntactic sugar for invoking a function and expanding an array for arguments. * @@ -19,7 +21,6 @@ * @returns {Function} */ module.exports = function spread(callback) { - 'use strict'; return function (arr) { callback.apply(null, arr); }; diff --git a/lib/helpers/transformData.js b/lib/helpers/transformData.js index 4a25bbd..a40d1f4 100644 --- a/lib/helpers/transformData.js +++ b/lib/helpers/transformData.js @@ -1,3 +1,5 @@ +'use strict'; + var utils = require('./../utils'); /** @@ -9,7 +11,6 @@ var utils = require('./../utils'); * @returns {*} The resulting transformed data */ module.exports = function transformData(data, headers, fns) { - 'use strict'; utils.forEach(fns, function (fn) { data = fn(data, headers); }); diff --git a/lib/helpers/urlIsSameOrigin.js b/lib/helpers/urlIsSameOrigin.js index ab58f22..9628022 100644 --- a/lib/helpers/urlIsSameOrigin.js +++ b/lib/helpers/urlIsSameOrigin.js @@ -1,3 +1,5 @@ +'use strict'; + var utils = require('./../utils'); var msie = /(msie|trident)/i.test(navigator.userAgent); var urlParsingNode = document.createElement('a'); @@ -10,7 +12,6 @@ var originUrl; * @returns {Object} */ function urlResolve(url) { - 'use strict'; var href = url; if (msie) { @@ -45,7 +46,6 @@ originUrl = urlResolve(window.location.href); * @returns {boolean} True if URL shares the same origin, otherwise false */ module.exports = function urlIsSameOrigin(requestUrl) { - 'use strict'; var parsed = (utils.isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl; return (parsed.protocol === originUrl.protocol && parsed.host === originUrl.host); diff --git a/lib/utils.js b/lib/utils.js index ea91be3..651b7ff 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -1,4 +1,7 @@ +'use strict'; + /*global toString:true*/ + // utils is a library of generic helper functions non-specific to axios var toString = Object.prototype.toString; @@ -10,7 +13,6 @@ var toString = Object.prototype.toString; * @returns {boolean} True if value is an Array, otherwise false */ function isArray(val) { - 'use strict'; return toString.call(val) === '[object Array]'; } @@ -21,7 +23,6 @@ function isArray(val) { * @returns {boolean} True if value is an ArrayBuffer, otherwise false */ function isArrayBuffer(val) { - 'use strict'; return toString.call(val) === '[object ArrayBuffer]'; } @@ -32,7 +33,6 @@ function isArrayBuffer(val) { * @returns {boolean} True if value is an FormData, otherwise false */ function isFormData(val) { - 'use strict'; return toString.call(val) === '[object FormData]'; } @@ -43,7 +43,6 @@ function isFormData(val) { * @returns {boolean} True if value is a view on an ArrayBuffer, otherwise false */ function isArrayBufferView(val) { - 'use strict'; if ((typeof ArrayBuffer !== 'undefined') && (ArrayBuffer.isView)) { return ArrayBuffer.isView(val); } else { @@ -58,7 +57,6 @@ function isArrayBufferView(val) { * @returns {boolean} True if value is a String, otherwise false */ function isString(val) { - 'use strict'; return typeof val === 'string'; } @@ -69,7 +67,6 @@ function isString(val) { * @returns {boolean} True if value is a Number, otherwise false */ function isNumber(val) { - 'use strict'; return typeof val === 'number'; } @@ -80,7 +77,6 @@ function isNumber(val) { * @returns {boolean} True if the value is undefined, otherwise false */ function isUndefined(val) { - 'use strict'; return typeof val === 'undefined'; } @@ -91,7 +87,6 @@ function isUndefined(val) { * @returns {boolean} True if value is an Object, otherwise false */ function isObject(val) { - 'use strict'; return val !== null && typeof val === 'object'; } @@ -102,7 +97,6 @@ function isObject(val) { * @returns {boolean} True if value is a Date, otherwise false */ function isDate(val) { - 'use strict'; return toString.call(val) === '[object Date]'; } @@ -113,7 +107,6 @@ function isDate(val) { * @returns {boolean} True if value is a File, otherwise false */ function isFile(val) { - 'use strict'; return toString.call(val) === '[object File]'; } @@ -124,7 +117,6 @@ function isFile(val) { * @returns {boolean} True if value is a Blob, otherwise false */ function isBlob(val) { - 'use strict'; return toString.call(val) === '[object Blob]'; } @@ -135,7 +127,6 @@ function isBlob(val) { * @returns {String} The String freed of excess whitespace */ function trim(str) { - 'use strict'; return str.replace(/^\s*/, '').replace(/\s*$/, ''); } @@ -152,7 +143,6 @@ function trim(str) { * @param {Function} fn The callback to invoke for each item */ function forEach(obj, fn) { - 'use strict'; // Don't bother if no value provided if (obj === null || typeof obj === 'undefined') { return; @@ -200,7 +190,6 @@ function forEach(obj, fn) { * @returns {Object} Result of all merge properties */ function merge(/*obj1, obj2, obj3, ...*/) { - 'use strict'; var result = {}; forEach(arguments, function (obj) { forEach(obj, function (val, key) {