Skip to content

Commit

Permalink
Backport PR #6653
Browse files Browse the repository at this point in the history
---------

**Commit 1:**
[internal] Replace empty var declaration with let

Any time there is a variable defined in a JS file without also storing a
value in it, we know that definition cannot be converted to a const, so
we convert it to a let.

For example:

`var blah;` becomes `let blah;`

Some of these things variables might be unused, and many others can
likely be switched to const with only minor refactoring, but the commit
is very large, so there are no changes in it other than the 1:1 switch.

* Original sha: bfc59e9
* Authored by Court Ewing <court@epixa.com> on 2016-03-24T22:27:29Z
  • Loading branch information
elastic-jasper committed Mar 29, 2016
1 parent 60d8a88 commit 23b1d01
Show file tree
Hide file tree
Showing 277 changed files with 1,121 additions and 1,121 deletions.
4 changes: 2 additions & 2 deletions src/cli/plugin/__tests__/setting_parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ describe('kibana cli', function () {

describe('parse function', function () {

var options;
var parser;
let options;
let parser;
beforeEach(function () {
options = { install: 'dummy/dummy', pluginDir: fromRoot('installedPlugins') };
});
Expand Down
10 changes: 5 additions & 5 deletions src/server/config/__tests__/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ describe('lib/config/config', function () {

describe('#resetTo(object)', function () {

var config;
let config;
beforeEach(function () {
config = new Config(schema);
});
Expand All @@ -79,7 +79,7 @@ describe('lib/config/config', function () {

describe('#has(key)', function () {

var config;
let config;
beforeEach(function () {
config = new Config(schema);
});
Expand All @@ -99,7 +99,7 @@ describe('lib/config/config', function () {
});

describe('#set(key, value)', function () {
var config;
let config;

beforeEach(function () {
config = new Config(schema);
Expand Down Expand Up @@ -148,7 +148,7 @@ describe('lib/config/config', function () {

describe('#get(key)', function () {

var config;
let config;

beforeEach(function () {
config = new Config(schema);
Expand Down Expand Up @@ -187,7 +187,7 @@ describe('lib/config/config', function () {
});

describe('#extendSchema(key, schema)', function () {
var config;
let config;
beforeEach(function () {
config = new Config(schema);
});
Expand Down
2 changes: 1 addition & 1 deletion src/server/config/flattenWith.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var _ = require('lodash');
module.exports = function (dot, nestedObj, flattenArrays) {
var key; // original key
let key; // original key
var stack = []; // track key stack
var flatObj = {};
(function flattenObj(obj) {
Expand Down
4 changes: 2 additions & 2 deletions src/server/status/__tests__/ServerStatus.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ var Status = require('../Status');
var ServerStatus = require('../ServerStatus');

describe('ServerStatus class', function () {
var server;
var serverStatus;
let server;
let serverStatus;

beforeEach(function () {
server = { expose: sinon.stub(), log: sinon.stub() };
Expand Down
4 changes: 2 additions & 2 deletions src/server/status/__tests__/Status.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ var ServerStatus = require('../ServerStatus');

describe('Status class', function () {

var server;
var serverStatus;
let server;
let serverStatus;

beforeEach(function () {
server = { expose: sinon.stub(), log: sinon.stub() };
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/Binder/__tests__/Binder.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var ngMock = require('ngMock');
var Binder = require('ui/Binder');

describe('Binder class', function () {
var $scope;
let $scope;

beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function ($rootScope) {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/IndexedArray/IndexedArray.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ define(function (require) {

var from = pathGetter.partial(prop).value();
var to = inflect(prop);
var cache;
let cache;

Object.defineProperty(self, to, {
enumerable: false,
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/IndexedArray/__tests__/IndexedArray.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ users.inIdOrder = _.sortBy(users, 'id');

describe('IndexedArray', function () {
describe('Basics', function () {
var reg;
let reg;

beforeEach(function () {
reg = new IndexedArray();
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/IndexedArray/inflector.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ define(function (require) {

function inflector(prefix, postfix) {
return function inflect(key) {
var inflected;
let inflected;

if (key.indexOf('.') !== -1) {
inflected = key
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/StackTraceMapper/stackLineFormat.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var opts = [
/(?: \(|at )((?:[!#$&-;=?-\[\]_a-z~]|%[0-9a-f]{2})+\.js)\:(\d+)(?:\:(\d+)|())/ig
];

var sample;
let sample;
try { throw new Error('msg'); } catch (e) { sample = e.stack; }

var format = _.find(opts, function (format) {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/Vis/AggConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ define(function (require) {
*/
AggConfig.prototype.resetParams = function () {
var fieldParam = this.type && this.type.params.byName.field;
var field;
let field;

if (fieldParam) {
var prevField = this.params.field;
Expand Down
6 changes: 3 additions & 3 deletions src/ui/public/Vis/AggConfigs.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ define(function (require) {

AggConfigs.prototype.toDsl = function () {
var dslTopLvl = {};
var dslLvlCursor;
var nestedMetrics;
let dslLvlCursor;
let nestedMetrics;

if (this.vis.isHierarchical()) {
// collect all metrics, and filter out the ones that we won't be copying
Expand Down Expand Up @@ -85,7 +85,7 @@ define(function (require) {
}

var dsl = dslLvlCursor[config.id] = config.toDsl();
var subAggs;
let subAggs;

if (config.schema.group === 'buckets' && i < list.length - 1) {
// buckets that are not the last item in the list accept sub-aggs
Expand Down
10 changes: 5 additions & 5 deletions src/ui/public/Vis/__tests__/_AggConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ describe('AggConfig', function () {
var expect = require('expect.js');
var ngMock = require('ngMock');

var Vis;
var AggType;
var AggConfig;
var indexPattern;
var fieldFormat;
let Vis;
let AggType;
let AggConfig;
let indexPattern;
let fieldFormat;

beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Expand Down
6 changes: 3 additions & 3 deletions src/ui/public/Vis/__tests__/_AggConfigResult.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ describe('AggConfigResult', function () {
var expect = require('expect.js');
var ngMock = require('ngMock');

var AggConfig;
var indexPattern;
var Vis;
let AggConfig;
let indexPattern;
let Vis;

beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Expand Down
16 changes: 8 additions & 8 deletions src/ui/public/Vis/__tests__/_AggConfigs.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ describe('AggConfigs', function () {
var expect = require('expect.js');
var ngMock = require('ngMock');

var Vis;
var IndexedArray;
var AggConfig;
var AggConfigs;
var SpiedAggConfig;
var indexPattern;
var Schemas;
let Vis;
let IndexedArray;
let AggConfig;
let AggConfigs;
let SpiedAggConfig;
let indexPattern;
let Schemas;

beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Expand Down Expand Up @@ -95,7 +95,7 @@ describe('AggConfigs', function () {
});

describe('defaults', function () {
var vis;
let vis;
beforeEach(function () {
vis = {
indexPattern: indexPattern,
Expand Down
10 changes: 5 additions & 5 deletions src/ui/public/Vis/__tests__/_Renderbot.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
describe('renderbot', function () {
var Renderbot;
let Renderbot;
var expect = require('expect.js');
var ngMock = require('ngMock');

Expand All @@ -12,10 +12,10 @@ describe('renderbot', function () {
}

describe('API', function () {
var vis;
var $el;
var renderbot;
var uiState;
let vis;
let $el;
let renderbot;
let uiState;

beforeEach(init);
beforeEach(function () {
Expand Down
8 changes: 4 additions & 4 deletions src/ui/public/Vis/__tests__/_Vis.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ describe('Vis Class', function () {
var ngMock = require('ngMock');
var expect = require('expect.js');

var indexPattern;
var Vis;
var visTypes;
let indexPattern;
let Vis;
let visTypes;

var vis;
let vis;
var stateFixture = {
type: 'pie',
aggs: [
Expand Down
18 changes: 9 additions & 9 deletions src/ui/public/agg_response/geo_json/__tests__/geo_json.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ var expect = require('expect.js');
var ngMock = require('ngMock');

describe('GeoJson Agg Response Converter', function () {
var vis;
var tabify;
var convert;
var esResponse;
var aggs;
let vis;
let tabify;
let convert;
let esResponse;
let aggs;

beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Expand Down Expand Up @@ -103,10 +103,10 @@ describe('GeoJson Agg Response Converter', function () {
describe('includes one feature per row in the table', function () {
this.timeout(60000);

var table;
var chart;
var geoColI;
var metricColI;
let table;
let chart;
let geoColI;
let metricColI;

before(function () {
table = makeTable();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var expect = require('expect.js');
describe('buildHierarchicalData()', function () {
describe('arrayToLinkedList', function () {

var results;
let results;
beforeEach(function () {
results = arrayToLinkedList([
{ id: 1 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');

var Vis;
var Notifier;
var AggConfigs;
var indexPattern;
var buildHierarchicalData;
let Vis;
let Notifier;
let AggConfigs;
let indexPattern;
let buildHierarchicalData;

describe('buildHierarchicalData', function () {

Expand All @@ -27,8 +27,8 @@ describe('buildHierarchicalData', function () {


describe('metric only', function () {
var vis;
var results;
let vis;
let results;

beforeEach(function () {
var id = 1;
Expand Down Expand Up @@ -99,8 +99,8 @@ describe('buildHierarchicalData', function () {
});

describe('threeTermBuckets', function () {
var vis;
var results;
let vis;
let results;

beforeEach(function () {
var id = 1;
Expand Down Expand Up @@ -141,8 +141,8 @@ describe('buildHierarchicalData', function () {
});

describe('oneHistogramBucket', function () {
var vis;
var results;
let vis;
let results;

beforeEach(function () {
var id = 1;
Expand Down Expand Up @@ -173,8 +173,8 @@ describe('buildHierarchicalData', function () {
});

describe('oneRangeBucket', function () {
var vis;
var results;
let vis;
let results;

beforeEach(function () {
var id = 1;
Expand Down Expand Up @@ -214,8 +214,8 @@ describe('buildHierarchicalData', function () {
});

describe('oneFilterBucket', function () {
var vis;
var results;
let vis;
let results;

beforeEach(function () {
var id = 1;
Expand Down Expand Up @@ -250,8 +250,8 @@ describe('buildHierarchicalData', function () {
});

describe('oneFilterBucket that is a split', function () {
var vis;
var results;
let vis;
let results;

beforeEach(function () {
var id = 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var _ = require('lodash');
var collectBranch = require('ui/agg_response/hierarchical/_collect_branch');
var expect = require('expect.js');
describe('collectBranch()', function () {
var results;
let results;
var convert = function (name) {
return 'converted:' + name;
};
Expand Down
Loading

0 comments on commit 23b1d01

Please sign in to comment.