github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Backport PR #6706

Browse source 
---------

**Commit 1:**
[internal] Replace var assignments with let in non-ui

This change was applied to all directories under src/ except for the ui/
directory. Only .js files were searched.

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: 9eee35d228
* Authored by Court Ewing <court@epixa.com> on 2016-03-30T17:53:10Z

**Commit 2:**
[internal] use strict in babel_options

This file is not transpiled, so in order to use es6 features such as
const/let, we need to enable strict mode.

* Original sha: f3ec7765ca
* Authored by Court Ewing <court@epixa.com> on 2016-03-30T21:43:10Z
This commit is contained in:
Elastic Jasper 2016-03-31 21:04:11 -04:00
parent 1353fb0cd9
commit 60de9e40c2
78 changed files with 270 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cli/Command.js
View file

@ -82,7 +82,7 @@ Command.prototype.parseOptions = _.wrap(Command.prototype.parseOptions, function
Command.prototype.action = _.wrap(Command.prototype.action, function (action, fn) {
return action.call(this, function (...args) {
var ret = fn.apply(this, args);
let ret = fn.apply(this, args);
if (ret && typeof ret.then === 'function') {
ret.then(null, function (e) {
console.log('FATAL CLI ERROR', e.stack);

4
src/cli/cli.js
View file

@ -22,7 +22,7 @@ program
.command('help <command>')
.description('Get the help for a specific command')
.action(function (cmdName) {
var cmd = _.find(program.commands, { _name: cmdName });
let cmd = _.find(program.commands, { _name: cmdName });
if (!cmd) return this.error(`unknown command ${cmdName}`);
cmd.help();
});
@ -34,7 +34,7 @@ program
});
// check for no command name
var subCommand = argv[2] && !String(argv[2][0]).match(/^-|^\.|\//);
let subCommand = argv[2] && !String(argv[2][0]).match(/^-|^\.|\//);
if (!subCommand) {
if (_.intersection(argv.slice(2), ['-h', '--help']).length) {

2
src/cli/cluster/ClusterManager.js
View file

@ -51,7 +51,7 @@ module.exports = class ClusterManager {
}
setupWatching() {
var chokidar = require('chokidar');
let chokidar = require('chokidar');
let utils = require('requirefrom')('src/utils');
let fromRoot = utils('fromRoot');

4
src/cli/color.js
View file

@ -1,6 +1,6 @@
var _ = require('lodash');
var ansicolors = require('ansicolors');
let _ = require('lodash');
let ansicolors = require('ansicolors');
exports.green = _.flow(ansicolors.black, ansicolors.bgGreen);
exports.red = _.flow(ansicolors.white, ansicolors.bgRed);

4
src/cli/help.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = function (command, spaces) {
if (!_.size(command.commands)) {
@ -69,6 +69,6 @@ ${indent(cmd.optionHelp(), 2)}
}
function humanReadableArgName(arg) {
var nameOutput = arg.name + (arg.variadic === true ? '...' : '');
let nameOutput = arg.name + (arg.variadic === true ? '...' : '');
return arg.required ? '<' + nameOutput + '>' : '[' + nameOutput + ']';
}

2
src/cli/plugin/__tests__/plugin_installer.js
View file

@ -39,7 +39,7 @@ describe('kibana cli', function () {
pluginPath: testWorkingPath
};
var errorStub = sinon.stub();
let errorStub = sinon.stub();
return pluginInstaller.install(settings, logger)
.catch(errorStub)
.then(function (data) {

82
src/cli/plugin/__tests__/setting_parser.js
View file

@ -1,9 +1,9 @@
var path = require('path');
var expect = require('expect.js');
let path = require('path');
let expect = require('expect.js');
var utils = require('requirefrom')('src/utils');
var fromRoot = utils('fromRoot');
var settingParser = require('../setting_parser');
let utils = require('requirefrom')('src/utils');
let fromRoot = utils('fromRoot');
let settingParser = require('../setting_parser');
describe('kibana cli', function () {
@ -13,23 +13,23 @@ describe('kibana cli', function () {
describe('parseMilliseconds function', function () {
var parser = settingParser();
let parser = settingParser();
it('should return 0 for an empty string', function () {
var value = '';
let value = '';
var result = parser.parseMilliseconds(value);
let result = parser.parseMilliseconds(value);
expect(result).to.be(0);
});
it('should return 0 for a number with an invalid unit of measure', function () {
var result = parser.parseMilliseconds('1gigablasts');
let result = parser.parseMilliseconds('1gigablasts');
expect(result).to.be(0);
});
it('should assume a number with no unit of measure is specified as milliseconds', function () {
var result = parser.parseMilliseconds(1);
let result = parser.parseMilliseconds(1);
expect(result).to.be(1);
result = parser.parseMilliseconds('1');
@ -37,32 +37,32 @@ describe('kibana cli', function () {
});
it('should interpret a number with "s" as the unit of measure as seconds', function () {
var result = parser.parseMilliseconds('5s');
let result = parser.parseMilliseconds('5s');
expect(result).to.be(5 * 1000);
});
it('should interpret a number with "second" as the unit of measure as seconds', function () {
var result = parser.parseMilliseconds('5second');
let result = parser.parseMilliseconds('5second');
expect(result).to.be(5 * 1000);
});
it('should interpret a number with "seconds" as the unit of measure as seconds', function () {
var result = parser.parseMilliseconds('5seconds');
let result = parser.parseMilliseconds('5seconds');
expect(result).to.be(5 * 1000);
});
it('should interpret a number with "m" as the unit of measure as minutes', function () {
var result = parser.parseMilliseconds('9m');
let result = parser.parseMilliseconds('9m');
expect(result).to.be(9 * 1000 * 60);
});
it('should interpret a number with "minute" as the unit of measure as minutes', function () {
var result = parser.parseMilliseconds('9minute');
let result = parser.parseMilliseconds('9minute');
expect(result).to.be(9 * 1000 * 60);
});
it('should interpret a number with "minutes" as the unit of measure as minutes', function () {
var result = parser.parseMilliseconds('9minutes');
let result = parser.parseMilliseconds('9minutes');
expect(result).to.be(9 * 1000 * 60);
});
@ -120,7 +120,7 @@ describe('kibana cli', function () {
it('should default to false', function () {
parser = settingParser(options);
var settings = parser.parse(options);
let settings = parser.parse(options);
expect(settings.quiet).to.be(false);
});
@ -128,7 +128,7 @@ describe('kibana cli', function () {
it('should set settings.quiet property to true', function () {
options.parent = { quiet: true };
parser = settingParser(options);
var settings = parser.parse(options);
let settings = parser.parse(options);
expect(settings.quiet).to.be(true);
});
@ -139,7 +139,7 @@ describe('kibana cli', function () {
it('should default to false', function () {
parser = settingParser(options);
var settings = parser.parse(options);
let settings = parser.parse(options);
expect(settings).to.have.property('silent', false);
});
@ -147,7 +147,7 @@ describe('kibana cli', function () {
it('should set settings.silent property to true', function () {
options.silent = true;
parser = settingParser(options);
var settings = parser.parse(options);
let settings = parser.parse(options);
expect(settings).to.have.property('silent', true);
});
@ -159,7 +159,7 @@ describe('kibana cli', function () {
it('should default to 0 (milliseconds)', function () {
parser = settingParser(options);
var settings = parser.parse(options);
let settings = parser.parse(options);
expect(settings).to.have.property('timeout', 0);
});
@ -167,7 +167,7 @@ describe('kibana cli', function () {
it('should set settings.timeout property to specified value', function () {
options.timeout = 1234;
parser = settingParser(options);
var settings = parser.parse(options);
let settings = parser.parse(options);
expect(settings).to.have.property('timeout', 1234);
});
@ -179,7 +179,7 @@ describe('kibana cli', function () {
it('should set settings.action property to "install"', function () {
options.install = 'org/package/version';
parser = settingParser(options);
var settings = parser.parse(options);
let settings = parser.parse(options);
expect(settings).to.have.property('action', 'install');
});
@ -190,7 +190,7 @@ describe('kibana cli', function () {
expect(parser.parse).withArgs().to.not.throwError();
var settings = parser.parse(options);
let settings = parser.parse(options);
expect(settings).to.have.property('organization', 'kibana');
expect(settings).to.have.property('package', 'test-plugin');
@ -203,7 +203,7 @@ describe('kibana cli', function () {
expect(parser.parse).withArgs().to.not.throwError();
var settings = parser.parse(options);
let settings = parser.parse(options);
expect(settings).to.have.property('organization', 'kibana');
expect(settings).to.have.property('package', 'test-plugin');
@ -228,7 +228,7 @@ describe('kibana cli', function () {
options.install = 'kibana/test-plugin';
parser = settingParser(options);
var settings = parser.parse();
let settings = parser.parse();
expect(settings.urls).to.have.property('length', 1);
expect(settings.urls).to.contain('https://download.elastic.co/kibana/test-plugin/test-plugin-latest.tar.gz');
@ -238,7 +238,7 @@ describe('kibana cli', function () {
options.install = 'kibana/test-plugin/v1.1.1';
parser = settingParser(options);
var settings = parser.parse();
let settings = parser.parse();
expect(settings.urls).to.have.property('length', 1);
expect(settings.urls).to.contain('https://download.elastic.co/kibana/test-plugin/test-plugin-v1.1.1.tar.gz');
@ -248,8 +248,8 @@ describe('kibana cli', function () {
options.install = 'kibana/test-plugin';
parser = settingParser(options);
var settings = parser.parse();
var expected = fromRoot('installedPlugins/test-plugin');
let settings = parser.parse();
let expected = fromRoot('installedPlugins/test-plugin');
expect(settings).to.have.property('pluginPath', expected);
});
@ -258,8 +258,8 @@ describe('kibana cli', function () {
options.install = 'kibana/test-plugin';
parser = settingParser(options);
var settings = parser.parse();
var expected = fromRoot('installedPlugins/.plugin.installing');
let settings = parser.parse();
let expected = fromRoot('installedPlugins/.plugin.installing');
expect(settings).to.have.property('workingPath', expected);
});
@ -268,8 +268,8 @@ describe('kibana cli', function () {
options.install = 'kibana/test-plugin';
parser = settingParser(options);
var settings = parser.parse();
var expected = fromRoot('installedPlugins/.plugin.installing/archive.part');
let settings = parser.parse();
let expected = fromRoot('installedPlugins/.plugin.installing/archive.part');
expect(settings).to.have.property('tempArchiveFile', expected);
});
@ -283,7 +283,7 @@ describe('kibana cli', function () {
expect(parser.parse).withArgs().to.not.throwError();
var settings = parser.parse();
let settings = parser.parse();
expect(settings).to.have.property('package', 'test-plugin');
});
@ -298,12 +298,12 @@ describe('kibana cli', function () {
});
it('should result in only the specified url in urls collection', function () {
var url = 'http://www.google.com/plugin.tar.gz';
let url = 'http://www.google.com/plugin.tar.gz';
options.install = 'test-plugin';
options.url = url;
parser = settingParser(options);
var settings = parser.parse();
let settings = parser.parse();
expect(settings).to.have.property('urls');
expect(settings.urls).to.be.an('array');
@ -322,7 +322,7 @@ describe('kibana cli', function () {
options.remove = 'package';
parser = settingParser(options);
var settings = parser.parse();
let settings = parser.parse();
expect(settings).to.have.property('action', 'remove');
});
@ -332,7 +332,7 @@ describe('kibana cli', function () {
options.remove = 'test-plugin';
parser = settingParser(options);
var settings = parser.parse();
let settings = parser.parse();
expect(settings).to.have.property('package', 'test-plugin');
});
@ -351,8 +351,8 @@ describe('kibana cli', function () {
options.remove = 'test-plugin';
parser = settingParser(options);
var settings = parser.parse();
var expected = fromRoot('installedPlugins/test-plugin');
let settings = parser.parse();
let expected = fromRoot('installedPlugins/test-plugin');
expect(settings).to.have.property('pluginPath', expected);
});
@ -367,7 +367,7 @@ describe('kibana cli', function () {
options.list = true;
parser = settingParser(options);
var settings = parser.parse();
let settings = parser.parse();
expect(settings).to.have.property('action', 'list');
});

14
src/fixtures/agg_resp/geohash_grid.js
View file

@ -1,7 +1,7 @@
define(function (require) {
return function GeoHashGridAggResponseFixture() {
var _ = require('lodash');
let _ = require('lodash');
// for vis:
//
@ -18,23 +18,23 @@ define(function (require) {
// },
// });
var geoHashCharts = _.union(
let geoHashCharts = _.union(
_.range(48, 57), // 0-9
_.range(65, 90), // A-Z
_.range(97, 122) // a-z
);
var totalDocCount = 0;
let totalDocCount = 0;
var tags = _.times(_.random(4, 20), function (i) {
let tags = _.times(_.random(4, 20), function (i) {
// random number of tags
var docCount = 0;
var buckets = _.times(_.random(40, 200), function () {
let docCount = 0;
let buckets = _.times(_.random(40, 200), function () {
return _.sample(geoHashCharts, 3).join('');
})
.sort()
.map(function (geoHash) {
var count = _.random(1, 5000);
let count = _.random(1, 5000);
totalDocCount += count;
docCount += count;

2
src/fixtures/fake_chart_events.js
View file

@ -1,5 +1,5 @@
define(function (require) {
var results = {};
let results = {};
results.timeSeries = {
data: {

2
src/fixtures/fake_hierarchical_data.js
View file

@ -1,5 +1,5 @@
define(function (require) {
var data = { };
let data = { };
data.metricOnly = {
hits: { total: 1000, hits: [], max_score: 0 },

4
src/fixtures/fake_row.js
View file

@ -1,6 +1,6 @@
define(function (require) {
var _ = require('lodash');
var longString = Array(200).join('_');
let _ = require('lodash');
let longString = Array(200).join('_');
return function (id, mapping) {
function fakeVals(type) {

2
src/fixtures/hits.js
View file

@ -1,5 +1,5 @@
define(function (require) {
var _ = require('lodash');
let _ = require('lodash');
return function fitsFixture() {
return _.map([
{_source: {'@timestamp': 0, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 10, request: 'foo'}},

2
src/fixtures/logstash_fields.js
View file

@ -1,6 +1,6 @@
define(function (require) {
function stubbedLogstashFields() {
var sourceData = [
let sourceData = [
{ name: 'bytes', type: 'number', indexed: true, analyzed: true, sortable: true, filterable: true, count: 10 },
{ name: 'ssl', type: 'boolean', indexed: true, analyzed: true, sortable: true, filterable: true, count: 20 },
{ name: '@timestamp', type: 'date', indexed: true, analyzed: true, sortable: true, filterable: true, count: 30 },

10
src/fixtures/mock_courier.js
View file

@ -1,13 +1,13 @@
define(function (require) {
var _ = require('lodash');
var sinon = require('auto-release-sinon');
let _ = require('lodash');
let sinon = require('auto-release-sinon');
return function (Private, Promise) {
var indexPatterns = Private(require('fixtures/stubbed_logstash_index_pattern'));
var getIndexPatternStub = sinon.stub();
let indexPatterns = Private(require('fixtures/stubbed_logstash_index_pattern'));
let getIndexPatternStub = sinon.stub();
getIndexPatternStub.returns(Promise.resolve(indexPatterns));
var courier = {
let courier = {
indexPatterns: { get: getIndexPatternStub },
getStub: getIndexPatternStub
};

4
src/fixtures/mock_state.js
View file

@ -1,6 +1,6 @@
define(function (require) {
var _ = require('lodash');
var sinon = require('auto-release-sinon');
let _ = require('lodash');
let sinon = require('auto-release-sinon');
function MockState(defaults) {
this.on = _.noop;

4
src/fixtures/mock_ui_state.js
View file

@ -1,6 +1,6 @@
define(function (require) {
var _ = require('lodash');
var keys = {};
let _ = require('lodash');
let keys = {};
return {
get: function (path, def) {
return keys[path] == null ? def : keys[path];

2
src/fixtures/search_response.js
View file

@ -1,5 +1,5 @@
define(function (require) {
var hits = require('fixtures/real_hits');
let hits = require('fixtures/real_hits');
return {
took: 73,

2
src/fixtures/stubbed_doc_source_response.js
View file

@ -1,6 +1,6 @@
define(function (require) {
function stubbedDocSourceResponse(Private) {
var mockLogstashFields = Private(require('fixtures/logstash_fields'));
let mockLogstashFields = Private(require('fixtures/logstash_fields'));
return function (id, index) {
index = index || '.kibana';

14
src/fixtures/stubbed_logstash_index_pattern.js
View file

@ -1,21 +1,21 @@
define(function (require) {
return function stubbedLogstashIndexPatternService(Private) {
var StubIndexPattern = Private(require('testUtils/stub_index_pattern'));
var fieldTypes = Private(require('ui/index_patterns/_field_types'));
var mockLogstashFields = Private(require('fixtures/logstash_fields'));
let StubIndexPattern = Private(require('testUtils/stub_index_pattern'));
let fieldTypes = Private(require('ui/index_patterns/_field_types'));
let mockLogstashFields = Private(require('fixtures/logstash_fields'));
var _ = require('lodash');
let _ = require('lodash');
var fields = mockLogstashFields.map(function (field) {
let fields = mockLogstashFields.map(function (field) {
field.displayName = field.name;
var type = fieldTypes.byName[field.type];
let type = fieldTypes.byName[field.type];
if (!type) throw new TypeError('unknown type ' + field.type);
if (!_.has(field, 'sortable')) field.sortable = type.sortable;
if (!_.has(field, 'filterable')) field.filterable = type.filterable;
return field;
});
var indexPattern = new StubIndexPattern('logstash-*', 'time', fields);
let indexPattern = new StubIndexPattern('logstash-*', 'time', fields);
indexPattern.id = 'logstash-*';
return indexPattern;

8
src/fixtures/stubbed_search_source.js
View file

@ -1,10 +1,10 @@
define(function (require) {
var sinon = require('auto-release-sinon');
var searchResponse = require('fixtures/search_response');
let sinon = require('auto-release-sinon');
let searchResponse = require('fixtures/search_response');
return function stubSearchSource(Private, $q, Promise) {
var deferedResult = $q.defer();
var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
let deferedResult = $q.defer();
let indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
return {
sort: sinon.spy(),

2
src/fixtures/tilemap_map.js
View file

@ -1,5 +1,5 @@
define(function (require) {
var sinon = require('auto-release-sinon');
let sinon = require('auto-release-sinon');
function MockMap(container, chartData, params) {
this.container = container;

12
src/fixtures/vislib/_vis_fixture.js
View file

@ -1,9 +1,9 @@
var $ = require('jquery');
var _ = require('lodash');
let $ = require('jquery');
let _ = require('lodash');
var $visCanvas = $('<div>').attr('id', 'vislib-vis-fixtures').appendTo('body');
var count = 0;
var visHeight = $visCanvas.height();
let $visCanvas = $('<div>').attr('id', 'vislib-vis-fixtures').appendTo('body');
let count = 0;
let visHeight = $visCanvas.height();
$visCanvas.new = function () {
count += 1;
@ -19,7 +19,7 @@ afterEach(function () {
module.exports = function VislibFixtures(Private) {
return function (visLibParams) {
var Vis = Private(require('ui/vislib/vis'));
let Vis = Private(require('ui/vislib/vis'));
return new Vis($visCanvas.new(), _.defaults({}, visLibParams || {}, {
shareYAxis: true,
addTooltip: true,

2
src/fixtures/vislib/mock_data/date_histogram/_columns.js
View file

@ -1,4 +1,4 @@
var moment = require('moment');
let moment = require('moment');
module.exports = {
'columns': [

2
src/fixtures/vislib/mock_data/date_histogram/_rows.js
View file

@ -1,4 +1,4 @@
var moment = require('moment');
let moment = require('moment');
module.exports = {
'rows': [

2
src/fixtures/vislib/mock_data/date_histogram/_series.js
View file

@ -1,4 +1,4 @@
var moment = require('moment');
let moment = require('moment');
module.exports = {
'label': '',

2
src/fixtures/vislib/mock_data/date_histogram/_series_neg.js
View file

@ -1,4 +1,4 @@
var moment = require('moment');
let moment = require('moment');
module.exports = {
'label': '',

2
src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js
View file

@ -1,4 +1,4 @@
var moment = require('moment');
let moment = require('moment');
module.exports = {
'label': '',

2
src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js
View file

@ -1,4 +1,4 @@
var moment = require('moment');
let moment = require('moment');
module.exports = {
'label': '',

2
src/fixtures/vislib/mock_data/filters/_columns.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'columns': [

2
src/fixtures/vislib/mock_data/filters/_rows.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'rows': [

2
src/fixtures/vislib/mock_data/filters/_series.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'label': '',

2
src/fixtures/vislib/mock_data/geohash/_columns.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'columns': [
{

2
src/fixtures/vislib/mock_data/geohash/_geo_json.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'valueFormatter': _.identity,

2
src/fixtures/vislib/mock_data/geohash/_rows.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'rows': [

2
src/fixtures/vislib/mock_data/histogram/_columns.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'columns': [

2
src/fixtures/vislib/mock_data/histogram/_rows.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'rows': [

2
src/fixtures/vislib/mock_data/histogram/_series.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'label': '',

2
src/fixtures/vislib/mock_data/histogram/_slices.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'label': '',

2
src/fixtures/vislib/mock_data/not_enough_data/_one_point.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'label': '',

2
src/fixtures/vislib/mock_data/range/_columns.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'columns': [

2
src/fixtures/vislib/mock_data/range/_rows.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'rows': [

2
src/fixtures/vislib/mock_data/range/_series.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'label': '',

2
src/fixtures/vislib/mock_data/significant_terms/_columns.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'columns': [

2
src/fixtures/vislib/mock_data/significant_terms/_rows.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'rows': [

2
src/fixtures/vislib/mock_data/significant_terms/_series.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'label': '',

2
src/fixtures/vislib/mock_data/stacked/_stacked.js
View file

@ -1,4 +1,4 @@
var moment = require('moment');
let moment = require('moment');
module.exports = {
'label': '',

2
src/fixtures/vislib/mock_data/terms/_columns.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'columns': [

2
src/fixtures/vislib/mock_data/terms/_rows.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'rows': [

2
src/fixtures/vislib/mock_data/terms/_series.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = {
'label': '',

4
src/optimize/BaseOptimizer.js
View file

@ -3,10 +3,10 @@ let { defaults } = require('lodash');
let { resolve } = require('path');
let { writeFile } = require('fs');
let webpack = require('webpack');
var Boom = require('boom');
let Boom = require('boom');
let DirectoryNameAsMain = require('webpack-directory-name-as-main');
let ExtractTextPlugin = require('extract-text-webpack-plugin');
var CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin');
let CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin');
let utils = require('requirefrom')('src/utils');
let fromRoot = utils('fromRoot');

4
src/optimize/babelOptions.build.js
View file

@ -1,5 +1,5 @@
var cloneDeep = require('lodash').cloneDeep;
var fromRoot = require('path').resolve.bind(null, __dirname, '../../');
let cloneDeep = require('lodash').cloneDeep;
let fromRoot = require('path').resolve.bind(null, __dirname, '../../');
if (!process.env.BABEL_CACHE_PATH) {
process.env.BABEL_CACHE_PATH = fromRoot('optimize/.babelcache.json');

7
src/optimize/babelOptions.js
View file

@ -1,5 +1,8 @@
var cloneDeep = require('lodash').cloneDeep;
var fromRoot = require('path').resolve.bind(null, __dirname, '../../');
// this file is not transpiled
'use strict'; // eslint-disable-line strict
let cloneDeep = require('lodash').cloneDeep;
let fromRoot = require('path').resolve.bind(null, __dirname, '../../');
if (!process.env.BABEL_CACHE_PATH) {
process.env.BABEL_CACHE_PATH = fromRoot('optimize/.babelcache.json');

2
src/plugins/metric_vis/public/metric_vis_controller.js
View file

@ -1,5 +1,5 @@
define(function (require) {
var _ = require('lodash');
let _ = require('lodash');
// get the kibana/metric_vis module, and make sure that it requires the "kibana" module if it
// didn't already
const module = require('ui/modules').get('kibana/metric_vis', ['kibana']);

46
src/server/config/__tests__/config.js
View file

@ -1,7 +1,7 @@
var Config = require('../config');
var expect = require('expect.js');
var _ = require('lodash');
var Joi = require('joi');
let Config = require('../config');
let expect = require('expect.js');
let _ = require('lodash');
let Joi = require('joi');
/**
* Plugins should defined a config method that takes a joi object. By default
@ -9,12 +9,12 @@ var Joi = require('joi');
*
* Config should be newed up with a joi schema (containing defaults via joi)
*
* var schema = { ... }
* let schema = { ... }
* new Config(schema);
*
*/
var data = {
let data = {
test: {
hosts: ['host-01', 'host-02'],
client: {
@ -25,7 +25,7 @@ var data = {
}
};
var schema = Joi.object({
let schema = Joi.object({
test: Joi.object({
enable: Joi.boolean().default(true),
hosts: Joi.array().items(Joi.string()),
@ -44,8 +44,8 @@ describe('lib/config/config', function () {
describe('constructor', function () {
it('should not allow any config if the schema is not passed', function (done) {
var config = new Config();
var run = function () {
let config = new Config();
let run = function () {
config.set('something.enable', true);
};
expect(run).to.throwException();
@ -53,7 +53,7 @@ describe('lib/config/config', function () {
});
it('should set defaults', function () {
var config = new Config(schema);
let config = new Config(schema);
expect(config.get('test.enable')).to.be(true);
expect(config.get('test.client.type')).to.be('datastore');
});
@ -69,7 +69,7 @@ describe('lib/config/config', function () {
it('should reset the config object with new values', function () {
config.set(data);
var newData = config.get();
let newData = config.get();
newData.test.enable = false;
config.resetTo(newData);
expect(config.get()).to.eql(newData);
@ -111,21 +111,21 @@ describe('lib/config/config', function () {
});
it('should use an object to set config values', function () {
var hosts = ['host-01', 'host-02'];
let hosts = ['host-01', 'host-02'];
config.set({ test: { enable: false, hosts: hosts } });
expect(config.get('test.enable')).to.be(false);
expect(config.get('test.hosts')).to.eql(hosts);
});
it('should use a flatten object to set config values', function () {
var hosts = ['host-01', 'host-02'];
let hosts = ['host-01', 'host-02'];
config.set({ 'test.enable': false, 'test.hosts': hosts });
expect(config.get('test.enable')).to.be(false);
expect(config.get('test.hosts')).to.eql(hosts);
});
it('should override values with just the values present', function () {
var newData = _.cloneDeep(data);
let newData = _.cloneDeep(data);
config.set(data);
newData.test.enable = false;
config.set({ test: { enable: false } });
@ -133,7 +133,7 @@ describe('lib/config/config', function () {
});
it('should thow an exception when setting a value with the wrong type', function (done) {
var run = function () {
let run = function () {
config.set('test.enable', 'something');
};
expect(run).to.throwException(function (err) {
@ -156,7 +156,7 @@ describe('lib/config/config', function () {
});
it('should return the whole config object when called without a key', function () {
var newData = _.cloneDeep(data);
let newData = _.cloneDeep(data);
newData.test.enable = true;
expect(config.get()).to.eql(newData);
});
@ -171,14 +171,14 @@ describe('lib/config/config', function () {
});
it('should throw exception for unknown config values', function () {
var run = function () {
let run = function () {
config.get('test.does.not.exist');
};
expect(run).to.throwException(/Unknown config key: test.does.not.exist/);
});
it('should not throw exception for undefined known config values', function () {
var run = function getUndefValue() {
let run = function getUndefValue() {
config.get('test.undefValue');
};
expect(run).to.not.throwException();
@ -193,14 +193,14 @@ describe('lib/config/config', function () {
});
it('should allow you to extend the schema at the top level', function () {
var newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
let newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
config.extendSchema('myTest', newSchema);
expect(config.get('myTest.test')).to.be(true);
});
it('should NOT allow you to extend the schema if somethign else is there', function () {
var newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
var run = function () {
let newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
let run = function () {
config.extendSchema('test', newSchema);
};
expect(run).to.throwException();
@ -210,7 +210,7 @@ describe('lib/config/config', function () {
describe('#removeSchema(key)', function () {
it('should completely remove the key', function () {
var config = new Config(Joi.object().keys({
let config = new Config(Joi.object().keys({
a: Joi.number().default(1)
}));
@ -220,7 +220,7 @@ describe('lib/config/config', function () {
});
it('only removes existing keys', function () {
var config = new Config(Joi.object());
let config = new Config(Joi.object());
expect(() => config.removeSchema('b')).to.throwException('Unknown schema');
});

8
src/server/config/__tests__/explodeBy.js
View file

@ -1,10 +1,10 @@
var explodeBy = require('../explodeBy');
var expect = require('expect.js');
let explodeBy = require('../explodeBy');
let expect = require('expect.js');
describe('explode_by(dot, flatObject)', function () {
it('should explode a flatten object with dots', function () {
var flatObject = {
let flatObject = {
'test.enable': true,
'test.hosts': ['host-01', 'host-02']
};
@ -17,7 +17,7 @@ describe('explode_by(dot, flatObject)', function () {
});
it('should explode a flatten object with slashes', function () {
var flatObject = {
let flatObject = {
'test/enable': true,
'test/hosts': ['host-01', 'host-02']
};

6
src/server/config/__tests__/flattenWith.js
View file

@ -1,10 +1,10 @@
var flattenWith = require('../flattenWith');
var expect = require('expect.js');
let flattenWith = require('../flattenWith');
let expect = require('expect.js');
describe('flatten_with(dot, nestedObj)', function () {
it('should flatten object with dot', function () {
var nestedObj = {
let nestedObj = {
test: {
enable: true,
hosts: ['host-01', 'host-02'],

8
src/server/config/__tests__/override.js
View file

@ -1,10 +1,10 @@
var override = require('../override');
var expect = require('expect.js');
let override = require('../override');
let expect = require('expect.js');
describe('override(target, source)', function () {
it('should override the values form source to target', function () {
var target = {
let target = {
test: {
enable: true,
host: ['host-01', 'host-02'],
@ -13,7 +13,7 @@ describe('override(target, source)', function () {
}
}
};
var source = { test: { client: { type: 'nosql' } } };
let source = { test: { client: { type: 'nosql' } } };
expect(override(target, source)).to.eql({
test: {
enable: true,

8
src/server/config/explodeBy.js
View file

@ -1,10 +1,10 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = function (dot, flatObject) {
var fullObject = {};
let fullObject = {};
_.each(flatObject, function (value, key) {
var keys = key.split(dot);
let keys = key.split(dot);
(function walk(memo, keys, value) {
var _key = keys.shift();
let _key = keys.shift();
if (keys.length === 0) {
memo[_key] = value;
} else {

6
src/server/config/flattenWith.js
View file

@ -1,8 +1,8 @@
var _ = require('lodash');
let _ = require('lodash');
module.exports = function (dot, nestedObj, flattenArrays) {
let key; // original key
var stack = []; // track key stack
var flatObj = {};
let stack = []; // track key stack
let flatObj = {};
(function flattenObj(obj) {
_.keys(obj).forEach(function (key) {
stack.push(key);

10
src/server/config/override.js
View file

@ -1,10 +1,10 @@
var _ = require('lodash');
var flattenWith = require('./flattenWith');
var explodeBy = require('./explodeBy');
let _ = require('lodash');
let flattenWith = require('./flattenWith');
let explodeBy = require('./explodeBy');
module.exports = function (target, source) {
var _target = flattenWith('.', target);
var _source = flattenWith('.', source);
let _target = flattenWith('.', target);
let _source = flattenWith('.', source);
return explodeBy('.', _.defaults(_source, _target));
};

2
src/server/http/index.js
View file

@ -13,7 +13,7 @@ module.exports = function (kbnServer, server, config) {
const shortUrlLookup = require('./short_url_lookup')(server);
// Create a new connection
var connectionOptions = {
let connectionOptions = {
host: config.get('server.host'),
port: config.get('server.port'),
state: {

8
src/server/logging/LogFormat.js
View file

@ -41,13 +41,13 @@ module.exports = class TransformObjStream extends Stream.Transform {
}
_transform(event, enc, next) {
var data = this.filter(this.readEvent(event));
let data = this.filter(this.readEvent(event));
this.push(this.format(data) + '\n');
next();
}
readEvent(event) {
var data = {
let data = {
type: event.event,
'@timestamp': moment.utc(event.timestamp).format(),
tags: [].concat(event.tags || []),
@ -69,7 +69,7 @@ module.exports = class TransformObjStream extends Stream.Transform {
referer: event.source.referer
};
var contentLength = 0;
let contentLength = 0;
if (typeof event.responsePayload === 'object') {
contentLength = stringify(event.responsePayload).length;
} else {
@ -82,7 +82,7 @@ module.exports = class TransformObjStream extends Stream.Transform {
contentLength: contentLength
};
var query = querystring.stringify(event.query);
let query = querystring.stringify(event.query);
if (query) data.req.url += '?' + query;

6
src/server/logging/__tests__/applyFiltersToKeys.js
View file

@ -1,9 +1,9 @@
var applyFiltersToKeys = require('../applyFiltersToKeys');
var expect = require('expect.js');
let applyFiltersToKeys = require('../applyFiltersToKeys');
let expect = require('expect.js');
describe('applyFiltersToKeys(obj, actionsByKey)', function () {
it('applies for each key+prop in actionsByKey', function () {
var data = applyFiltersToKeys({
let data = applyFiltersToKeys({
a: {
b: {
c: 1

2
src/server/logging/applyFiltersToKeys.js
View file

@ -21,7 +21,7 @@ function apply(obj, key, action) {
obj[k] = ('' + val).replace(/./g, 'X');
}
else if (/\/.+\//.test(action)) {
var matches = action.match(/\/(.+)\//);
let matches = action.match(/\/(.+)\//);
if (matches) {
let regex = new RegExp(matches[1]);
obj[k] = ('' + val).replace(regex, replacer);

18
src/server/pid/index.js
View file

@ -1,20 +1,20 @@
var _ = require('lodash');
var Boom = require('boom');
var Promise = require('bluebird');
var writeFile = Promise.promisify(require('fs').writeFile);
var unlink = require('fs').unlinkSync;
let _ = require('lodash');
let Boom = require('boom');
let Promise = require('bluebird');
let writeFile = Promise.promisify(require('fs').writeFile);
let unlink = require('fs').unlinkSync;
module.exports = Promise.method(function (kbnServer, server, config) {
var path = config.get('pid.file');
let path = config.get('pid.file');
if (!path) return;
var pid = String(process.pid);
let pid = String(process.pid);
return writeFile(path, pid, { flag: 'wx' })
.catch(function (err) {
if (err.code !== 'EEXIST') throw err;
var log = {
let log = {
tmpl: 'pid file already exists at <%= path %>',
path: path,
pid: pid
@ -36,7 +36,7 @@ module.exports = Promise.method(function (kbnServer, server, config) {
pid: pid
});
var clean = _.once(function (code) {
let clean = _.once(function (code) {
unlink(path);
});

4
src/server/plugins/scan.js
View file

@ -5,8 +5,8 @@ module.exports = async (kbnServer, server, config) => {
let { resolve } = require('path');
let { each } = require('bluebird');
var PluginCollection = require('./PluginCollection');
var plugins = kbnServer.plugins = new PluginCollection(kbnServer);
let PluginCollection = require('./PluginCollection');
let plugins = kbnServer.plugins = new PluginCollection(kbnServer);
let scanDirs = [].concat(config.get('plugins.scanDirs') || []);
let pluginPaths = [].concat(config.get('plugins.paths') || []);

6
src/server/status/Samples.js
View file

@ -1,4 +1,4 @@
var _ = require('lodash');
let _ = require('lodash');
function Samples(max) {
this.vals = {};
@ -7,8 +7,8 @@ function Samples(max) {
}
Samples.prototype.add = function (sample) {
var vals = this.vals;
var length = this.length = Math.min(this.length + 1, this.max);
let vals = this.vals;
let length = this.length = Math.min(this.length + 1, this.max);
_.forOwn(sample, function (val, name) {
if (val == null) val = null;

8
src/server/status/ServerStatus.js
View file

@ -31,15 +31,15 @@ module.exports = class ServerStatus {
}
overall() {
var state = _(this._created)
let state = _(this._created)
.map(function (status) {
return states.get(status.state);
})
.sortBy('severity')
.pop();
var statuses = _.where(this._created, { state: state.id });
var since = _.get(_.sortBy(statuses, 'since'), [0, 'since']);
let statuses = _.where(this._created, { state: state.id });
let since = _.get(_.sortBy(statuses, 'since'), [0, 'since']);
return {
state: state.id,
@ -59,7 +59,7 @@ module.exports = class ServerStatus {
}
toString() {
var overall = this.overall();
let overall = this.overall();
return `${overall.title} – ${overall.nickname}`;
}

2
src/server/status/Status.js
View file

@ -13,7 +13,7 @@ class Status extends EventEmitter {
this.on('change', function (previous, previousMsg) {
this.since = new Date();
var tags = ['status', name];
let tags = ['status', name];
tags.push(this.state === 'red' ? 'error' : 'info');
server.log(tags, {

32
src/server/status/__tests__/ServerStatus.js
View file

@ -1,10 +1,10 @@
var _ = require('lodash');
var expect = require('expect.js');
var sinon = require('sinon');
let _ = require('lodash');
let expect = require('expect.js');
let sinon = require('sinon');
var states = require('../states');
var Status = require('../Status');
var ServerStatus = require('../ServerStatus');
let states = require('../states');
let Status = require('../Status');
let ServerStatus = require('../ServerStatus');
describe('ServerStatus class', function () {
let server;
@ -17,21 +17,21 @@ describe('ServerStatus class', function () {
describe('#create(name)', function () {
it('should create a new status by name', function () {
var status = serverStatus.create('name');
let status = serverStatus.create('name');
expect(status).to.be.a(Status);
});
});
describe('#get(name)', function () {
it('exposes plugins by name', function () {
var status = serverStatus.create('name');
let status = serverStatus.create('name');
expect(serverStatus.get('name')).to.be(status);
});
});
describe('#getState(name)', function () {
it('should expose the state of the plugin by name', function () {
var status = serverStatus.create('name');
let status = serverStatus.create('name');
status.green();
expect(serverStatus.getState('name')).to.be('green');
});
@ -39,11 +39,11 @@ describe('ServerStatus class', function () {
describe('#overall()', function () {
it('considers each status to produce a summary', function () {
var status = serverStatus.create('name');
let status = serverStatus.create('name');
expect(serverStatus.overall().state).to.be('uninitialized');
var match = function (overall, state) {
let match = function (overall, state) {
expect(overall).to.have.property('state', state.id);
expect(overall).to.have.property('title', state.title);
expect(overall).to.have.property('icon', state.icon);
@ -65,20 +65,20 @@ describe('ServerStatus class', function () {
describe('#toJSON()', function () {
it('serializes to overall status and individuals', function () {
var one = serverStatus.create('one');
var two = serverStatus.create('two');
var three = serverStatus.create('three');
let one = serverStatus.create('one');
let two = serverStatus.create('two');
let three = serverStatus.create('three');
one.green();
two.yellow();
three.red();
var obj = JSON.parse(JSON.stringify(serverStatus));
let obj = JSON.parse(JSON.stringify(serverStatus));
expect(obj).to.have.property('overall');
expect(obj.overall.state).to.eql(serverStatus.overall().state);
expect(obj.statuses).to.have.length(3);
var outs = _.indexBy(obj.statuses, 'name');
let outs = _.indexBy(obj.statuses, 'name');
expect(outs.one).to.have.property('state', 'green');
expect(outs.two).to.have.property('state', 'yellow');
expect(outs.three).to.have.property('state', 'red');

30
src/server/status/__tests__/Status.js
View file

@ -1,7 +1,7 @@
var expect = require('expect.js');
var sinon = require('sinon');
var Status = require('../Status');
var ServerStatus = require('../ServerStatus');
let expect = require('expect.js');
let sinon = require('sinon');
let Status = require('../Status');
let ServerStatus = require('../ServerStatus');
describe('Status class', function () {
@ -18,7 +18,7 @@ describe('Status class', function () {
});
it('emits change when the status is set', function (done) {
var status = serverStatus.create('test');
let status = serverStatus.create('test');
status.once('change', function (prev, prevMsg) {
expect(status.state).to.be('green');
@ -41,8 +41,8 @@ describe('Status class', function () {
});
it('should only trigger the change listener when something changes', function () {
var status = serverStatus.create('test');
var stub = sinon.stub();
let status = serverStatus.create('test');
let stub = sinon.stub();
status.on('change', stub);
status.green('Ready');
status.green('Ready');
@ -51,26 +51,26 @@ describe('Status class', function () {
});
it('should create a JSON representation of the status', function () {
var status = serverStatus.create('test');
let status = serverStatus.create('test');
status.green('Ready');
var json = status.toJSON();
let json = status.toJSON();
expect(json.state).to.eql('green');
expect(json.message).to.eql('Ready');
});
function testState(color) {
it(`should change the state to ${color} when #${color}() is called`, function () {
var status = serverStatus.create('test');
var message = 'testing ' + color;
let status = serverStatus.create('test');
let message = 'testing ' + color;
status[color](message);
expect(status).to.have.property('state', color);
expect(status).to.have.property('message', message);
});
it(`should trigger the "change" listner when #${color}() is called`, function (done) {
var status = serverStatus.create('test');
var message = 'testing ' + color;
let status = serverStatus.create('test');
let message = 'testing ' + color;
status.on('change', function (prev, prevMsg) {
expect(status.state).to.be(color);
expect(status.message).to.be(message);
@ -83,8 +83,8 @@ describe('Status class', function () {
});
it(`should trigger the "${color}" listner when #${color}() is called`, function (done) {
var status = serverStatus.create('test');
var message = 'testing ' + color;
let status = serverStatus.create('test');
let message = 'testing ' + color;
status.on(color, function (prev, prevMsg) {
expect(status.state).to.be(color);
expect(status.message).to.be(message);

8
src/server/status/index.js
View file

@ -1,6 +1,6 @@
module.exports = function (kbnServer, server, config) {
var _ = require('lodash');
var ServerStatus = require('./ServerStatus');
let _ = require('lodash');
let ServerStatus = require('./ServerStatus');
var { join } = require('path');
kbnServer.status = new ServerStatus(kbnServer.server);
@ -21,8 +21,8 @@ module.exports = function (kbnServer, server, config) {
});
server.decorate('reply', 'renderStatusPage', function () {
var app = kbnServer.uiExports.getHiddenApp('statusPage');
var resp = app ? this.renderApp(app) : this(kbnServer.status.toString());
let app = kbnServer.uiExports.getHiddenApp('statusPage');
let resp = app ? this.renderApp(app) : this(kbnServer.status.toString());
resp.code(kbnServer.status.isGreen() ? 200 : 503);
return resp;
});

6
src/server/status/metrics.js
View file

@ -1,6 +1,6 @@
module.exports = function (kbnServer, server, config) {
var _ = require('lodash');
var Samples = require('./Samples');
let _ = require('lodash');
let Samples = require('./Samples');
let lastReport = Date.now();
kbnServer.metrics = new Samples(12);
@ -10,7 +10,7 @@ module.exports = function (kbnServer, server, config) {
let secSinceLast = (now - lastReport) / 1000;
lastReport = now;
var port = config.get('server.port');
let port = config.get('server.port');
let requests = _.get(event, ['requests', port, 'total'], 0);
let requestsPerSecond = requests / secSinceLast;

6
src/testUtils/noDigestPromises.js
View file

@ -1,4 +1,4 @@
var Bluebird = require('bluebird');
let Bluebird = require('bluebird');
require('ui/promises');
Bluebird.longStackTraces();
@ -7,7 +7,7 @@ Bluebird.longStackTraces();
* replace the Promise service with Bluebird so that tests
* can use promises without having to call $rootScope.apply()
*
* var noDigestPromises = require('testUtils/noDigestPromises');
* let noDigestPromises = require('testUtils/noDigestPromises');
*
* describe('some module that does complex shit with promises', function () {
* beforeEach(noDigestPromises.activate);
@ -15,7 +15,7 @@ Bluebird.longStackTraces();
* });
*/
var active = false;
let active = false;
require('ui/modules')
.get('kibana')

24
src/testUtils/simulateKeys.js
View file

@ -1,10 +1,10 @@
define(function (require) {
var $ = require('jquery');
var _ = require('lodash');
var Promise = require('bluebird');
var keyMap = require('ui/utils/key_map');
var reverseKeyMap = _.mapValues(_.invert(keyMap), _.ary(_.parseInt, 1));
var KeyboardEvent = window.KeyboardEvent;
let $ = require('jquery');
let _ = require('lodash');
let Promise = require('bluebird');
let keyMap = require('ui/utils/key_map');
let reverseKeyMap = _.mapValues(_.invert(keyMap), _.ary(_.parseInt, 1));
let KeyboardEvent = window.KeyboardEvent;
/**
* Simulate keyboard events in an element. This allows testing the way that
@ -36,7 +36,7 @@ define(function (require) {
* @async
*/
return function ($el, sequence) {
var modifierState = {
let modifierState = {
ctrlKey: false,
shiftKey: false,
altKey: false,
@ -46,7 +46,7 @@ define(function (require) {
return doList(_.clone(sequence));
function setModifier(key, state) {
var name = key + 'Key';
let name = key + 'Key';
if (modifierState.hasOwnProperty(name)) {
modifierState[name] = !!state;
}
@ -56,7 +56,7 @@ define(function (require) {
return Promise.try(function () {
if (!list || !list.length) return;
var event = list[0];
let event = list[0];
if (_.isString(event)) {
event = { type: 'press', key: event };
}
@ -92,14 +92,14 @@ define(function (require) {
}
function fire(type, key, repeat) {
var keyCode = reverseKeyMap[key];
let keyCode = reverseKeyMap[key];
if (!keyCode) throw new TypeError('invalid key "' + key + '"');
if (type === 'keydown') setModifier(key, true);
if (type === 'keyup') setModifier(key, false);
var $target = _.isFunction($el) ? $el() : $el;
var $event = new $.Event(type, _.defaults({ keyCode: keyCode }, modifierState));
let $target = _.isFunction($el) ? $el() : $el;
let $event = new $.Event(type, _.defaults({ keyCode: keyCode }, modifierState));
$target.trigger($event);
}
};

20
src/testUtils/stub_index_pattern.js
View file

@ -1,16 +1,16 @@
define(function (require) {
return function (Private) {
var _ = require('lodash');
var sinon = require('sinon');
var Promise = require('bluebird');
var IndexedArray = require('ui/IndexedArray');
var IndexPattern = require('ui/index_patterns/_index_pattern');
var fieldFormats = Private(require('ui/registry/field_formats'));
var flattenHit = Private(require('ui/index_patterns/_flatten_hit'));
var formatHit = require('ui/index_patterns/_format_hit');
var getComputedFields = require('ui/index_patterns/_get_computed_fields');
let _ = require('lodash');
let sinon = require('sinon');
let Promise = require('bluebird');
let IndexedArray = require('ui/IndexedArray');
let IndexPattern = require('ui/index_patterns/_index_pattern');
let fieldFormats = Private(require('ui/registry/field_formats'));
let flattenHit = Private(require('ui/index_patterns/_flatten_hit'));
let formatHit = require('ui/index_patterns/_format_hit');
let getComputedFields = require('ui/index_patterns/_get_computed_fields');
var Field = Private(require('ui/index_patterns/_field'));
let Field = Private(require('ui/index_patterns/_field'));
function StubIndexPattern(pattern, timeField, fields) {
this.id = pattern;

4
src/utils/fromRoot.js
View file

@ -1,5 +1,5 @@
var _ = require('lodash');
var root = require('./packageJson').__dirname;
let _ = require('lodash');
let root = require('./packageJson').__dirname;
var { join, dirname, normalize } = require('path');
module.exports = _.flow(_.partial(join, root), normalize);

4
src/utils/packageJson.js
View file

@ -1,11 +1,11 @@
var { join } = require('path');
var existsSync = require('fs').existsSync;
let existsSync = require('fs').existsSync;
let packageDir;
let packagePath;
while (!packagePath || !existsSync(packagePath)) {
var prev = packageDir;
let prev = packageDir;
packageDir = prev ? join(prev, '..') : __dirname;
packagePath = join(packageDir, 'package.json');