Skip to content

Commit 1388c4c

Browse files
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: ec0707f * Authored by Court Ewing <[email protected]> on 2016-04-15T21:20:57Z
1 parent 4c346d5 commit 1388c4c

23 files changed

+131
-131
lines changed

src/ui/public/utils/BaseObject.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
define(function (require) {
2-
var _ = require('lodash');
3-
var rison = require('ui/utils/rison');
4-
var angular = require('angular');
2+
let _ = require('lodash');
3+
let rison = require('ui/utils/rison');
4+
let angular = require('angular');
55

66
function BaseObject(attributes) {
77
// Set the attributes or default to an empty object

src/ui/public/utils/CidrMask.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
define(function (require) {
2-
var Ipv4Address = require('ui/utils/Ipv4Address');
3-
var NUM_BITS = 32;
2+
let Ipv4Address = require('ui/utils/Ipv4Address');
3+
let NUM_BITS = 32;
44

55
function throwError(mask) {
66
throw Error('Invalid CIDR mask: ' + mask);
77
}
88

99
function CidrMask(mask) {
10-
var splits = mask.split('\/');
10+
let splits = mask.split('\/');
1111
if (splits.length !== 2) throwError(mask);
1212
this.initialAddress = new Ipv4Address(splits[0]);
1313
this.prefixLength = Number(splits[1]);
1414
if (this.prefixLength < 1 || this.prefixLength > NUM_BITS) throwError(mask);
1515
}
1616

1717
CidrMask.prototype.getRange = function () {
18-
var variableBits = NUM_BITS - this.prefixLength;
19-
var fromAddress = this.initialAddress.valueOf() >> variableBits << variableBits >>> 0; // >>> 0 coerces to unsigned
20-
var numAddresses = Math.pow(2, variableBits);
18+
let variableBits = NUM_BITS - this.prefixLength;
19+
let fromAddress = this.initialAddress.valueOf() >> variableBits << variableBits >>> 0; // >>> 0 coerces to unsigned
20+
let numAddresses = Math.pow(2, variableBits);
2121
return {
2222
from: new Ipv4Address(fromAddress).toString(),
2323
to: new Ipv4Address(fromAddress + numAddresses - 1).toString()

src/ui/public/utils/Ipv4Address.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
define(function () {
2-
var NUM_BYTES = 4;
3-
var BYTE_SIZE = 256;
2+
let NUM_BYTES = 4;
3+
let BYTE_SIZE = 256;
44

55
function throwError(ipAddress) {
66
throw Error('Invalid IPv4 address: ' + ipAddress);
@@ -19,11 +19,11 @@ define(function () {
1919
if (typeof ipAddress === 'string') {
2020
this.value = 0;
2121

22-
var bytes = ipAddress.split('.');
22+
let bytes = ipAddress.split('.');
2323
if (bytes.length !== NUM_BYTES) throwError(ipAddress);
2424

25-
for (var i = 0; i < bytes.length; i++) {
26-
var byte = Number(bytes[i]);
25+
for (let i = 0; i < bytes.length; i++) {
26+
let byte = Number(bytes[i]);
2727
if (!isIntegerInRange(byte, 0, BYTE_SIZE)) throwError(ipAddress);
2828
this.value += Math.pow(BYTE_SIZE, NUM_BYTES - 1 - i) * byte;
2929
}
@@ -33,9 +33,9 @@ define(function () {
3333
}
3434

3535
Ipv4Address.prototype.toString = function () {
36-
var value = this.value;
37-
var bytes = [];
38-
for (var i = 0; i < NUM_BYTES; i++) {
36+
let value = this.value;
37+
let bytes = [];
38+
for (let i = 0; i < NUM_BYTES; i++) {
3939
bytes.unshift(value % 256);
4040
value = Math.floor(value / 256);
4141
}

src/ui/public/utils/ObjDefine.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
define(function (require) {
2-
var _ = require('lodash');
2+
let _ = require('lodash');
33

44
function ObjDefine(defaults, prototype) {
55
this.obj; // created by this.create()
@@ -10,7 +10,7 @@ define(function (require) {
1010
}
1111

1212
ObjDefine.REDEFINE_SUPPORTED = (function () {
13-
var a = Object.create(Object.prototype, {
13+
let a = Object.create(Object.prototype, {
1414
prop: {
1515
configurable: true,
1616
value: 1
@@ -67,7 +67,7 @@ define(function (require) {
6767
* @return {object} - created object
6868
*/
6969
ObjDefine.prototype.create = function () {
70-
var self = this;
70+
let self = this;
7171
self.obj = Object.create(this.prototype, self.descs);
7272

7373
if (!ObjDefine.REDEFINE_SUPPORTED && !self.prototype.toJSON) {
@@ -77,7 +77,7 @@ define(function (require) {
7777
// due to https://github.com/ariya/phantomjs/issues/11856
7878
self.obj.toJSON = function () {
7979
return _.transform(self.obj, function (json, val, key) {
80-
var desc = self.descs[key];
80+
let desc = self.descs[key];
8181
if (desc && desc.enumerable && val == null) return;
8282
json[key] = val;
8383
}, {});
@@ -98,8 +98,8 @@ define(function (require) {
9898
};
9999

100100
ObjDefine.prototype._describe = function (name, val, exported, changeable) {
101-
var self = this;
102-
var exists = val != null;
101+
let self = this;
102+
let exists = val != null;
103103

104104
if (exported && ObjDefine.REDEFINE_SUPPORTED) {
105105
return {

src/ui/public/utils/SimpleEmitter.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
define(function (require) {
2-
var _ = require('lodash');
3-
var BaseObject = require('ui/utils/BaseObject');
2+
let _ = require('lodash');
3+
let BaseObject = require('ui/utils/BaseObject');
44

55
/**
66
* Simple event emitter class used in the vislib. Calls
@@ -21,7 +21,7 @@ define(function (require) {
2121
* @return {SimpleEmitter} - this, for chaining
2222
*/
2323
SimpleEmitter.prototype.on = function (name, handler) {
24-
var handlers = this._listeners[name];
24+
let handlers = this._listeners[name];
2525
if (!handlers) handlers = this._listeners[name] = [];
2626

2727
handlers.push(handler);
@@ -69,8 +69,8 @@ define(function (require) {
6969
*/
7070
SimpleEmitter.prototype.emit = _.restParam(function (name, args) {
7171
if (!this._listeners[name]) return this;
72-
var listeners = this.listeners(name);
73-
var i = -1;
72+
let listeners = this.listeners(name);
73+
let i = -1;
7474

7575
while (++i < listeners.length) {
7676
listeners[i].apply(this, args);

src/ui/public/utils/add_word_breaks.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
define(function () {
22
return function addWordBreaks(text, minLineLength) {
33
text = text || '';
4-
var lineSize = 0;
5-
var newText = '';
6-
var inHtmlTag = false;
7-
var inHtmlChar = false;
4+
let lineSize = 0;
5+
let newText = '';
6+
let inHtmlTag = false;
7+
let inHtmlChar = false;
88

9-
for (var i = 0, len = text.length; i < len; i++) {
10-
var chr = text.charAt(i);
9+
for (let i = 0, len = text.length; i < len; i++) {
10+
let chr = text.charAt(i);
1111
newText += chr;
1212

1313
switch (chr) {

src/ui/public/utils/brush_event.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
define(function (require) {
2-
var moment = require('moment');
2+
let moment = require('moment');
33
return function brushEventProvider(timefilter) {
44
return function (event) {
5-
var from = moment(event.range[0]);
6-
var to = moment(event.range[1]);
5+
let from = moment(event.range[0]);
6+
let to = moment(event.range[1]);
77

88
if (to - from === 0) return;
99

src/ui/public/utils/dateMath.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
define(function (require) {
2-
var _ = require('lodash');
3-
var moment = require('moment');
2+
let _ = require('lodash');
3+
let moment = require('moment');
44

5-
var units = ['y', 'M', 'w', 'd', 'h', 'm', 's'];
6-
var unitsAsc = _.sortBy(units, function (unit) {
5+
let units = ['y', 'M', 'w', 'd', 'h', 'm', 's'];
6+
let unitsAsc = _.sortBy(units, function (unit) {
77
return moment.duration(1, unit).valueOf();
88
});
9-
var unitsDesc = unitsAsc.reverse();
9+
let unitsDesc = unitsAsc.reverse();
1010

1111
/* This is a simplified version of elasticsearch's date parser */
1212
function parse(text, roundUp) {
@@ -15,7 +15,7 @@ define(function (require) {
1515
if (_.isDate(text)) return moment(text);
1616

1717
let time;
18-
var mathString = '';
18+
let mathString = '';
1919
let index;
2020
let parseString;
2121

@@ -43,12 +43,12 @@ define(function (require) {
4343
}
4444

4545
function parseDateMath(mathString, time, roundUp) {
46-
var dateTime = time;
47-
var i = 0;
48-
var len = mathString.length;
46+
let dateTime = time;
47+
let i = 0;
48+
let len = mathString.length;
4949

5050
while (i < len) {
51-
var c = mathString.charAt(i++);
51+
let c = mathString.charAt(i++);
5252
let type;
5353
let num;
5454
let unit;
@@ -68,7 +68,7 @@ define(function (require) {
6868
} else if (mathString.length === 2) {
6969
num = mathString.charAt(i);
7070
} else {
71-
var numFrom = i;
71+
let numFrom = i;
7272
while (!isNaN(mathString.charAt(i))) {
7373
i++;
7474
if (i > 10) return undefined;

src/ui/public/utils/date_range.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
define(function (require) {
2-
var moment = require('moment');
2+
let moment = require('moment');
33

44
return {
55
toString: function (range, format) {
@@ -12,7 +12,7 @@ define(function (require) {
1212
}
1313
},
1414
parse: function (rangeString, format) {
15-
var chunks = rangeString.split(' to ');
15+
let chunks = rangeString.split(' to ');
1616
if (chunks.length === 2) return {from: moment(chunks[0], format), to: moment(chunks[1], format)};
1717

1818
chunks = rangeString.split('Before ');

src/ui/public/utils/decode_geo_hash.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ define(function (require) {
1717
* @return {Object} interval
1818
*/
1919
function decodeGeoHash(geohash) {
20-
var BITS = [16, 8, 4, 2, 1];
21-
var BASE32 = '0123456789bcdefghjkmnpqrstuvwxyz';
22-
var is_even = 1;
23-
var lat = [];
24-
var lon = [];
20+
let BITS = [16, 8, 4, 2, 1];
21+
let BASE32 = '0123456789bcdefghjkmnpqrstuvwxyz';
22+
let is_even = 1;
23+
let lat = [];
24+
let lon = [];
2525
lat[0] = -90.0;
2626
lat[1] = 90.0;
2727
lon[0] = -180.0;
2828
lon[1] = 180.0;
29-
var lat_err = 90.0;
30-
var lon_err = 180.0;
31-
for (var i = 0; i < geohash.length; i++) {
32-
var c = geohash[i];
33-
var cd = BASE32.indexOf(c);
34-
for (var j = 0; j < 5; j++) {
35-
var mask = BITS[j];
29+
let lat_err = 90.0;
30+
let lon_err = 180.0;
31+
for (let i = 0; i < geohash.length; i++) {
32+
let c = geohash[i];
33+
let cd = BASE32.indexOf(c);
34+
for (let j = 0; j < 5; j++) {
35+
let mask = BITS[j];
3636
if (is_even) {
3737
lon_err /= 2;
3838
refine_interval(lon, cd, mask);

0 commit comments

Comments
 (0)