Skip to content

Commit 80a733f

Browse files
epixaepixa
committed
[internal] Replace var with let in ui/public U-W (no utils/vislib)
This change was applied to any .js files under directories beginning with `u` through `w` (other than utils and vislib) in src/ui/public. There are no `y` or `z` directories. The utils directory isn't included because the generic change breaks something in it. The vislib directory isn't included because it had too many changes on its own. 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=`
1 parent 14f4b1a commit 80a733f

14 files changed

Lines changed: 141 additions & 141 deletions

File tree

‎src/ui/public/url/url.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ uiModules.get('kibana/url')
88
.service('kbnUrl', function (Private) { return Private(KbnUrlProvider); });
99

1010
function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getAppState) {
11-
var self = this;
11+
let self = this;
1212

1313
/**
1414
* Navigate to a url
@@ -70,10 +70,10 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA
7070

7171
return template.replace(/\{\{([^\}]+)\}\}/g, function (match, expr) {
7272
// remove filters
73-
var key = expr.split('|')[0].trim();
73+
let key = expr.split('|')[0].trim();
7474

7575
// verify that the expression can be evaluated
76-
var p = $parse(key)(paramObj);
76+
let p = $parse(key)(paramObj);
7777

7878
// if evaluation can't be made, throw
7979
if (_.isUndefined(p)) {
@@ -109,7 +109,7 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA
109109
* @return {string} - the computed url
110110
*/
111111
self.getRouteUrl = function (obj, route) {
112-
var template = obj && obj.routes && obj.routes[route];
112+
let template = obj && obj.routes && obj.routes[route];
113113
if (template) return self.eval(template, obj);
114114
};
115115

@@ -143,7 +143,7 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA
143143
let reloading;
144144

145145
self._changeLocation = function (type, url, paramObj, replace) {
146-
var prev = {
146+
let prev = {
147147
path: $location.path(),
148148
search: $location.search()
149149
};
@@ -152,13 +152,13 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA
152152
$location[type](url);
153153
if (replace) $location.replace();
154154

155-
var next = {
155+
let next = {
156156
path: $location.path(),
157157
search: $location.search()
158158
};
159159

160160
if (self._shouldAutoReload(next, prev)) {
161-
var appState = getAppState();
161+
let appState = getAppState();
162162
if (appState) appState.destroy();
163163

164164
reloading = $rootScope.$on('$locationChangeSuccess', function () {
@@ -174,13 +174,13 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA
174174
self._shouldAutoReload = function (next, prev) {
175175
if (reloading) return false;
176176

177-
var route = $route.current && $route.current.$$route;
177+
let route = $route.current && $route.current.$$route;
178178
if (!route) return false;
179179

180180
if (next.path !== prev.path) return false;
181181

182-
var reloadOnSearch = route.reloadOnSearch;
183-
var searchSame = _.isEqual(next.search, prev.search);
182+
let reloadOnSearch = route.reloadOnSearch;
183+
let searchSame = _.isEqual(next.search, prev.search);
184184

185185
return (reloadOnSearch && searchSame) || !reloadOnSearch;
186186
};

‎src/ui/public/vis/agg_config.js‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import _ from 'lodash';
22
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
33
export default function AggConfigFactory(Private, fieldTypeFilter) {
4-
var fieldFormats = Private(RegistryFieldFormatsProvider);
4+
let fieldFormats = Private(RegistryFieldFormatsProvider);
55

66
function AggConfig(vis, opts) {
7-
var self = this;
7+
let self = this;
88

99
self.id = String(opts.id || AggConfig.nextId(vis.aggs));
1010
self.vis = vis;
@@ -26,13 +26,13 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
2626
* @return {array} - the list that was passed in
2727
*/
2828
AggConfig.ensureIds = function (list) {
29-
var have = [];
30-
var haveNot = [];
29+
let have = [];
30+
let haveNot = [];
3131
list.forEach(function (obj) {
3232
(obj.id ? have : haveNot).push(obj);
3333
});
3434

35-
var nextId = AggConfig.nextId(have);
35+
let nextId = AggConfig.nextId(have);
3636
haveNot.forEach(function (obj) {
3737
obj.id = String(nextId++);
3838
});
@@ -97,12 +97,12 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
9797
* @return {undefined}
9898
*/
9999
AggConfig.prototype.fillDefaults = function (from) {
100-
var self = this;
100+
let self = this;
101101
from = from || self.params || {};
102-
var to = self.params = {};
102+
let to = self.params = {};
103103

104104
self.getAggParams().forEach(function (aggParam) {
105-
var val = from[aggParam.name];
105+
let val = from[aggParam.name];
106106

107107
if (val == null) {
108108
if (aggParam.default == null) return;
@@ -116,11 +116,11 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
116116
}
117117

118118
if (aggParam.deserialize) {
119-
var isTyped = _.isFunction(aggParam.type);
119+
let isTyped = _.isFunction(aggParam.type);
120120

121-
var isType = isTyped && (val instanceof aggParam.type);
122-
var isObject = !isTyped && _.isObject(val);
123-
var isDeserialized = (isType || isObject);
121+
let isType = isTyped && (val instanceof aggParam.type);
122+
let isObject = !isTyped && _.isObject(val);
123+
let isDeserialized = (isType || isObject);
124124

125125
if (!isDeserialized) {
126126
val = aggParam.deserialize(val, self);
@@ -140,12 +140,12 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
140140
* @return {object} the new params object
141141
*/
142142
AggConfig.prototype.resetParams = function () {
143-
var fieldParam = this.type && this.type.params.byName.field;
143+
let fieldParam = this.type && this.type.params.byName.field;
144144
let field;
145145

146146
if (fieldParam) {
147-
var prevField = this.params.field;
148-
var fieldOpts = fieldTypeFilter(this.vis.indexPattern.fields, fieldParam.filterFieldTypes);
147+
let prevField = this.params.field;
148+
let fieldOpts = fieldTypeFilter(this.vis.indexPattern.fields, fieldParam.filterFieldTypes);
149149
field = _.contains(fieldOpts, prevField) ? prevField : null;
150150
}
151151

@@ -161,10 +161,10 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
161161
throw new TypeError('The "' + this.type.title + '" aggregation does not support filtering.');
162162
}
163163

164-
var field = this.field();
165-
var label = this.fieldDisplayName();
164+
let field = this.field();
165+
let label = this.fieldDisplayName();
166166
if (field && !field.filterable) {
167-
var message = 'The "' + label + '" field can not be used for filtering.';
167+
let message = 'The "' + label + '" field can not be used for filtering.';
168168
if (field.scripted) {
169169
message = 'The "' + label + '" field is scripted and can not be used for filtering.';
170170
}
@@ -181,7 +181,7 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
181181
* @return {[type]} [description]
182182
*/
183183
AggConfig.prototype.requesting = function () {
184-
var self = this;
184+
let self = this;
185185
self.type && self.type.params.forEach(function (param) {
186186
if (param.onRequest) param.onRequest(self);
187187
});
@@ -198,14 +198,14 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
198198
*/
199199
AggConfig.prototype.toDsl = function () {
200200
if (this.type.hasNoDsl) return;
201-
var output = this.write();
201+
let output = this.write();
202202

203-
var configDsl = {};
203+
let configDsl = {};
204204
configDsl[this.type.dslName || this.type.name] = output.params;
205205

206206
// if the config requires subAggs, write them to the dsl as well
207207
if (output.subAggs) {
208-
var subDslLvl = configDsl.aggs || (configDsl.aggs = {});
208+
let subDslLvl = configDsl.aggs || (configDsl.aggs = {});
209209
output.subAggs.forEach(function nestAdhocSubAggs(subAggConfig) {
210210
subDslLvl[subAggConfig.id] = subAggConfig.toDsl();
211211
});
@@ -215,11 +215,11 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
215215
};
216216

217217
AggConfig.prototype.toJSON = function () {
218-
var self = this;
219-
var params = self.params;
218+
let self = this;
219+
let params = self.params;
220220

221-
var outParams = _.transform(self.getAggParams(), function (out, aggParam) {
222-
var val = params[aggParam.name];
221+
let outParams = _.transform(self.getAggParams(), function (out, aggParam) {
222+
let val = params[aggParam.name];
223223

224224
// don't serialize undefined/null values
225225
if (val == null) return;
@@ -264,7 +264,7 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
264264
}
265265

266266
if (!this.type) return '';
267-
var pre = (_.get(this.vis, 'params.mode') === 'percentage') ? 'Percentage of ' : '';
267+
let pre = (_.get(this.vis, 'params.mode') === 'percentage') ? 'Percentage of ' : '';
268268
return pre += this.type.makeLabel(this);
269269
};
270270

@@ -273,31 +273,31 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
273273
};
274274

275275
AggConfig.prototype.fieldFormatter = function (contentType, defaultFormat) {
276-
var format = this.type && this.type.getFormat(this);
276+
let format = this.type && this.type.getFormat(this);
277277
if (format) return format.getConverterFor(contentType);
278278
return this.fieldOwnFormatter(contentType, defaultFormat);
279279
};
280280

281281
AggConfig.prototype.fieldOwnFormatter = function (contentType, defaultFormat) {
282-
var field = this.field();
283-
var format = field && field.format;
282+
let field = this.field();
283+
let format = field && field.format;
284284
if (!format) format = defaultFormat;
285285
if (!format) format = fieldFormats.getDefaultInstance('string');
286286
return format.getConverterFor(contentType);
287287
};
288288

289289
AggConfig.prototype.fieldName = function () {
290-
var field = this.field();
290+
let field = this.field();
291291
return field ? field.name : '';
292292
};
293293

294294
AggConfig.prototype.fieldDisplayName = function () {
295-
var field = this.field();
295+
let field = this.field();
296296
return field ? (field.displayName || this.fieldName()) : '';
297297
};
298298

299299
AggConfig.prototype.fieldIsTimeField = function () {
300-
var timeFieldName = this.vis.indexPattern.timeFieldName;
300+
let timeFieldName = this.vis.indexPattern.timeFieldName;
301301
return timeFieldName && this.fieldName() === timeFieldName;
302302
};
303303

‎src/ui/public/vis/agg_config_result.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
define(function () {
2-
var i = 0;
2+
let i = 0;
33

44
function AggConfigResult(aggConfig, parent, value, key) {
55
this.key = key;

‎src/ui/public/vis/agg_configs.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import IndexedArray from 'ui/indexed_array';
33
import VisAggConfigProvider from 'ui/vis/agg_config';
44
import AggTypesIndexProvider from 'ui/agg_types/index';
55
export default function AggConfigsFactory(Private) {
6-
var AggConfig = Private(VisAggConfigProvider);
6+
let AggConfig = Private(VisAggConfigProvider);
77

88
AggConfig.aggTypes = Private(AggTypesIndexProvider);
99

1010
_.class(AggConfigs).inherits(IndexedArray);
1111
function AggConfigs(vis, configStates) {
12-
var self = this;
12+
let self = this;
1313
self.vis = vis;
1414

1515
configStates = AggConfig.ensureIds(configStates || []);
@@ -36,9 +36,9 @@ export default function AggConfigsFactory(Private) {
3636
})
3737
.each(function (schema) {
3838
if (!self.bySchemaName[schema.name]) {
39-
var defaults = schema.defaults.slice(0, schema.max);
39+
let defaults = schema.defaults.slice(0, schema.max);
4040
_.each(defaults, function (defaultState) {
41-
var state = _.defaults({ id: AggConfig.nextId(self) }, defaultState);
41+
let state = _.defaults({ id: AggConfig.nextId(self) }, defaultState);
4242
self.push(new AggConfig(vis, state));
4343
});
4444
}
@@ -48,7 +48,7 @@ export default function AggConfigsFactory(Private) {
4848
}
4949

5050
AggConfigs.prototype.toDsl = function () {
51-
var dslTopLvl = {};
51+
let dslTopLvl = {};
5252
let dslLvlCursor;
5353
let nestedMetrics;
5454

@@ -76,16 +76,16 @@ export default function AggConfigsFactory(Private) {
7676
// start at the top level
7777
dslLvlCursor = dslTopLvl;
7878
} else {
79-
var prevConfig = list[i - 1];
80-
var prevDsl = dslLvlCursor[prevConfig.id];
79+
let prevConfig = list[i - 1];
80+
let prevDsl = dslLvlCursor[prevConfig.id];
8181

8282
// advance the cursor and nest under the previous agg, or
8383
// put it on the same level if the previous agg doesn't accept
8484
// sub aggs
8585
dslLvlCursor = prevDsl.aggs || dslLvlCursor;
8686
}
8787

88-
var dsl = dslLvlCursor[config.id] = config.toDsl();
88+
let dsl = dslLvlCursor[config.id] = config.toDsl();
8989
let subAggs;
9090

9191
if (config.schema.group === 'buckets' && i < list.length - 1) {
@@ -122,7 +122,7 @@ export default function AggConfigsFactory(Private) {
122122
*/
123123
AggConfigs.prototype.getResponseAggs = function () {
124124
return this.getRequestAggs().reduce(function (responseValuesAggs, agg) {
125-
var aggs = agg.getResponseAggs();
125+
let aggs = agg.getResponseAggs();
126126
return aggs ? responseValuesAggs.concat(aggs) : responseValuesAggs;
127127
}, []);
128128
};
@@ -137,7 +137,7 @@ export default function AggConfigsFactory(Private) {
137137
*/
138138
AggConfigs.prototype.getResponseAggById = function (id) {
139139
id = String(id);
140-
var reqAgg = _.find(this.getRequestAggs(), function (agg) {
140+
let reqAgg = _.find(this.getRequestAggs(), function (agg) {
141141
return id.substr(0, String(agg.id).length) === agg.id;
142142
});
143143
if (!reqAgg) return;

‎src/ui/public/vis/schemas.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import _ from 'lodash';
22
import IndexedArray from 'ui/indexed_array';
33
import AggTypesAggParamsProvider from 'ui/agg_types/agg_params';
44
export default function VisTypeSchemasFactory(Private) {
5-
var AggParams = Private(AggTypesAggParamsProvider);
5+
let AggParams = Private(AggTypesAggParamsProvider);
66

77
function Schemas(schemas) {
8-
var self = this;
8+
let self = this;
99

1010
_(schemas || [])
1111
.map(function (schema) {

0 commit comments

Comments
 (0)