From a9e3cfe24a20819cfed5762372039c9c2fa1fa7a Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 18 Apr 2016 10:35:24 -0400 Subject: [PATCH] Backport PR #6951 --------- **Commit 1:** [internal] Replace var with let in ui/public/utils (no rison) This change was applied to any .js files under the src/ui/public/utils directory except for the `rison.js` file. The rison code has block level hoisting issues, but it seems safer to just not touch the file rather than fix them. This was an automatic replacement from var to let for any variable declaration that doubles as the initial assignment. Ultimately we want most of these to be converted to const, but this commit is so large that it warrants breaking each step of automation up into its own commit. For example: `var foo = 'bar';` becomes `let foo = 'var';` This was accomplished by replacing: find: `var ([a-zA-Z_$][0-9a-zA-Z_$]*)(\s+)=` replace: `let $1$2=` * Original sha: ec0707f092e8726c484410d59c83ea5fb0aed062 * Authored by Court Ewing on 2016-04-15T21:20:57Z --- src/ui/public/utils/BaseObject.js | 6 ++--- src/ui/public/utils/CidrMask.js | 12 +++++----- src/ui/public/utils/Ipv4Address.js | 16 ++++++------- src/ui/public/utils/ObjDefine.js | 12 +++++----- src/ui/public/utils/SimpleEmitter.js | 10 ++++---- src/ui/public/utils/add_word_breaks.js | 12 +++++----- src/ui/public/utils/brush_event.js | 6 ++--- src/ui/public/utils/dateMath.js | 22 +++++++++--------- src/ui/public/utils/date_range.js | 4 ++-- src/ui/public/utils/decode_geo_hash.js | 24 ++++++++++---------- src/ui/public/utils/diff_object.js | 12 +++++----- src/ui/public/utils/diff_time_picker_vals.js | 6 ++--- src/ui/public/utils/esBool.js | 4 ++-- src/ui/public/utils/find_by_param.js | 4 ++-- src/ui/public/utils/mapping_setup.js | 18 +++++++-------- src/ui/public/utils/no_white_space.js | 2 +- src/ui/public/utils/ordinal_suffix.js | 8 +++---- src/ui/public/utils/parse_interval.js | 18 +++++++-------- src/ui/public/utils/query_string.js | 22 +++++++++--------- src/ui/public/utils/range.js | 10 ++++---- src/ui/public/utils/sequencer.js | 16 ++++++------- src/ui/public/utils/slugify_id.js | 6 ++--- src/ui/public/utils/supports.js | 12 +++++----- 23 files changed, 131 insertions(+), 131 deletions(-) diff --git a/src/ui/public/utils/BaseObject.js b/src/ui/public/utils/BaseObject.js index dcecdb16b1e3c..2dc9727363ff5 100644 --- a/src/ui/public/utils/BaseObject.js +++ b/src/ui/public/utils/BaseObject.js @@ -1,7 +1,7 @@ define(function (require) { - var _ = require('lodash'); - var rison = require('ui/utils/rison'); - var angular = require('angular'); + let _ = require('lodash'); + let rison = require('ui/utils/rison'); + let angular = require('angular'); function BaseObject(attributes) { // Set the attributes or default to an empty object diff --git a/src/ui/public/utils/CidrMask.js b/src/ui/public/utils/CidrMask.js index 2ca30f3fb9091..be51f4c70f842 100644 --- a/src/ui/public/utils/CidrMask.js +++ b/src/ui/public/utils/CidrMask.js @@ -1,13 +1,13 @@ define(function (require) { - var Ipv4Address = require('ui/utils/Ipv4Address'); - var NUM_BITS = 32; + let Ipv4Address = require('ui/utils/Ipv4Address'); + let NUM_BITS = 32; function throwError(mask) { throw Error('Invalid CIDR mask: ' + mask); } function CidrMask(mask) { - var splits = mask.split('\/'); + let splits = mask.split('\/'); if (splits.length !== 2) throwError(mask); this.initialAddress = new Ipv4Address(splits[0]); this.prefixLength = Number(splits[1]); @@ -15,9 +15,9 @@ define(function (require) { } CidrMask.prototype.getRange = function () { - var variableBits = NUM_BITS - this.prefixLength; - var fromAddress = this.initialAddress.valueOf() >> variableBits << variableBits >>> 0; // >>> 0 coerces to unsigned - var numAddresses = Math.pow(2, variableBits); + let variableBits = NUM_BITS - this.prefixLength; + let fromAddress = this.initialAddress.valueOf() >> variableBits << variableBits >>> 0; // >>> 0 coerces to unsigned + let numAddresses = Math.pow(2, variableBits); return { from: new Ipv4Address(fromAddress).toString(), to: new Ipv4Address(fromAddress + numAddresses - 1).toString() diff --git a/src/ui/public/utils/Ipv4Address.js b/src/ui/public/utils/Ipv4Address.js index d0c8fd3f5f29d..d8c396d02ab6b 100644 --- a/src/ui/public/utils/Ipv4Address.js +++ b/src/ui/public/utils/Ipv4Address.js @@ -1,6 +1,6 @@ define(function () { - var NUM_BYTES = 4; - var BYTE_SIZE = 256; + let NUM_BYTES = 4; + let BYTE_SIZE = 256; function throwError(ipAddress) { throw Error('Invalid IPv4 address: ' + ipAddress); @@ -19,11 +19,11 @@ define(function () { if (typeof ipAddress === 'string') { this.value = 0; - var bytes = ipAddress.split('.'); + let bytes = ipAddress.split('.'); if (bytes.length !== NUM_BYTES) throwError(ipAddress); - for (var i = 0; i < bytes.length; i++) { - var byte = Number(bytes[i]); + for (let i = 0; i < bytes.length; i++) { + let byte = Number(bytes[i]); if (!isIntegerInRange(byte, 0, BYTE_SIZE)) throwError(ipAddress); this.value += Math.pow(BYTE_SIZE, NUM_BYTES - 1 - i) * byte; } @@ -33,9 +33,9 @@ define(function () { } Ipv4Address.prototype.toString = function () { - var value = this.value; - var bytes = []; - for (var i = 0; i < NUM_BYTES; i++) { + let value = this.value; + let bytes = []; + for (let i = 0; i < NUM_BYTES; i++) { bytes.unshift(value % 256); value = Math.floor(value / 256); } diff --git a/src/ui/public/utils/ObjDefine.js b/src/ui/public/utils/ObjDefine.js index ef5bb4737beb1..c13010ee62cdc 100644 --- a/src/ui/public/utils/ObjDefine.js +++ b/src/ui/public/utils/ObjDefine.js @@ -1,5 +1,5 @@ define(function (require) { - var _ = require('lodash'); + let _ = require('lodash'); function ObjDefine(defaults, prototype) { this.obj; // created by this.create() @@ -10,7 +10,7 @@ define(function (require) { } ObjDefine.REDEFINE_SUPPORTED = (function () { - var a = Object.create(Object.prototype, { + let a = Object.create(Object.prototype, { prop: { configurable: true, value: 1 @@ -67,7 +67,7 @@ define(function (require) { * @return {object} - created object */ ObjDefine.prototype.create = function () { - var self = this; + let self = this; self.obj = Object.create(this.prototype, self.descs); if (!ObjDefine.REDEFINE_SUPPORTED && !self.prototype.toJSON) { @@ -77,7 +77,7 @@ define(function (require) { // due to https://github.com/ariya/phantomjs/issues/11856 self.obj.toJSON = function () { return _.transform(self.obj, function (json, val, key) { - var desc = self.descs[key]; + let desc = self.descs[key]; if (desc && desc.enumerable && val == null) return; json[key] = val; }, {}); @@ -98,8 +98,8 @@ define(function (require) { }; ObjDefine.prototype._describe = function (name, val, exported, changeable) { - var self = this; - var exists = val != null; + let self = this; + let exists = val != null; if (exported && ObjDefine.REDEFINE_SUPPORTED) { return { diff --git a/src/ui/public/utils/SimpleEmitter.js b/src/ui/public/utils/SimpleEmitter.js index a82ce604ea9cd..d3001ecb4a9fe 100644 --- a/src/ui/public/utils/SimpleEmitter.js +++ b/src/ui/public/utils/SimpleEmitter.js @@ -1,6 +1,6 @@ define(function (require) { - var _ = require('lodash'); - var BaseObject = require('ui/utils/BaseObject'); + let _ = require('lodash'); + let BaseObject = require('ui/utils/BaseObject'); /** * Simple event emitter class used in the vislib. Calls @@ -21,7 +21,7 @@ define(function (require) { * @return {SimpleEmitter} - this, for chaining */ SimpleEmitter.prototype.on = function (name, handler) { - var handlers = this._listeners[name]; + let handlers = this._listeners[name]; if (!handlers) handlers = this._listeners[name] = []; handlers.push(handler); @@ -69,8 +69,8 @@ define(function (require) { */ SimpleEmitter.prototype.emit = _.restParam(function (name, args) { if (!this._listeners[name]) return this; - var listeners = this.listeners(name); - var i = -1; + let listeners = this.listeners(name); + let i = -1; while (++i < listeners.length) { listeners[i].apply(this, args); diff --git a/src/ui/public/utils/add_word_breaks.js b/src/ui/public/utils/add_word_breaks.js index 99c35649eedd2..6f2454e93ebe4 100644 --- a/src/ui/public/utils/add_word_breaks.js +++ b/src/ui/public/utils/add_word_breaks.js @@ -1,13 +1,13 @@ define(function () { return function addWordBreaks(text, minLineLength) { text = text || ''; - var lineSize = 0; - var newText = ''; - var inHtmlTag = false; - var inHtmlChar = false; + let lineSize = 0; + let newText = ''; + let inHtmlTag = false; + let inHtmlChar = false; - for (var i = 0, len = text.length; i < len; i++) { - var chr = text.charAt(i); + for (let i = 0, len = text.length; i < len; i++) { + let chr = text.charAt(i); newText += chr; switch (chr) { diff --git a/src/ui/public/utils/brush_event.js b/src/ui/public/utils/brush_event.js index 7ddad4ca1cfb6..83bf127df93a1 100644 --- a/src/ui/public/utils/brush_event.js +++ b/src/ui/public/utils/brush_event.js @@ -1,9 +1,9 @@ define(function (require) { - var moment = require('moment'); + let moment = require('moment'); return function brushEventProvider(timefilter) { return function (event) { - var from = moment(event.range[0]); - var to = moment(event.range[1]); + let from = moment(event.range[0]); + let to = moment(event.range[1]); if (to - from === 0) return; diff --git a/src/ui/public/utils/dateMath.js b/src/ui/public/utils/dateMath.js index dd4ac1aa5e43f..46de0fd4a8ed6 100644 --- a/src/ui/public/utils/dateMath.js +++ b/src/ui/public/utils/dateMath.js @@ -1,12 +1,12 @@ define(function (require) { - var _ = require('lodash'); - var moment = require('moment'); + let _ = require('lodash'); + let moment = require('moment'); - var units = ['y', 'M', 'w', 'd', 'h', 'm', 's']; - var unitsAsc = _.sortBy(units, function (unit) { + let units = ['y', 'M', 'w', 'd', 'h', 'm', 's']; + let unitsAsc = _.sortBy(units, function (unit) { return moment.duration(1, unit).valueOf(); }); - var unitsDesc = unitsAsc.reverse(); + let unitsDesc = unitsAsc.reverse(); /* This is a simplified version of elasticsearch's date parser */ function parse(text, roundUp) { @@ -15,7 +15,7 @@ define(function (require) { if (_.isDate(text)) return moment(text); let time; - var mathString = ''; + let mathString = ''; let index; let parseString; @@ -43,12 +43,12 @@ define(function (require) { } function parseDateMath(mathString, time, roundUp) { - var dateTime = time; - var i = 0; - var len = mathString.length; + let dateTime = time; + let i = 0; + let len = mathString.length; while (i < len) { - var c = mathString.charAt(i++); + let c = mathString.charAt(i++); let type; let num; let unit; @@ -68,7 +68,7 @@ define(function (require) { } else if (mathString.length === 2) { num = mathString.charAt(i); } else { - var numFrom = i; + let numFrom = i; while (!isNaN(mathString.charAt(i))) { i++; if (i > 10) return undefined; diff --git a/src/ui/public/utils/date_range.js b/src/ui/public/utils/date_range.js index 285e9693ce5d5..78c213693de79 100644 --- a/src/ui/public/utils/date_range.js +++ b/src/ui/public/utils/date_range.js @@ -1,5 +1,5 @@ define(function (require) { - var moment = require('moment'); + let moment = require('moment'); return { toString: function (range, format) { @@ -12,7 +12,7 @@ define(function (require) { } }, parse: function (rangeString, format) { - var chunks = rangeString.split(' to '); + let chunks = rangeString.split(' to '); if (chunks.length === 2) return {from: moment(chunks[0], format), to: moment(chunks[1], format)}; chunks = rangeString.split('Before '); diff --git a/src/ui/public/utils/decode_geo_hash.js b/src/ui/public/utils/decode_geo_hash.js index 87b061eb16839..48881569089bf 100644 --- a/src/ui/public/utils/decode_geo_hash.js +++ b/src/ui/public/utils/decode_geo_hash.js @@ -17,22 +17,22 @@ define(function (require) { * @return {Object} interval */ function decodeGeoHash(geohash) { - var BITS = [16, 8, 4, 2, 1]; - var BASE32 = '0123456789bcdefghjkmnpqrstuvwxyz'; - var is_even = 1; - var lat = []; - var lon = []; + let BITS = [16, 8, 4, 2, 1]; + let BASE32 = '0123456789bcdefghjkmnpqrstuvwxyz'; + let is_even = 1; + let lat = []; + let lon = []; lat[0] = -90.0; lat[1] = 90.0; lon[0] = -180.0; lon[1] = 180.0; - var lat_err = 90.0; - var lon_err = 180.0; - for (var i = 0; i < geohash.length; i++) { - var c = geohash[i]; - var cd = BASE32.indexOf(c); - for (var j = 0; j < 5; j++) { - var mask = BITS[j]; + let lat_err = 90.0; + let lon_err = 180.0; + for (let i = 0; i < geohash.length; i++) { + let c = geohash[i]; + let cd = BASE32.indexOf(c); + for (let j = 0; j < 5; j++) { + let mask = BITS[j]; if (is_even) { lon_err /= 2; refine_interval(lon, cd, mask); diff --git a/src/ui/public/utils/diff_object.js b/src/ui/public/utils/diff_object.js index 9f2859d1ae03c..890baa5ee848e 100644 --- a/src/ui/public/utils/diff_object.js +++ b/src/ui/public/utils/diff_object.js @@ -1,17 +1,17 @@ define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); + let _ = require('lodash'); + let angular = require('angular'); return function (target, source) { - var diff = {}; + let diff = {}; /** * Filter the private vars * @param {string} key The keys * @returns {boolean} */ - var filterPrivateAndMethods = function (obj) { + let filterPrivateAndMethods = function (obj) { return function (key) { if (_.isFunction(obj[key])) return false; if (key.charAt(0) === '$') return false; @@ -19,8 +19,8 @@ define(function (require) { }; }; - var targetKeys = _.keys(target).filter(filterPrivateAndMethods(target)); - var sourceKeys = _.keys(source).filter(filterPrivateAndMethods(source)); + let targetKeys = _.keys(target).filter(filterPrivateAndMethods(target)); + let sourceKeys = _.keys(source).filter(filterPrivateAndMethods(source)); // Find the keys to be removed diff.removed = _.difference(targetKeys, sourceKeys); diff --git a/src/ui/public/utils/diff_time_picker_vals.js b/src/ui/public/utils/diff_time_picker_vals.js index f56d842e33c2d..87fcd4a178f92 100644 --- a/src/ui/public/utils/diff_time_picker_vals.js +++ b/src/ui/public/utils/diff_time_picker_vals.js @@ -1,9 +1,9 @@ define(function (require) { return function DiffTimePickerValuesFn() { - var _ = require('lodash'); - var angular = require('angular'); + let _ = require('lodash'); + let angular = require('angular'); - var valueOf = function (o) { + let valueOf = function (o) { if (o) return o.valueOf(); }; diff --git a/src/ui/public/utils/esBool.js b/src/ui/public/utils/esBool.js index a3a9fa9206f89..a580ffac72188 100644 --- a/src/ui/public/utils/esBool.js +++ b/src/ui/public/utils/esBool.js @@ -1,5 +1,5 @@ define(function () { - var map = { + let map = { 'false': false, 'off': false, 'no': false, @@ -11,7 +11,7 @@ define(function () { }; return function (str) { - var bool = map[String(str)]; + let bool = map[String(str)]; if (typeof bool !== 'boolean') { throw new TypeError('"' + str + '" does not map to an esBool'); diff --git a/src/ui/public/utils/find_by_param.js b/src/ui/public/utils/find_by_param.js index c22a5c6ed00f7..0564871bdbfc7 100644 --- a/src/ui/public/utils/find_by_param.js +++ b/src/ui/public/utils/find_by_param.js @@ -1,10 +1,10 @@ define(function (require) { - var _ = require('lodash'); + let _ = require('lodash'); // given an object or array of objects, return the value of the passed param // if the param is missing, return undefined return function findByParam(values, param) { if (_.isArray(values)) { // point series chart - var index = _.findIndex(values, param); + let index = _.findIndex(values, param); if (index === -1) return; return values[index][param]; } diff --git a/src/ui/public/utils/mapping_setup.js b/src/ui/public/utils/mapping_setup.js index d54b6feded7d8..8715b75fd5d48 100644 --- a/src/ui/public/utils/mapping_setup.js +++ b/src/ui/public/utils/mapping_setup.js @@ -1,10 +1,10 @@ define(function () { return function MappingSetupService(kbnIndex, es) { - var angular = require('angular'); - var _ = require('lodash'); - var mappingSetup = this; + let angular = require('angular'); + let _ = require('lodash'); + let mappingSetup = this; - var json = { + let json = { _serialize: function (val) { if (val != null) return angular.toJson(val); }, @@ -16,14 +16,14 @@ define(function () { /** * Use to create the mappings, but that should only happen one at a time */ - var activeTypeCreations = {}; + let activeTypeCreations = {}; /** * Get the list of type's mapped in elasticsearch * @return {[type]} [description] */ - var getKnownKibanaTypes = _.once(function () { - var indexName = kbnIndex; + let getKnownKibanaTypes = _.once(function () { + let indexName = kbnIndex; return es.indices.getFieldMapping({ // only concerned with types in this kibana index index: indexName, @@ -70,13 +70,13 @@ define(function () { }); } - var prom = getKnownKibanaTypes() + let prom = getKnownKibanaTypes() .then(function (knownTypes) { // if the type is in the knownTypes array already if (~knownTypes.indexOf(type)) return false; // we need to create the mapping - var body = {}; + let body = {}; body[type] = { properties: mapping }; diff --git a/src/ui/public/utils/no_white_space.js b/src/ui/public/utils/no_white_space.js index 2118f400ae553..988e923f3d93f 100644 --- a/src/ui/public/utils/no_white_space.js +++ b/src/ui/public/utils/no_white_space.js @@ -1,5 +1,5 @@ define(function (require) { - var TAGS_WITH_WS = />\s+\s+= 11 && hunth <= 13) return 'th'; - var tenth = int % 10; + let tenth = int % 10; if (tenth === 1) return 'st'; if (tenth === 2) return 'nd'; if (tenth === 3) return 'rd'; diff --git a/src/ui/public/utils/parse_interval.js b/src/ui/public/utils/parse_interval.js index 551fba8e24c7c..4ee1317e0b069 100644 --- a/src/ui/public/utils/parse_interval.js +++ b/src/ui/public/utils/parse_interval.js @@ -1,21 +1,21 @@ define(function (require) { - var _ = require('lodash'); - var moment = require('moment'); - var dateMath = require('ui/utils/dateMath'); + let _ = require('lodash'); + let moment = require('moment'); + let dateMath = require('ui/utils/dateMath'); // Assume interval is in the form (value)(unit), such as "1h" - var INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + dateMath.units.join('|') + ')$'); + let INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + dateMath.units.join('|') + ')$'); return function parseInterval(interval) { - var matches = String(interval).trim().match(INTERVAL_STRING_RE); + let matches = String(interval).trim().match(INTERVAL_STRING_RE); if (!matches) return null; try { - var value = parseFloat(matches[1]) || 1; - var unit = matches[2]; + let value = parseFloat(matches[1]) || 1; + let unit = matches[2]; - var duration = moment.duration(value, unit); + let duration = moment.duration(value, unit); // There is an error with moment, where if you have a fractional interval between 0 and 1, then when you add that // interval to an existing moment object, it will remain unchanged, which causes problems in the ordered_x_keys @@ -24,7 +24,7 @@ define(function (require) { // adding 0.5 days until we hit the end date. However, since there is a bug in moment, when you add 0.5 days to // the start date, you get the same exact date (instead of being ahead by 12 hours). So instead of returning // a duration corresponding to 0.5 hours, we return a duration corresponding to 12 hours. - var selectedUnit = _.find(dateMath.units, function (unit) { + let selectedUnit = _.find(dateMath.units, function (unit) { return Math.abs(duration.as(unit)) >= 1; }); diff --git a/src/ui/public/utils/query_string.js b/src/ui/public/utils/query_string.js index f0e28a56b1003..eb7929af6ea3f 100644 --- a/src/ui/public/utils/query_string.js +++ b/src/ui/public/utils/query_string.js @@ -1,5 +1,5 @@ define(function (require) { - var qs = {}; + let qs = {}; /***** /*** orignally copied from angular, modified our purposes @@ -38,7 +38,7 @@ define(function (require) { * @returns {Object.} */ qs.decode = function (keyValue) { - var obj = {}; + let obj = {}; let keyValueParts; let key; @@ -47,7 +47,7 @@ define(function (require) { keyValueParts = keyValue.split('='); key = tryDecodeURIComponent(keyValueParts[0]); if (key !== void 0) { - var val = keyValueParts[1] !== void 0 ? tryDecodeURIComponent(keyValueParts[1]) : true; + let val = keyValueParts[1] !== void 0 ? tryDecodeURIComponent(keyValueParts[1]) : true; if (!obj[key]) { obj[key] = val; } else if (Array.isArray(obj[key])) { @@ -67,10 +67,10 @@ define(function (require) { * @return {String} */ qs.encode = function (obj) { - var parts = []; - var keys = Object.keys(obj).sort(); + let parts = []; + let keys = Object.keys(obj).sort(); keys.forEach(function (key) { - var value = obj[key]; + let value = obj[key]; if (Array.isArray(value)) { value.forEach(function (arrayValue) { parts.push(qs.param(key, arrayValue)); @@ -93,8 +93,8 @@ define(function (require) { * the same if the url does not have a query string */ qs.findInUrl = function (url) { - var qsStart = url.indexOf('?'); - var hashStart = url.lastIndexOf('#'); + let qsStart = url.indexOf('?'); + let hashStart = url.lastIndexOf('#'); if (hashStart === -1) { // out of bounds @@ -112,8 +112,8 @@ define(function (require) { }; qs.replaceParamInUrl = function (url, param, newVal) { - var loc = qs.findInUrl(url); - var parsed = qs.decode(url.substring(loc.start + 1, loc.end)); + let loc = qs.findInUrl(url); + let parsed = qs.decode(url.substring(loc.start + 1, loc.end)); if (newVal != null) { parsed[param] = newVal; @@ -121,7 +121,7 @@ define(function (require) { delete parsed[param]; } - var chars = url.split(''); + let chars = url.split(''); chars.splice(loc.start, loc.end - loc.start, '?' + qs.encode(parsed)); return chars.join(''); }; diff --git a/src/ui/public/utils/range.js b/src/ui/public/utils/range.js index 9a2f2dcba21d2..15a977ff517ca 100644 --- a/src/ui/public/utils/range.js +++ b/src/ui/public/utils/range.js @@ -1,5 +1,5 @@ define(function (require) { - var _ = require('lodash'); + let _ = require('lodash'); /** * Regexp portion that matches our number @@ -14,7 +14,7 @@ define(function (require) { * * @type {String} */ - var _RE_NUMBER = '(\\-?(?:\\d+(?:\\.\\d+)?|Infinity))'; + let _RE_NUMBER = '(\\-?(?:\\d+(?:\\.\\d+)?|Infinity))'; /** * Regexp for the interval notation @@ -26,11 +26,11 @@ define(function (require) { * * @type {RegExp} */ - var RANGE_RE = new RegExp('^\\s*([\\[|\\(])\\s*' + _RE_NUMBER + '\\s*,\\s*' + _RE_NUMBER + '\\s*([\\]|\\)])\\s*$'); + let RANGE_RE = new RegExp('^\\s*([\\[|\\(])\\s*' + _RE_NUMBER + '\\s*,\\s*' + _RE_NUMBER + '\\s*([\\]|\\)])\\s*$'); function parse(input) { - var match = String(input).match(RANGE_RE); + let match = String(input).match(RANGE_RE); if (!match) { throw new TypeError('expected input to be in interval notation eg. (100, 200]'); } @@ -44,7 +44,7 @@ define(function (require) { } function Range(/* minIncl, min, max, maxIncl */) { - var args = _.toArray(arguments); + let args = _.toArray(arguments); if (args[1] > args[2]) args.reverse(); this.minInclusive = args[0]; diff --git a/src/ui/public/utils/sequencer.js b/src/ui/public/utils/sequencer.js index bfd863b2e239e..cdabe878ef3ac 100644 --- a/src/ui/public/utils/sequencer.js +++ b/src/ui/public/utils/sequencer.js @@ -1,19 +1,19 @@ define(function (require) { - var _ = require('lodash'); + let _ = require('lodash'); function create(min, max, length, mod) { - var seq = new Array(length); + let seq = new Array(length); - var valueDist = max - min; + let valueDist = max - min; // range of values that the mod creates - var modRange = [mod(0, length), mod(length - 1, length)]; + let modRange = [mod(0, length), mod(length - 1, length)]; // distance between - var modRangeDist = modRange[1] - modRange[0]; + let modRangeDist = modRange[1] - modRange[0]; _.times(length, function (i) { - var modIPercent = (mod(i, length) - modRange[0]) / modRangeDist; + let modIPercent = (mod(i, length) - modRange[0]) / modRangeDist; // percent applied to distance and added to min to // produce value @@ -81,8 +81,8 @@ define(function (require) { // adapted from output of http://www.timotheegroleau.com/Flash/experiments/easing_function_generator.htm // generates numbers from 0 to 100 - var ts = (i /= length) * i; - var tc = ts * i; + let ts = (i /= length) * i; + let tc = ts * i; return 100 * ( 0.5 * tc * ts + -3 * ts * ts + diff --git a/src/ui/public/utils/slugify_id.js b/src/ui/public/utils/slugify_id.js index 7dc20065691f6..d0206ccc24388 100644 --- a/src/ui/public/utils/slugify_id.js +++ b/src/ui/public/utils/slugify_id.js @@ -1,16 +1,16 @@ define(function (require) { - var _ = require('lodash'); + let _ = require('lodash'); return function (id) { if (id == null) return; - var trans = { + let trans = { '/' : '-slash-', '\\?' : '-questionmark-', '\\&' : '-ampersand-', '=' : '-equal-' }; _.each(trans, function (val, key) { - var regex = new RegExp(key, 'g'); + let regex = new RegExp(key, 'g'); id = id.replace(regex, val); }); id = id.replace(/[\s]+/g, '-'); diff --git a/src/ui/public/utils/supports.js b/src/ui/public/utils/supports.js index 1c9cd1a9ee099..8e33af752fc27 100644 --- a/src/ui/public/utils/supports.js +++ b/src/ui/public/utils/supports.js @@ -1,19 +1,19 @@ define(function (require) { - var _ = require('lodash'); + let _ = require('lodash'); /** * just a place to put feature detection checks */ return { cssFilters: (function () { - var e = document.createElement('img'); - var rules = ['webkitFilter', 'mozFilter', 'msFilter', 'filter']; - var test = 'grayscale(1)'; + let e = document.createElement('img'); + let rules = ['webkitFilter', 'mozFilter', 'msFilter', 'filter']; + let test = 'grayscale(1)'; rules.forEach(function (rule) { e.style[rule] = test; }); document.body.appendChild(e); - var styles = window.getComputedStyle(e); - var can = _(styles).pick(rules).includes(test); + let styles = window.getComputedStyle(e); + let can = _(styles).pick(rules).includes(test); document.body.removeChild(e); return can;