From 23b1d01e166a8adbe88bcbfcd58f2d71c80ef843 Mon Sep 17 00:00:00 2001 From: Elastic Jasper Date: Tue, 29 Mar 2016 12:42:30 -0400 Subject: [PATCH] Backport PR #6653 --------- **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: bfc59e9666d1cb593e6fe94b09322af5c6e3db07 * Authored by Court Ewing on 2016-03-24T22:27:29Z --- src/cli/plugin/__tests__/setting_parser.js | 4 +- src/server/config/__tests__/config.js | 10 ++--- src/server/config/flattenWith.js | 2 +- src/server/status/__tests__/ServerStatus.js | 4 +- src/server/status/__tests__/Status.js | 4 +- src/ui/public/Binder/__tests__/Binder.js | 2 +- src/ui/public/IndexedArray/IndexedArray.js | 2 +- .../IndexedArray/__tests__/IndexedArray.js | 2 +- src/ui/public/IndexedArray/inflector.js | 2 +- .../StackTraceMapper/stackLineFormat.js | 2 +- src/ui/public/Vis/AggConfig.js | 2 +- src/ui/public/Vis/AggConfigs.js | 6 +-- src/ui/public/Vis/__tests__/_AggConfig.js | 10 ++--- .../public/Vis/__tests__/_AggConfigResult.js | 6 +-- src/ui/public/Vis/__tests__/_AggConfigs.js | 16 +++---- src/ui/public/Vis/__tests__/_Renderbot.js | 10 ++--- src/ui/public/Vis/__tests__/_Vis.js | 8 ++-- .../geo_json/__tests__/geo_json.js | 18 ++++---- .../__tests__/array_to_linked_list.js | 2 +- .../__tests__/build_hierarchical_data.js | 34 +++++++------- .../hierarchical/__tests__/collect_branch.js | 2 +- .../hierarchical/__tests__/create_raw_data.js | 10 ++--- .../__tests__/transform_aggregation.js | 4 +- .../hierarchical/_array_to_linked_list.js | 2 +- .../_hierarchical_tooltip_formatter.js | 2 +- .../point_series/__tests__/_add_to_siri.js | 2 +- .../point_series/__tests__/_fake_x_aspect.js | 10 ++--- .../point_series/__tests__/_get_aspects.js | 14 +++--- .../point_series/__tests__/_get_point.js | 18 ++++---- .../point_series/__tests__/_get_series.js | 2 +- .../point_series/__tests__/_init_x_axis.js | 2 +- .../point_series/__tests__/_init_y_axis.js | 2 +- .../point_series/__tests__/_main.js | 8 ++-- .../__tests__/_ordered_date_axis.js | 2 +- .../__tests__/_tooltip_formatter.js | 2 +- .../agg_response/point_series/_get_series.js | 2 +- .../agg_response/tabify/__tests__/_buckets.js | 2 +- .../tabify/__tests__/_get_columns.js | 6 +-- .../tabify/__tests__/_integration.js | 20 ++++----- .../tabify/__tests__/_response_writer.js | 16 +++---- .../agg_response/tabify/__tests__/_table.js | 2 +- .../tabify/__tests__/_table_group.js | 2 +- src/ui/public/agg_table/__tests__/_group.js | 12 ++--- src/ui/public/agg_table/__tests__/_table.js | 14 +++--- .../public/agg_types/__tests__/AggParams.js | 10 ++--- src/ui/public/agg_types/__tests__/AggType.js | 12 ++--- .../agg_types/__tests__/bucketCountBetween.js | 12 ++--- .../agg_types/__tests__/buckets/_histogram.js | 4 +- .../agg_types/__tests__/buckets/_range.js | 6 +-- .../buckets/create_filter/date_histogram.js | 20 ++++----- .../buckets/create_filter/date_range.js | 8 ++-- .../buckets/create_filter/filters.js | 8 ++-- .../buckets/create_filter/histogram.js | 8 ++-- .../buckets/create_filter/ip_range.js | 8 ++-- .../__tests__/buckets/create_filter/range.js | 8 ++-- .../__tests__/buckets/create_filter/terms.js | 8 ++-- .../buckets/date_histogram/_editor.js | 18 ++++---- .../buckets/date_histogram/_params.js | 12 ++--- .../__tests__/controls/number_list.js | 6 +-- src/ui/public/agg_types/__tests__/index.js | 8 ++-- .../param_types/_calculate_interval.js | 10 ++--- .../agg_types/__tests__/param_types/_field.js | 4 +- .../__tests__/param_types/_optioned.js | 4 +- .../__tests__/param_types/_raw_json.js | 10 ++--- .../agg_types/__tests__/param_types/_regex.js | 12 ++--- .../__tests__/param_types/_string.js | 10 ++--- .../buckets/create_filter/ip_range.js | 2 +- .../agg_types/buckets/date_histogram.js | 2 +- .../public/agg_types/param_types/raw_json.js | 2 +- src/ui/public/bind/__tests__/bind.js | 4 +- .../app_switcher/__tests__/app_switcher.js | 2 +- src/ui/public/compile_recursive_directive.js | 2 +- src/ui/public/config/__tests__/config.js | 6 +-- src/ui/public/config/_delayed_updater.js | 6 +-- src/ui/public/config/config.js | 4 +- .../data_source/__tests__/decorate_query.js | 8 ++-- .../__tests__/normalize_sort_request.js | 6 +-- .../courier/data_source/_doc_send_to_es.js | 2 +- .../data_source/_normalize_sort_request.js | 2 +- .../data_source/_root_search_source.js | 2 +- src/ui/public/courier/fetch/__tests__/doc.js | 10 ++--- src/ui/public/courier/fetch/_call_client.js | 2 +- .../courier/saved_object/saved_object.js | 2 +- src/ui/public/debounce/__tests__/debounce.js | 8 ++-- src/ui/public/debounce/debounce.js | 8 ++-- .../__tests__/auto_select_if_only_one.js | 4 +- .../directives/__tests__/confirm-click.js | 12 ++--- .../directives/__tests__/css_truncate.js | 6 +-- .../directives/__tests__/fixedScroll.js | 10 ++--- .../public/directives/__tests__/inequality.js | 10 ++--- .../directives/__tests__/input_focus.js | 14 +++--- .../__tests__/input_whole_number.js | 4 +- .../public/directives/__tests__/json_input.js | 6 +-- .../directives/__tests__/parse_query.js | 20 ++++----- src/ui/public/directives/__tests__/spinner.js | 6 +-- .../public/directives/__tests__/timepicker.js | 14 +++--- .../public/directives/__tests__/truncate.js | 6 +-- .../public/directives/__tests__/typeahead.js | 12 ++--- .../__tests__/validate_cidr_mask.js | 4 +- .../__tests__/validate_date_math.js | 4 +- .../__tests__/validate_index_name.js | 4 +- .../directives/__tests__/validate_ip.js | 4 +- .../directives/__tests__/validate_json.js | 6 +-- src/ui/public/directives/infinite_scroll.js | 2 +- src/ui/public/directives/paginate.js | 2 +- src/ui/public/directives/pretty_duration.js | 2 +- .../public/directives/saved_object_finder.js | 2 +- .../public/doc_table/__tests__/doc_table.js | 10 ++--- .../doc_table/__tests__/lib/get_sort.js | 2 +- .../doc_table/__tests__/lib/rows_headers.js | 22 +++++----- .../public/doc_table/components/table_row.js | 4 +- src/ui/public/doc_table/lib/get_sort.js | 4 +- .../public/doc_title/__tests__/doc_title.js | 8 ++-- src/ui/public/doc_title/doc_title.js | 2 +- .../public/doc_viewer/__tests__/doc_viewer.js | 10 ++--- src/ui/public/es.js | 2 +- .../public/factories/__tests__/base_object.js | 4 +- src/ui/public/factories/__tests__/events.js | 10 ++--- .../fancy_forms/__tests__/fancy_forms.js | 12 ++--- .../field_editor/__tests__/field_editor.js | 18 ++++---- .../filter_bar/__tests__/_addFilters.js | 10 ++--- .../filter_bar/__tests__/_getFilters.js | 12 ++--- .../filter_bar/__tests__/_invertFilters.js | 10 ++--- .../filter_bar/__tests__/_pinFilters.js | 10 ++--- .../filter_bar/__tests__/_removeFilters.js | 10 ++--- .../filter_bar/__tests__/_toggleFilters.js | 10 ++--- .../filter_bar/__tests__/_updateFilters.js | 12 ++--- .../public/filter_bar/__tests__/filter_bar.js | 18 ++++---- .../filter_bar/__tests__/push_filter.js | 10 ++--- .../filter_bar/__tests__/query_filter.js | 6 +-- .../filter_bar/filter_bar_click_handler.js | 2 +- .../lib/__tests__/changeTimeFilter.js | 4 +- .../lib/__tests__/extractTimeFilter.js | 4 +- .../lib/__tests__/filterOutTimeBasedFilter.js | 4 +- .../lib/__tests__/generateMappingChain.js | 6 +-- .../lib/__tests__/mapAndFlattenFilters.js | 4 +- .../filter_bar/lib/__tests__/mapDefault.js | 4 +- .../filter_bar/lib/__tests__/mapExists.js | 4 +- .../filter_bar/lib/__tests__/mapFilter.js | 4 +- .../lib/__tests__/mapFlattenAndWrapFilters.js | 4 +- .../lib/__tests__/mapGeoBoundingBox.js | 4 +- .../filter_bar/lib/__tests__/mapMissing.js | 4 +- .../lib/__tests__/mapQueryString.js | 4 +- .../filter_bar/lib/__tests__/mapRange.js | 4 +- .../filter_bar/lib/__tests__/mapScript.js | 4 +- .../filter_bar/lib/__tests__/mapTerms.js | 4 +- .../public/filter_bar/lib/compareFilters.js | 4 +- src/ui/public/filter_bar/lib/mapExists.js | 4 +- .../filter_bar/lib/mapGeoBoundingBox.js | 10 ++--- src/ui/public/filter_bar/lib/mapMissing.js | 4 +- .../public/filter_bar/lib/mapQueryString.js | 4 +- src/ui/public/filter_bar/lib/mapScript.js | 6 +-- src/ui/public/filter_bar/lib/mapTerms.js | 6 +-- src/ui/public/filter_bar/query_filter.js | 6 +-- .../__tests__/filter_manager.js | 8 ++-- .../public/filter_manager/filter_manager.js | 2 +- .../filter_manager/lib/__tests__/phrase.js | 4 +- .../filter_manager/lib/__tests__/query.js | 4 +- .../filter_manager/lib/__tests__/range.js | 4 +- src/ui/public/filters/__tests__/commaList.js | 2 +- src/ui/public/filters/__tests__/field_type.js | 4 +- src/ui/public/filters/__tests__/label.js | 2 +- src/ui/public/filters/__tests__/moment.js | 6 +-- src/ui/public/filters/__tests__/rison.js | 4 +- src/ui/public/filters/__tests__/short_dots.js | 4 +- src/ui/public/filters/__tests__/start_from.js | 2 +- src/ui/public/filters/__tests__/uriescape.js | 2 +- src/ui/public/filters/short_dots.js | 2 +- src/ui/public/fixedScroll.js | 2 +- .../public/highlight/__tests__/highlight.js | 4 +- .../index_patterns/__tests__/_FieldFormat.js | 4 +- .../__tests__/_cast_mapping_type.js | 4 +- .../__tests__/_get_computed_fields.js | 6 +-- .../__tests__/_index_pattern.js | 34 +++++++------- .../index_patterns/__tests__/_map_field.js | 4 +- .../index_patterns/__tests__/flatten_hit.js | 8 ++-- .../index_patterns/__tests__/intervals.js | 2 +- src/ui/public/index_patterns/_get_ids.js | 2 +- src/ui/public/index_patterns/_intervals.js | 2 +- src/ui/public/listen/__tests__/listen.js | 4 +- src/ui/public/notify/__tests__/notifier.js | 4 +- src/ui/public/notify/notifier.js | 8 ++-- .../public/paginated_table/__tests__/index.js | 34 +++++++------- .../public/paginated_table/paginated_table.js | 2 +- .../persisted_log/__tests__/persisted_log.js | 6 +-- .../__tests__/persisted_state.js | 20 ++++----- src/ui/public/private/__tests__/private.js | 2 +- src/ui/public/private/private.js | 6 +-- src/ui/public/promises/promises.js | 2 +- .../__tests__/reflow_watcher.js | 10 ++--- src/ui/public/registry/__tests__/index.js | 8 ++-- src/ui/public/registry/field_formats.js | 2 +- src/ui/public/routes/RouteManager.js | 2 +- .../public/routes/__tests__/_RouteManager.js | 4 +- src/ui/public/routes/__tests__/_WorkQueue.js | 4 +- .../routes/__tests__/_wrapRouteWithPrep.js | 10 ++--- .../safe_confirm/__tests__/safe_confirm.js | 16 +++---- .../state_management/__tests__/app_state.js | 6 +-- .../__tests__/global_state.js | 6 +-- .../state_management/__tests__/state.js | 10 ++--- src/ui/public/state_management/app_state.js | 6 +-- src/ui/public/storage/__tests__/storage.js | 4 +- src/ui/public/stringify/__tests__/_color.js | 4 +- .../stringify/__tests__/_conformance.js | 10 ++--- src/ui/public/stringify/__tests__/_date.js | 10 ++--- src/ui/public/stringify/__tests__/_ip.js | 2 +- src/ui/public/stringify/__tests__/_source.js | 10 ++--- src/ui/public/stringify/__tests__/_string.js | 2 +- .../public/stringify/__tests__/_truncate.js | 2 +- src/ui/public/stringify/__tests__/_url.js | 4 +- .../styleCompile/__tests__/styleCompile.js | 4 +- src/ui/public/testHarness/testHarness.js | 2 +- .../public/time_buckets/calc_auto_interval.js | 2 +- src/ui/public/time_buckets/time_buckets.js | 4 +- .../timefilter/__tests__/diff_interval.js | 8 ++-- .../public/timefilter/__tests__/diff_time.js | 8 ++-- src/ui/public/timefilter/timefilter.js | 2 +- src/ui/public/url/__tests__/url.js | 16 +++---- src/ui/public/url/url.js | 2 +- .../public/utils/__tests__/SimpleEmitter.js | 2 +- src/ui/public/utils/__tests__/datemath.js | 22 +++++----- .../utils/__tests__/diff_time_picker_vals.js | 2 +- src/ui/public/utils/dateMath.js | 12 ++--- src/ui/public/utils/query_string.js | 4 +- src/ui/public/utils/rison.js | 6 +-- .../vislib/__tests__/components/color.js | 16 +++---- .../vislib/__tests__/components/labels.js | 42 +++++++++--------- .../__tests__/components/zero_injection.js | 42 +++++++++--------- src/ui/public/vislib/__tests__/index.js | 2 +- .../public/vislib/__tests__/lib/axis_title.js | 16 +++---- .../vislib/__tests__/lib/chart_title.js | 12 ++--- src/ui/public/vislib/__tests__/lib/data.js | 32 +++++++------- .../public/vislib/__tests__/lib/dispatch.js | 22 +++++----- .../vislib/__tests__/lib/error_handler.js | 4 +- .../vislib/__tests__/lib/handler/handler.js | 10 ++--- .../vislib/__tests__/lib/layout/layout.js | 10 ++--- .../__tests__/lib/layout/layout_types.js | 4 +- .../lib/layout/splits/column_chart/splits.js | 24 +++++----- .../lib/layout/types/column_layout.js | 6 +-- .../vislib/__tests__/lib/resize_checker.js | 14 +++--- src/ui/public/vislib/__tests__/lib/x_axis.js | 36 +++++++-------- src/ui/public/vislib/__tests__/lib/y_axis.js | 30 ++++++------- src/ui/public/vislib/__tests__/vis.js | 20 ++++----- .../__tests__/visualizations/area_chart.js | 20 ++++----- .../vislib/__tests__/visualizations/chart.js | 18 ++++---- .../__tests__/visualizations/column_chart.js | 14 +++--- .../__tests__/visualizations/line_chart.js | 16 +++---- .../__tests__/visualizations/pie_chart.js | 44 +++++++++---------- .../__tests__/visualizations/tile_maps/map.js | 18 ++++---- .../visualizations/tile_maps/markers.js | 20 ++++----- .../visualizations/tile_maps/tile_map.js | 8 ++-- .../__tests__/visualizations/time_marker.js | 22 +++++----- .../__tests__/visualizations/vis_types.js | 4 +- .../Tooltip/__tests__/positioning.js | 8 ++-- .../components/Tooltip/positionTooltip.js | 6 +-- .../components/zero_injection/flatten_data.js | 2 +- .../components/zero_injection/uniq_keys.js | 2 +- .../zero_injection/zero_fill_data_array.js | 6 +-- src/ui/public/vislib/lib/chart_title.js | 6 +-- src/ui/public/vislib/lib/data.js | 8 ++-- .../vislib/lib/handler/types/point_series.js | 2 +- .../layout/splits/column_chart/chart_split.js | 2 +- .../layout/splits/pie_chart/chart_split.js | 2 +- .../lib/layout/splits/tile_map/map_split.js | 2 +- src/ui/public/vislib/lib/x_axis.js | 40 ++++++++--------- .../vislib/visualizations/area_chart.js | 20 ++++----- .../vislib/visualizations/column_chart.js | 22 +++++----- .../vislib/visualizations/line_chart.js | 16 +++---- .../visualizations/marker_types/heatmap.js | 4 +- .../public/vislib/visualizations/pie_chart.js | 2 +- .../__tests__/_VislibRenderbot.js | 30 ++++++------- .../__tests__/_buildChartData.js | 8 ++-- .../public/vislib_vis_type/buildChartData.js | 4 +- src/ui/public/visualize/spy.js | 2 +- src/ui/public/visualize/visualize.js | 2 +- .../watch_multi/__tests__/watch_multi.js | 10 ++--- src/utils/packageJson.js | 4 +- 277 files changed, 1121 insertions(+), 1121 deletions(-) diff --git a/src/cli/plugin/__tests__/setting_parser.js b/src/cli/plugin/__tests__/setting_parser.js index f02d5905e090d..5d1c8917c969c 100644 --- a/src/cli/plugin/__tests__/setting_parser.js +++ b/src/cli/plugin/__tests__/setting_parser.js @@ -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') }; }); diff --git a/src/server/config/__tests__/config.js b/src/server/config/__tests__/config.js index 6e570220af56d..ccf4ccc9cab62 100644 --- a/src/server/config/__tests__/config.js +++ b/src/server/config/__tests__/config.js @@ -62,7 +62,7 @@ describe('lib/config/config', function () { describe('#resetTo(object)', function () { - var config; + let config; beforeEach(function () { config = new Config(schema); }); @@ -79,7 +79,7 @@ describe('lib/config/config', function () { describe('#has(key)', function () { - var config; + let config; beforeEach(function () { config = new Config(schema); }); @@ -99,7 +99,7 @@ describe('lib/config/config', function () { }); describe('#set(key, value)', function () { - var config; + let config; beforeEach(function () { config = new Config(schema); @@ -148,7 +148,7 @@ describe('lib/config/config', function () { describe('#get(key)', function () { - var config; + let config; beforeEach(function () { config = new Config(schema); @@ -187,7 +187,7 @@ describe('lib/config/config', function () { }); describe('#extendSchema(key, schema)', function () { - var config; + let config; beforeEach(function () { config = new Config(schema); }); diff --git a/src/server/config/flattenWith.js b/src/server/config/flattenWith.js index 8718c9c4313c0..1b2a3a4178a8d 100644 --- a/src/server/config/flattenWith.js +++ b/src/server/config/flattenWith.js @@ -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) { diff --git a/src/server/status/__tests__/ServerStatus.js b/src/server/status/__tests__/ServerStatus.js index 08187c0b8bcd6..6e2f77af26e5b 100644 --- a/src/server/status/__tests__/ServerStatus.js +++ b/src/server/status/__tests__/ServerStatus.js @@ -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() }; diff --git a/src/server/status/__tests__/Status.js b/src/server/status/__tests__/Status.js index 8563500a34af0..5fa9306ebba14 100644 --- a/src/server/status/__tests__/Status.js +++ b/src/server/status/__tests__/Status.js @@ -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() }; diff --git a/src/ui/public/Binder/__tests__/Binder.js b/src/ui/public/Binder/__tests__/Binder.js index c54c053865dd6..dd26ad08728f3 100644 --- a/src/ui/public/Binder/__tests__/Binder.js +++ b/src/ui/public/Binder/__tests__/Binder.js @@ -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) { diff --git a/src/ui/public/IndexedArray/IndexedArray.js b/src/ui/public/IndexedArray/IndexedArray.js index e42b67bbf7502..e8cd1eb1617e0 100644 --- a/src/ui/public/IndexedArray/IndexedArray.js +++ b/src/ui/public/IndexedArray/IndexedArray.js @@ -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, diff --git a/src/ui/public/IndexedArray/__tests__/IndexedArray.js b/src/ui/public/IndexedArray/__tests__/IndexedArray.js index c3f19ef00456a..56d3f30c7cc6a 100644 --- a/src/ui/public/IndexedArray/__tests__/IndexedArray.js +++ b/src/ui/public/IndexedArray/__tests__/IndexedArray.js @@ -21,7 +21,7 @@ users.inIdOrder = _.sortBy(users, 'id'); describe('IndexedArray', function () { describe('Basics', function () { - var reg; + let reg; beforeEach(function () { reg = new IndexedArray(); diff --git a/src/ui/public/IndexedArray/inflector.js b/src/ui/public/IndexedArray/inflector.js index 38f324274d496..f5d1ff5a00bc9 100644 --- a/src/ui/public/IndexedArray/inflector.js +++ b/src/ui/public/IndexedArray/inflector.js @@ -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 diff --git a/src/ui/public/StackTraceMapper/stackLineFormat.js b/src/ui/public/StackTraceMapper/stackLineFormat.js index 27706a165a5c1..07bde99b5a803 100644 --- a/src/ui/public/StackTraceMapper/stackLineFormat.js +++ b/src/ui/public/StackTraceMapper/stackLineFormat.js @@ -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) { diff --git a/src/ui/public/Vis/AggConfig.js b/src/ui/public/Vis/AggConfig.js index b877d310662f8..12d9f05450880 100644 --- a/src/ui/public/Vis/AggConfig.js +++ b/src/ui/public/Vis/AggConfig.js @@ -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; diff --git a/src/ui/public/Vis/AggConfigs.js b/src/ui/public/Vis/AggConfigs.js index 5a42d9accef10..910c0d5400793 100644 --- a/src/ui/public/Vis/AggConfigs.js +++ b/src/ui/public/Vis/AggConfigs.js @@ -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 @@ -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 diff --git a/src/ui/public/Vis/__tests__/_AggConfig.js b/src/ui/public/Vis/__tests__/_AggConfig.js index 5dc2213735ba1..3281dae93c0b8 100644 --- a/src/ui/public/Vis/__tests__/_AggConfig.js +++ b/src/ui/public/Vis/__tests__/_AggConfig.js @@ -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) { diff --git a/src/ui/public/Vis/__tests__/_AggConfigResult.js b/src/ui/public/Vis/__tests__/_AggConfigResult.js index 9a48b95f433be..8816e5ba0b88f 100644 --- a/src/ui/public/Vis/__tests__/_AggConfigResult.js +++ b/src/ui/public/Vis/__tests__/_AggConfigResult.js @@ -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) { diff --git a/src/ui/public/Vis/__tests__/_AggConfigs.js b/src/ui/public/Vis/__tests__/_AggConfigs.js index cd165a86c0682..493b6291d73f1 100644 --- a/src/ui/public/Vis/__tests__/_AggConfigs.js +++ b/src/ui/public/Vis/__tests__/_AggConfigs.js @@ -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) { @@ -95,7 +95,7 @@ describe('AggConfigs', function () { }); describe('defaults', function () { - var vis; + let vis; beforeEach(function () { vis = { indexPattern: indexPattern, diff --git a/src/ui/public/Vis/__tests__/_Renderbot.js b/src/ui/public/Vis/__tests__/_Renderbot.js index 2ef792fcf0817..db72e80f3895d 100644 --- a/src/ui/public/Vis/__tests__/_Renderbot.js +++ b/src/ui/public/Vis/__tests__/_Renderbot.js @@ -1,5 +1,5 @@ describe('renderbot', function () { - var Renderbot; + let Renderbot; var expect = require('expect.js'); var ngMock = require('ngMock'); @@ -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 () { diff --git a/src/ui/public/Vis/__tests__/_Vis.js b/src/ui/public/Vis/__tests__/_Vis.js index f72e69e29af9d..77d2191f74f68 100644 --- a/src/ui/public/Vis/__tests__/_Vis.js +++ b/src/ui/public/Vis/__tests__/_Vis.js @@ -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: [ diff --git a/src/ui/public/agg_response/geo_json/__tests__/geo_json.js b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js index f4ad5d637e614..61cb4d0386704 100644 --- a/src/ui/public/agg_response/geo_json/__tests__/geo_json.js +++ b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js @@ -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) { @@ -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(); diff --git a/src/ui/public/agg_response/hierarchical/__tests__/array_to_linked_list.js b/src/ui/public/agg_response/hierarchical/__tests__/array_to_linked_list.js index 176ae74e04f97..ffa66906f1963 100644 --- a/src/ui/public/agg_response/hierarchical/__tests__/array_to_linked_list.js +++ b/src/ui/public/agg_response/hierarchical/__tests__/array_to_linked_list.js @@ -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 }, diff --git a/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js index efa1b9c003c41..e891bac393781 100644 --- a/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js +++ b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js @@ -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 () { @@ -27,8 +27,8 @@ describe('buildHierarchicalData', function () { describe('metric only', function () { - var vis; - var results; + let vis; + let results; beforeEach(function () { var id = 1; @@ -99,8 +99,8 @@ describe('buildHierarchicalData', function () { }); describe('threeTermBuckets', function () { - var vis; - var results; + let vis; + let results; beforeEach(function () { var id = 1; @@ -141,8 +141,8 @@ describe('buildHierarchicalData', function () { }); describe('oneHistogramBucket', function () { - var vis; - var results; + let vis; + let results; beforeEach(function () { var id = 1; @@ -173,8 +173,8 @@ describe('buildHierarchicalData', function () { }); describe('oneRangeBucket', function () { - var vis; - var results; + let vis; + let results; beforeEach(function () { var id = 1; @@ -214,8 +214,8 @@ describe('buildHierarchicalData', function () { }); describe('oneFilterBucket', function () { - var vis; - var results; + let vis; + let results; beforeEach(function () { var id = 1; @@ -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; diff --git a/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js b/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js index 7de60241fc7e0..8bc2f6730ce5d 100644 --- a/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js +++ b/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js @@ -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; }; diff --git a/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js index ff1312c9eb51f..b289f6b534572 100644 --- a/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js +++ b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js @@ -6,14 +6,14 @@ var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_l var expect = require('expect.js'); var ngMock = require('ngMock'); -var AggConfigs; -var Vis; -var indexPattern; +let AggConfigs; +let Vis; +let indexPattern; describe('buildHierarchicalData()', function () { describe('createRawData()', function () { - var vis; - var results; + let vis; + let results; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js index 378df0c65d4cb..26a37bfb6d0e1 100644 --- a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js +++ b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js @@ -4,8 +4,8 @@ describe('buildHierarchicalData()', function () { var _ = require('lodash'); var expect = require('expect.js'); var ngMock = require('ngMock'); - var transform; - var fixture; + let transform; + let fixture; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js b/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js index fb8b236cd0c0c..db419aca2c4f7 100644 --- a/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js +++ b/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js @@ -1,7 +1,7 @@ define(function (require) { var _ = require('lodash'); return function (buckets) { - var previous; + let previous; _.each(buckets, function (bucket) { if (previous) { bucket._previous = previous; diff --git a/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js b/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js index bfae524ebf840..57dd63516d70f 100644 --- a/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js +++ b/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js @@ -22,7 +22,7 @@ define(function (require) { _.forEachRight($tooltipScope.rows, function (row, i, rows) { row.spacer = $sce.trustAsHtml(_.repeat(' ', row.depth)); - var percent; + let percent; if (row.item.percentOfGroup != null) { percent = row.item.percentOfGroup; } diff --git a/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js index 0e7042d8a2e3a..811e7c28a5e75 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js +++ b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js @@ -1,7 +1,7 @@ describe('addToSiri', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var addToSiri; + let addToSiri; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js index 1f7d8e338cf56..2984520a285e7 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js +++ b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js @@ -1,10 +1,10 @@ describe('makeFakeXAspect', function () { - var makeFakeXAspect; - var Vis; - var AggType; - var AggConfig; - var indexPattern; + let makeFakeXAspect; + let Vis; + let AggType; + let AggConfig; + let indexPattern; var expect = require('expect.js'); var ngMock = require('ngMock'); diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js index 9ac566e0e48bd..75f8306c17e70 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js +++ b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js @@ -4,11 +4,11 @@ describe('getAspects', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var Vis; - var Table; - var AggConfig; - var indexPattern; - var getAspects; + let Vis; + let Table; + let AggConfig; + let indexPattern; + let getAspects; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -19,8 +19,8 @@ describe('getAspects', function () { indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern')); })); - var vis; - var table; + let vis; + let table; var date = _.memoize(function (n) { return moment().startOf('day').add(n, 'hour').valueOf(); diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_point.js b/src/ui/public/agg_response/point_series/__tests__/_get_point.js index 26afb0d767506..1614b788f0fb7 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_get_point.js +++ b/src/ui/public/agg_response/point_series/__tests__/_get_point.js @@ -4,7 +4,7 @@ describe('getPoint', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var getPoint; + let getPoint; var truthFormatted = { fieldFormatter: _.constant(_.constant(true)) }; var identFormatted = { fieldFormatter: _.constant(_.identity) }; @@ -15,10 +15,10 @@ describe('getPoint', function () { })); describe('Without series aspect', function () { - var seriesAspect; - var xAspect; - var yAspect; - var yScale; + let seriesAspect; + let xAspect; + let yAspect; + let yScale; beforeEach(function () { seriesAspect = null; @@ -48,10 +48,10 @@ describe('getPoint', function () { }); describe('With series aspect', function () { - var row; - var xAspect; - var yAspect; - var yScale; + let row; + let xAspect; + let yAspect; + let yScale; beforeEach(function () { row = [ { value: 1 }, { value: 2 }, { value: 3 }]; diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_series.js b/src/ui/public/agg_response/point_series/__tests__/_get_series.js index c7c0bf6a2c05e..3c0b67f713309 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_get_series.js +++ b/src/ui/public/agg_response/point_series/__tests__/_get_series.js @@ -2,7 +2,7 @@ describe('getSeries', function () { var _ = require('lodash'); var expect = require('expect.js'); var ngMock = require('ngMock'); - var getSeries; + let getSeries; var agg = { fieldFormatter: _.constant(_.identity) }; diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js index 904ee1c1b20d1..cd33603d49387 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js +++ b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js @@ -3,7 +3,7 @@ describe('initXAxis', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var initXAxis; + let initXAxis; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js index 0421369f95ff7..dacfd5e02dbb9 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js +++ b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js @@ -3,7 +3,7 @@ describe('initYAxis', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var initYAxis; + let initYAxis; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_response/point_series/__tests__/_main.js b/src/ui/public/agg_response/point_series/__tests__/_main.js index c2f1939ac4182..8433116a91357 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_main.js +++ b/src/ui/public/agg_response/point_series/__tests__/_main.js @@ -7,10 +7,10 @@ describe('pointSeriesChartDataFromTable', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var pointSeriesChartDataFromTable; - var indexPattern; - var Table; - var Vis; + let pointSeriesChartDataFromTable; + let indexPattern; + let Table; + let Vis; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js index f25fcd8321ef0..17d576ed0589f 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js +++ b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js @@ -27,7 +27,7 @@ describe('orderedDateAxis', function () { } }; - var orderedDateAxis; + let orderedDateAxis; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js index 75566f842fc09..a3cbc69009301 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js +++ b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js @@ -4,7 +4,7 @@ describe('tooltipFormatter', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var tooltipFormatter; + let tooltipFormatter; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_response/point_series/_get_series.js b/src/ui/public/agg_response/point_series/_get_series.js index 7e86ecf67ba2f..60b6cf5992786 100644 --- a/src/ui/public/agg_response/point_series/_get_series.js +++ b/src/ui/public/agg_response/point_series/_get_series.js @@ -36,7 +36,7 @@ define(function (require) { if (multiY) { series = _.sortBy(series, function (siri) { var firstVal = siri.values[0]; - var y; + let y; if (firstVal) { var agg = firstVal.aggConfigResult.aggConfig; diff --git a/src/ui/public/agg_response/tabify/__tests__/_buckets.js b/src/ui/public/agg_response/tabify/__tests__/_buckets.js index f019564d93853..78899f26c3bcc 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_buckets.js +++ b/src/ui/public/agg_response/tabify/__tests__/_buckets.js @@ -1,5 +1,5 @@ describe('Buckets wrapper', function () { - var Buckets; + let Buckets; var expect = require('expect.js'); var ngMock = require('ngMock'); diff --git a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js index 136ad133d362c..36138c2fb7c96 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js +++ b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js @@ -1,7 +1,7 @@ describe('get columns', function () { - var getColumns; - var Vis; - var indexPattern; + let getColumns; + let Vis; + let indexPattern; var expect = require('expect.js'); var ngMock = require('ngMock'); diff --git a/src/ui/public/agg_response/tabify/__tests__/_integration.js b/src/ui/public/agg_response/tabify/__tests__/_integration.js index fec883f229585..23ae2e98d8495 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_integration.js +++ b/src/ui/public/agg_response/tabify/__tests__/_integration.js @@ -4,10 +4,10 @@ describe('tabifyAggResponse Integration', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var Vis; - var Buckets; - var indexPattern; - var tabifyAggResponse; + let Vis; + let Buckets; + let indexPattern; + let tabifyAggResponse; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { @@ -43,12 +43,12 @@ describe('tabifyAggResponse Integration', function () { describe('transforms a complex response', function () { this.slow(1000); - var vis; - var avg; - var ext; - var src; - var os; - var esResp; + let vis; + let avg; + let ext; + let src; + let os; + let esResp; beforeEach(function () { vis = new Vis(indexPattern, { diff --git a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js index 0b5ab94190f4f..ccc63dfd35442 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js +++ b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js @@ -4,14 +4,14 @@ describe('ResponseWriter class', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var Vis; - var Table; - var Buckets; - var Private; - var TableGroup; - var getColumns; - var indexPattern; - var ResponseWriter; + let Vis; + let Table; + let Buckets; + let Private; + let TableGroup; + let getColumns; + let indexPattern; + let ResponseWriter; function defineSetup(stubGetColumns) { beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/agg_response/tabify/__tests__/_table.js b/src/ui/public/agg_response/tabify/__tests__/_table.js index d65a93b1e906e..953d3412a4be0 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_table.js +++ b/src/ui/public/agg_response/tabify/__tests__/_table.js @@ -3,7 +3,7 @@ describe('Table class', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var Table; + let Table; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { diff --git a/src/ui/public/agg_response/tabify/__tests__/_table_group.js b/src/ui/public/agg_response/tabify/__tests__/_table_group.js index ead9e4e41e5ea..29be6627b7a40 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_table_group.js +++ b/src/ui/public/agg_response/tabify/__tests__/_table_group.js @@ -1,5 +1,5 @@ describe('Table Group class', function () { - var TableGroup; + let TableGroup; var expect = require('expect.js'); var ngMock = require('ngMock'); diff --git a/src/ui/public/agg_table/__tests__/_group.js b/src/ui/public/agg_table/__tests__/_group.js index 945a2f274dd6b..0cef2c5be64cb 100644 --- a/src/ui/public/agg_table/__tests__/_group.js +++ b/src/ui/public/agg_table/__tests__/_group.js @@ -5,11 +5,11 @@ describe('AggTableGroup Directive', function () { var expect = require('expect.js'); var fixtures = require('fixtures/fake_hierarchical_data'); - var $rootScope; - var $compile; - var tabifyAggResponse; - var Vis; - var indexPattern; + let $rootScope; + let $compile; + let tabifyAggResponse; + let Vis; + let indexPattern; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector, Private) { @@ -21,7 +21,7 @@ describe('AggTableGroup Directive', function () { $compile = $injector.get('$compile'); })); - var $scope; + let $scope; beforeEach(function () { $scope = $rootScope.$new(); }); diff --git a/src/ui/public/agg_table/__tests__/_table.js b/src/ui/public/agg_table/__tests__/_table.js index d54ca44a8efd8..583b6fff30c78 100644 --- a/src/ui/public/agg_table/__tests__/_table.js +++ b/src/ui/public/agg_table/__tests__/_table.js @@ -6,11 +6,11 @@ describe('AggTable Directive', function () { var fixtures = require('fixtures/fake_hierarchical_data'); var sinon = require('auto-release-sinon'); - var $rootScope; - var $compile; - var tabifyAggResponse; - var Vis; - var indexPattern; + let $rootScope; + let $compile; + let tabifyAggResponse; + let Vis; + let indexPattern; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector, Private) { @@ -22,7 +22,7 @@ describe('AggTable Directive', function () { $compile = $injector.get('$compile'); })); - var $scope; + let $scope; beforeEach(function () { $scope = $rootScope.$new(); }); @@ -131,7 +131,7 @@ describe('AggTable Directive', function () { }); describe('aggTable.exportAsCsv()', function () { - var origBlob; + let origBlob; function FakeBlob(slices, opts) { this.slices = slices; this.opts = opts; diff --git a/src/ui/public/agg_types/__tests__/AggParams.js b/src/ui/public/agg_types/__tests__/AggParams.js index 0d0c839fb9aef..d1e7e7bf286ec 100644 --- a/src/ui/public/agg_types/__tests__/AggParams.js +++ b/src/ui/public/agg_types/__tests__/AggParams.js @@ -3,11 +3,11 @@ describe('AggParams class', function () { var ngMock = require('ngMock'); var expect = require('expect.js'); - var AggParams; - var BaseAggParam; - var FieldAggParam; - var OptionedAggParam; - var RegexAggParam; + let AggParams; + let BaseAggParam; + let FieldAggParam; + let OptionedAggParam; + let RegexAggParam; beforeEach(ngMock.module('kibana')); // stub out the param classes before we get the AggParams diff --git a/src/ui/public/agg_types/__tests__/AggType.js b/src/ui/public/agg_types/__tests__/AggType.js index 8e2e0c13da1d7..5d3fc211475cb 100644 --- a/src/ui/public/agg_types/__tests__/AggType.js +++ b/src/ui/public/agg_types/__tests__/AggType.js @@ -3,12 +3,12 @@ describe('AggType Class', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); var sinon = require('auto-release-sinon'); - var AggType; - var AggParams; - var AggConfig; - var indexPattern; - var fieldFormat; - var Vis; + let AggType; + let AggParams; + let AggConfig; + let indexPattern; + let fieldFormat; + let Vis; require('ui/private'); diff --git a/src/ui/public/agg_types/__tests__/bucketCountBetween.js b/src/ui/public/agg_types/__tests__/bucketCountBetween.js index 45f716b99e408..46db7ec09ed6b 100644 --- a/src/ui/public/agg_types/__tests__/bucketCountBetween.js +++ b/src/ui/public/agg_types/__tests__/bucketCountBetween.js @@ -2,12 +2,12 @@ describe('bucketCountBetween util', function () { var _ = require('lodash'); var expect = require('expect.js'); var ngMock = require('ngMock'); - var indexPattern; - var Vis; - var visTypes; - var aggTypes; - var AggConfig; - var bucketCountBetween; + let indexPattern; + let Vis; + let visTypes; + let aggTypes; + let AggConfig; + let bucketCountBetween; // http://cwestblog.com/2014/02/25/javascript-testing-for-negative-zero/ // works for -0 and +0 diff --git a/src/ui/public/agg_types/__tests__/buckets/_histogram.js b/src/ui/public/agg_types/__tests__/buckets/_histogram.js index 5da2bf18b56a1..f303515aee164 100644 --- a/src/ui/public/agg_types/__tests__/buckets/_histogram.js +++ b/src/ui/public/agg_types/__tests__/buckets/_histogram.js @@ -4,7 +4,7 @@ describe('Histogram Agg', function () { var ngMock = require('ngMock'); describe('ordered', function () { - var histogram; + let histogram; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -22,7 +22,7 @@ describe('Histogram Agg', function () { describe('params', function () { - var paramWriter; + let paramWriter; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_types/__tests__/buckets/_range.js b/src/ui/public/agg_types/__tests__/buckets/_range.js index 998b0857ba642..95ff74caeb8cc 100644 --- a/src/ui/public/agg_types/__tests__/buckets/_range.js +++ b/src/ui/public/agg_types/__tests__/buckets/_range.js @@ -7,9 +7,9 @@ describe('Range Agg', function () { var resp = require('fixtures/agg_resp/range'); var buckets = values(resp.aggregations[1].buckets); - var range; - var Vis; - var indexPattern; + let range; + let Vis; + let indexPattern; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js index 21da090d58cd8..236575d3659d0 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js @@ -7,16 +7,16 @@ describe('AggConfig Filters', function () { var ngMock = require('ngMock'); var expect = require('expect.js'); - var vis; - var agg; - var field; - var filter; - var bucketKey; - var bucketStart; - var getIntervalStub; - var intervalOptions; + let vis; + let agg; + let field; + let filter; + let bucketKey; + let bucketStart; + let getIntervalStub; + let intervalOptions; - var init; + let init; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { @@ -79,7 +79,7 @@ describe('AggConfig Filters', function () { it('extends the filter edge to 1ms before the next bucket for all interval options', function () { intervalOptions.forEach(function (option) { - var duration; + let duration; if (option.val !== 'custom' && moment(1, option.val).isValid()) { duration = moment.duration(10, option.val); diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js index d86bb6ad9e552..909be6cdae409 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js @@ -5,10 +5,10 @@ var ngMock = require('ngMock'); describe('AggConfig Filters', function () { describe('Date range', function () { - var AggConfig; - var indexPattern; - var Vis; - var createFilter; + let AggConfig; + let indexPattern; + let Vis; + let createFilter; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js index c891a95c7d157..cd11fab3c047d 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js @@ -5,10 +5,10 @@ var ngMock = require('ngMock'); describe('AggConfig Filters', function () { describe('filters', function () { - var AggConfig; - var indexPattern; - var Vis; - var createFilter; + let AggConfig; + let indexPattern; + let Vis; + let createFilter; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js index 076386dd4ed69..68441b3283148 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js @@ -5,10 +5,10 @@ var ngMock = require('ngMock'); describe('AggConfig Filters', function () { describe('histogram', function () { - var AggConfig; - var indexPattern; - var Vis; - var createFilter; + let AggConfig; + let indexPattern; + let Vis; + let createFilter; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js index c58bcff71dbb8..fba808068c300 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js @@ -3,10 +3,10 @@ describe('AggConfig Filters', function () { var ngMock = require('ngMock'); describe('IP range', function () { - var AggConfig; - var indexPattern; - var Vis; - var createFilter; + let AggConfig; + let indexPattern; + let Vis; + let createFilter; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js index ca5b8eff5f745..aafcf3f5bed3d 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js @@ -3,10 +3,10 @@ describe('AggConfig Filters', function () { var ngMock = require('ngMock'); describe('range', function () { - var AggConfig; - var indexPattern; - var Vis; - var createFilter; + let AggConfig; + let indexPattern; + let Vis; + let createFilter; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js index 32a9fe897921d..465c8ec6c0112 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js @@ -3,10 +3,10 @@ describe('AggConfig Filters', function () { var ngMock = require('ngMock'); describe('terms', function () { - var AggConfig; - var indexPattern; - var Vis; - var createFilter; + let AggConfig; + let indexPattern; + let Vis; + let createFilter; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js index 88152a39f55e3..a0fb283c892a8 100644 --- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js +++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js @@ -4,11 +4,11 @@ describe('editor', function () { var ngMock = require('ngMock'); var expect = require('expect.js'); - var indexPattern; - var vis; - var agg; - var render; - var $scope; + let indexPattern; + let vis; + let agg; + let render; + let $scope; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector, $compile) { @@ -66,9 +66,9 @@ describe('editor', function () { })); describe('random field/interval', function () { - var params; - var field; - var interval; + let params; + let field; + let interval; beforeEach(ngMock.inject(function (Private) { field = _.sample(indexPattern.fields); @@ -94,7 +94,7 @@ describe('editor', function () { }); describe('interval "auto" and indexPattern timeField', function () { - var params; + let params; beforeEach(function () { params = render({ field: indexPattern.timeFieldName, interval: 'auto' }); diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js index 4ad58ff3d3026..5944e119bf3b6 100644 --- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js +++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js @@ -4,13 +4,13 @@ describe('params', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var paramWriter; - var writeInterval; + let paramWriter; + let writeInterval; - var aggTypes; - var AggConfig; - var setTimeBounds; - var timeField; + let aggTypes; + let AggConfig; + let setTimeBounds; + let timeField; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { diff --git a/src/ui/public/agg_types/__tests__/controls/number_list.js b/src/ui/public/agg_types/__tests__/controls/number_list.js index 8ea2d47d297f2..3eb2d322fae17 100644 --- a/src/ui/public/agg_types/__tests__/controls/number_list.js +++ b/src/ui/public/agg_types/__tests__/controls/number_list.js @@ -7,9 +7,9 @@ describe('NumberList directive', function () { require('ui/number_list'); - var $el; - var $scope; - var compile; + let $el; + let $scope; + let compile; function onlyValidValues() { return $el.find('[ng-model]').toArray().map(function (el) { diff --git a/src/ui/public/agg_types/__tests__/index.js b/src/ui/public/agg_types/__tests__/index.js index ac1e8c19bb91d..b239079de277b 100644 --- a/src/ui/public/agg_types/__tests__/index.js +++ b/src/ui/public/agg_types/__tests__/index.js @@ -9,8 +9,8 @@ describe('AggTypesComponent', function () { require('./buckets/_range'); describe('bucket aggs', function () { - var bucketAggs; - var BucketAggType; + let bucketAggs; + let BucketAggType; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -26,8 +26,8 @@ describe('AggTypesComponent', function () { }); describe('metric aggs', function () { - var metricAggs; - var MetricAggType; + let metricAggs; + let MetricAggType; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js index 5dc57a8ed33c0..aa2e3c69a8e3b 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js +++ b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js @@ -3,11 +3,11 @@ var expect = require('expect.js'); var ngMock = require('ngMock'); describe('calculateInterval()', function () { - var AggConfig; - var indexPattern; - var Vis; - var createFilter; - var calculateInterval; + let AggConfig; + let indexPattern; + let Vis; + let createFilter; + let calculateInterval; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_types/__tests__/param_types/_field.js b/src/ui/public/agg_types/__tests__/param_types/_field.js index 2bc90026efba4..8e37583e8c35b 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_field.js +++ b/src/ui/public/agg_types/__tests__/param_types/_field.js @@ -3,8 +3,8 @@ describe('Field', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var BaseAggParam; - var FieldAggParam; + let BaseAggParam; + let FieldAggParam; beforeEach(ngMock.module('kibana')); // fetch out deps diff --git a/src/ui/public/agg_types/__tests__/param_types/_optioned.js b/src/ui/public/agg_types/__tests__/param_types/_optioned.js index b15ecd02e47bd..0571d7440d9f5 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_optioned.js +++ b/src/ui/public/agg_types/__tests__/param_types/_optioned.js @@ -3,8 +3,8 @@ describe('Optioned', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var BaseAggParam; - var OptionedAggParam; + let BaseAggParam; + let OptionedAggParam; beforeEach(ngMock.module('kibana')); // fetch out deps diff --git a/src/ui/public/agg_types/__tests__/param_types/_raw_json.js b/src/ui/public/agg_types/__tests__/param_types/_raw_json.js index 31033b3080d46..bc8a312120c44 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_raw_json.js +++ b/src/ui/public/agg_types/__tests__/param_types/_raw_json.js @@ -5,11 +5,11 @@ var ngMock = require('ngMock'); module.exports = describe('JSON', function () { var paramName = 'json_test'; - var BaseAggParam; - var JsonAggParam; - var aggParam; - var aggConfig; - var output; + let BaseAggParam; + let JsonAggParam; + let aggParam; + let aggConfig; + let output; function initAggParam(config) { config = config || {}; diff --git a/src/ui/public/agg_types/__tests__/param_types/_regex.js b/src/ui/public/agg_types/__tests__/param_types/_regex.js index 6d466df588925..188e0331c2245 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_regex.js +++ b/src/ui/public/agg_types/__tests__/param_types/_regex.js @@ -3,10 +3,10 @@ describe('Regex', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var BaseAggParam; - var RegexAggParam; - var Vis; - var indexPattern; + let BaseAggParam; + let RegexAggParam; + let Vis; + let indexPattern; beforeEach(ngMock.module('kibana')); // fetch out deps @@ -30,8 +30,8 @@ describe('Regex', function () { }); describe('write results', function () { - var aggParam; - var aggConfig; + let aggParam; + let aggConfig; var output = { params: {} }; var paramName = 'exclude'; diff --git a/src/ui/public/agg_types/__tests__/param_types/_string.js b/src/ui/public/agg_types/__tests__/param_types/_string.js index f55a0a207b7c0..14c236dcfa0fd 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_string.js +++ b/src/ui/public/agg_types/__tests__/param_types/_string.js @@ -4,11 +4,11 @@ var ngMock = require('ngMock'); module.exports = describe('String', function () { var paramName = 'json_test'; - var BaseAggParam; - var StringAggParam; - var aggParam; - var aggConfig; - var output; + let BaseAggParam; + let StringAggParam; + let aggParam; + let aggConfig; + let output; function initAggParam(config) { config = config || {}; diff --git a/src/ui/public/agg_types/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/buckets/create_filter/ip_range.js index ccb21d517f4c9..7410cb5e4494c 100644 --- a/src/ui/public/agg_types/buckets/create_filter/ip_range.js +++ b/src/ui/public/agg_types/buckets/create_filter/ip_range.js @@ -3,7 +3,7 @@ define(function (require) { var buildRangeFilter = require('ui/filter_manager/lib/range'); return function createIpRangeFilterProvider() { return function (aggConfig, key) { - var range; + let range; if (aggConfig.params.ipRangeType === 'mask') { range = new CidrMask(key).getRange(); } else { diff --git a/src/ui/public/agg_types/buckets/date_histogram.js b/src/ui/public/agg_types/buckets/date_histogram.js index a323e304850c5..afe98ec5c6ffb 100644 --- a/src/ui/public/agg_types/buckets/date_histogram.js +++ b/src/ui/public/agg_types/buckets/date_histogram.js @@ -40,7 +40,7 @@ define(function (require) { }, createFilter: createFilter, decorateAggConfig: function () { - var buckets; + let buckets; return { buckets: { configurable: true, diff --git a/src/ui/public/agg_types/param_types/raw_json.js b/src/ui/public/agg_types/param_types/raw_json.js index c338ee8feec34..5cc0dcd147707 100644 --- a/src/ui/public/agg_types/param_types/raw_json.js +++ b/src/ui/public/agg_types/param_types/raw_json.js @@ -25,7 +25,7 @@ define(function (require) { * @return {undefined} */ RawJSONAggParam.prototype.write = function (aggConfig, output) { - var paramJSON; + let paramJSON; var param = aggConfig.params[this.name]; if (!param) { diff --git a/src/ui/public/bind/__tests__/bind.js b/src/ui/public/bind/__tests__/bind.js index 34fbbbd395f19..7e4b0ef76dd5e 100644 --- a/src/ui/public/bind/__tests__/bind.js +++ b/src/ui/public/bind/__tests__/bind.js @@ -3,8 +3,8 @@ describe('$scope.$bind', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var $rootScope; - var $scope; + let $rootScope; + let $scope; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector) { diff --git a/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js index 13d4c8caec0a6..91063d48b20d0 100644 --- a/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js +++ b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js @@ -12,7 +12,7 @@ require('../app_switcher'); var DomLocationProvider = require('ui/domLocation'); describe('appSwitcher directive', function () { - var env; + let env; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/compile_recursive_directive.js b/src/ui/public/compile_recursive_directive.js index 87220985823e7..9d9a52037951d 100644 --- a/src/ui/public/compile_recursive_directive.js +++ b/src/ui/public/compile_recursive_directive.js @@ -26,7 +26,7 @@ define(function (require) { // Break the recursion loop by removing the contents var contents = element.contents().remove(); - var compiledContents; + let compiledContents; return { pre: (link && link.pre) ? link.pre : null, /** diff --git a/src/ui/public/config/__tests__/config.js b/src/ui/public/config/__tests__/config.js index ad0cfc8401b08..ba8e267a8b28c 100644 --- a/src/ui/public/config/__tests__/config.js +++ b/src/ui/public/config/__tests__/config.js @@ -1,7 +1,7 @@ describe('config component', function () { - var $scope; - var config; - var defaults; + let $scope; + let config; + let defaults; var expect = require('expect.js'); var ngMock = require('ngMock'); diff --git a/src/ui/public/config/_delayed_updater.js b/src/ui/public/config/_delayed_updater.js index ef8ce8798a1a4..0db77a70ba959 100644 --- a/src/ui/public/config/_delayed_updater.js +++ b/src/ui/public/config/_delayed_updater.js @@ -10,7 +10,7 @@ define(function (require) { var updater = this; var queue = []; var log = {}; - var timer; + let timer; updater.fire = function () { clearTimeout(timer); @@ -19,8 +19,8 @@ define(function (require) { if (updater.fired) return; updater.fired = true; - var method; - var body; + let method; + let body; var updated = []; var deleted = []; diff --git a/src/ui/public/config/config.js b/src/ui/public/config/config.js index 7b84b90bf00df..ce713254aa6d3 100644 --- a/src/ui/public/config/config.js +++ b/src/ui/public/config/config.js @@ -23,7 +23,7 @@ define(function (require) { // active or previous instance of DelayedUpdater. This will log and then process an // update once it is requested by calling #set() or #clear(). - var updater; + let updater; var DocSource = Private(require('ui/courier/data_source/doc_source')); var doc = (new DocSource()) @@ -77,7 +77,7 @@ define(function (require) { }); config.get = function (key, defaultVal) { - var keyVal; + let keyVal; if (vals[key] == null) { if (defaultVal == null) { diff --git a/src/ui/public/courier/data_source/__tests__/decorate_query.js b/src/ui/public/courier/data_source/__tests__/decorate_query.js index 138e16ef937a7..cdd8cc2140f18 100644 --- a/src/ui/public/courier/data_source/__tests__/decorate_query.js +++ b/src/ui/public/courier/data_source/__tests__/decorate_query.js @@ -5,13 +5,13 @@ var ngMock = require('ngMock'); describe('Query decorator', function () { var _ = require('lodash'); - var config; + let config; - var indexPattern; + let indexPattern; - var getComputedFields; + let getComputedFields; - var fn; + let fn; beforeEach(ngMock.module( 'kibana', function ($provide) { diff --git a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js index a3560f3f91fa9..c647e3898875b 100644 --- a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js +++ b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js @@ -5,9 +5,9 @@ describe('SearchSource#normalizeSortRequest', function () { var ngMock = require('ngMock'); var expect = require('expect.js'); - var normalizeSortRequest; - var indexPattern; - var normalizedSort; + let normalizeSortRequest; + let indexPattern; + let normalizedSort; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/courier/data_source/_doc_send_to_es.js b/src/ui/public/courier/data_source/_doc_send_to_es.js index 57b0dca60ea6c..ea3d5f49b5f26 100644 --- a/src/ui/public/courier/data_source/_doc_send_to_es.js +++ b/src/ui/public/courier/data_source/_doc_send_to_es.js @@ -31,7 +31,7 @@ define(function (require) { doc._storeVersion(resp._version); doc.id(resp._id); - var docFetchProm; + let docFetchProm; if (method !== 'index') { docFetchProm = doc.fetch(); } else { diff --git a/src/ui/public/courier/data_source/_normalize_sort_request.js b/src/ui/public/courier/data_source/_normalize_sort_request.js index 31030774fd7dc..c5e38e2b42bfa 100644 --- a/src/ui/public/courier/data_source/_normalize_sort_request.js +++ b/src/ui/public/courier/data_source/_normalize_sort_request.js @@ -28,7 +28,7 @@ define(function (require) { var indexField = indexPattern.fields.byName[sortField]; if (indexField && indexField.scripted && indexField.sortable) { - var direction; + let direction; if (_.isString(sortValue)) direction = sortValue; if (_.isObject(sortValue) && sortValue.order) direction = sortValue.order; diff --git a/src/ui/public/courier/data_source/_root_search_source.js b/src/ui/public/courier/data_source/_root_search_source.js index 1c53f6771dd46..1f676175c1560 100644 --- a/src/ui/public/courier/data_source/_root_search_source.js +++ b/src/ui/public/courier/data_source/_root_search_source.js @@ -11,7 +11,7 @@ define(function (require) { return timefilter.get(globalSource.get('index')); }); - var appSource; // set in setAppSource() + let appSource; // set in setAppSource() resetAppSource(); // when the route changes, clear the appSource diff --git a/src/ui/public/courier/fetch/__tests__/doc.js b/src/ui/public/courier/fetch/__tests__/doc.js index 9f07a05f05994..bc225fdaba6cc 100644 --- a/src/ui/public/courier/fetch/__tests__/doc.js +++ b/src/ui/public/courier/fetch/__tests__/doc.js @@ -4,12 +4,12 @@ describe('Courier DocFetchRequest class', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var storage; - var source; - var defer; - var req; + let storage; + let source; + let defer; + let req; - var setVersion; + let setVersion; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, Promise, $injector) { diff --git a/src/ui/public/courier/fetch/_call_client.js b/src/ui/public/courier/fetch/_call_client.js index 8cab455a0cb5c..2f47ebad76b8f 100644 --- a/src/ui/public/courier/fetch/_call_client.js +++ b/src/ui/public/courier/fetch/_call_client.js @@ -19,7 +19,7 @@ define(function (require) { if (!execCount) return Promise.resolve([]); // resolved by respond() - var esPromise; + let esPromise; var defer = Promise.defer(); // for each respond with either the response or ABORTED diff --git a/src/ui/public/courier/saved_object/saved_object.js b/src/ui/public/courier/saved_object/saved_object.js index 439a805fd45f4..3d48bdf4a3700 100644 --- a/src/ui/public/courier/saved_object/saved_object.js +++ b/src/ui/public/courier/saved_object/saved_object.js @@ -146,7 +146,7 @@ define(function (require) { if (!self.searchSource) return; // if we have a searchSource, set its state based on the searchSourceJSON field - var state; + let state; try { state = JSON.parse(searchSourceJson); } catch (e) { diff --git a/src/ui/public/debounce/__tests__/debounce.js b/src/ui/public/debounce/__tests__/debounce.js index 596b8ca7456e2..24b88ebe5baef 100644 --- a/src/ui/public/debounce/__tests__/debounce.js +++ b/src/ui/public/debounce/__tests__/debounce.js @@ -3,9 +3,9 @@ var sinon = require('auto-release-sinon'); var expect = require('expect.js'); var ngMock = require('ngMock'); -var debounce; -var $timeout; -var $timeoutSpy; +let debounce; +let $timeout; +let $timeoutSpy; function init() { ngMock.module('kibana'); @@ -19,7 +19,7 @@ function init() { } describe('debounce service', function () { - var spy; + let spy; beforeEach(function () { spy = sinon.spy(function () {}); init(); diff --git a/src/ui/public/debounce/debounce.js b/src/ui/public/debounce/debounce.js index 0f1fe8e092f9c..7cf725f6bf023 100644 --- a/src/ui/public/debounce/debounce.js +++ b/src/ui/public/debounce/debounce.js @@ -7,10 +7,10 @@ define(function (require) { module.service('debounce', ['$timeout', function ($timeout) { return function (func, wait, options) { - var timeout; - var args; - var self; - var result; + let timeout; + let args; + let self; + let result; options = _.defaults(options || {}, { leading: false, trailing: true diff --git a/src/ui/public/directives/__tests__/auto_select_if_only_one.js b/src/ui/public/directives/__tests__/auto_select_if_only_one.js index 893ac280e347a..af309bbfcd1be 100644 --- a/src/ui/public/directives/__tests__/auto_select_if_only_one.js +++ b/src/ui/public/directives/__tests__/auto_select_if_only_one.js @@ -5,8 +5,8 @@ var ngMock = require('ngMock'); require('ui/directives/auto_select_if_only_one'); describe('Auto-select if only one directive', function () { - var $compile; - var $rootScope; + let $compile; + let $rootScope; var zeroOptions = []; var oneOption = [{label: 'foo'}]; var multiOptions = [{label: 'foo'}, {label: 'bar'}]; diff --git a/src/ui/public/directives/__tests__/confirm-click.js b/src/ui/public/directives/__tests__/confirm-click.js index 90b464db9759b..0e45723937ac2 100644 --- a/src/ui/public/directives/__tests__/confirm-click.js +++ b/src/ui/public/directives/__tests__/confirm-click.js @@ -7,11 +7,11 @@ var ngMock = require('ngMock'); require('ui/directives/confirm_click'); require('plugins/kibana/discover/index'); -var $parentScope; +let $parentScope; -var $scope; +let $scope; -var $elem; +let $elem; var init = function (text) { // Load the application @@ -47,7 +47,7 @@ describe('confirmClick directive', function () { describe('event handlers', function () { - var events; + let events; beforeEach(function () { init(); @@ -71,7 +71,7 @@ describe('confirmClick directive', function () { describe('confirmed', function () { - var confirmed; + let confirmed; beforeEach(function () { init(); @@ -98,7 +98,7 @@ describe('confirmClick directive', function () { }); describe('not confirmed', function () { - var confirmed; + let confirmed; beforeEach(function () { init(); diff --git a/src/ui/public/directives/__tests__/css_truncate.js b/src/ui/public/directives/__tests__/css_truncate.js index 31c05c7409085..3fe32b98ca3db 100644 --- a/src/ui/public/directives/__tests__/css_truncate.js +++ b/src/ui/public/directives/__tests__/css_truncate.js @@ -4,11 +4,11 @@ var expect = require('expect.js'); var ngMock = require('ngMock'); require('plugins/kibana/discover/index'); -var $parentScope; +let $parentScope; -var $scope; +let $scope; -var $elem; +let $elem; var init = function (expandable) { // Load the application diff --git a/src/ui/public/directives/__tests__/fixedScroll.js b/src/ui/public/directives/__tests__/fixedScroll.js index 357cb3e9800d8..254166b4a804b 100644 --- a/src/ui/public/directives/__tests__/fixedScroll.js +++ b/src/ui/public/directives/__tests__/fixedScroll.js @@ -8,7 +8,7 @@ describe('FixedScroll directive', function () { var sinon = require('auto-release-sinon'); var Promise = require('bluebird'); - var compile; + let compile; var trash = []; beforeEach(ngMock.module('kibana')); @@ -112,10 +112,10 @@ describe('FixedScroll directive', function () { { from: '$scroller', to: '$container' } ].forEach(function (names) { describe('scroll events ' + JSON.stringify(names), function () { - var spy; - var els; - var $from; - var $to; + let spy; + let els; + let $from; + let $to; beforeEach(function () { spy = sinon.spy($.fn, 'scrollLeft'); diff --git a/src/ui/public/directives/__tests__/inequality.js b/src/ui/public/directives/__tests__/inequality.js index ce852af58d25e..c1672d2539d66 100644 --- a/src/ui/public/directives/__tests__/inequality.js +++ b/src/ui/public/directives/__tests__/inequality.js @@ -4,9 +4,9 @@ var ngMock = require('ngMock'); require('ui/directives/inequality'); describe('greater_than model validator directive', function () { - var $compile; - var $rootScope; - var html; + let $compile; + let $rootScope; + let html; beforeEach(ngMock.module('kibana')); @@ -17,7 +17,7 @@ describe('greater_than model validator directive', function () { // no value is the same as 0 describe('without value', function () { - var element; + let element; beforeEach(function () { html = ''; element = $compile(html)($rootScope); @@ -44,7 +44,7 @@ describe('greater_than model validator directive', function () { [0, 1, 10, 42, -12].forEach(function (num) { describe('with value ' + num, function () { - var element; + let element; beforeEach(function () { html = ''; element = $compile(html)($rootScope); diff --git a/src/ui/public/directives/__tests__/input_focus.js b/src/ui/public/directives/__tests__/input_focus.js index a291a0b9c8a53..4a670e846fefb 100644 --- a/src/ui/public/directives/__tests__/input_focus.js +++ b/src/ui/public/directives/__tests__/input_focus.js @@ -5,13 +5,13 @@ var ngMock = require('ngMock'); require('ui/directives/input_focus'); describe('Input focus directive', function () { - var $compile; - var $rootScope; - var $timeout; - var element; - var $el; - var selectedEl; - var selectedText; + let $compile; + let $rootScope; + let $timeout; + let element; + let $el; + let selectedEl; + let selectedText; var inputValue = 'Input Text Value'; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/directives/__tests__/input_whole_number.js b/src/ui/public/directives/__tests__/input_whole_number.js index f55831152e1ae..d6892da71f7f2 100644 --- a/src/ui/public/directives/__tests__/input_whole_number.js +++ b/src/ui/public/directives/__tests__/input_whole_number.js @@ -4,8 +4,8 @@ var ngMock = require('ngMock'); require('ui/directives/input_whole_number'); describe('Whole number input directive', function () { - var $compile; - var $rootScope; + let $compile; + let $rootScope; var html = ''; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/directives/__tests__/json_input.js b/src/ui/public/directives/__tests__/json_input.js index 28def76b46bf7..014d267e6c90b 100644 --- a/src/ui/public/directives/__tests__/json_input.js +++ b/src/ui/public/directives/__tests__/json_input.js @@ -5,10 +5,10 @@ var ngMock = require('ngMock'); require('ui/directives/json_input'); describe('JSON input validation', function () { - var $compile; - var $rootScope; + let $compile; + let $rootScope; var html = ''; - var element; + let element; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/directives/__tests__/parse_query.js b/src/ui/public/directives/__tests__/parse_query.js index 3f3bc12fe9b06..c1c7c85cc5aa1 100644 --- a/src/ui/public/directives/__tests__/parse_query.js +++ b/src/ui/public/directives/__tests__/parse_query.js @@ -6,18 +6,18 @@ var ngMock = require('ngMock'); // Load the kibana app dependencies. require('ui/parse_query'); -var $rootScope; -var $timeout; -var $compile; -var Promise; -var Private; -var config; -var $elemScope; -var $elem; +let $rootScope; +let $timeout; +let $compile; +let Promise; +let Private; +let config; +let $elemScope; +let $elem; var cycleIndex = 0; var markup = ''; -var fromUser; +let fromUser; var toUser = require('ui/parse_query/lib/to_user'); var init = function () { @@ -101,7 +101,7 @@ describe('parse-query directive', function () { describe('model presentation formatter', function () { it('should present undefined as empty string', function () { - var notDefined; + let notDefined; expect(toUser(notDefined)).to.be(''); }); diff --git a/src/ui/public/directives/__tests__/spinner.js b/src/ui/public/directives/__tests__/spinner.js index 3bbde6a37af68..b879bbb9b6fdf 100644 --- a/src/ui/public/directives/__tests__/spinner.js +++ b/src/ui/public/directives/__tests__/spinner.js @@ -5,11 +5,11 @@ var ngMock = require('ngMock'); require('plugins/kibana/discover/index'); -var $parentScope; +let $parentScope; -var $scope; +let $scope; -var $elem; +let $elem; var init = function () { // Load the application diff --git a/src/ui/public/directives/__tests__/timepicker.js b/src/ui/public/directives/__tests__/timepicker.js index 590c6604a5753..e0f2bf75ee463 100644 --- a/src/ui/public/directives/__tests__/timepicker.js +++ b/src/ui/public/directives/__tests__/timepicker.js @@ -12,13 +12,13 @@ require('plugins/kibana/dashboard/index'); // TODO: This should not be needed, timefilter is only included here, it should move require('plugins/kibana/discover/index'); -var $parentScope; +let $parentScope; -var $scope; +let $scope; -var $elem; +let $elem; var anchor = '2014-01-01T06:06:06.666Z'; -var clock; +let clock; var init = function () { // Load the application @@ -85,7 +85,7 @@ describe('timepicker directive', function () { }); describe('refresh interval', function () { - var $courier; + let $courier; beforeEach(function () { init(); ngMock.inject(function (courier, $rootScope) { @@ -232,7 +232,7 @@ describe('timepicker directive', function () { }); it('disables the submit button if the form is invalid', function (done) { - var button; + let button; button = $elem.find('button[disabled]'); expect(button.length).to.be(0); @@ -359,7 +359,7 @@ describe('timepicker directive', function () { describe('absolute mode', function () { - var inputs; + let inputs; beforeEach(function () { init(); diff --git a/src/ui/public/directives/__tests__/truncate.js b/src/ui/public/directives/__tests__/truncate.js index 071a5743fe539..d75d073aa975b 100644 --- a/src/ui/public/directives/__tests__/truncate.js +++ b/src/ui/public/directives/__tests__/truncate.js @@ -5,11 +5,11 @@ var ngMock = require('ngMock'); require('plugins/kibana/discover/index'); -var $parentScope; +let $parentScope; -var $scope; +let $scope; -var $elem; +let $elem; var init = function (text) { // Load the application diff --git a/src/ui/public/directives/__tests__/typeahead.js b/src/ui/public/directives/__tests__/typeahead.js index a2a666015be6a..b60664b03976e 100644 --- a/src/ui/public/directives/__tests__/typeahead.js +++ b/src/ui/public/directives/__tests__/typeahead.js @@ -9,12 +9,12 @@ require('plugins/kibana/discover/index'); var typeaheadHistoryCount = 10; var typeaheadName = 'unittest'; -var $parentScope; -var $typeaheadScope; -var $elem; -var $typeaheadInputScope; -var typeaheadCtrl; -var PersistedLog; +let $parentScope; +let $typeaheadScope; +let $elem; +let $typeaheadInputScope; +let typeaheadCtrl; +let PersistedLog; var markup = '
' + '' + diff --git a/src/ui/public/directives/__tests__/validate_cidr_mask.js b/src/ui/public/directives/__tests__/validate_cidr_mask.js index 63572114b7eb2..48781616804d3 100644 --- a/src/ui/public/directives/__tests__/validate_cidr_mask.js +++ b/src/ui/public/directives/__tests__/validate_cidr_mask.js @@ -5,8 +5,8 @@ var ngMock = require('ngMock'); require('ui/directives/validate_cidr_mask'); describe('Validate CIDR mask directive', function () { - var $compile; - var $rootScope; + let $compile; + let $rootScope; var html = ''; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/directives/__tests__/validate_date_math.js b/src/ui/public/directives/__tests__/validate_date_math.js index 5514ef2dd8666..3242bf3223416 100644 --- a/src/ui/public/directives/__tests__/validate_date_math.js +++ b/src/ui/public/directives/__tests__/validate_date_math.js @@ -5,8 +5,8 @@ var ngMock = require('ngMock'); require('ui/directives/validate_date_math'); describe('Validate date math directive', function () { - var $compile; - var $rootScope; + let $compile; + let $rootScope; var html = ''; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/directives/__tests__/validate_index_name.js b/src/ui/public/directives/__tests__/validate_index_name.js index 50a00f3561947..dddec37e88308 100644 --- a/src/ui/public/directives/__tests__/validate_index_name.js +++ b/src/ui/public/directives/__tests__/validate_index_name.js @@ -6,8 +6,8 @@ var ngMock = require('ngMock'); require('ui/directives/validate_index_name'); describe('Validate index name directive', function () { - var $compile; - var $rootScope; + let $compile; + let $rootScope; var html = ''; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/directives/__tests__/validate_ip.js b/src/ui/public/directives/__tests__/validate_ip.js index 36fa6330b811d..1cda22fc5b6b2 100644 --- a/src/ui/public/directives/__tests__/validate_ip.js +++ b/src/ui/public/directives/__tests__/validate_ip.js @@ -5,8 +5,8 @@ var ngMock = require('ngMock'); require('ui/directives/validate_ip'); describe('Validate IP directive', function () { - var $compile; - var $rootScope; + let $compile; + let $rootScope; var html = ''; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/directives/__tests__/validate_json.js b/src/ui/public/directives/__tests__/validate_json.js index 83c99ab2a323e..fa04a204b6f70 100644 --- a/src/ui/public/directives/__tests__/validate_json.js +++ b/src/ui/public/directives/__tests__/validate_json.js @@ -5,9 +5,9 @@ var ngMock = require('ngMock'); // Load the kibana app dependencies. require('ui/directives/validate_json'); -var $parentScope; -var $elemScope; -var $elem; +let $parentScope; +let $elemScope; +let $elem; var mockScope = ''; var input = { diff --git a/src/ui/public/directives/infinite_scroll.js b/src/ui/public/directives/infinite_scroll.js index f079bc09729b2..2acfe3768116e 100644 --- a/src/ui/public/directives/infinite_scroll.js +++ b/src/ui/public/directives/infinite_scroll.js @@ -10,7 +10,7 @@ define(function (require) { }, link: function ($scope, $element, attrs) { var $window = $(window); - var checkTimer; + let checkTimer; function onScroll() { if (!$scope.more) return; diff --git a/src/ui/public/directives/paginate.js b/src/ui/public/directives/paginate.js index 0430a2ad5e03d..cac3ee123afc4 100644 --- a/src/ui/public/directives/paginate.js +++ b/src/ui/public/directives/paginate.js @@ -105,7 +105,7 @@ define(function (require) { var count = perPage ? Math.ceil($scope.list.length / perPage) : 1; _.times(count, function (i) { - var page; + let page; if (perPage) { var start = perPage * i; diff --git a/src/ui/public/directives/pretty_duration.js b/src/ui/public/directives/pretty_duration.js index ff15fa456ed69..dab9106b325a2 100644 --- a/src/ui/public/directives/pretty_duration.js +++ b/src/ui/public/directives/pretty_duration.js @@ -23,7 +23,7 @@ define(function (require) { }); function stringify() { - var text; + let text; // If both parts are date math, try to look up a reasonable string if ($scope.from && $scope.to && !moment.isMoment($scope.from) && !moment.isMoment($scope.to)) { var tryLookup = lookupByRange[$scope.from.toString() + ' to ' + $scope.to.toString()]; diff --git a/src/ui/public/directives/saved_object_finder.js b/src/ui/public/directives/saved_object_finder.js index b11aa779db49e..0cd80f51150a6 100644 --- a/src/ui/public/directives/saved_object_finder.js +++ b/src/ui/public/directives/saved_object_finder.js @@ -36,7 +36,7 @@ define(function (require) { var currentFilter = $scope.filter; // the most recently entered search/filter - var prevSearch; + let prevSearch; // the list of hits, used to render display self.hits = []; diff --git a/src/ui/public/doc_table/__tests__/doc_table.js b/src/ui/public/doc_table/__tests__/doc_table.js index 4ff421e86c804..b982f20d36851 100644 --- a/src/ui/public/doc_table/__tests__/doc_table.js +++ b/src/ui/public/doc_table/__tests__/doc_table.js @@ -11,16 +11,16 @@ require('ui/private'); require('ui/doc_table'); -var $parentScope; +let $parentScope; -var $scope; +let $scope; -var $timeout; +let $timeout; -var searchSource; +let searchSource; var init = function ($elem, props) { ngMock.inject(function ($rootScope, $compile, _$timeout_) { @@ -46,7 +46,7 @@ var destroy = function () { }; describe('docTable', function () { - var $elem; + let $elem; beforeEach(ngMock.module('kibana')); beforeEach(function () { diff --git a/src/ui/public/doc_table/__tests__/lib/get_sort.js b/src/ui/public/doc_table/__tests__/lib/get_sort.js index 5a4cdb7259d04..9c83ad57bf069 100644 --- a/src/ui/public/doc_table/__tests__/lib/get_sort.js +++ b/src/ui/public/doc_table/__tests__/lib/get_sort.js @@ -2,7 +2,7 @@ var getSort = require('ui/doc_table/lib/get_sort'); var defaultSort = {time: 'desc'}; var expect = require('expect.js'); var ngMock = require('ngMock'); -var indexPattern; +let indexPattern; describe('docTable', function () { beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/doc_table/__tests__/lib/rows_headers.js b/src/ui/public/doc_table/__tests__/lib/rows_headers.js index 4a7a5a309d9b5..d57ce171ff13e 100644 --- a/src/ui/public/doc_table/__tests__/lib/rows_headers.js +++ b/src/ui/public/doc_table/__tests__/lib/rows_headers.js @@ -9,14 +9,14 @@ var getFakeRow = require('fixtures/fake_row'); describe('Doc Table', function () { require('plugins/kibana/discover/index'); - var $parentScope; + let $parentScope; - var $scope; + let $scope; - var config; + let config; // Stub out a minimal mapping of 4 fields - var mapping; + let mapping; beforeEach(ngMock.module('kibana', 'apps/discover')); beforeEach(ngMock.inject(function (_config_, $rootScope, Private) { @@ -52,7 +52,7 @@ describe('Doc Table', function () { }); it('should be able to add and remove columns', function (done) { - var childElems; + let childElems; // Should include a column for toggling and the time column by default $parentScope.columns = ['bytes']; parentElem.scope().$digest(); @@ -244,7 +244,7 @@ describe('Doc Table', function () { }); describe('expanded', function () { - var $details; + let $details; beforeEach(function () { // Open the row $scope.toggleRow(); @@ -277,7 +277,7 @@ describe('Doc Table', function () { 'index-pattern="indexPattern"' + '>' ); - var $details; + let $details; beforeEach(function () { var row = getFakeRow(0, mapping); @@ -311,10 +311,10 @@ describe('Doc Table', function () { }); describe('row diffing', function () { - var $row; - var $scope; - var $root; - var $before; + let $row; + let $scope; + let $root; + let $before; beforeEach(ngMock.inject(function ($rootScope, $compile, Private) { $root = $rootScope; diff --git a/src/ui/public/doc_table/components/table_row.js b/src/ui/public/doc_table/components/table_row.js index a3acb0f33e922..f81fb902bcc5d 100644 --- a/src/ui/public/doc_table/components/table_row.js +++ b/src/ui/public/doc_table/components/table_row.js @@ -46,10 +46,10 @@ define(function (require) { }; // when we compile the details, we use this $scope - var $detailsScope; + let $detailsScope; // when we compile the toggle button in the summary, we use this $scope - var $toggleScope; + let $toggleScope; // toggle display of the rows details, a full list of the fields from each row $scope.toggleRow = function () { diff --git a/src/ui/public/doc_table/lib/get_sort.js b/src/ui/public/doc_table/lib/get_sort.js index 14ad92645cd91..6fa8870bf79c3 100644 --- a/src/ui/public/doc_table/lib/get_sort.js +++ b/src/ui/public/doc_table/lib/get_sort.js @@ -9,8 +9,8 @@ define(function (require) { */ function getSort(sort, indexPattern) { var sortObj = {}; - var field; - var direction; + let field; + let direction; function isSortable(field) { return (indexPattern.fields.byName[field] && indexPattern.fields.byName[field].sortable); diff --git a/src/ui/public/doc_title/__tests__/doc_title.js b/src/ui/public/doc_title/__tests__/doc_title.js index e24ae006d7aaa..ee4b58cdac23e 100644 --- a/src/ui/public/doc_title/__tests__/doc_title.js +++ b/src/ui/public/doc_title/__tests__/doc_title.js @@ -4,11 +4,11 @@ describe('docTitle Service', function () { var sinon = require('auto-release-sinon'); var expect = require('expect.js'); var ngMock = require('ngMock'); - var initialDocTitle; + let initialDocTitle; var MAIN_TITLE = 'Kibana 4'; - var docTitle; - var $rootScope; + let docTitle; + let $rootScope; beforeEach(function () { initialDocTitle = document.title; @@ -60,7 +60,7 @@ describe('docTitle Service', function () { }); describe('#change', function () { - var getActiveTabStub; + let getActiveTabStub; beforeEach(function () { getActiveTabStub = sinon.stub(require('ui/chrome'), 'getActiveTab'); diff --git a/src/ui/public/doc_title/doc_title.js b/src/ui/public/doc_title/doc_title.js index 85e118f90d660..bc7898dc692ea 100644 --- a/src/ui/public/doc_title/doc_title.js +++ b/src/ui/public/doc_title/doc_title.js @@ -14,7 +14,7 @@ define(function (require) { var baseTitle = document.title; var self = this; - var lastChange; + let lastChange; function render() { lastChange = lastChange || []; diff --git a/src/ui/public/doc_viewer/__tests__/doc_viewer.js b/src/ui/public/doc_viewer/__tests__/doc_viewer.js index 09e0123a24fbb..604e5c8050c78 100644 --- a/src/ui/public/doc_viewer/__tests__/doc_viewer.js +++ b/src/ui/public/doc_viewer/__tests__/doc_viewer.js @@ -24,16 +24,16 @@ require('ui/private'); require('ui/doc_viewer'); -var $parentScope; +let $parentScope; -var $scope; +let $scope; -var indexPattern; +let indexPattern; -var flattened; +let flattened; var init = function ($elem, props) { ngMock.inject(function ($rootScope, $compile) { @@ -51,7 +51,7 @@ var destroy = function () { }; describe('docViewer', function () { - var $elem; + let $elem; beforeEach(ngMock.module('kibana')); beforeEach(function () { diff --git a/src/ui/public/es.js b/src/ui/public/es.js index 01895fd90d639..43fa5fdecec40 100644 --- a/src/ui/public/es.js +++ b/src/ui/public/es.js @@ -2,7 +2,7 @@ define(function (require) { require('elasticsearch-browser/elasticsearch.angular.js'); var _ = require('lodash'); - var es; // share the client amoungst all apps + let es; // share the client amoungst all apps require('ui/modules') .get('kibana', ['elasticsearch', 'kibana/config']) .service('es', function (esFactory, esUrl, $q, esApiVersion, esRequestTimeout) { diff --git a/src/ui/public/factories/__tests__/base_object.js b/src/ui/public/factories/__tests__/base_object.js index 90829e31de907..29a8ed45fcdef 100644 --- a/src/ui/public/factories/__tests__/base_object.js +++ b/src/ui/public/factories/__tests__/base_object.js @@ -6,8 +6,8 @@ var ngMock = require('ngMock'); require('ui/private'); describe('Base Object', function () { - var $rootScope; - var BaseObject; + let $rootScope; + let BaseObject; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (_$rootScope_, Private) { diff --git a/src/ui/public/factories/__tests__/events.js b/src/ui/public/factories/__tests__/events.js index d0f6e773a43f9..885225f22cb91 100644 --- a/src/ui/public/factories/__tests__/events.js +++ b/src/ui/public/factories/__tests__/events.js @@ -9,10 +9,10 @@ require('ui/private'); describe('Events', function () { require('testUtils/noDigestPromises').activateForSuite(); - var $rootScope; - var Events; - var Notifier; - var Promise; + let $rootScope; + let Events; + let Notifier; + let Promise; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector, Private) { @@ -184,7 +184,7 @@ describe('Events', function () { it('should preserve the scope of the handler', function () { var obj = new Events(); var expected = 'some value'; - var testValue; + let testValue; function handler(arg1, arg2) { testValue = this.getVal(); diff --git a/src/ui/public/fancy_forms/__tests__/fancy_forms.js b/src/ui/public/fancy_forms/__tests__/fancy_forms.js index a57dd5cf50da5..e7882976c8757 100644 --- a/src/ui/public/fancy_forms/__tests__/fancy_forms.js +++ b/src/ui/public/fancy_forms/__tests__/fancy_forms.js @@ -3,12 +3,12 @@ var ngMock = require('ngMock'); var expect = require('expect.js'); describe('fancy forms', function () { - var $el; - var $scope; - var $compile; - var $rootScope; - var ngForm; - var ngModel; + let $el; + let $scope; + let $compile; + let $rootScope; + let ngForm; + let ngModel; function generateEl() { return $('
').html( diff --git a/src/ui/public/field_editor/__tests__/field_editor.js b/src/ui/public/field_editor/__tests__/field_editor.js index 9ff77b928129b..99e506df5f3d6 100644 --- a/src/ui/public/field_editor/__tests__/field_editor.js +++ b/src/ui/public/field_editor/__tests__/field_editor.js @@ -3,13 +3,13 @@ describe('FieldEditor directive', function () { var ngMock = require('ngMock'); var expect = require('expect.js'); - var Field; - var StringFormat; - var $rootScope; + let Field; + let StringFormat; + let $rootScope; - var compile; - var $scope; - var $el; + let compile; + let $scope; + let $el; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($compile, $injector, Private) { @@ -44,7 +44,7 @@ describe('FieldEditor directive', function () { }); describe('$scope.editor', function () { - var editor; + let editor; beforeEach(function () { compile(); @@ -60,8 +60,8 @@ describe('FieldEditor directive', function () { }); describe('editor.field', function () { - var field; - var actual; + let field; + let actual; beforeEach(function () { field = editor.field; diff --git a/src/ui/public/filter_bar/__tests__/_addFilters.js b/src/ui/public/filter_bar/__tests__/_addFilters.js index 15b7a9491421b..2b7f8c54bddb0 100644 --- a/src/ui/public/filter_bar/__tests__/_addFilters.js +++ b/src/ui/public/filter_bar/__tests__/_addFilters.js @@ -8,11 +8,11 @@ describe('add filters', function () { app: 'appState', global: 'globalState' }; - var filters; - var queryFilter; - var $rootScope; - var appState; - var globalState; + let filters; + let queryFilter; + let $rootScope; + let appState; + let globalState; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/__tests__/_getFilters.js b/src/ui/public/filter_bar/__tests__/_getFilters.js index 6b14c18f298da..0eb056d910a33 100644 --- a/src/ui/public/filter_bar/__tests__/_getFilters.js +++ b/src/ui/public/filter_bar/__tests__/_getFilters.js @@ -7,10 +7,10 @@ describe('get filters', function () { app: 'appState', global: 'globalState' }; - var queryFilter; - var $rootScope; - var appState; - var globalState; + let queryFilter; + let $rootScope; + let appState; + let globalState; beforeEach(ngMock.module( 'kibana', @@ -34,7 +34,7 @@ describe('get filters', function () { })); describe('getFilters method', function () { - var filters; + let filters; beforeEach(function () { filters = [ @@ -109,7 +109,7 @@ describe('get filters', function () { }); describe('filter reconciliation', function () { - var filters; + let filters; beforeEach(function () { filters = [ diff --git a/src/ui/public/filter_bar/__tests__/_invertFilters.js b/src/ui/public/filter_bar/__tests__/_invertFilters.js index 3f3a5ba52d813..8939ecf5985ee 100644 --- a/src/ui/public/filter_bar/__tests__/_invertFilters.js +++ b/src/ui/public/filter_bar/__tests__/_invertFilters.js @@ -8,11 +8,11 @@ describe('invert filters', function () { app: 'appState', global: 'globalState' }; - var filters; - var queryFilter; - var $rootScope; - var appState; - var globalState; + let filters; + let queryFilter; + let $rootScope; + let appState; + let globalState; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/__tests__/_pinFilters.js b/src/ui/public/filter_bar/__tests__/_pinFilters.js index dd45be09df790..307f8cf9a2c02 100644 --- a/src/ui/public/filter_bar/__tests__/_pinFilters.js +++ b/src/ui/public/filter_bar/__tests__/_pinFilters.js @@ -8,11 +8,11 @@ describe('pin filters', function () { app: 'appState', global: 'globalState' }; - var filters; - var queryFilter; - var $rootScope; - var appState; - var globalState; + let filters; + let queryFilter; + let $rootScope; + let appState; + let globalState; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/__tests__/_removeFilters.js b/src/ui/public/filter_bar/__tests__/_removeFilters.js index 672e02f702842..01a1f1f62660f 100644 --- a/src/ui/public/filter_bar/__tests__/_removeFilters.js +++ b/src/ui/public/filter_bar/__tests__/_removeFilters.js @@ -8,11 +8,11 @@ describe('remove filters', function () { app: 'appState', global: 'globalState' }; - var filters; - var queryFilter; - var $rootScope; - var appState; - var globalState; + let filters; + let queryFilter; + let $rootScope; + let appState; + let globalState; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/__tests__/_toggleFilters.js b/src/ui/public/filter_bar/__tests__/_toggleFilters.js index 0855ba00e5f39..b298d9bde239d 100644 --- a/src/ui/public/filter_bar/__tests__/_toggleFilters.js +++ b/src/ui/public/filter_bar/__tests__/_toggleFilters.js @@ -8,11 +8,11 @@ describe('toggle filters', function () { app: 'appState', global: 'globalState' }; - var filters; - var queryFilter; - var $rootScope; - var appState; - var globalState; + let filters; + let queryFilter; + let $rootScope; + let appState; + let globalState; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/__tests__/_updateFilters.js b/src/ui/public/filter_bar/__tests__/_updateFilters.js index d7bec65389633..32fc68ee5bdf2 100644 --- a/src/ui/public/filter_bar/__tests__/_updateFilters.js +++ b/src/ui/public/filter_bar/__tests__/_updateFilters.js @@ -8,10 +8,10 @@ describe('update filters', function () { app: 'appState', global: 'globalState' }; - var queryFilter; - var appState; - var globalState; - var $rootScope; + let queryFilter; + let appState; + let globalState; + let $rootScope; beforeEach(ngMock.module( 'kibana', @@ -38,8 +38,8 @@ describe('update filters', function () { })); describe('updating', function () { - var currentFilter; - var newFilter; + let currentFilter; + let newFilter; beforeEach(function () { newFilter = _.cloneDeep({ diff --git a/src/ui/public/filter_bar/__tests__/filter_bar.js b/src/ui/public/filter_bar/__tests__/filter_bar.js index 5b102de7043f6..939dea7398ccd 100644 --- a/src/ui/public/filter_bar/__tests__/filter_bar.js +++ b/src/ui/public/filter_bar/__tests__/filter_bar.js @@ -9,15 +9,15 @@ require('ui/filter_bar'); var MockState = require('fixtures/mock_state'); describe('Filter Bar Directive', function () { - var $rootScope; - var $compile; - var $timeout; - var Promise; - var appState; - var queryFilter; - var mapFilter; - var $el; - var $scope; + let $rootScope; + let $compile; + let $timeout; + let Promise; + let appState; + let queryFilter; + let mapFilter; + let $el; + let $scope; // require('testUtils/noDigestPromises').activateForSuite(); beforeEach(ngMock.module('kibana/global_state', function ($provide) { diff --git a/src/ui/public/filter_bar/__tests__/push_filter.js b/src/ui/public/filter_bar/__tests__/push_filter.js index 1bd2c689d217b..9d5f4dbac370c 100644 --- a/src/ui/public/filter_bar/__tests__/push_filter.js +++ b/src/ui/public/filter_bar/__tests__/push_filter.js @@ -3,7 +3,7 @@ describe('Filter Bar pushFilter()', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var pushFilterFn; + let pushFilterFn; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { @@ -20,9 +20,9 @@ describe('Filter Bar pushFilter()', function () { }); describe('pushFilter($state)()', function () { - var $state; - var pushFilter; - var filter; + let $state; + let pushFilter; + let filter; beforeEach(ngMock.inject(function (Private, $injector) { $state = {filters:[]}; @@ -39,7 +39,7 @@ describe('Filter Bar pushFilter()', function () { it('should replace the filters property instead of modifying it', function () { // If we push directly instead of using pushFilter a $watch('filters') does not trigger - var oldFilters; + let oldFilters; oldFilters = $state.filters; $state.filters.push(filter); diff --git a/src/ui/public/filter_bar/__tests__/query_filter.js b/src/ui/public/filter_bar/__tests__/query_filter.js index f4357afaaa7eb..1f768997b02d4 100644 --- a/src/ui/public/filter_bar/__tests__/query_filter.js +++ b/src/ui/public/filter_bar/__tests__/query_filter.js @@ -1,9 +1,9 @@ var _ = require('lodash'); var expect = require('expect.js'); var ngMock = require('ngMock'); -var queryFilter; -var EventEmitter; -var $rootScope; +let queryFilter; +let EventEmitter; +let $rootScope; describe('Query Filter', function () { describe('Module', function () { diff --git a/src/ui/public/filter_bar/filter_bar_click_handler.js b/src/ui/public/filter_bar/filter_bar_click_handler.js index 59844f9207bf7..e6ea125e0e604 100644 --- a/src/ui/public/filter_bar/filter_bar_click_handler.js +++ b/src/ui/public/filter_bar/filter_bar_click_handler.js @@ -10,7 +10,7 @@ define(function (require) { var notify = new Notifier({ location: 'Filter bar' }); - var aggConfigResult; + let aggConfigResult; // Hierarchical and tabular data set their aggConfigResult parameter // differently because of how the point is rewritten between the two. So diff --git a/src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js b/src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js index 8764f5982f084..e7137347e08fb 100644 --- a/src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js +++ b/src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js @@ -5,9 +5,9 @@ var expect = require('expect.js'); describe('Filter Bar Directive', function () { describe('changeTimeFilter()', function () { - var changeTimeFilter; + let changeTimeFilter; - var timefilter; + let timefilter; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js b/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js index 8f7245fd3790c..4ffc64f712e87 100644 --- a/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js +++ b/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js @@ -4,8 +4,8 @@ describe('Filter Bar Directive', function () { var sinon = require('auto-release-sinon'); var expect = require('expect.js'); var ngMock = require('ngMock'); - var extractTimeFilter; - var $rootScope; + let extractTimeFilter; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js b/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js index 3b12ef06d9d44..4ca0b7412adc3 100644 --- a/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js +++ b/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js @@ -5,8 +5,8 @@ describe('Filter Bar Directive', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); var sinon = require('auto-release-sinon'); - var filterOutTimeBasedFilter; - var $rootScope; + let filterOutTimeBasedFilter; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js b/src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js index e73ec155e167e..ee3e4e6a63f21 100644 --- a/src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js +++ b/src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js @@ -5,10 +5,10 @@ var ngMock = require('ngMock'); describe('Filter Bar Directive', function () { describe('generateMappingChain()', function () { - var generateMappingChain; + let generateMappingChain; - var $rootScope; - var Promise; + let $rootScope; + let Promise; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, _$rootScope_, _Promise_) { $rootScope = _$rootScope_; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js b/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js index db93d8d124872..04d06de5d55fe 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js @@ -4,8 +4,8 @@ describe('Filter Bar Directive', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); var sinon = require('auto-release-sinon'); - var mapAndFlattenFilters; - var $rootScope; + let mapAndFlattenFilters; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/mapDefault.js b/src/ui/public/filter_bar/lib/__tests__/mapDefault.js index 83f603e83d5ed..e809c2ba0298f 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapDefault.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapDefault.js @@ -3,8 +3,8 @@ describe('Filter Bar Directive', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var mapDefault; - var $rootScope; + let mapDefault; + let $rootScope; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, _$rootScope_) { $rootScope = _$rootScope_; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapExists.js b/src/ui/public/filter_bar/lib/__tests__/mapExists.js index f77774d7b154d..e08621c12c4a6 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapExists.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapExists.js @@ -3,8 +3,8 @@ describe('Filter Bar Directive', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var mapExists; - var $rootScope; + let mapExists; + let $rootScope; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, _$rootScope_) { $rootScope = _$rootScope_; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapFilter.js b/src/ui/public/filter_bar/lib/__tests__/mapFilter.js index 3bf771a8d0247..8535af5141124 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapFilter.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapFilter.js @@ -3,8 +3,8 @@ describe('Filter Bar Directive', function () { var sinon = require('auto-release-sinon'); var expect = require('expect.js'); var ngMock = require('ngMock'); - var mapFilter; - var $rootScope; + let mapFilter; + let $rootScope; beforeEach(ngMock.module( diff --git a/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js b/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js index adaa34a789651..ef76a86f08df9 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js @@ -5,8 +5,8 @@ describe('Filter Bar Directive', function () { var sinon = require('auto-release-sinon'); var expect = require('expect.js'); var ngMock = require('ngMock'); - var mapFlattenAndWrapFilters; - var $rootScope; + let mapFlattenAndWrapFilters; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js b/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js index 931ee06c09d87..83306e0623a13 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js @@ -4,8 +4,8 @@ describe('Filter Bar Directive', function () { var sinon = require('auto-release-sinon'); var expect = require('expect.js'); var ngMock = require('ngMock'); - var mapGeoBoundingBox; - var $rootScope; + let mapGeoBoundingBox; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/mapMissing.js b/src/ui/public/filter_bar/lib/__tests__/mapMissing.js index fe0d9cab3a0da..b0be44b2f824c 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapMissing.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapMissing.js @@ -3,9 +3,9 @@ var expect = require('expect.js'); describe('Filter Bar Directive', function () { describe('mapMissing()', function () { - var mapMissing; + let mapMissing; - var $rootScope; + let $rootScope; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, _$rootScope_) { $rootScope = _$rootScope_; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js b/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js index 57683d3c1276b..bb880f7e41c37 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js @@ -2,8 +2,8 @@ describe('Filter Bar Directive', function () { describe('mapQueryString()', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var mapQueryString; - var $rootScope; + let mapQueryString; + let $rootScope; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, _$rootScope_) { $rootScope = _$rootScope_; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapRange.js b/src/ui/public/filter_bar/lib/__tests__/mapRange.js index dba4b114cad03..767bc9e2d626f 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapRange.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapRange.js @@ -4,8 +4,8 @@ describe('Filter Bar Directive', function () { var sinon = require('auto-release-sinon'); var expect = require('expect.js'); var ngMock = require('ngMock'); - var mapRange; - var $rootScope; + let mapRange; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/mapScript.js b/src/ui/public/filter_bar/lib/__tests__/mapScript.js index 2c2876aa03883..32b41f606d624 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapScript.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapScript.js @@ -4,8 +4,8 @@ describe('Filter Bar Directive', function () { var sinon = require('auto-release-sinon'); var expect = require('expect.js'); var ngMock = require('ngMock'); - var mapScript; - var $rootScope; + let mapScript; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/mapTerms.js b/src/ui/public/filter_bar/lib/__tests__/mapTerms.js index d3f2634c6bbd6..0c3528e1e0de8 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapTerms.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapTerms.js @@ -4,8 +4,8 @@ describe('Filter Bar Directive', function () { var sinon = require('auto-release-sinon'); var expect = require('expect.js'); var ngMock = require('ngMock'); - var mapTerms; - var $rootScope; + let mapTerms; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/compareFilters.js b/src/ui/public/filter_bar/lib/compareFilters.js index 8e29a236ae977..16e9fe011a193 100644 --- a/src/ui/public/filter_bar/lib/compareFilters.js +++ b/src/ui/public/filter_bar/lib/compareFilters.js @@ -1,8 +1,8 @@ define(function (require) { var _ = require('lodash'); var angular = require('angular'); - var excludedAttributes; - var comparators; + let excludedAttributes; + let comparators; /** * Compare two filters to see if they match diff --git a/src/ui/public/filter_bar/lib/mapExists.js b/src/ui/public/filter_bar/lib/mapExists.js index 93c458a95318e..d52519e01016f 100644 --- a/src/ui/public/filter_bar/lib/mapExists.js +++ b/src/ui/public/filter_bar/lib/mapExists.js @@ -1,8 +1,8 @@ define(function (require) { return function mapExistsProvider(Promise) { return function (filter) { - var key; - var value; + let key; + let value; if (filter.exists) { key = 'exists'; value = filter.exists.field; diff --git a/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js b/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js index 9687c928c93c8..41f7007bce6d9 100644 --- a/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js +++ b/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js @@ -2,11 +2,11 @@ define(function (require) { var _ = require('lodash'); return function mapGeoBoundBoxProvider(Promise, courier) { return function (filter) { - var key; - var value; - var topLeft; - var bottomRight; - var field; + let key; + let value; + let topLeft; + let bottomRight; + let field; if (filter.geo_bounding_box) { return courier .indexPatterns diff --git a/src/ui/public/filter_bar/lib/mapMissing.js b/src/ui/public/filter_bar/lib/mapMissing.js index 245831c995d0e..55c50d8570a6e 100644 --- a/src/ui/public/filter_bar/lib/mapMissing.js +++ b/src/ui/public/filter_bar/lib/mapMissing.js @@ -1,8 +1,8 @@ define(function (require) { return function mapMissingProvider(Promise) { return function (filter) { - var key; - var value; + let key; + let value; if (filter.missing) { key = 'missing'; value = filter.missing.field; diff --git a/src/ui/public/filter_bar/lib/mapQueryString.js b/src/ui/public/filter_bar/lib/mapQueryString.js index 57a141aa59cd0..c4dfe924a11fc 100644 --- a/src/ui/public/filter_bar/lib/mapQueryString.js +++ b/src/ui/public/filter_bar/lib/mapQueryString.js @@ -1,8 +1,8 @@ define(function (require) { return function mapQueryStringProvider(Promise) { return function (filter) { - var key; - var value; + let key; + let value; if (filter.query && filter.query.query_string) { key = 'query'; value = filter.query.query_string.query; diff --git a/src/ui/public/filter_bar/lib/mapScript.js b/src/ui/public/filter_bar/lib/mapScript.js index b25835b21cf4e..dd4f7a6cb6b0d 100644 --- a/src/ui/public/filter_bar/lib/mapScript.js +++ b/src/ui/public/filter_bar/lib/mapScript.js @@ -1,9 +1,9 @@ define(function () { return function mapScriptProvider(Promise, courier) { return function (filter) { - var key; - var value; - var field; + let key; + let value; + let field; if (filter.script) { return courier .indexPatterns diff --git a/src/ui/public/filter_bar/lib/mapTerms.js b/src/ui/public/filter_bar/lib/mapTerms.js index 313dda7ac3c99..46000ab3ddedb 100644 --- a/src/ui/public/filter_bar/lib/mapTerms.js +++ b/src/ui/public/filter_bar/lib/mapTerms.js @@ -2,9 +2,9 @@ define(function (require) { var _ = require('lodash'); return function mapTermsProvider(Promise, courier) { return function (filter) { - var key; - var value; - var field; + let key; + let value; + let field; if (filter.query && filter.query.match) { return courier .indexPatterns diff --git a/src/ui/public/filter_bar/query_filter.js b/src/ui/public/filter_bar/query_filter.js index 384186b780daf..df72437feff95 100644 --- a/src/ui/public/filter_bar/query_filter.js +++ b/src/ui/public/filter_bar/query_filter.js @@ -72,8 +72,8 @@ define(function (require) { queryFilter.removeFilter = function (matchFilter) { var appState = getAppState(); var filter = _.omit(matchFilter, ['$$hashKey']); - var state; - var index; + let state; + let index; // check for filter in appState if (appState) { @@ -288,7 +288,7 @@ define(function (require) { * @returns {void} */ function initWatchers() { - var removeAppStateWatchers; + let removeAppStateWatchers; $rootScope.$watch(getAppState, function () { removeAppStateWatchers && removeAppStateWatchers(); diff --git a/src/ui/public/filter_manager/__tests__/filter_manager.js b/src/ui/public/filter_manager/__tests__/filter_manager.js index d3114d562a34d..df329406a2a7b 100644 --- a/src/ui/public/filter_manager/__tests__/filter_manager.js +++ b/src/ui/public/filter_manager/__tests__/filter_manager.js @@ -3,10 +3,10 @@ var sinon = require('auto-release-sinon'); var MockState = require('fixtures/mock_state'); var expect = require('expect.js'); var ngMock = require('ngMock'); -var $rootScope; -var queryFilter; -var filterManager; -var appState; +let $rootScope; +let queryFilter; +let filterManager; +let appState; function checkAddFilters(length, comps, idx) { idx = idx || 0; diff --git a/src/ui/public/filter_manager/filter_manager.js b/src/ui/public/filter_manager/filter_manager.js index 497fc49983ac3..c8faf78fcc3b3 100644 --- a/src/ui/public/filter_manager/filter_manager.js +++ b/src/ui/public/filter_manager/filter_manager.js @@ -15,7 +15,7 @@ define(function (require) { // TODO: On array fields, negating does not negate the combination, rather all terms _.each(values, function (value) { - var filter; + let filter; var existing = _.find(filters, function (filter) { if (!filter) return; diff --git a/src/ui/public/filter_manager/lib/__tests__/phrase.js b/src/ui/public/filter_manager/lib/__tests__/phrase.js index 1bdd62c2417e8..1a3adfe5952bf 100644 --- a/src/ui/public/filter_manager/lib/__tests__/phrase.js +++ b/src/ui/public/filter_manager/lib/__tests__/phrase.js @@ -3,8 +3,8 @@ var fn = require('ui/filter_manager/lib/phrase'); var expect = require('expect.js'); var _ = require('lodash'); var ngMock = require('ngMock'); -var indexPattern; -var expected; +let indexPattern; +let expected; describe('Filter Manager', function () { describe('Phrase filter builder', function () { beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/filter_manager/lib/__tests__/query.js b/src/ui/public/filter_manager/lib/__tests__/query.js index 19a81f2d80bdb..333d3cde0e0c5 100644 --- a/src/ui/public/filter_manager/lib/__tests__/query.js +++ b/src/ui/public/filter_manager/lib/__tests__/query.js @@ -3,8 +3,8 @@ var fn = require('ui/filter_manager/lib/query'); var expect = require('expect.js'); var _ = require('lodash'); var ngMock = require('ngMock'); -var indexPattern; -var expected; +let indexPattern; +let expected; describe('Filter Manager', function () { describe('Phrase filter builder', function () { beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/filter_manager/lib/__tests__/range.js b/src/ui/public/filter_manager/lib/__tests__/range.js index 8145a9a3a0212..427fadca5eca1 100644 --- a/src/ui/public/filter_manager/lib/__tests__/range.js +++ b/src/ui/public/filter_manager/lib/__tests__/range.js @@ -3,8 +3,8 @@ var fn = require('ui/filter_manager/lib/range'); var expect = require('expect.js'); var _ = require('lodash'); var ngMock = require('ngMock'); -var indexPattern; -var expected; +let indexPattern; +let expected; describe('Filter Manager', function () { describe('Range filter builder', function () { beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/filters/__tests__/commaList.js b/src/ui/public/filters/__tests__/commaList.js index 461f3e2aeec76..c005c5333d97b 100644 --- a/src/ui/public/filters/__tests__/commaList.js +++ b/src/ui/public/filters/__tests__/commaList.js @@ -4,7 +4,7 @@ var ngMock = require('ngMock'); describe('Comma-List filter', function () { - var commaList; + let commaList; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector) { diff --git a/src/ui/public/filters/__tests__/field_type.js b/src/ui/public/filters/__tests__/field_type.js index 3a70397c5712a..7799270465172 100644 --- a/src/ui/public/filters/__tests__/field_type.js +++ b/src/ui/public/filters/__tests__/field_type.js @@ -5,9 +5,9 @@ var ngMock = require('ngMock'); require('plugins/kibana/discover/index'); require('ui/filters/field_type'); -var filter; +let filter; -var types; +let types; var init = function (expandable) { // Load the application diff --git a/src/ui/public/filters/__tests__/label.js b/src/ui/public/filters/__tests__/label.js index 802614fc149ba..717e9de75c1a3 100644 --- a/src/ui/public/filters/__tests__/label.js +++ b/src/ui/public/filters/__tests__/label.js @@ -7,7 +7,7 @@ var ngMock = require('ngMock'); // Load kibana and its applications require('plugins/kibana/discover/index'); -var filter; +let filter; var init = function (expandable) { // Load the application diff --git a/src/ui/public/filters/__tests__/moment.js b/src/ui/public/filters/__tests__/moment.js index b2b1259a07e75..ff720aba35d34 100644 --- a/src/ui/public/filters/__tests__/moment.js +++ b/src/ui/public/filters/__tests__/moment.js @@ -6,11 +6,11 @@ var ngMock = require('ngMock'); require('ui/filters/moment'); -var filter; +let filter; -var config; +let config; var anchor = '2014-01-01T06:06:06.666'; -var clock; +let clock; var init = function (expandable) { // Load the application diff --git a/src/ui/public/filters/__tests__/rison.js b/src/ui/public/filters/__tests__/rison.js index 7da99317b682e..fb3732ad2bd24 100644 --- a/src/ui/public/filters/__tests__/rison.js +++ b/src/ui/public/filters/__tests__/rison.js @@ -5,8 +5,8 @@ var ngMock = require('ngMock'); // Load kibana and its applications require('plugins/kibana/discover/index'); -var rison; -var risonDecode; +let rison; +let risonDecode; var init = function (expandable) { // Load the application diff --git a/src/ui/public/filters/__tests__/short_dots.js b/src/ui/public/filters/__tests__/short_dots.js index 242224d90cff9..568ac8227297f 100644 --- a/src/ui/public/filters/__tests__/short_dots.js +++ b/src/ui/public/filters/__tests__/short_dots.js @@ -6,9 +6,9 @@ var ngMock = require('ngMock'); require('plugins/kibana/discover/index'); require('ui/filters/short_dots'); -var filter; +let filter; -var config; +let config; var init = function (expandable) { // Load the application diff --git a/src/ui/public/filters/__tests__/start_from.js b/src/ui/public/filters/__tests__/start_from.js index fbb94552c761c..baea1d67c2efe 100644 --- a/src/ui/public/filters/__tests__/start_from.js +++ b/src/ui/public/filters/__tests__/start_from.js @@ -4,7 +4,7 @@ var ngMock = require('ngMock'); require('ui/filters/start_from'); -var filter; +let filter; var init = function (expandable) { // Load the application diff --git a/src/ui/public/filters/__tests__/uriescape.js b/src/ui/public/filters/__tests__/uriescape.js index 5d09813c909b8..acb32e9f76fb2 100644 --- a/src/ui/public/filters/__tests__/uriescape.js +++ b/src/ui/public/filters/__tests__/uriescape.js @@ -5,7 +5,7 @@ var ngMock = require('ngMock'); require('plugins/kibana/discover/index'); -var filter; +let filter; var init = function (expandable) { // Load the application diff --git a/src/ui/public/filters/short_dots.js b/src/ui/public/filters/short_dots.js index 0496dd64c33e7..56e679143c57a 100644 --- a/src/ui/public/filters/short_dots.js +++ b/src/ui/public/filters/short_dots.js @@ -11,7 +11,7 @@ define(function (require) { }); function shortDotsFilterProvider(config, $rootScope) { - var filter; + let filter; function updateFilter() { filter = config.get('shortDots:enable') ? _.shortenDottedString : _.identity; diff --git a/src/ui/public/fixedScroll.js b/src/ui/public/fixedScroll.js index ad2a7f85e15d8..d8381b818eadf 100644 --- a/src/ui/public/fixedScroll.js +++ b/src/ui/public/fixedScroll.js @@ -36,7 +36,7 @@ define(function (require) { throw new Error('fixedScroll listeners were not cleaned up properly before re-listening!'); } - var blockTo; + let blockTo; function bind($from, $to) { function handler() { if (blockTo === $to) return (blockTo = null); diff --git a/src/ui/public/highlight/__tests__/highlight.js b/src/ui/public/highlight/__tests__/highlight.js index fff63f1e33325..594e5f41e292c 100644 --- a/src/ui/public/highlight/__tests__/highlight.js +++ b/src/ui/public/highlight/__tests__/highlight.js @@ -5,9 +5,9 @@ describe('Highlight', function () { var ngMock = require('ngMock'); require('ui/highlight'); - var filter; + let filter; - var tags; + let tags; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (highlightFilter, highlightTags) { diff --git a/src/ui/public/index_patterns/__tests__/_FieldFormat.js b/src/ui/public/index_patterns/__tests__/_FieldFormat.js index 6863573b8ec1a..7c20cba922cce 100644 --- a/src/ui/public/index_patterns/__tests__/_FieldFormat.js +++ b/src/ui/public/index_patterns/__tests__/_FieldFormat.js @@ -3,8 +3,8 @@ describe('FieldFormat class', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var FieldFormat; - var TestFormat; + let FieldFormat; + let TestFormat; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js index 1c18a8f7f942f..3960b34ddc325 100644 --- a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js +++ b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js @@ -3,8 +3,8 @@ describe('type normalizer (castMappingType)', function () { var ngMock = require('ngMock'); var expect = require('expect.js'); - var fn; - var fields; + let fn; + let fields; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { fn = Private(require('ui/index_patterns/_cast_mapping_type')); diff --git a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js index 96f814df4312d..1ff4607121cba 100644 --- a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js +++ b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js @@ -3,11 +3,11 @@ describe('get computed fields', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var indexPattern; + let indexPattern; - var getComputedFields; + let getComputedFields; - var fn; + let fn; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern')); diff --git a/src/ui/public/index_patterns/__tests__/_index_pattern.js b/src/ui/public/index_patterns/__tests__/_index_pattern.js index 3ec70cbd92322..a196d51452ba5 100644 --- a/src/ui/public/index_patterns/__tests__/_index_pattern.js +++ b/src/ui/public/index_patterns/__tests__/_index_pattern.js @@ -6,18 +6,18 @@ describe('index pattern', function () { var Promise = require('bluebird'); var errors = require('ui/errors'); var IndexedArray = require('ui/IndexedArray'); - var IndexPattern; - var mapper; - var mappingSetup; - var mockLogstashFields; - var DocSource; - var config; - var docSourceResponse; + let IndexPattern; + let mapper; + let mappingSetup; + let mockLogstashFields; + let DocSource; + let config; + let docSourceResponse; var indexPatternId = 'test-pattern'; - var indexPattern; - var calculateIndices; - var $rootScope; - var intervals; + let indexPattern; + let calculateIndices; + let $rootScope; + let intervals; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector, _config_) { @@ -142,9 +142,9 @@ describe('index pattern', function () { // override the default indexPattern, with a truncated field list require('testUtils/noDigestPromises').activateForSuite(); var indexPatternId = 'test-pattern'; - var indexPattern; - var fieldLength; - var truncatedFields; + let indexPattern; + let fieldLength; + let truncatedFields; beforeEach(function () { fieldLength = mockLogstashFields.length; @@ -297,7 +297,7 @@ describe('index pattern', function () { describe('#toDetailedIndexList', function () { require('testUtils/noDigestPromises').activateForSuite(); context('when index pattern is an interval', function () { - var interval; + let interval; beforeEach(function () { interval = 'result:getInterval'; sinon.stub(indexPattern, 'getInterval').returns(interval); @@ -376,7 +376,7 @@ describe('index pattern', function () { context('when index pattern is an interval', function () { require('testUtils/noDigestPromises').activateForSuite(); - var interval; + let interval; beforeEach(function () { interval = 'result:getInterval'; sinon.stub(indexPattern, 'getInterval').returns(interval); @@ -447,7 +447,7 @@ describe('index pattern', function () { }); it('is fulfilled by id', function () { - var indexList; + let indexList; indexPattern.toIndexList().then(function (val) { indexList = val; }); diff --git a/src/ui/public/index_patterns/__tests__/_map_field.js b/src/ui/public/index_patterns/__tests__/_map_field.js index 190fdcca49dc6..3fe5461c8dc6d 100644 --- a/src/ui/public/index_patterns/__tests__/_map_field.js +++ b/src/ui/public/index_patterns/__tests__/_map_field.js @@ -3,8 +3,8 @@ describe('field mapping normalizer (mapField)', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var fn; - var fields; + let fn; + let fields; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector, config) { config.set('metaFields', ['_id', '_timestamp']); diff --git a/src/ui/public/index_patterns/__tests__/flatten_hit.js b/src/ui/public/index_patterns/__tests__/flatten_hit.js index d6ff0d80eba1c..533f440bf2340 100644 --- a/src/ui/public/index_patterns/__tests__/flatten_hit.js +++ b/src/ui/public/index_patterns/__tests__/flatten_hit.js @@ -5,10 +5,10 @@ describe('IndexPattern#flattenHit()', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var flattenHit; - var config; - var hit; - var flat; + let flattenHit; + let config; + let hit; + let flat; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { diff --git a/src/ui/public/index_patterns/__tests__/intervals.js b/src/ui/public/index_patterns/__tests__/intervals.js index 1f380416d9963..77983787ca9e5 100644 --- a/src/ui/public/index_patterns/__tests__/intervals.js +++ b/src/ui/public/index_patterns/__tests__/intervals.js @@ -6,7 +6,7 @@ describe('Index Patterns', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var intervals; + let intervals; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { intervals = Private(require('ui/index_patterns/_intervals')); diff --git a/src/ui/public/index_patterns/_get_ids.js b/src/ui/public/index_patterns/_get_ids.js index 751344fba1b44..d8041ab38fe72 100644 --- a/src/ui/public/index_patterns/_get_ids.js +++ b/src/ui/public/index_patterns/_get_ids.js @@ -4,7 +4,7 @@ define(function (require) { // many places may require the id list, so we will cache it seperately // didn't incorportate with the indexPattern cache to prevent id collisions. - var cachedPromise; + let cachedPromise; var getIds = function () { if (cachedPromise) { diff --git a/src/ui/public/index_patterns/_intervals.js b/src/ui/public/index_patterns/_intervals.js index c449a7d8890a7..57484e7c119f1 100644 --- a/src/ui/public/index_patterns/_intervals.js +++ b/src/ui/public/index_patterns/_intervals.js @@ -36,7 +36,7 @@ define(function (require) { }); intervals.toIndexList = function (format, interval, a, b, sortDirection) { - var bounds; + let bounds; // setup the range that the list will span, return two moment objects that // are in proper order. a and b can be numbers to specify to go before or after now (respectively) diff --git a/src/ui/public/listen/__tests__/listen.js b/src/ui/public/listen/__tests__/listen.js index 56fe2205bdb7c..70ff8aa6ef079 100644 --- a/src/ui/public/listen/__tests__/listen.js +++ b/src/ui/public/listen/__tests__/listen.js @@ -4,8 +4,8 @@ describe('listen component', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var $rootScope; - var Events; + let $rootScope; + let Events; require('ui/listen'); diff --git a/src/ui/public/notify/__tests__/notifier.js b/src/ui/public/notify/__tests__/notifier.js index 61179fdab5cfe..f2c084b2c4579 100644 --- a/src/ui/public/notify/__tests__/notifier.js +++ b/src/ui/public/notify/__tests__/notifier.js @@ -5,8 +5,8 @@ describe('Notifier', function () { var Notifier = require('ui/notify/notifier'); var message = 'Oh, the humanity!'; - var notifier; - var params; + let notifier; + let params; var version = window.__KBN__.version; var buildNum = window.__KBN__.buildNum; diff --git a/src/ui/public/notify/notifier.js b/src/ui/public/notify/notifier.js index 5789324daf60c..eeedf3fdea1ee 100644 --- a/src/ui/public/notify/notifier.js +++ b/src/ui/public/notify/notifier.js @@ -21,7 +21,7 @@ define(function (require) { var firstFatal = true; var fatalToastTemplate = (function lazyTemplate(tmpl) { - var compiled; + let compiled; return function (vars) { return (compiled || (compiled = _.template(tmpl)))(vars); }; @@ -285,9 +285,9 @@ define(function (require) { var groups = window[type + 'Groups'] = {}; return function logger(name, success) { - var status; // status of the timer - var exec; // function to execute and wrap - var ret; // return value + let status; // status of the timer + let exec; // function to execute and wrap + let ret; // return value var complete = function (val) { logger(name, true); return val; }; var failure = function (err) { logger(name, false); throw err; }; diff --git a/src/ui/public/paginated_table/__tests__/index.js b/src/ui/public/paginated_table/__tests__/index.js index 0a798c511952d..34feb6982a436 100644 --- a/src/ui/public/paginated_table/__tests__/index.js +++ b/src/ui/public/paginated_table/__tests__/index.js @@ -7,12 +7,12 @@ var expect = require('expect.js'); var ngMock = require('ngMock'); describe('paginated table', function () { - var $el; - var $rootScope; - var $compile; - var $scope; - var $elScope; - var $orderBy; + let $el; + let $rootScope; + let $compile; + let $scope; + let $elScope; + let $orderBy; var defaultPerPage = 10; var makeData = function (colCount, rowCount) { @@ -109,9 +109,9 @@ describe('paginated table', function () { }); describe('sorting', function () { - var data; - var lastRowIndex; - var paginatedTable; + let data; + let lastRowIndex; + let paginatedTable; beforeEach(function () { data = makeData(3, [ @@ -210,8 +210,8 @@ describe('paginated table', function () { }); describe('sorting duplicate columns', function () { - var data; - var paginatedTable; + let data; + let paginatedTable; var colText = 'test row'; beforeEach(function () { @@ -290,9 +290,9 @@ describe('paginated table', function () { }); describe('custom sorting', function () { - var data; - var paginatedTable; - var sortHandler; + let data; + let paginatedTable; + let sortHandler; beforeEach(function () { sortHandler = sinon.spy(); @@ -320,9 +320,9 @@ describe('paginated table', function () { }); describe('object rows', function () { - var cols; - var rows; - var paginatedTable; + let cols; + let rows; + let paginatedTable; beforeEach(function () { cols = [{ diff --git a/src/ui/public/paginated_table/paginated_table.js b/src/ui/public/paginated_table/paginated_table.js index e90c958db2e8e..5d14609a72e84 100644 --- a/src/ui/public/paginated_table/paginated_table.js +++ b/src/ui/public/paginated_table/paginated_table.js @@ -30,7 +30,7 @@ define(function (require) { if (!col) return; if (col.sortable === false) return; - var sortDirection; + let sortDirection; if (self.sort.columnIndex !== colIndex) { sortDirection = 'asc'; diff --git a/src/ui/public/persisted_log/__tests__/persisted_log.js b/src/ui/public/persisted_log/__tests__/persisted_log.js index 726d20e2652ae..535844649f75d 100644 --- a/src/ui/public/persisted_log/__tests__/persisted_log.js +++ b/src/ui/public/persisted_log/__tests__/persisted_log.js @@ -3,9 +3,9 @@ var sinon = require('sinon'); var expect = require('expect.js'); var ngMock = require('ngMock'); -var storage; -var config; -var PersistedLog; +let storage; +let config; +let PersistedLog; var historyName = 'testHistory'; var historyLimit = 10; diff --git a/src/ui/public/persisted_state/__tests__/persisted_state.js b/src/ui/public/persisted_state/__tests__/persisted_state.js index c62bedba492e4..0820f5b1f244a 100644 --- a/src/ui/public/persisted_state/__tests__/persisted_state.js +++ b/src/ui/public/persisted_state/__tests__/persisted_state.js @@ -5,8 +5,8 @@ var ngMock = require('ngMock'); var expect = require('expect.js'); var errors = require('ui/errors'); -var PersistedState; -var Events; +let PersistedState; +let Events; describe('Persisted State', function () { noDigestPromises.activateForSuite(); @@ -21,7 +21,7 @@ describe('Persisted State', function () { }); describe('state creation', function () { - var persistedState; + let persistedState; it('should create an empty state instance', function () { persistedState = new PersistedState(); @@ -99,7 +99,7 @@ describe('Persisted State', function () { it('should throw if given a parent without a path', function () { var run = function () { var val = { red: 'blue' }; - var path; + let path; var parent = new PersistedState(); new PersistedState(val, path, parent); @@ -112,7 +112,7 @@ describe('Persisted State', function () { }); describe('child state creation', function () { - var childState; + let childState; it('should not append the child state to the parent, without parent value', function () { var childIndex = 'i can haz child'; @@ -369,7 +369,7 @@ describe('Persisted State', function () { }); describe('JSON importing and exporting', function () { - var persistedStateValue; + let persistedStateValue; beforeEach(function () { persistedStateValue = { one: 1, two: 2, 'meaning of life': 42 }; @@ -494,7 +494,7 @@ describe('Persisted State', function () { }); describe('simple replace operations', function () { - var persistedState; + let persistedState; it('should replace value with string', function () { persistedState = new PersistedState({ hello: 'world' }); @@ -530,7 +530,7 @@ describe('Persisted State', function () { }); describe('deep replace operations', function () { - var persistedState; + let persistedState; it('should append to the object', function () { persistedState = new PersistedState({ hello: { message: 'world' } }); @@ -574,8 +574,8 @@ describe('Persisted State', function () { }); describe('events', function () { - var persistedState; - var emitter; + let persistedState; + let emitter; var getByType = function (type, spy) { spy = spy || emitter; diff --git a/src/ui/public/private/__tests__/private.js b/src/ui/public/private/__tests__/private.js index c797d70654f04..230daf98f874d 100644 --- a/src/ui/public/private/__tests__/private.js +++ b/src/ui/public/private/__tests__/private.js @@ -1,7 +1,7 @@ describe('Private module loader', function () { - var Private; + let Private; var expect = require('expect.js'); var ngMock = require('ngMock'); diff --git a/src/ui/public/private/private.js b/src/ui/public/private/private.js index 767e30d5bc3f3..8d2f29f9056d7 100644 --- a/src/ui/public/private/private.js +++ b/src/ui/public/private/private.js @@ -152,7 +152,7 @@ define(function (require) { function get(id, prov, $delegateProv, $delegateId) { if (cache[id]) return cache[id]; - var instance; + let instance; if ($delegateId != null && $delegateProv != null) { instance = instantiate(prov, { @@ -168,8 +168,8 @@ define(function (require) { // main api, get the appropriate instance for a provider function Private(prov) { var id = identify(prov); - var $delegateId; - var $delegateProv; + let $delegateId; + let $delegateProv; if (swaps[id]) { $delegateId = id; diff --git a/src/ui/public/promises/promises.js b/src/ui/public/promises/promises.js index b52ab063b55e9..a2407d1e0cf82 100644 --- a/src/ui/public/promises/promises.js +++ b/src/ui/public/promises/promises.js @@ -74,7 +74,7 @@ define(function (require) { return Promise.reject(new TypeError('fn must be a function')); } - var value; + let value; if (_.isArray(args)) { try { value = fn.apply(ctx, args); } diff --git a/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js b/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js index da013d6132b9e..f10426ded09c2 100644 --- a/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js +++ b/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js @@ -15,10 +15,10 @@ describe('Reflow watcher', function () { })).to.be(true); }; - var EventEmitter; - var reflowWatcher; - var $rootScope; - var $onStub; + let EventEmitter; + let reflowWatcher; + let $rootScope; + let $onStub; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { @@ -49,7 +49,7 @@ describe('Reflow watcher', function () { }); describe('un-listens in #destroy()', function () { - var $offStub; + let $offStub; beforeEach(function () { $offStub = sinon.stub($.fn, 'off'); diff --git a/src/ui/public/registry/__tests__/index.js b/src/ui/public/registry/__tests__/index.js index c33369195ff59..e0e6ab585e30b 100644 --- a/src/ui/public/registry/__tests__/index.js +++ b/src/ui/public/registry/__tests__/index.js @@ -4,8 +4,8 @@ describe('Registry', function () { var registry = require('ui/registry/_registry'); var expect = require('expect.js'); var ngMock = require('ngMock'); - var Private; - var IndexedArray; + let Private; + let IndexedArray; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector) { @@ -44,7 +44,7 @@ describe('Registry', function () { describe('spec', function () { it('executes with the module list as "this", and can override it', function () { var i = 0; - var self; + let self; var reg = registry({ constructor: function () { @@ -84,7 +84,7 @@ describe('Registry', function () { it('executes with the module list as "this", and can override it', function () { var i = 0; - var self; + let self; var reg = registry({ constructor: function () { diff --git a/src/ui/public/registry/field_formats.js b/src/ui/public/registry/field_formats.js index 3de51d4924d20..4eb93526f0321 100644 --- a/src/ui/public/registry/field_formats.js +++ b/src/ui/public/registry/field_formats.js @@ -8,7 +8,7 @@ define(function (require) { constructor: function (config, $rootScope) { var self = this; - var defaultMap; + let defaultMap; function init() { parseDefaultTypeMap(); diff --git a/src/ui/public/routes/RouteManager.js b/src/ui/public/routes/RouteManager.js index f6a77d8631a51..2b77fd843fead 100644 --- a/src/ui/public/routes/RouteManager.js +++ b/src/ui/public/routes/RouteManager.js @@ -8,7 +8,7 @@ function RouteManager() { var setup = new RouteSetupManager(); var when = []; var defaults = []; - var otherwise; + let otherwise; self.config = function ($routeProvider) { when.forEach(function (args) { diff --git a/src/ui/public/routes/__tests__/_RouteManager.js b/src/ui/public/routes/__tests__/_RouteManager.js index ce5a7e9864a3e..568023723562b 100644 --- a/src/ui/public/routes/__tests__/_RouteManager.js +++ b/src/ui/public/routes/__tests__/_RouteManager.js @@ -4,14 +4,14 @@ var sinon = require('auto-release-sinon'); var RouteManager = require('ui/routes/RouteManager'); var expect = require('expect.js'); -var routes; // will contain an new instance of RouteManager for each test +let routes; // will contain an new instance of RouteManager for each test var chainableMethods = [ { name: 'when', args: ['', {}] }, { name: 'otherwise', args: [{}] }, { name: 'defaults', args: [/regexp/, {}] } ]; -var $rp; +let $rp; describe('routes/RouteManager', function () { beforeEach(ngMock.module('kibana', function ($routeProvider) { $rp = $routeProvider; diff --git a/src/ui/public/routes/__tests__/_WorkQueue.js b/src/ui/public/routes/__tests__/_WorkQueue.js index 526df2161b402..1c55c8162ba9d 100644 --- a/src/ui/public/routes/__tests__/_WorkQueue.js +++ b/src/ui/public/routes/__tests__/_WorkQueue.js @@ -6,8 +6,8 @@ var sinon = require('auto-release-sinon'); require('ui/promises'); describe('work queue', function () { - var queue; - var Promise; + let queue; + let Promise; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (_Promise_) { diff --git a/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js b/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js index d37cf57c10dfa..2355f863ad965 100644 --- a/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js +++ b/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js @@ -9,7 +9,7 @@ var stub = require('auto-release-sinon').stub; require('ui/private'); -var routes; +let routes; describe('wrapRouteWithPrep fn', function () { require('testUtils/noDigestPromises').activateForSuite(); @@ -28,10 +28,10 @@ describe('wrapRouteWithPrep fn', function () { ngMock.module('kibana', 'kibana/notify'); var setupComplete = false; var userWorkComplete = false; - var route; - var Private; - var Promise; - var $injector; + let route; + let Private; + let Promise; + let $injector; ngMock.inject(function ($rootScope, _Private_, _Promise_, _$injector_) { Private = _Private_; diff --git a/src/ui/public/safe_confirm/__tests__/safe_confirm.js b/src/ui/public/safe_confirm/__tests__/safe_confirm.js index 8952cec32f9b4..cea7886d565b7 100644 --- a/src/ui/public/safe_confirm/__tests__/safe_confirm.js +++ b/src/ui/public/safe_confirm/__tests__/safe_confirm.js @@ -3,12 +3,12 @@ describe('ui/safe_confirm', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var $rootScope; - var $window; - var $timeout; - var message; - var safeConfirm; - var promise; + let $rootScope; + let $window; + let $timeout; + let message; + let safeConfirm; + let promise; beforeEach(function () { ngMock.module('kibana', function ($provide) { @@ -54,7 +54,7 @@ describe('ui/safe_confirm', function () { it('promise is fulfilled with true', function () { $timeout.flush(); - var value; + let value; promise.then(function (v) { value = v; }); @@ -69,7 +69,7 @@ describe('ui/safe_confirm', function () { $window.confirm.returns(false); // must be set before $timeout.flush() $timeout.flush(); - var value; + let value; promise.then(null, function (v) { value = v; }); diff --git a/src/ui/public/state_management/__tests__/app_state.js b/src/ui/public/state_management/__tests__/app_state.js index 61dcf5a9ab31c..075c8c75fc756 100644 --- a/src/ui/public/state_management/__tests__/app_state.js +++ b/src/ui/public/state_management/__tests__/app_state.js @@ -4,8 +4,8 @@ var ngMock = require('ngMock'); require('ui/state_management/app_state'); describe('State Management', function () { - var $rootScope; - var AppState; + let $rootScope; + let AppState; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (_$rootScope_, _$location_, Private) { @@ -14,7 +14,7 @@ describe('State Management', function () { })); describe('App State', function () { - var appState; + let appState; beforeEach(function () { appState = new AppState(); diff --git a/src/ui/public/state_management/__tests__/global_state.js b/src/ui/public/state_management/__tests__/global_state.js index 8e8c586456ead..28b5a9914f58a 100644 --- a/src/ui/public/state_management/__tests__/global_state.js +++ b/src/ui/public/state_management/__tests__/global_state.js @@ -5,9 +5,9 @@ var ngMock = require('ngMock'); require('ui/state_management/global_state'); describe('State Management', function () { - var $rootScope; - var $location; - var state; + let $rootScope; + let $location; + let state; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (_$location_, globalState) { diff --git a/src/ui/public/state_management/__tests__/state.js b/src/ui/public/state_management/__tests__/state.js index 4fbe7286422ff..c1a762d27c665 100644 --- a/src/ui/public/state_management/__tests__/state.js +++ b/src/ui/public/state_management/__tests__/state.js @@ -6,10 +6,10 @@ var ngMock = require('ngMock'); require('ui/private'); describe('State Management', function () { - var $rootScope; - var $location; - var State; - var Events; + let $rootScope; + let $location; + let State; + let Events; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (_$rootScope_, _$location_, Private) { @@ -136,7 +136,7 @@ describe('State Management', function () { }); it('should clear state when missing form URL', function () { - var stateObj; + let stateObj; var state = new State(); // set satte via URL diff --git a/src/ui/public/state_management/app_state.js b/src/ui/public/state_management/app_state.js index a3b3317b1c3b4..7a6ed5191c3e0 100644 --- a/src/ui/public/state_management/app_state.js +++ b/src/ui/public/state_management/app_state.js @@ -6,8 +6,8 @@ define(function (require) { function AppStateProvider(Private, $rootScope, getAppState) { var State = Private(require('ui/state_management/state')); var PersistedState = Private(require('ui/persisted_state/persisted_state')); - var persistedStates; - var eventUnsubscribers; + let persistedStates; + let eventUnsubscribers; _.class(AppState).inherits(State); function AppState(defaults) { @@ -71,7 +71,7 @@ define(function (require) { return Private(AppStateProvider); }) .service('getAppState', function ($location) { - var currentAppState; + let currentAppState; function get() { return currentAppState; diff --git a/src/ui/public/storage/__tests__/storage.js b/src/ui/public/storage/__tests__/storage.js index c6b99c6324f14..ce1a19d7a9950 100644 --- a/src/ui/public/storage/__tests__/storage.js +++ b/src/ui/public/storage/__tests__/storage.js @@ -2,8 +2,8 @@ var sinon = require('sinon'); var expect = require('expect.js'); var ngMock = require('ngMock'); -var storage; -var $window; +let storage; +let $window; var payload = { first: 'john', last: 'smith' }; require('ui/storage'); diff --git a/src/ui/public/stringify/__tests__/_color.js b/src/ui/public/stringify/__tests__/_color.js index b8093ab75a3c6..2be0de4443624 100644 --- a/src/ui/public/stringify/__tests__/_color.js +++ b/src/ui/public/stringify/__tests__/_color.js @@ -1,6 +1,6 @@ describe('Color Format', function () { - var fieldFormats; - var ColorFormat; + let fieldFormats; + let ColorFormat; var expect = require('expect.js'); var ngMock = require('ngMock'); diff --git a/src/ui/public/stringify/__tests__/_conformance.js b/src/ui/public/stringify/__tests__/_conformance.js index 30f424d04836d..89af762624782 100644 --- a/src/ui/public/stringify/__tests__/_conformance.js +++ b/src/ui/public/stringify/__tests__/_conformance.js @@ -2,9 +2,9 @@ var _ = require('lodash'); var expect = require('expect.js'); var ngMock = require('ngMock'); -var fieldFormats; -var FieldFormat; -var config; +let fieldFormats; +let FieldFormat; +let config; var formatIds = [ 'bytes', @@ -28,8 +28,8 @@ module.exports = describe('conformance', function () { })); formatIds.forEach(function (id) { - var instance; - var Type; + let instance; + let Type; beforeEach(function () { Type = fieldFormats.getType(id); diff --git a/src/ui/public/stringify/__tests__/_date.js b/src/ui/public/stringify/__tests__/_date.js index 40f3380df52da..747c65aa60b4b 100644 --- a/src/ui/public/stringify/__tests__/_date.js +++ b/src/ui/public/stringify/__tests__/_date.js @@ -2,11 +2,11 @@ describe('Date Format', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); var moment = require('moment-timezone'); - var fieldFormats; - var settings; - var convert; - var $scope; - var off; + let fieldFormats; + let settings; + let convert; + let $scope; + let off; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, config, $rootScope) { diff --git a/src/ui/public/stringify/__tests__/_ip.js b/src/ui/public/stringify/__tests__/_ip.js index b8964bca664ff..7d387ec492197 100644 --- a/src/ui/public/stringify/__tests__/_ip.js +++ b/src/ui/public/stringify/__tests__/_ip.js @@ -1,5 +1,5 @@ describe('IP Address Format', function () { - var fieldFormats; + let fieldFormats; var expect = require('expect.js'); var ngMock = require('ngMock'); diff --git a/src/ui/public/stringify/__tests__/_source.js b/src/ui/public/stringify/__tests__/_source.js index 41c989258487a..28156d09b6f04 100644 --- a/src/ui/public/stringify/__tests__/_source.js +++ b/src/ui/public/stringify/__tests__/_source.js @@ -4,7 +4,7 @@ describe('_source formatting', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var fieldFormats; + let fieldFormats; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -12,10 +12,10 @@ describe('_source formatting', function () { })); describe('Source format', function () { - var indexPattern; - var hits; - var format; - var convertHtml; + let indexPattern; + let hits; + let format; + let convertHtml; beforeEach(ngMock.inject(function (Private) { indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern')); diff --git a/src/ui/public/stringify/__tests__/_string.js b/src/ui/public/stringify/__tests__/_string.js index c2a7a2276b6d7..12e89e99067aa 100644 --- a/src/ui/public/stringify/__tests__/_string.js +++ b/src/ui/public/stringify/__tests__/_string.js @@ -1,5 +1,5 @@ describe('String Format', function () { - var fieldFormats; + let fieldFormats; var expect = require('expect.js'); var ngMock = require('ngMock'); diff --git a/src/ui/public/stringify/__tests__/_truncate.js b/src/ui/public/stringify/__tests__/_truncate.js index b51c5a8d8f431..e89a63abd1f03 100644 --- a/src/ui/public/stringify/__tests__/_truncate.js +++ b/src/ui/public/stringify/__tests__/_truncate.js @@ -1,5 +1,5 @@ describe('String Truncate Format', function () { - var fieldFormats; + let fieldFormats; var expect = require('expect.js'); var ngMock = require('ngMock'); diff --git a/src/ui/public/stringify/__tests__/_url.js b/src/ui/public/stringify/__tests__/_url.js index f9b0943f6b45d..d14d8894f9cdb 100644 --- a/src/ui/public/stringify/__tests__/_url.js +++ b/src/ui/public/stringify/__tests__/_url.js @@ -3,7 +3,7 @@ describe('Url Format', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var fieldFormats; + let fieldFormats; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -11,7 +11,7 @@ describe('Url Format', function () { })); describe('Url Format', function () { - var Url; + let Url; beforeEach(function () { Url = fieldFormats.getType('url'); diff --git a/src/ui/public/styleCompile/__tests__/styleCompile.js b/src/ui/public/styleCompile/__tests__/styleCompile.js index 0b51ff35c9d67..2d72034ac586c 100644 --- a/src/ui/public/styleCompile/__tests__/styleCompile.js +++ b/src/ui/public/styleCompile/__tests__/styleCompile.js @@ -3,8 +3,8 @@ describe('styleCompile directive', function () { var expect = require('expect.js'); var ngMock = require('ngMock'); - var config; - var $rootScope; + let config; + let $rootScope; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector) { diff --git a/src/ui/public/testHarness/testHarness.js b/src/ui/public/testHarness/testHarness.js index de49194825b19..1c62d655efce6 100644 --- a/src/ui/public/testHarness/testHarness.js +++ b/src/ui/public/testHarness/testHarness.js @@ -37,7 +37,7 @@ before(function () { // before the tests start, load the sourcemap and hook into error generation for the mocha reporter this.timeout(30000); - var mapper; + let mapper; var Runner = window.Mocha.Runner; Runner.prototype.emit = _.wrap(Runner.prototype.emit, function (emit, event, test, err) { diff --git a/src/ui/public/time_buckets/calc_auto_interval.js b/src/ui/public/time_buckets/calc_auto_interval.js index a511540a743da..24a38f1731f6d 100644 --- a/src/ui/public/time_buckets/calc_auto_interval.js +++ b/src/ui/public/time_buckets/calc_auto_interval.js @@ -28,7 +28,7 @@ define(function (require) { function find(rules, check, last) { function pick(buckets, duration) { var target = duration / buckets; - var lastResp; + let lastResp; for (var i = 0; i < rules.length; i++) { var rule = rules[i]; diff --git a/src/ui/public/time_buckets/time_buckets.js b/src/ui/public/time_buckets/time_buckets.js index 71faa411f91d7..10bb9b5ff9733 100644 --- a/src/ui/public/time_buckets/time_buckets.js +++ b/src/ui/public/time_buckets/time_buckets.js @@ -42,7 +42,7 @@ define(function (require) { TimeBuckets.prototype.setBounds = function (input) { if (!input) return this.clearBounds(); - var bounds; + let bounds; if (_.isPlainObject(input)) { // accept the response from timefilter.getActiveBounds() bounds = [input.min, input.max]; @@ -213,7 +213,7 @@ define(function (require) { var maxLength = config.get('histogram:maxBars'); var approxLen = duration / interval; - var scaled; + let scaled; if (approxLen > maxLength) { scaled = calcAuto.lessThan(maxLength, duration); diff --git a/src/ui/public/timefilter/__tests__/diff_interval.js b/src/ui/public/timefilter/__tests__/diff_interval.js index 19bfad1bde475..8fd9f98c8f29e 100644 --- a/src/ui/public/timefilter/__tests__/diff_interval.js +++ b/src/ui/public/timefilter/__tests__/diff_interval.js @@ -5,10 +5,10 @@ var ngMock = require('ngMock'); describe('Timefilter service', function () { describe('Refresh interval diff watcher', function () { - var fn; - var update; - var fetch; - var timefilter; + let fn; + let update; + let fetch; + let timefilter; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/timefilter/__tests__/diff_time.js b/src/ui/public/timefilter/__tests__/diff_time.js index 6c2e1ad35b455..5e0415ab8ba7a 100644 --- a/src/ui/public/timefilter/__tests__/diff_time.js +++ b/src/ui/public/timefilter/__tests__/diff_time.js @@ -4,10 +4,10 @@ var ngMock = require('ngMock'); describe('Timefilter service', function () { describe('time diff watcher', function () { - var fn; - var update; - var fetch; - var timefilter; + let fn; + let update; + let fetch; + let timefilter; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/timefilter/timefilter.js b/src/ui/public/timefilter/timefilter.js index cc81cf813daca..96b7b447ae025 100644 --- a/src/ui/public/timefilter/timefilter.js +++ b/src/ui/public/timefilter/timefilter.js @@ -77,7 +77,7 @@ define(function (require) { } Timefilter.prototype.get = function (indexPattern) { - var filter; + let filter; var timefield = indexPattern.timeFieldName && _.find(indexPattern.fields, {name: indexPattern.timeFieldName}); if (timefield) { diff --git a/src/ui/public/url/__tests__/url.js b/src/ui/public/url/__tests__/url.js index 321bb94718401..892a597591746 100644 --- a/src/ui/public/url/__tests__/url.js +++ b/src/ui/public/url/__tests__/url.js @@ -7,12 +7,12 @@ var _ = require('lodash'); var MockState = require('fixtures/mock_state'); // global vars, injected and mocked in init() -var kbnUrl; -var $route; -var $location; -var $rootScope; -var globalStateMock; -var appState; +let kbnUrl; +let $route; +let $location; +let $rootScope; +let globalStateMock; +let appState; require('ui/url'); @@ -374,8 +374,8 @@ describe('kbnUrl', function () { }); describe('_shouldAutoReload', function () { - var next; - var prev; + let next; + let prev; beforeEach(function () { $route.current = { diff --git a/src/ui/public/url/url.js b/src/ui/public/url/url.js index 85d903717a626..bede54413b9f7 100644 --- a/src/ui/public/url/url.js +++ b/src/ui/public/url/url.js @@ -140,7 +140,7 @@ define(function (require) { ///// // private api ///// - var reloading; + let reloading; self._changeLocation = function (type, url, paramObj, replace) { var prev = { diff --git a/src/ui/public/utils/__tests__/SimpleEmitter.js b/src/ui/public/utils/__tests__/SimpleEmitter.js index 04a6380ab8e96..65d9045f2dde8 100644 --- a/src/ui/public/utils/__tests__/SimpleEmitter.js +++ b/src/ui/public/utils/__tests__/SimpleEmitter.js @@ -2,7 +2,7 @@ describe('SimpleEmitter class', function () { var SimpleEmitter = require('ui/utils/SimpleEmitter'); var expect = require('expect.js'); var sinon = require('auto-release-sinon'); - var emitter; + let emitter; beforeEach(function () { emitter = new SimpleEmitter(); diff --git a/src/ui/public/utils/__tests__/datemath.js b/src/ui/public/utils/__tests__/datemath.js index 00a1995f43d8a..1fed8755297b9 100644 --- a/src/ui/public/utils/__tests__/datemath.js +++ b/src/ui/public/utils/__tests__/datemath.js @@ -10,7 +10,7 @@ describe('dateMath', function () { var anchor = '2014-01-01T06:06:06.666Z'; var unix = moment(anchor).valueOf(); var format = 'YYYY-MM-DDTHH:mm:ss.SSSZ'; - var clock; + let clock; describe('errors', function () { it('should return undefined if passed something falsy', function () { @@ -39,10 +39,10 @@ describe('dateMath', function () { }); describe('objects and strings', function () { - var mmnt; - var date; - var string; - var now; + let mmnt; + let date; + let string; + let now; beforeEach(function () { clock = sinon.useFakeTimers(unix); @@ -70,8 +70,8 @@ describe('dateMath', function () { }); describe('subtraction', function () { - var now; - var anchored; + let now; + let anchored; beforeEach(function () { clock = sinon.useFakeTimers(unix); @@ -94,8 +94,8 @@ describe('dateMath', function () { }); describe('addition', function () { - var now; - var anchored; + let now; + let anchored; beforeEach(function () { clock = sinon.useFakeTimers(unix); @@ -119,8 +119,8 @@ describe('dateMath', function () { }); describe('rounding', function () { - var now; - var anchored; + let now; + let anchored; beforeEach(function () { clock = sinon.useFakeTimers(unix); diff --git a/src/ui/public/utils/__tests__/diff_time_picker_vals.js b/src/ui/public/utils/__tests__/diff_time_picker_vals.js index 68c474a733ef3..6c27a1364a49c 100644 --- a/src/ui/public/utils/__tests__/diff_time_picker_vals.js +++ b/src/ui/public/utils/__tests__/diff_time_picker_vals.js @@ -4,7 +4,7 @@ var ngMock = require('ngMock'); var expect = require('expect.js'); describe('Diff Time Picker Values', function () { - var diffTimePickerValues; + let diffTimePickerValues; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/utils/dateMath.js b/src/ui/public/utils/dateMath.js index 5c1ea32b893de..dd4ac1aa5e43f 100644 --- a/src/ui/public/utils/dateMath.js +++ b/src/ui/public/utils/dateMath.js @@ -14,10 +14,10 @@ define(function (require) { if (moment.isMoment(text)) return text; if (_.isDate(text)) return moment(text); - var time; + let time; var mathString = ''; - var index; - var parseString; + let index; + let parseString; if (text.substring(0, 3) === 'now') { time = moment(); @@ -49,9 +49,9 @@ define(function (require) { while (i < len) { var c = mathString.charAt(i++); - var type; - var num; - var unit; + let type; + let num; + let unit; if (c === '/') { type = 0; diff --git a/src/ui/public/utils/query_string.js b/src/ui/public/utils/query_string.js index 02274179e4ca9..f0e28a56b1003 100644 --- a/src/ui/public/utils/query_string.js +++ b/src/ui/public/utils/query_string.js @@ -39,8 +39,8 @@ define(function (require) { */ qs.decode = function (keyValue) { var obj = {}; - var keyValueParts; - var key; + let keyValueParts; + let key; (keyValue || '').split('&').forEach(function (keyValue) { if (keyValue) { diff --git a/src/ui/public/utils/rison.js b/src/ui/public/utils/rison.js index 2dd955105f59d..c4932355e62fe 100644 --- a/src/ui/public/utils/rison.js +++ b/src/ui/public/utils/rison.js @@ -361,7 +361,7 @@ define(function () { rison.parser.parse_array = function (parser) { var ar = []; - var c; + let c; while ((c = parser.next()) != ')') { if (!c) return parser.error("unmatched '!('"); if (ar.length) { @@ -400,7 +400,7 @@ define(function () { }, '(': function () { var o = {}; - var c; + let c; var count = 0; while ((c = this.next()) != ')') { if (count) { @@ -425,7 +425,7 @@ define(function () { var i = this.index; var start = i; var segments = []; - var c; + let c; while ((c = s.charAt(i++)) != "'") { //if (i == s.length) return this.error('unmatched "\'"'); if (!c) return this.error('unmatched "\'"'); diff --git a/src/ui/public/vislib/__tests__/components/color.js b/src/ui/public/vislib/__tests__/components/color.js index ffd1545766c4b..15228bb4d3fd0 100644 --- a/src/ui/public/vislib/__tests__/components/color.js +++ b/src/ui/public/vislib/__tests__/components/color.js @@ -5,13 +5,13 @@ const _ = require('lodash'); const d3 = require('d3'); describe('Vislib Color Module Test Suite', function () { - var seedColors; - var mappedColors; + let seedColors; + let mappedColors; let config; describe('Color (main)', function () { let previousConfig; - var getColors; + let getColors; var arr = ['good', 'better', 'best', 'never', 'let', 'it', 'rest']; var arrayOfNumbers = [1, 2, 3, 4, 5]; var arrayOfUndefinedValues = [undefined, undefined, undefined]; @@ -20,8 +20,8 @@ describe('Vislib Color Module Test Suite', function () { var arrayOfNullValues = [null, null, null]; var emptyObject = {}; var nullValue = null; - var notAValue; - var color; + let notAValue; + let color; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject((Private, config) => { @@ -247,9 +247,9 @@ describe('Vislib Color Module Test Suite', function () { var nullValue = null; var emptyArr = []; var emptyObject = {}; - var notAValue; - var createColorPalette; - var colorPalette; + let notAValue; + let createColorPalette; + let colorPalette; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/vislib/__tests__/components/labels.js b/src/ui/public/vislib/__tests__/components/labels.js index 0882b20eb985c..d4cf64095084d 100644 --- a/src/ui/public/vislib/__tests__/components/labels.js +++ b/src/ui/public/vislib/__tests__/components/labels.js @@ -3,13 +3,13 @@ var _ = require('lodash'); var expect = require('expect.js'); var ngMock = require('ngMock'); -var getLabels; -var seriesLabels; -var rowsLabels; -var seriesArr; -var rowsArr; -var uniqLabels; -var error; +let getLabels; +let seriesLabels; +let rowsLabels; +let seriesArr; +let rowsArr; +let uniqLabels; +let error; var seriesData = { 'label': '', @@ -165,10 +165,10 @@ describe('Vislib Labels Module Test Suite', function () { var boolean = false; var emptyArray = []; var nullValue = null; - var notAValue; - var dataArray; - var testSeries; - var testRows; + let notAValue; + let dataArray; + let testSeries; + let testRows; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -262,7 +262,7 @@ describe('Vislib Labels Module Test Suite', function () { }); describe('Unique labels', function () { - var uniqLabels; + let uniqLabels; var arrObj = [ {'label': 'a'}, {'label': 'b'}, @@ -278,9 +278,9 @@ describe('Vislib Labels Module Test Suite', function () { var nullValue = null; var emptyObject = {}; var emptyArray = []; - var notAValue; - var uniq; - var testArr; + let notAValue; + let uniq; + let testArr; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -348,12 +348,12 @@ describe('Vislib Labels Module Test Suite', function () { }; var emptyObject = {}; var emptyArray = []; - var notAValue; - var getSeries; - var columnsLabels; - var rowsLabels; - var columnsArr; - var rowsArr; + let notAValue; + let getSeries; + let columnsLabels; + let rowsLabels; + let columnsArr; + let rowsArr; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/vislib/__tests__/components/zero_injection.js b/src/ui/public/vislib/__tests__/components/zero_injection.js index 5da63afb33a0a..eb628c9980b48 100644 --- a/src/ui/public/vislib/__tests__/components/zero_injection.js +++ b/src/ui/public/vislib/__tests__/components/zero_injection.js @@ -246,13 +246,13 @@ describe('Vislib Zero Injection Module Test Suite', function () { var boolean = false; var nullValue = null; var emptyArray = []; - var notAValue; + let notAValue; describe('Zero Injection (main)', function () { - var injectZeros; - var sample1; - var sample2; - var sample3; + let injectZeros; + let sample1; + let sample2; + let sample3; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -356,9 +356,9 @@ describe('Vislib Zero Injection Module Test Suite', function () { }); describe('Order X Values', function () { - var orderXValues; - var results; - var numberedResults; + let orderXValues; + let results; + let numberedResults; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -416,8 +416,8 @@ describe('Vislib Zero Injection Module Test Suite', function () { }); describe('Unique Keys', function () { - var uniqueKeys; - var results; + let uniqueKeys; + let results; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -465,8 +465,8 @@ describe('Vislib Zero Injection Module Test Suite', function () { }); describe('Flatten Data', function () { - var flattenData; - var results; + let flattenData; + let results; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -490,11 +490,11 @@ describe('Vislib Zero Injection Module Test Suite', function () { }); describe('Zero Filled Array', function () { - var createZeroArray; + let createZeroArray; var arr1 = [1, 2, 3, 4, 5]; var arr2 = ['1', '2', '3', '4', '5']; - var results1; - var results2; + let results1; + let results2; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -571,12 +571,12 @@ describe('Vislib Zero Injection Module Test Suite', function () { }); describe('Zero Filled Data Array', function () { - var zeroFillArray; + let zeroFillArray; var xValueArr = [1, 2, 3, 4, 5]; - var createZeroArray; - var arr1; + let createZeroArray; + let arr1; var arr2 = [ {x: 3, y: 834} ]; - var results; + let results; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -637,8 +637,8 @@ describe('Vislib Zero Injection Module Test Suite', function () { }); describe('Injected Zero values return in the correct order', function () { - var injectZeros; - var results; + let injectZeros; + let results; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/vislib/__tests__/index.js b/src/ui/public/vislib/__tests__/index.js index 9ebf1f24a6f1a..921f896db915c 100644 --- a/src/ui/public/vislib/__tests__/index.js +++ b/src/ui/public/vislib/__tests__/index.js @@ -8,7 +8,7 @@ require('ui/vislib/styles/main.less'); var angular = require('angular'); describe('Vislib Index Test Suite', function () { - var vislib; + let vislib; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/vislib/__tests__/lib/axis_title.js b/src/ui/public/vislib/__tests__/lib/axis_title.js index b5e45e9f599ee..9c8eac24e4444 100644 --- a/src/ui/public/vislib/__tests__/lib/axis_title.js +++ b/src/ui/public/vislib/__tests__/lib/axis_title.js @@ -6,14 +6,14 @@ var ngMock = require('ngMock'); var expect = require('expect.js'); describe('Vislib AxisTitle Class Test Suite', function () { - var AxisTitle; - var Data; - var PersistedState; - var axisTitle; - var el; - var dataObj; - var xTitle; - var yTitle; + let AxisTitle; + let Data; + let PersistedState; + let axisTitle; + let el; + let dataObj; + let xTitle; + let yTitle; var data = { hits: 621, label: '', diff --git a/src/ui/public/vislib/__tests__/lib/chart_title.js b/src/ui/public/vislib/__tests__/lib/chart_title.js index 8a79ad901585d..948f683323ae5 100644 --- a/src/ui/public/vislib/__tests__/lib/chart_title.js +++ b/src/ui/public/vislib/__tests__/lib/chart_title.js @@ -6,12 +6,12 @@ var ngMock = require('ngMock'); var expect = require('expect.js'); describe('Vislib ChartTitle Class Test Suite', function () { - var ChartTitle; - var Data; - var persistedState; - var chartTitle; - var el; - var dataObj; + let ChartTitle; + let Data; + let persistedState; + let chartTitle; + let el; + let dataObj; var data = { hits: 621, label: '', diff --git a/src/ui/public/vislib/__tests__/lib/data.js b/src/ui/public/vislib/__tests__/lib/data.js index 83ee9f3ba4d55..f6bf399865c9a 100644 --- a/src/ui/public/vislib/__tests__/lib/data.js +++ b/src/ui/public/vislib/__tests__/lib/data.js @@ -100,8 +100,8 @@ var colsData = { }; describe('Vislib Data Class Test Suite', function () { - var Data; - var persistedState; + let Data; + let persistedState; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -200,7 +200,7 @@ describe('Vislib Data Class Test Suite', function () { describe('_removeZeroSlices', function () { - var data; + let data; var pieData = { slices: { children: [ @@ -222,12 +222,12 @@ describe('Vislib Data Class Test Suite', function () { }); describe('Data.flatten', function () { - var serIn; - var rowIn; - var colIn; - var serOut; - var rowOut; - var colOut; + let serIn; + let rowIn; + let colIn; + let serOut; + let rowOut; + let colOut; beforeEach(function () { serIn = new Data(seriesData, {}, persistedState); @@ -261,9 +261,9 @@ describe('Vislib Data Class Test Suite', function () { }); describe('getYMin method', function () { - var visData; - var visDataNeg; - var visDataStacked; + let visData; + let visDataNeg; + let visDataStacked; var minValue = 4; var minValueNeg = -41; var minValueStacked = 15; @@ -298,9 +298,9 @@ describe('Vislib Data Class Test Suite', function () { }); describe('getYMax method', function () { - var visData; - var visDataNeg; - var visDataStacked; + let visData; + let visDataNeg; + let visDataStacked; var maxValue = 41; var maxValueNeg = -4; var maxValueStacked = 115; @@ -335,7 +335,7 @@ describe('Vislib Data Class Test Suite', function () { }); describe('geohashGrid methods', function () { - var data; + let data; var geohashGridData = { hits: 3954, rows: [{ diff --git a/src/ui/public/vislib/__tests__/lib/dispatch.js b/src/ui/public/vislib/__tests__/lib/dispatch.js index 668afd5b7280d..125ff4a1f65ba 100644 --- a/src/ui/public/vislib/__tests__/lib/dispatch.js +++ b/src/ui/public/vislib/__tests__/lib/dispatch.js @@ -20,9 +20,9 @@ describe('Vislib Dispatch Class Test Suite', function () { } describe('', function () { - var vis; - var persistedState; - var SimpleEmitter; + let vis; + let persistedState; + let SimpleEmitter; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -46,8 +46,8 @@ describe('Vislib Dispatch Class Test Suite', function () { }); describe('Stock event handlers', function () { - var vis; - var persistedState; + let vis; + let persistedState; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -117,9 +117,9 @@ describe('Vislib Dispatch Class Test Suite', function () { describe('Custom event handlers', function () { it('should attach whatever gets passed on vis.on() to chart.events', function (done) { - var vis; - var persistedState; - var chart; + let vis; + let persistedState; + let chart; ngMock.module('kibana'); ngMock.inject(function (Private) { vis = Private(require('fixtures/vislib/_vis_fixture'))(); @@ -137,9 +137,9 @@ describe('Vislib Dispatch Class Test Suite', function () { }); it('can be added after rendering', function () { - var vis; - var persistedState; - var chart; + let vis; + let persistedState; + let chart; ngMock.module('kibana'); ngMock.inject(function (Private) { vis = Private(require('fixtures/vislib/_vis_fixture'))(); diff --git a/src/ui/public/vislib/__tests__/lib/error_handler.js b/src/ui/public/vislib/__tests__/lib/error_handler.js index a56e3135c6472..64049675f3d02 100644 --- a/src/ui/public/vislib/__tests__/lib/error_handler.js +++ b/src/ui/public/vislib/__tests__/lib/error_handler.js @@ -4,8 +4,8 @@ var angular = require('angular'); var ngMock = require('ngMock'); describe('Vislib ErrorHandler Test Suite', function () { - var ErrorHandler; - var errorHandler; + let ErrorHandler; + let errorHandler; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/vislib/__tests__/lib/handler/handler.js b/src/ui/public/vislib/__tests__/lib/handler/handler.js index ba09f34823e04..43bc998fb325c 100644 --- a/src/ui/public/vislib/__tests__/lib/handler/handler.js +++ b/src/ui/public/vislib/__tests__/lib/handler/handler.js @@ -24,9 +24,9 @@ var names = [ dateHistogramArray.forEach(function (data, i) { describe('Vislib Handler Test Suite for ' + names[i] + ' Data', function () { - var Handler; - var vis; - var persistedState; + let Handler; + let vis; + let persistedState; var events = [ 'click', 'brush' @@ -55,7 +55,7 @@ dateHistogramArray.forEach(function (data, i) { }); describe('enable Method', function () { - var charts; + let charts; beforeEach(function () { charts = vis.handler.charts; @@ -77,7 +77,7 @@ dateHistogramArray.forEach(function (data, i) { }); describe('disable Method', function () { - var charts; + let charts; beforeEach(function () { charts = vis.handler.charts; diff --git a/src/ui/public/vislib/__tests__/lib/layout/layout.js b/src/ui/public/vislib/__tests__/lib/layout/layout.js index f10949009c951..eb9921088950f 100644 --- a/src/ui/public/vislib/__tests__/lib/layout/layout.js +++ b/src/ui/public/vislib/__tests__/lib/layout/layout.js @@ -24,11 +24,11 @@ var names = [ dateHistogramArray.forEach(function (data, i) { describe('Vislib Layout Class Test Suite for ' + names[i] + ' Data', function () { - var Layout; - var vis; - var persistedState; - var numberOfCharts; - var testLayout; + let Layout; + let vis; + let persistedState; + let numberOfCharts; + let testLayout; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/vislib/__tests__/lib/layout/layout_types.js b/src/ui/public/vislib/__tests__/lib/layout/layout_types.js index a60a188a3f854..c85a2561e8da0 100644 --- a/src/ui/public/vislib/__tests__/lib/layout/layout_types.js +++ b/src/ui/public/vislib/__tests__/lib/layout/layout_types.js @@ -4,8 +4,8 @@ var ngMock = require('ngMock'); var expect = require('expect.js'); describe('Vislib Layout Types Test Suite', function () { - var layoutType; - var layoutFunc; + let layoutType; + let layoutFunc; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js b/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js index 9cb339150214c..f83b8320d21dc 100644 --- a/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js +++ b/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js @@ -6,11 +6,11 @@ var expect = require('expect.js'); describe('Vislib Split Function Test Suite', function () { describe('Column Chart', function () { - var chartSplit; - var chartTitleSplit; - var xAxisSplit; - var yAxisSplit; - var el; + let chartSplit; + let chartTitleSplit; + let xAxisSplit; + let yAxisSplit; + let el; var data = { rows: [ { @@ -149,7 +149,7 @@ describe('Vislib Split Function Test Suite', function () { }); describe('chart split function', function () { - var fixture; + let fixture; beforeEach(ngMock.inject(function () { fixture = d3.select('.visualization').call(chartSplit); @@ -169,8 +169,8 @@ describe('Vislib Split Function Test Suite', function () { }); describe('chart title split function', function () { - var newEl; - var fixture; + let newEl; + let fixture; beforeEach(ngMock.inject(function () { el.append('div').attr('class', 'x-axis-chart-title'); @@ -209,8 +209,8 @@ describe('Vislib Split Function Test Suite', function () { }); describe('x axis split function', function () { - var fixture; - var divs; + let fixture; + let divs; beforeEach(ngMock.inject(function () { fixture = d3.select('body').append('div') @@ -231,8 +231,8 @@ describe('Vislib Split Function Test Suite', function () { }); describe('y axis split function', function () { - var fixture; - var divs; + let fixture; + let divs; beforeEach(ngMock.inject(function () { fixture = d3.select('body').append('div') diff --git a/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js b/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js index ceef4687ee1d7..c0dc4ea100d72 100644 --- a/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js +++ b/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js @@ -5,9 +5,9 @@ var ngMock = require('ngMock'); var expect = require('expect.js'); describe('Vislib Column Layout Test Suite', function () { - var layoutType; - var columnLayout; - var el; + let layoutType; + let columnLayout; + let el; var data = { hits: 621, label: '', diff --git a/src/ui/public/vislib/__tests__/lib/resize_checker.js b/src/ui/public/vislib/__tests__/lib/resize_checker.js index 17f8610c69b8f..5841e0f35a8f8 100644 --- a/src/ui/public/vislib/__tests__/lib/resize_checker.js +++ b/src/ui/public/vislib/__tests__/lib/resize_checker.js @@ -9,10 +9,10 @@ describe('Vislib Resize Checker', function () { var sinon = require('auto-release-sinon'); require('testUtils/noDigestPromises').activateForSuite(); - var ResizeChecker; - var EventEmitter; - var checker; - var reflowWatcher; + let ResizeChecker; + let EventEmitter; + let checker; + let reflowWatcher; var reflowSpies = {}; beforeEach(ngMock.module('kibana')); @@ -93,7 +93,7 @@ describe('Vislib Resize Checker', function () { }); describe('#check()', function () { - var emit; + let emit; beforeEach(function () { emit = sinon.stub(checker, 'emit'); @@ -158,8 +158,8 @@ describe('Vislib Resize Checker', function () { }); describe('scheduling', function () { - var clock; - var schedule; + let clock; + let schedule; beforeEach(function () { // prevent the checker from running automatically diff --git a/src/ui/public/vislib/__tests__/lib/x_axis.js b/src/ui/public/vislib/__tests__/lib/x_axis.js index a338f0ac34665..c8b1c05236d64 100644 --- a/src/ui/public/vislib/__tests__/lib/x_axis.js +++ b/src/ui/public/vislib/__tests__/lib/x_axis.js @@ -6,13 +6,13 @@ var ngMock = require('ngMock'); var expect = require('expect.js'); describe('Vislib xAxis Class Test Suite', function () { - var XAxis; - var Data; - var persistedState; - var xAxis; - var el; - var fixture; - var dataObj; + let XAxis; + let Data; + let persistedState; + let xAxis; + let el; + let fixture; + let dataObj; var data = { hits: 621, label: '', @@ -124,13 +124,13 @@ describe('Vislib xAxis Class Test Suite', function () { }); describe('getScale, getDomain, getTimeDomain, getOrdinalDomain, and getRange Methods', function () { - var ordered; - var timeScale; - var timeDomain; - var ordinalScale; - var ordinalDomain; - var width; - var range; + let ordered; + let timeScale; + let timeDomain; + let ordinalScale; + let ordinalDomain; + let width; + let range; beforeEach(function () { timeScale = xAxis.getScale(); @@ -173,8 +173,8 @@ describe('Vislib xAxis Class Test Suite', function () { }); describe('getXScale Method', function () { - var width; - var xScale; + let width; + let xScale; beforeEach(function () { width = $('.x-axis-div').width(); @@ -197,8 +197,8 @@ describe('Vislib xAxis Class Test Suite', function () { }); describe('getXAxis Method', function () { - var width; - var axis; + let width; + let axis; beforeEach(function () { width = $('.x-axis-div').width(); diff --git a/src/ui/public/vislib/__tests__/lib/y_axis.js b/src/ui/public/vislib/__tests__/lib/y_axis.js index e32d0da0ea72d..9eef839ed6edf 100644 --- a/src/ui/public/vislib/__tests__/lib/y_axis.js +++ b/src/ui/public/vislib/__tests__/lib/y_axis.js @@ -4,13 +4,13 @@ var $ = require('jquery'); var ngMock = require('ngMock'); var expect = require('expect.js'); -var YAxis; -var Data; -var persistedState; -var el; -var buildYAxis; -var yAxis; -var yAxisDiv; +let YAxis; +let Data; +let persistedState; +let el; +let buildYAxis; +let yAxis; +let yAxisDiv; var timeSeries = [ 1408734060000, @@ -127,9 +127,9 @@ describe('Vislib yAxis Class Test Suite', function () { }); describe('getYScale Method', function () { - var yScale; - var graphData; - var domain; + let yScale; + let graphData; + let domain; var height = 50; function checkDomain(min, max) { @@ -156,8 +156,8 @@ describe('Vislib yAxis Class Test Suite', function () { }); describe('should return log values', function () { - var domain; - var extents; + let domain; + let extents; it('should return 1', function () { yAxis._attr.scale = 'log'; @@ -322,9 +322,9 @@ describe('Vislib yAxis Class Test Suite', function () { }); describe('getYAxis method', function () { - var mode; - var yMax; - var yScale; + let mode; + let yMax; + let yScale; beforeEach(function () { createData(defaultGraphData); mode = yAxis._attr.mode; diff --git a/src/ui/public/vislib/__tests__/vis.js b/src/ui/public/vislib/__tests__/vis.js index 38a7732d90d38..f6baec7a07a12 100644 --- a/src/ui/public/vislib/__tests__/vis.js +++ b/src/ui/public/vislib/__tests__/vis.js @@ -28,10 +28,10 @@ dataArray.forEach(function (data, i) { describe('Vislib Vis Test Suite for ' + names[i] + ' Data', function () { var beforeEvent = 'click'; var afterEvent = 'brush'; - var vis; - var persistedState; - var secondVis; - var numberOfCharts; + let vis; + let persistedState; + let secondVis; + let numberOfCharts; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -131,9 +131,9 @@ dataArray.forEach(function (data, i) { beforeEvent, afterEvent ]; - var listeners; - var listener1; - var listener2; + let listeners; + let listener1; + let listener2; beforeEach(function () { listeners = [ @@ -181,9 +181,9 @@ dataArray.forEach(function (data, i) { }); describe('off Method', function () { - var listeners; - var listener1; - var listener2; + let listeners; + let listener1; + let listener2; beforeEach(function () { listeners = []; diff --git a/src/ui/public/vislib/__tests__/visualizations/area_chart.js b/src/ui/public/vislib/__tests__/visualizations/area_chart.js index 07245e525007d..efb0d1f09332b 100644 --- a/src/ui/public/vislib/__tests__/visualizations/area_chart.js +++ b/src/ui/public/vislib/__tests__/visualizations/area_chart.js @@ -25,8 +25,8 @@ var visLibParams = { _.forOwn(someOtherVariables, function (variablesAreCool, imaVariable) { describe('Vislib Area Chart Test Suite for ' + imaVariable + ' Data', function () { - var vis; - var persistedState; + let vis; + let persistedState; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -74,8 +74,8 @@ _.forOwn(someOtherVariables, function (variablesAreCool, imaVariable) { }); describe('stackData method', function () { - var stackedData; - var isStacked; + let stackedData; + let isStacked; beforeEach(function () { vis.handler.charts.forEach(function (chart) { @@ -103,12 +103,12 @@ _.forOwn(someOtherVariables, function (variablesAreCool, imaVariable) { }); describe('addCircleEvents method', function () { - var circle; - var brush; - var d3selectedCircle; - var onBrush; - var onClick; - var onMouseOver; + let circle; + let brush; + let d3selectedCircle; + let onBrush; + let onClick; + let onMouseOver; beforeEach(ngMock.inject(function () { vis.handler.charts.forEach(function (chart) { diff --git a/src/ui/public/vislib/__tests__/visualizations/chart.js b/src/ui/public/vislib/__tests__/visualizations/chart.js index b4c5b88b620ed..71571e8cb186c 100644 --- a/src/ui/public/vislib/__tests__/visualizations/chart.js +++ b/src/ui/public/vislib/__tests__/visualizations/chart.js @@ -4,16 +4,16 @@ var expect = require('expect.js'); var ngMock = require('ngMock'); describe('Vislib _chart Test Suite', function () { - var ColumnChart; - var Chart; - var Data; - var persistedState; - var Vis; + let ColumnChart; + let Chart; + let Data; + let persistedState; + let Vis; var chartData = {}; - var vis; - var el; - var myChart; - var config; + let vis; + let el; + let myChart; + let config; var data = { hits : 621, label : '', diff --git a/src/ui/public/vislib/__tests__/visualizations/column_chart.js b/src/ui/public/vislib/__tests__/visualizations/column_chart.js index 78351a44578cb..97f5e814e7816 100644 --- a/src/ui/public/vislib/__tests__/visualizations/column_chart.js +++ b/src/ui/public/vislib/__tests__/visualizations/column_chart.js @@ -30,8 +30,8 @@ dataTypesArray.forEach(function (dataType, i) { var data = dataType[2]; describe('Vislib Column Chart Test Suite for ' + name + ' Data', function () { - var vis; - var persistedState; + let vis; + let persistedState; var visLibParams = { type: 'histogram', hasTimeField: true, @@ -54,8 +54,8 @@ dataTypesArray.forEach(function (dataType, i) { }); describe('stackData method', function () { - var stackedData; - var isStacked; + let stackedData; + let isStacked; beforeEach(function () { vis.handler.charts.forEach(function (chart) { @@ -76,9 +76,9 @@ dataTypesArray.forEach(function (dataType, i) { describe('addBars method', function () { it('should append rects', function () { - var numOfSeries; - var numOfValues; - var product; + let numOfSeries; + let numOfValues; + let product; vis.handler.charts.forEach(function (chart) { numOfSeries = chart.chartData.series.length; diff --git a/src/ui/public/vislib/__tests__/visualizations/line_chart.js b/src/ui/public/vislib/__tests__/visualizations/line_chart.js index 46c6529c7fd66..c5187c79b1e77 100644 --- a/src/ui/public/vislib/__tests__/visualizations/line_chart.js +++ b/src/ui/public/vislib/__tests__/visualizations/line_chart.js @@ -28,8 +28,8 @@ describe('Vislib Line Chart', function () { var data = type[1]; describe(name + ' Data', function () { - var vis; - var persistedState; + let vis; + let persistedState; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -52,12 +52,12 @@ describe('Vislib Line Chart', function () { }); describe('addCircleEvents method', function () { - var circle; - var brush; - var d3selectedCircle; - var onBrush; - var onClick; - var onMouseOver; + let circle; + let brush; + let d3selectedCircle; + let onBrush; + let onClick; + let onMouseOver; beforeEach(ngMock.inject(function () { vis.handler.charts.forEach(function (chart) { diff --git a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js index d7da631189466..942c7f76310e7 100644 --- a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js +++ b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js @@ -60,14 +60,14 @@ describe('No global chart settings', function () { addLegend: true, addTooltip: true }; - var chart1; - var chart2; - var Vis; - var persistedState; - var indexPattern; - var buildHierarchicalData; - var data1; - var data2; + let chart1; + let chart2; + let Vis; + let persistedState; + let indexPattern; + let buildHierarchicalData; + let data1; + let data2; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -157,12 +157,12 @@ aggArray.forEach(function (dataAgg, i) { addLegend: true, addTooltip: true }; - var vis; - var Vis; - var persistedState; - var indexPattern; - var buildHierarchicalData; - var data; + let vis; + let Vis; + let persistedState; + let indexPattern; + let buildHierarchicalData; + let data; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -192,10 +192,10 @@ aggArray.forEach(function (dataAgg, i) { }); describe('addPathEvents method', function () { - var path; - var d3selectedPath; - var onClick; - var onMouseOver; + let path; + let d3selectedPath; + let onClick; + let onMouseOver; beforeEach(function () { vis.handler.charts.forEach(function (chart) { @@ -222,10 +222,10 @@ aggArray.forEach(function (dataAgg, i) { }); describe('addPath method', function () { - var width; - var height; - var svg; - var slices; + let width; + let height; + let svg; + let slices; beforeEach(ngMock.inject(function () { vis.handler.charts.forEach(function (chart) { diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js index c10ef8dde5dff..5617348cc59b9 100644 --- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js +++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js @@ -25,7 +25,7 @@ var geoJsonData = require('fixtures/vislib/mock_data/geohash/_geo_json'); describe('TileMap Map Tests', function () { var $mockMapEl = $('
'); - var TileMapMap; + let TileMapMap; var leafletStubs = {}; var leafletMocks = {}; @@ -43,8 +43,8 @@ describe('TileMap Map Tests', function () { })); describe('instantiation', function () { - var map; - var createStub; + let map; + let createStub; beforeEach(function () { createStub = sinon.stub(TileMapMap.prototype, '_createMap', _.noop); @@ -65,8 +65,8 @@ describe('TileMap Map Tests', function () { }); describe('createMap', function () { - var map; - var mapStubs; + let map; + let mapStubs; beforeEach(function () { mapStubs = { @@ -109,7 +109,7 @@ describe('TileMap Map Tests', function () { }); describe('attachEvents', function () { - var map; + let map; beforeEach(function () { sinon.stub(TileMapMap.prototype, '_createMap', function () { @@ -144,8 +144,8 @@ describe('TileMap Map Tests', function () { describe('addMarkers', function () { - var map; - var createStub; + let map; + let createStub; beforeEach(function () { sinon.stub(TileMapMap.prototype, '_createMap'); @@ -172,7 +172,7 @@ describe('TileMap Map Tests', function () { }); describe('getDataRectangles', function () { - var map; + let map; beforeEach(function () { sinon.stub(TileMapMap.prototype, '_createMap'); diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js index a81ec200150bb..bd6f34e2f337a 100644 --- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js +++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js @@ -11,8 +11,8 @@ var geoJsonData = require('fixtures/vislib/mock_data/geohash/_geo_json'); var defaultSWCoords = [13.496, -143.789]; var defaultNECoords = [55.526, -57.919]; var bounds = {}; -var MarkerType; -var map; +let MarkerType; +let map; angular.module('MarkerFactory', ['kibana']); @@ -35,8 +35,8 @@ var mockMap = { }; describe('Marker Tests', function () { - var mapData; - var markerLayer; + let mapData; + let markerLayer; function createMarker(MarkerClass, geoJson) { mapData = _.assign({}, geoJsonData.geoJson, geoJson || {}); @@ -60,7 +60,7 @@ describe('Marker Tests', function () { }); describe('Base Methods', function () { - var MarkerClass; + let MarkerClass; beforeEach(ngMock.module('MarkerFactory')); beforeEach(ngMock.inject(function (Private) { @@ -139,7 +139,7 @@ describe('Marker Tests', function () { describe('showTooltip', function () { it('should use the tooltip formatter', function () { - var content; + let content; var sample = _.sample(mapData.features); var stub = sinon.stub(markerLayer, '_tooltipFormatter', function (val) { @@ -154,8 +154,8 @@ describe('Marker Tests', function () { }); describe('addLegend', function () { - var addToSpy; - var leafletControlStub; + let addToSpy; + let leafletControlStub; beforeEach(function () { addToSpy = sinon.spy(); @@ -214,7 +214,7 @@ describe('Marker Tests', function () { }); describe('Scaled Circles', function () { - var zoom; + let zoom; beforeEach(ngMock.module('MarkerFactory')); beforeEach(ngMock.inject(function (Private) { @@ -270,7 +270,7 @@ describe('Marker Tests', function () { })); describe('dataToHeatArray', function () { - var max; + let max; beforeEach(function () { max = mapData.properties.allmax; diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js index 74c520a756b65..632ff499fc0b5 100644 --- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js +++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js @@ -9,8 +9,8 @@ var geoJsonData = require('fixtures/vislib/mock_data/geohash/_geo_json'); var MockMap = require('fixtures/tilemap_map'); var mockChartEl = $('
'); -var TileMap; -var extentsStub; +let TileMap; +let extentsStub; function createTileMap(handler, chartEl, chartData) { handler = handler || {}; @@ -22,7 +22,7 @@ function createTileMap(handler, chartEl, chartData) { } describe('TileMap Tests', function () { - var tilemap; + let tilemap; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -58,7 +58,7 @@ describe('TileMap Tests', function () { }); describe('appendMap', function () { - var $selection; + let $selection; beforeEach(function () { $selection = $('
'); diff --git a/src/ui/public/vislib/__tests__/visualizations/time_marker.js b/src/ui/public/vislib/__tests__/visualizations/time_marker.js index b60bd0cab4b6f..e34b66ef1fb13 100644 --- a/src/ui/public/vislib/__tests__/visualizations/time_marker.js +++ b/src/ui/public/vislib/__tests__/visualizations/time_marker.js @@ -32,14 +32,14 @@ describe('Vislib Time Marker Test Suite', function () { }); }; var times = []; - var TimeMarker; - var defaultMarker; - var customMarker; - var selection; - var xScale; - var minDomain; - var maxDomain; - var domain; + let TimeMarker; + let defaultMarker; + let customMarker; + let selection; + let xScale; + let minDomain; + let maxDomain; + let domain; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -62,8 +62,8 @@ describe('Vislib Time Marker Test Suite', function () { }); describe('_isTimeBaseChart method', function () { - var boolean; - var newSelection; + let boolean; + let newSelection; it('should return true when data is time based', function () { boolean = defaultMarker._isTimeBasedChart(selection); @@ -78,7 +78,7 @@ describe('Vislib Time Marker Test Suite', function () { }); describe('render method', function () { - var lineArray; + let lineArray; beforeEach(function () { defaultMarker.render(selection); diff --git a/src/ui/public/vislib/__tests__/visualizations/vis_types.js b/src/ui/public/vislib/__tests__/visualizations/vis_types.js index 24a401ab89aeb..7341d20419ca4 100644 --- a/src/ui/public/vislib/__tests__/visualizations/vis_types.js +++ b/src/ui/public/vislib/__tests__/visualizations/vis_types.js @@ -4,8 +4,8 @@ var ngMock = require('ngMock'); var _ = require('lodash'); describe('Vislib Vis Types Test Suite', function () { - var visTypes; - var visFunc; + let visTypes; + let visFunc; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/vislib/components/Tooltip/__tests__/positioning.js b/src/ui/public/vislib/components/Tooltip/__tests__/positioning.js index e205afaf1cc73..65337332cc412 100644 --- a/src/ui/public/vislib/components/Tooltip/__tests__/positioning.js +++ b/src/ui/public/vislib/components/Tooltip/__tests__/positioning.js @@ -8,10 +8,10 @@ describe('Tooltip Positioning', function () { var posTT = require('../positionTooltip'); var positions = ['north', 'south', 'east', 'west']; var bounds = ['top', 'left', 'bottom', 'right']; - var $window; - var $chart; - var $tooltip; - var $sizer; + let $window; + let $chart; + let $tooltip; + let $sizer; function testEl(width, height, $children) { var $el = $('
'); diff --git a/src/ui/public/vislib/components/Tooltip/positionTooltip.js b/src/ui/public/vislib/components/Tooltip/positionTooltip.js index cd299af804d34..a636d763853ba 100644 --- a/src/ui/public/vislib/components/Tooltip/positionTooltip.js +++ b/src/ui/public/vislib/components/Tooltip/positionTooltip.js @@ -2,7 +2,7 @@ var _ = require('lodash'); var $ = require('jquery'); var OFFSET = 10; -var $clone; +let $clone; // translate css properties into their basic direction var propDirs = { @@ -95,8 +95,8 @@ function pickPlacement(prop, pos, overflow, prev, pref, fallback, placement) { // list of directions in order of preference var dirs = _.unique([prev[stash], pref, fallback].filter(Boolean)); - var dir; - var value; + let dir; + let value; // find the first direction that doesn't overflow for (var i = 0; i < dirs.length; i++) { diff --git a/src/ui/public/vislib/components/zero_injection/flatten_data.js b/src/ui/public/vislib/components/zero_injection/flatten_data.js index 1f5a73fb3d9b5..b55dd2e103c7b 100644 --- a/src/ui/public/vislib/components/zero_injection/flatten_data.js +++ b/src/ui/public/vislib/components/zero_injection/flatten_data.js @@ -8,7 +8,7 @@ define(function (require) { */ return function (obj) { - var charts; + let charts; if (!_.isObject(obj) || !obj.rows && !obj.columns && !obj.series) { throw new TypeError('FlattenDataObjUtilService expects an object with a series, rows, or columns key'); diff --git a/src/ui/public/vislib/components/zero_injection/uniq_keys.js b/src/ui/public/vislib/components/zero_injection/uniq_keys.js index 848cd6044827d..3495c2b395786 100644 --- a/src/ui/public/vislib/components/zero_injection/uniq_keys.js +++ b/src/ui/public/vislib/components/zero_injection/uniq_keys.js @@ -19,7 +19,7 @@ define(function (require) { var flattenedData = flattenDataArray(obj); var uniqueXValues = new Map(); - var charts; + let charts; if (!obj.series) { charts = obj.rows ? obj.rows : obj.columns; } else { diff --git a/src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js b/src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js index dd89d2644400f..3845958f8a995 100644 --- a/src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js +++ b/src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js @@ -13,9 +13,9 @@ define(function (require) { throw new TypeError('ZeroFillDataArrayUtilService expects 2 arrays'); } - var i; - var val; - var index; + let i; + let val; + let index; var max = arr2.length; var getX = function (d) { diff --git a/src/ui/public/vislib/lib/chart_title.js b/src/ui/public/vislib/lib/chart_title.js index 9ca6eb9a4f9bb..bb4bed32901fc 100644 --- a/src/ui/public/vislib/lib/chart_title.js +++ b/src/ui/public/vislib/lib/chart_title.js @@ -56,9 +56,9 @@ define(function (require) { var n = text[0].length; var maxWidth = size / n * 0.9; var length = this.getComputedTextLength(); - var str; - var avg; - var end; + let str; + let avg; + let end; if (length > maxWidth) { str = text.text(); diff --git a/src/ui/public/vislib/lib/data.js b/src/ui/public/vislib/lib/data.js index 756540b50b470..23a76ef9a42d0 100644 --- a/src/ui/public/vislib/lib/data.js +++ b/src/ui/public/vislib/lib/data.js @@ -26,7 +26,7 @@ define(function (require) { this.uiState = uiState; var self = this; - var offset; + let offset; if (attr.mode === 'stacked') { offset = 'zero'; @@ -212,7 +212,7 @@ define(function (require) { Data.prototype.getDataType = function () { var data = this.getVisData(); - var type; + let type; data.forEach(function (obj) { if (obj.series) { @@ -249,7 +249,7 @@ define(function (require) { * @returns {*} Array of chart data objects */ Data.prototype.getVisData = function () { - var visData; + let visData; if (this.data.rows) { visData = this.data.rows; @@ -698,7 +698,7 @@ define(function (require) { * @returns {Array} min and max values */ Data.prototype.mapDataExtents = function (series) { - var values; + let values; values = _.map(series.rows, function (row) { return row[row.length - 1]; }); diff --git a/src/ui/public/vislib/lib/handler/types/point_series.js b/src/ui/public/vislib/lib/handler/types/point_series.js index 69c345ccaefb3..81756b4a5b9e4 100644 --- a/src/ui/public/vislib/lib/handler/types/point_series.js +++ b/src/ui/public/vislib/lib/handler/types/point_series.js @@ -18,7 +18,7 @@ define(function (require) { return function (vis) { var isUserDefinedYAxis = vis._attr.setYExtents; - var data; + let data; if (opts.zeroFill) { data = new Data(injectZeros(vis.data), vis._attr, vis.uiState); diff --git a/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js index e9f00a8d642f1..cf6888a1ac9c6 100644 --- a/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js +++ b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js @@ -19,7 +19,7 @@ define(function () { return 'chart-wrapper'; } }); - var divClass; + let divClass; var charts = div.selectAll('charts') .append('div') diff --git a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js index e1299da592f8a..708fd996be7b0 100644 --- a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js +++ b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js @@ -20,7 +20,7 @@ define(function () { return 'chart-wrapper'; } }); - var divClass; + let divClass; var charts = div.selectAll('charts') .append('div') diff --git a/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js b/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js index f1af47399684a..ced1988190f03 100644 --- a/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js +++ b/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js @@ -20,7 +20,7 @@ define(function () { return 'chart-wrapper'; } }); - var divClass; + let divClass; var charts = div.selectAll('charts') .append('div') diff --git a/src/ui/public/vislib/lib/x_axis.js b/src/ui/public/vislib/lib/x_axis.js index 2c12b0e6f2f12..dcdb208177da7 100644 --- a/src/ui/public/vislib/lib/x_axis.js +++ b/src/ui/public/vislib/lib/x_axis.js @@ -236,12 +236,12 @@ define(function (require) { */ XAxis.prototype.draw = function () { var self = this; - var div; - var width; - var height; - var svg; - var parentWidth; - var n; + let div; + let width; + let height; + let svg; + let parentWidth; + let n; this._attr.isRotated = false; return function (selection) { @@ -285,8 +285,8 @@ define(function (require) { XAxis.prototype.filterOrRotate = function () { var self = this; var ordered = self.ordered; - var axis; - var labels; + let axis; + let labels; return function (selection) { selection.each(function () { @@ -313,13 +313,13 @@ define(function (require) { */ XAxis.prototype.rotateAxisLabels = function () { var self = this; - var text; + let text; var barWidth = self.xScale.rangeBand(); var maxRotatedLength = 180; var xAxisPadding = 15; - var svg; + let svg; var lengths = []; - var length; + let length; self._attr.isRotated = false; return function (selection) { @@ -398,11 +398,11 @@ define(function (require) { XAxis.prototype.filterAxisLabels = function () { var self = this; var startX = 0; - var maxW; - var par; - var myX; - var myWidth; - var halfWidth; + let maxW; + let par; + let myX; + let myWidth; + let halfWidth; var padding = 1.1; return function (selection) { @@ -436,10 +436,10 @@ define(function (require) { */ XAxis.prototype.fitTitles = function () { var visEls = $('.vis-wrapper'); - var xAxisChartTitle; - var yAxisChartTitle; - var text; - var titles; + let xAxisChartTitle; + let yAxisChartTitle; + let text; + let titles; return function () { diff --git a/src/ui/public/vislib/visualizations/area_chart.js b/src/ui/public/vislib/visualizations/area_chart.js index dd1172ee499b2..da98212fe1312 100644 --- a/src/ui/public/vislib/visualizations/area_chart.js +++ b/src/ui/public/vislib/visualizations/area_chart.js @@ -172,8 +172,8 @@ define(function (require) { var tooltip = this.tooltip; var isTooltip = this._attr.addTooltip; var isOverlapping = this.isOverlapping; - var layer; - var circles; + let layer; + let circles; layer = svg.selectAll('.points') .data(data) @@ -296,14 +296,14 @@ define(function (require) { var minHeight = 20; var addTimeMarker = this._attr.addTimeMarker; var times = this._attr.times || []; - var timeMarker; - var div; - var svg; - var width; - var height; - var layers; - var circles; - var path; + let timeMarker; + let div; + let svg; + let width; + let height; + let layers; + let circles; + let path; return function (selection) { selection.each(function (data) { diff --git a/src/ui/public/vislib/visualizations/column_chart.js b/src/ui/public/vislib/visualizations/column_chart.js index b981a4dc86eac..c6cbfb3950af0 100644 --- a/src/ui/public/vislib/visualizations/column_chart.js +++ b/src/ui/public/vislib/visualizations/column_chart.js @@ -49,8 +49,8 @@ define(function (require) { var color = this.handler.data.getColorFunc(); var tooltip = this.tooltip; var isTooltip = this._attr.addTooltip; - var layer; - var bars; + let layer; + let bars; layer = svg.selectAll('.layer') .data(layers) @@ -118,7 +118,7 @@ define(function (require) { var yMin = this.handler.yAxis.yScale.domain()[0]; var self = this; - var barWidth; + let barWidth; if (data.ordered && data.ordered.date) { var start = data.ordered.min; var end = moment(data.ordered.min).add(data.ordered.interval).valueOf(); @@ -183,7 +183,7 @@ define(function (require) { var groupSpacingPercentage = 0.15; var isTimeScale = (data.ordered && data.ordered.date); var minWidth = 1; - var barWidth; + let barWidth; // update bars @@ -268,13 +268,13 @@ define(function (require) { var minHeight = 20; var addTimeMarker = this._attr.addTimeMarker; var times = this._attr.times || []; - var timeMarker; - var div; - var svg; - var width; - var height; - var layers; - var bars; + let timeMarker; + let div; + let svg; + let width; + let height; + let layers; + let bars; return function (selection) { selection.each(function (data) { diff --git a/src/ui/public/vislib/visualizations/line_chart.js b/src/ui/public/vislib/visualizations/line_chart.js index 067fb049b924f..0a5914b430fbc 100644 --- a/src/ui/public/vislib/visualizations/line_chart.js +++ b/src/ui/public/vislib/visualizations/line_chart.js @@ -203,7 +203,7 @@ define(function (require) { .y(function y(d) { return yScale(d.y); }); - var lines; + let lines; lines = svg .selectAll('.lines') @@ -276,13 +276,13 @@ define(function (require) { var lineStrokeWidth = 1; var addTimeMarker = this._attr.addTimeMarker; var times = this._attr.times || []; - var timeMarker; - var div; - var svg; - var width; - var height; - var lines; - var circles; + let timeMarker; + let div; + let svg; + let width; + let height; + let lines; + let circles; return function (selection) { selection.each(function (data) { diff --git a/src/ui/public/vislib/visualizations/marker_types/heatmap.js b/src/ui/public/vislib/visualizations/marker_types/heatmap.js index 343b817a1e119..5aa5b3a945419 100644 --- a/src/ui/public/vislib/visualizations/marker_types/heatmap.js +++ b/src/ui/public/vislib/visualizations/marker_types/heatmap.js @@ -113,7 +113,7 @@ define(function (require) { */ HeatmapMarker.prototype._nearestFeature = function (latLng) { var self = this; - var nearest; + let nearest; if (latLng.lng < -180 || latLng.lng > 180) { return; @@ -192,7 +192,7 @@ define(function (require) { return this.geoJson.features.map(function (feature) { var lat = feature.properties.center[0]; var lng = feature.properties.center[1]; - var heatIntensity; + let heatIntensity; if (!self._attr.heatNormalizeData) { // show bucket value on heatmap diff --git a/src/ui/public/vislib/visualizations/pie_chart.js b/src/ui/public/vislib/visualizations/pie_chart.js index baad87fa733e0..4f6e18f5916e0 100644 --- a/src/ui/public/vislib/visualizations/pie_chart.js +++ b/src/ui/public/vislib/visualizations/pie_chart.js @@ -184,7 +184,7 @@ define(function (require) { var div = d3.select(this); var width = $(this).width(); var height = $(this).height(); - var path; + let path; if (!slices.children.length) return; diff --git a/src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js b/src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js index 8b0f94f6966d6..2fc40c45f4037 100644 --- a/src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js +++ b/src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js @@ -4,12 +4,12 @@ describe('renderbot', function exportWrapper() { var ngMock = require('ngMock'); var expect = require('expect.js'); var sinon = require('auto-release-sinon'); - var vislib; - var Vis; - var Renderbot; - var VislibRenderbot; - var persistedState; - var normalizeChartData; + let vislib; + let Vis; + let Renderbot; + let VislibRenderbot; + let persistedState; + let normalizeChartData; var mockVisType = { name: 'test' }; @@ -32,8 +32,8 @@ describe('renderbot', function exportWrapper() { describe('creation', function () { var vis = { type: mockVisType }; var $el = 'element'; - var createVisStub; - var renderbot; + let createVisStub; + let renderbot; beforeEach(function () { createVisStub = sinon.stub(VislibRenderbot.prototype, '_createVis', _.noop); @@ -59,8 +59,8 @@ describe('renderbot', function exportWrapper() { } }; var $el = $('
testing
'); - var listenerSpy; - var renderbot; + let listenerSpy; + let renderbot; beforeEach(function () { sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _.constant({})); @@ -85,9 +85,9 @@ describe('renderbot', function exportWrapper() { }, mockVisType) }; var $el = $('
testing
'); - var createVisSpy; - var getParamsStub; - var renderbot; + let createVisSpy; + let getParamsStub; + let renderbot; beforeEach(function () { createVisSpy = sinon.spy(VislibRenderbot.prototype, '_createVis'); @@ -145,8 +145,8 @@ describe('renderbot', function exportWrapper() { } }; var $el = $('
testing
'); - var listenerSpy; - var renderbot; + let listenerSpy; + let renderbot; beforeEach(function () { sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _.constant({})); diff --git a/src/ui/public/vislib_vis_type/__tests__/_buildChartData.js b/src/ui/public/vislib_vis_type/__tests__/_buildChartData.js index 99b28d642cfe5..f731e60342527 100644 --- a/src/ui/public/vislib_vis_type/__tests__/_buildChartData.js +++ b/src/ui/public/vislib_vis_type/__tests__/_buildChartData.js @@ -4,10 +4,10 @@ describe('renderbot#buildChartData', function () { var expect = require('expect.js'); var sinon = require('auto-release-sinon'); - var buildChartData; - var aggResponse; - var TableGroup; - var Table; + let buildChartData; + let aggResponse; + let TableGroup; + let Table; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/vislib_vis_type/buildChartData.js b/src/ui/public/vislib_vis_type/buildChartData.js index 29f956f9e9693..acc1042ff095e 100644 --- a/src/ui/public/vislib_vis_type/buildChartData.js +++ b/src/ui/public/vislib_vis_type/buildChartData.js @@ -43,7 +43,7 @@ define(function (require) { if (!tables.length) return; var out = {}; - var outList; + let outList; tables.forEach(function (table) { if (!outList) { @@ -52,7 +52,7 @@ define(function (require) { outList = out[direction] = []; } - var output; + let output; if (output = convertTableGroup(vis, table)) { outList.push(output); } diff --git a/src/ui/public/visualize/spy.js b/src/ui/public/visualize/spy.js index 2629dce9b2901..3abbebfc1bad7 100644 --- a/src/ui/public/visualize/spy.js +++ b/src/ui/public/visualize/spy.js @@ -12,7 +12,7 @@ define(function (require) { restrict: 'E', template: require('ui/visualize/spy.html'), link: function ($scope, $el) { - var currentSpy; + let currentSpy; var $container = $el.find('.visualize-spy-container'); var fullPageSpy = _.get($scope.spy, 'mode.fill', false); $scope.modes = spyModes; diff --git a/src/ui/public/visualize/visualize.js b/src/ui/public/visualize/visualize.js index 45c97e5a9354a..1fd1dd7b527ed 100644 --- a/src/ui/public/visualize/visualize.js +++ b/src/ui/public/visualize/visualize.js @@ -27,7 +27,7 @@ define(function (require) { }, template: require('ui/visualize/visualize.html'), link: function ($scope, $el, attr) { - var chart; // set in "vis" watcher + let chart; // set in "vis" watcher var minVisChartHeight = 180; if (_.isUndefined($scope.showSpyPanel)) { diff --git a/src/ui/public/watch_multi/__tests__/watch_multi.js b/src/ui/public/watch_multi/__tests__/watch_multi.js index db72e78ceb72a..0d4434e0022fd 100644 --- a/src/ui/public/watch_multi/__tests__/watch_multi.js +++ b/src/ui/public/watch_multi/__tests__/watch_multi.js @@ -6,8 +6,8 @@ var expect = require('expect.js'); describe('$scope.$watchMulti', function () { var sinon = require('auto-release-sinon'); - var $rootScope; - var $scope; + let $rootScope; + let $scope; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector) { @@ -135,9 +135,9 @@ describe('$scope.$watchMulti', function () { }); describe('complex watch expressions', function () { - var stateWatchers; - var firstValue; - var secondValue; + let stateWatchers; + let firstValue; + let secondValue; beforeEach(function () { var firstGetter = function () { diff --git a/src/utils/packageJson.js b/src/utils/packageJson.js index 9c896f0610275..347715903cb2b 100644 --- a/src/utils/packageJson.js +++ b/src/utils/packageJson.js @@ -1,8 +1,8 @@ var { join } = require('path'); var existsSync = require('fs').existsSync; -var packageDir; -var packagePath; +let packageDir; +let packagePath; while (!packagePath || !existsSync(packagePath)) { var prev = packageDir;