From bfc59e9666d1cb593e6fe94b09322af5c6e3db07 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Thu, 24 Mar 2016 18:27:29 -0400 Subject: [PATCH] [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. --- src/server/config/__tests__/config.js | 10 ++--- src/server/config/flatten_with.js | 2 +- src/server/status/__tests__/server_status.js | 4 +- src/server/status/__tests__/status.js | 4 +- .../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__/agg_params.js | 10 ++--- src/ui/public/agg_types/__tests__/agg_type.js | 12 ++--- .../__tests__/bucket_count_between.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 +- src/ui/public/binder/__tests__/binder.js | 2 +- .../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 +- .../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__/fixed_scroll.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 ++++----- .../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 +- 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__/_add_filters.js | 10 ++--- .../filter_bar/__tests__/_get_filters.js | 12 ++--- .../filter_bar/__tests__/_invert_filters.js | 10 ++--- .../filter_bar/__tests__/_pin_filters.js | 10 ++--- .../filter_bar/__tests__/_remove_filters.js | 10 ++--- .../filter_bar/__tests__/_toggle_filters.js | 10 ++--- .../filter_bar/__tests__/_update_filters.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__/change_time_filter.js | 4 +- .../lib/__tests__/extract_time_filter.js | 4 +- .../__tests__/filter_out_time_based_filter.js | 4 +- .../lib/__tests__/generate_mapping_chain.js | 6 +-- .../lib/__tests__/map_and_flatten_filters.js | 4 +- .../filter_bar/lib/__tests__/map_default.js | 4 +- .../filter_bar/lib/__tests__/map_exists.js | 4 +- .../filter_bar/lib/__tests__/map_filter.js | 4 +- .../__tests__/map_flatten_and_wrap_filters.js | 4 +- .../lib/__tests__/map_geo_bounding_box.js | 4 +- .../filter_bar/lib/__tests__/map_missing.js | 4 +- .../lib/__tests__/map_query_string.js | 4 +- .../filter_bar/lib/__tests__/map_range.js | 4 +- .../filter_bar/lib/__tests__/map_script.js | 4 +- .../filter_bar/lib/__tests__/map_terms.js | 4 +- .../public/filter_bar/lib/compare_filters.js | 4 +- src/ui/public/filter_bar/lib/map_exists.js | 4 +- .../filter_bar/lib/map_geo_bounding_box.js | 10 ++--- src/ui/public/filter_bar/lib/map_missing.js | 4 +- .../public/filter_bar/lib/map_query_string.js | 4 +- src/ui/public/filter_bar/lib/map_script.js | 6 +-- src/ui/public/filter_bar/lib/map_terms.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__/comma_list.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/fixed_scroll.js | 2 +- .../public/highlight/__tests__/highlight.js | 4 +- .../__tests__/_cast_mapping_type.js | 4 +- .../index_patterns/__tests__/_field_format.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 +- .../indexed_array/__tests__/indexed_array.js | 2 +- src/ui/public/indexed_array/indexed_array.js | 2 +- src/ui/public/indexed_array/inflector.js | 2 +- src/ui/public/listen/__tests__/listen.js | 4 +- src/ui/public/notify/__tests__/notifier.js | 6 +-- 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 +- .../public/routes/__tests__/_route_manager.js | 4 +- src/ui/public/routes/__tests__/_work_queue.js | 4 +- .../routes/__tests__/_wrap_route_with_prep.js | 10 ++--- src/ui/public/routes/route_manager.js | 2 +- .../safe_confirm/__tests__/safe_confirm.js | 16 +++---- .../stack_trace_mapper/stack_line_format.js | 2 +- .../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 +- .../style_compile/__tests__/style_compile.js | 4 +- src/ui/public/test_harness/test_harness.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 +- src/ui/public/utils/__tests__/datemath.js | 22 +++++----- .../utils/__tests__/diff_time_picker_vals.js | 2 +- .../public/utils/__tests__/simple_emitter.js | 2 +- src/ui/public/utils/date_math.js | 12 ++--- src/ui/public/utils/query_string.js | 4 +- src/ui/public/utils/rison.js | 6 +-- src/ui/public/vis/__tests__/_agg_config.js | 10 ++--- .../vis/__tests__/_agg_config_result.js | 6 +-- src/ui/public/vis/__tests__/_agg_configs.js | 16 +++---- src/ui/public/vis/__tests__/_renderbot.js | 10 ++--- src/ui/public/vis/__tests__/_vis.js | 8 ++-- src/ui/public/vis/agg_config.js | 2 +- src/ui/public/vis/agg_configs.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/position_tooltip.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__/_build_chart_data.js | 8 ++-- .../__tests__/_vislib_renderbot.js | 30 ++++++------- .../vislib_vis_type/build_chart_data.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/package_json.js | 4 +- 272 files changed, 1106 insertions(+), 1106 deletions(-) diff --git a/src/server/config/__tests__/config.js b/src/server/config/__tests__/config.js index dbcc1a2e8d3f..7a48a7c61657 100644 --- a/src/server/config/__tests__/config.js +++ b/src/server/config/__tests__/config.js @@ -85,7 +85,7 @@ describe('lib/config/config', function () { describe('#resetTo(object)', function () { - var config; + let config; beforeEach(function () { config = new Config(schema); }); @@ -102,7 +102,7 @@ describe('lib/config/config', function () { describe('#has(key)', function () { - var config; + let config; beforeEach(function () { config = new Config(schema); }); @@ -122,7 +122,7 @@ describe('lib/config/config', function () { }); describe('#set(key, value)', function () { - var config; + let config; beforeEach(function () { config = new Config(schema); @@ -171,7 +171,7 @@ describe('lib/config/config', function () { describe('#get(key)', function () { - var config; + let config; beforeEach(function () { config = new Config(schema); @@ -210,7 +210,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/flatten_with.js b/src/server/config/flatten_with.js index c58fd773c7cd..ac4a90713096 100644 --- a/src/server/config/flatten_with.js +++ b/src/server/config/flatten_with.js @@ -1,6 +1,6 @@ import _ from '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__/server_status.js b/src/server/status/__tests__/server_status.js index c1c4228bddfa..82fdeef1675e 100644 --- a/src/server/status/__tests__/server_status.js +++ b/src/server/status/__tests__/server_status.js @@ -7,8 +7,8 @@ import Status from '../status'; import ServerStatus from '../server_status'; 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 bb550820a0ad..7f41596db8e7 100644 --- a/src/server/status/__tests__/status.js +++ b/src/server/status/__tests__/status.js @@ -4,8 +4,8 @@ import Status from '../status'; import ServerStatus from '../server_status'; 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/agg_response/geo_json/__tests__/geo_json.js b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js index dffaa87e2b66..78fc73fdd6c2 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 @@ -9,11 +9,11 @@ import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify'; import AggResponseGeoJsonGeoJsonProvider from 'ui/agg_response/geo_json/geo_json'; 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) { @@ -108,10 +108,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 c62f04b819cf..eeca8b79a6cd 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 @@ import expect from '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 68e258ba1d06..1498d6eb67f6 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 @@ -9,11 +9,11 @@ import VisAggConfigsProvider from 'ui/vis/agg_configs'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import AggResponseHierarchicalBuildHierarchicalDataProvider from 'ui/agg_response/hierarchical/build_hierarchical_data'; -var Vis; -var Notifier; -var AggConfigs; -var indexPattern; -var buildHierarchicalData; +let Vis; +let Notifier; +let AggConfigs; +let indexPattern; +let buildHierarchicalData; describe('buildHierarchicalData', function () { @@ -31,8 +31,8 @@ describe('buildHierarchicalData', function () { describe('metric only', function () { - var vis; - var results; + let vis; + let results; beforeEach(function () { var id = 1; @@ -103,8 +103,8 @@ describe('buildHierarchicalData', function () { }); describe('threeTermBuckets', function () { - var vis; - var results; + let vis; + let results; beforeEach(function () { var id = 1; @@ -145,8 +145,8 @@ describe('buildHierarchicalData', function () { }); describe('oneHistogramBucket', function () { - var vis; - var results; + let vis; + let results; beforeEach(function () { var id = 1; @@ -177,8 +177,8 @@ describe('buildHierarchicalData', function () { }); describe('oneRangeBucket', function () { - var vis; - var results; + let vis; + let results; beforeEach(function () { var id = 1; @@ -218,8 +218,8 @@ describe('buildHierarchicalData', function () { }); describe('oneFilterBucket', function () { - var vis; - var results; + let vis; + let results; beforeEach(function () { var id = 1; @@ -254,8 +254,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 bf3cf2ecfbef..d7dba5977d5c 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 @@ import _ from 'lodash'; import collectBranch from 'ui/agg_response/hierarchical/_collect_branch'; import expect from '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 2f89a7697bc9..9d05d2335e43 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 @@ -9,14 +9,14 @@ import VisProvider from 'ui/vis'; import VisAggConfigsProvider from 'ui/vis/agg_configs'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -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 b40f7a7de905..99afb3bb07f1 100644 --- a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js +++ b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js @@ -5,8 +5,8 @@ import AggResponseHierarchicalTransformAggregationProvider from 'ui/agg_response describe('buildHierarchicalData()', function () { describe('transformAggregation()', function () { - 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 be26787b56b4..9a2d58f4ecb4 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,6 +1,6 @@ import _ from 'lodash'; export default 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 7db92b680591..0d4c88554ae3 100644 --- a/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js +++ b/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js @@ -21,7 +21,7 @@ export default function HierarchicalTooltipFormaterProvider($rootScope, $compile _.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 483765e37e74..385f5e0a9304 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 @@ -2,7 +2,7 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import AggResponsePointSeriesAddToSiriProvider from 'ui/agg_response/point_series/_add_to_siri'; describe('addToSiri', function () { - 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 5447589c8178..8574fdf0af73 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 @@ -6,11 +6,11 @@ import AggTypesAggTypeProvider from 'ui/agg_types/agg_type'; import AggResponsePointSeriesFakeXAspectProvider from 'ui/agg_response/point_series/_fake_x_aspect'; describe('makeFakeXAspect', function () { - var makeFakeXAspect; - var Vis; - var AggType; - var AggConfig; - var indexPattern; + let makeFakeXAspect; + let Vis; + let AggType; + let AggConfig; + let indexPattern; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { 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 551484c84a79..efad784eacd9 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 @@ -9,11 +9,11 @@ import AggResponsePointSeriesGetAspectsProvider from 'ui/agg_response/point_seri import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('getAspects', function () { - 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) { @@ -24,8 +24,8 @@ describe('getAspects', function () { indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); })); - 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 173d68a8983e..6e77d96a695d 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 @@ -5,7 +5,7 @@ import AggResponsePointSeriesGetPointProvider from 'ui/agg_response/point_series describe('getPoint', function () { - var getPoint; + let getPoint; var truthFormatted = { fieldFormatter: _.constant(_.constant(true)) }; var identFormatted = { fieldFormatter: _.constant(_.identity) }; @@ -16,10 +16,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; @@ -49,10 +49,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 ce2d4506e6a1..c36a00be9628 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 @@ -3,7 +3,7 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import AggResponsePointSeriesGetSeriesProvider from 'ui/agg_response/point_series/_get_series'; describe('getSeries', function () { - 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 4a00b2b5beb6..2ca50fda6bff 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 @@ -4,7 +4,7 @@ import ngMock from 'ng_mock'; import AggResponsePointSeriesInitXAxisProvider from 'ui/agg_response/point_series/_init_x_axis'; describe('initXAxis', function () { - 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 5c42090963b3..ffb5d7e8682c 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 @@ -4,7 +4,7 @@ import ngMock from 'ng_mock'; import AggResponsePointSeriesInitYAxisProvider from 'ui/agg_response/point_series/_init_y_axis'; describe('initYAxis', function () { - 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 9563f397e27d..579d434f2212 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_main.js +++ b/src/ui/public/agg_response/point_series/__tests__/_main.js @@ -11,10 +11,10 @@ describe('pointSeriesChartDataFromTable', function () { this.slow(1000); - 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 8becee118e43..f0c5bd3aabd1 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 @@ -28,7 +28,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 16ccb6eb78b0..6468fdd72047 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 @@ -5,7 +5,7 @@ import ngMock from 'ng_mock'; import AggResponsePointSeriesTooltipFormatterProvider from 'ui/agg_response/point_series/_tooltip_formatter'; describe('tooltipFormatter', function () { - 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 ca79b74afacb..7c05f844a643 100644 --- a/src/ui/public/agg_response/point_series/_get_series.js +++ b/src/ui/public/agg_response/point_series/_get_series.js @@ -37,7 +37,7 @@ export default function PointSeriesGetSeries(Private) { 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 6b2747ebf93b..56c321d6de1b 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_buckets.js +++ b/src/ui/public/agg_response/tabify/__tests__/_buckets.js @@ -2,7 +2,7 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import AggResponseTabifyBucketsProvider from 'ui/agg_response/tabify/_buckets'; describe('Buckets wrapper', function () { - var Buckets; + let Buckets; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { 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 a542c35b1470..c9c844a683b5 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js +++ b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js @@ -4,9 +4,9 @@ import AggResponseTabifyGetColumnsProvider from 'ui/agg_response/tabify/_get_col import VisProvider from 'ui/vis'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('get columns', function () { - var getColumns; - var Vis; - var indexPattern; + let getColumns; + let Vis; + let indexPattern; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { diff --git a/src/ui/public/agg_response/tabify/__tests__/_integration.js b/src/ui/public/agg_response/tabify/__tests__/_integration.js index b8c4816c06e5..3b0ec6737738 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_integration.js +++ b/src/ui/public/agg_response/tabify/__tests__/_integration.js @@ -7,10 +7,10 @@ import VisProvider from 'ui/vis'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('tabifyAggResponse Integration', function () { - 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) { @@ -46,12 +46,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 e613da98ee55..608731f263c9 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js +++ b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js @@ -10,14 +10,14 @@ import VisProvider from 'ui/vis'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('ResponseWriter class', function () { - 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 c3f9aa9f734f..2f0c0f0077f2 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_table.js +++ b/src/ui/public/agg_response/tabify/__tests__/_table.js @@ -4,7 +4,7 @@ import ngMock from 'ng_mock'; import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table'; describe('Table class', function () { - 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 5c4cd7f51586..08d837290701 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_table_group.js +++ b/src/ui/public/agg_response/tabify/__tests__/_table_group.js @@ -2,7 +2,7 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group'; describe('Table Group class', function () { - var TableGroup; + let TableGroup; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { diff --git a/src/ui/public/agg_table/__tests__/_group.js b/src/ui/public/agg_table/__tests__/_group.js index 1c36a062c785..1c692da468b1 100644 --- a/src/ui/public/agg_table/__tests__/_group.js +++ b/src/ui/public/agg_table/__tests__/_group.js @@ -8,11 +8,11 @@ import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logsta import VisProvider from 'ui/vis'; describe('AggTableGroup Directive', function () { - 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) { @@ -24,7 +24,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 b3519a8cb642..8eadb01c5f12 100644 --- a/src/ui/public/agg_table/__tests__/_table.js +++ b/src/ui/public/agg_table/__tests__/_table.js @@ -9,11 +9,11 @@ import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logsta import VisProvider from 'ui/vis'; describe('AggTable Directive', function () { - 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) { @@ -25,7 +25,7 @@ describe('AggTable Directive', function () { $compile = $injector.get('$compile'); })); - var $scope; + let $scope; beforeEach(function () { $scope = $rootScope.$new(); }); @@ -134,7 +134,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__/agg_params.js b/src/ui/public/agg_types/__tests__/agg_params.js index 0fca03b0dda3..4b2719ae3d28 100644 --- a/src/ui/public/agg_types/__tests__/agg_params.js +++ b/src/ui/public/agg_types/__tests__/agg_params.js @@ -8,11 +8,11 @@ import AggTypesParamTypesOptionedProvider from 'ui/agg_types/param_types/optione import AggTypesParamTypesRegexProvider from 'ui/agg_types/param_types/regex'; describe('AggParams class', function () { - 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__/agg_type.js b/src/ui/public/agg_types/__tests__/agg_type.js index ab8b774cc57d..10dd716ab3b5 100644 --- a/src/ui/public/agg_types/__tests__/agg_type.js +++ b/src/ui/public/agg_types/__tests__/agg_type.js @@ -10,12 +10,12 @@ import AggTypesAggTypeProvider from 'ui/agg_types/agg_type'; import VisAggConfigProvider from 'ui/vis/agg_config'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('AggType Class', function () { - var AggType; - var AggParams; - var AggConfig; - var indexPattern; - var fieldFormat; - var Vis; + let AggType; + let AggParams; + let AggConfig; + let indexPattern; + let fieldFormat; + let Vis; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/agg_types/__tests__/bucket_count_between.js b/src/ui/public/agg_types/__tests__/bucket_count_between.js index 34b62e6a98f7..b1da84a139a5 100644 --- a/src/ui/public/agg_types/__tests__/bucket_count_between.js +++ b/src/ui/public/agg_types/__tests__/bucket_count_between.js @@ -8,12 +8,12 @@ import AggTypesIndexProvider from 'ui/agg_types/index'; import VisAggConfigProvider from 'ui/vis/agg_config'; import AggTypesBucketsBucketCountBetweenProvider from 'ui/agg_types/buckets/_bucket_count_between'; describe('bucketCountBetween util', function () { - 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 8127a5eb0221..e293c71aa263 100644 --- a/src/ui/public/agg_types/__tests__/buckets/_histogram.js +++ b/src/ui/public/agg_types/__tests__/buckets/_histogram.js @@ -6,7 +6,7 @@ import AggParamWriterProvider from '../agg_param_writer'; describe('Histogram Agg', function () { describe('ordered', function () { - var histogram; + let histogram; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -24,7 +24,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 5c85afeb0d90..3c18eb806060 100644 --- a/src/ui/public/agg_types/__tests__/buckets/_range.js +++ b/src/ui/public/agg_types/__tests__/buckets/_range.js @@ -11,9 +11,9 @@ describe('Range Agg', function () { 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 3392cb413dbb..86c5fbc7e43f 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 @@ -12,16 +12,16 @@ import AggTypesBucketsIntervalOptionsProvider from 'ui/agg_types/buckets/_interv describe('AggConfig Filters', function () { describe('date_histogram', function () { - 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) { @@ -84,7 +84,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 5fe8ef92b2b6..140231aeaeab 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 @@ -9,10 +9,10 @@ import AggTypesBucketsCreateFilterDateRangeProvider from 'ui/agg_types/buckets/c 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 6f63705a97d3..8bb6e5a3b64c 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 @@ -9,10 +9,10 @@ import AggTypesBucketsCreateFilterFiltersProvider from 'ui/agg_types/buckets/cre 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 e807bd8a7e19..094acc337dfc 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 @@ -9,10 +9,10 @@ import AggTypesBucketsCreateFilterHistogramProvider from 'ui/agg_types/buckets/c 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 6984e0725b7e..93157becdd0e 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 @@ -7,10 +7,10 @@ import AggTypesBucketsCreateFilterIpRangeProvider from 'ui/agg_types/buckets/cre describe('AggConfig Filters', function () { 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 841996b13756..c4ecfdba6f04 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 @@ -7,10 +7,10 @@ import AggTypesBucketsCreateFilterRangeProvider from 'ui/agg_types/buckets/creat describe('AggConfig Filters', function () { 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 f5a27342d546..ea99720afb89 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 @@ -7,10 +7,10 @@ import AggTypesBucketsCreateFilterTermsProvider from 'ui/agg_types/buckets/creat describe('AggConfig Filters', function () { 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 5261b02e9ebd..bf2c048ee683 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 @@ -7,11 +7,11 @@ import VisProvider from 'ui/vis'; import AggTypesBucketsIntervalOptionsProvider from 'ui/agg_types/buckets/_interval_options'; describe('editor', function () { - 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) { @@ -69,9 +69,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); @@ -97,7 +97,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 ae870c5f3c06..8ea6e756df3e 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 @@ -8,13 +8,13 @@ import AggTypesIndexProvider from 'ui/agg_types/index'; import VisAggConfigProvider from 'ui/vis/agg_config'; describe('params', function () { - 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 c73649b67937..509987165249 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 @@ import 'ui/number_list'; describe('NumberList directive', function () { - 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 8ceb3c95e9f9..b68dcfc87e28 100644 --- a/src/ui/public/agg_types/__tests__/index.js +++ b/src/ui/public/agg_types/__tests__/index.js @@ -12,8 +12,8 @@ import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_ag describe('AggTypesComponent', function () { describe('bucket aggs', function () { - var bucketAggs; - var BucketAggType; + let bucketAggs; + let BucketAggType; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -29,8 +29,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 b0eb534a961f..a5b6f033e0b7 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 @@ -7,11 +7,11 @@ import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logsta import AggTypesParamTypesCalculateIntervalProvider from 'ui/agg_types/param_types/_calculate_interval'; 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 019d336d8d9b..b4a336957b08 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_field.js +++ b/src/ui/public/agg_types/__tests__/param_types/_field.js @@ -5,8 +5,8 @@ import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base'; import AggTypesParamTypesFieldProvider from 'ui/agg_types/param_types/field'; describe('Field', function () { - 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 d4d6c7e711a2..14cd247b44b7 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_optioned.js +++ b/src/ui/public/agg_types/__tests__/param_types/_optioned.js @@ -5,8 +5,8 @@ import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base'; import AggTypesParamTypesOptionedProvider from 'ui/agg_types/param_types/optioned'; describe('Optioned', function () { - 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 fbfb6a61d949..ee9b995ac04c 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 @@ -7,11 +7,11 @@ import AggTypesParamTypesRawJsonProvider from 'ui/agg_types/param_types/raw_json 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 5aea856e7484..87f21d2b7d19 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_regex.js +++ b/src/ui/public/agg_types/__tests__/param_types/_regex.js @@ -7,10 +7,10 @@ import VisProvider from 'ui/vis'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('Regex', function () { - var BaseAggParam; - var RegexAggParam; - var Vis; - var indexPattern; + let BaseAggParam; + let RegexAggParam; + let Vis; + let indexPattern; beforeEach(ngMock.module('kibana')); // fetch out deps @@ -34,8 +34,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 f6d8629ca72e..0b5c5fcf23f0 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_string.js +++ b/src/ui/public/agg_types/__tests__/param_types/_string.js @@ -6,11 +6,11 @@ import AggTypesParamTypesStringProvider from 'ui/agg_types/param_types/string'; 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 d71e36bf09a9..490f67b320e0 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 @@ -2,7 +2,7 @@ import CidrMask from 'ui/utils/cidr_mask'; import buildRangeFilter from 'ui/filter_manager/lib/range'; export default 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 485ce7e664d0..89cfa6fe33fc 100644 --- a/src/ui/public/agg_types/buckets/date_histogram.js +++ b/src/ui/public/agg_types/buckets/date_histogram.js @@ -45,7 +45,7 @@ export default function DateHistogramAggType(timefilter, config, Private) { }, 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 7e11b255ee4b..8cc22af5cdce 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 @@ export default function RawJSONAggParamFactory(Private) { * @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 3b02918a30cd..a0c6b15eeaef 100644 --- a/src/ui/public/bind/__tests__/bind.js +++ b/src/ui/public/bind/__tests__/bind.js @@ -3,8 +3,8 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; describe('$scope.$bind', function () { - var $rootScope; - var $scope; + let $rootScope; + let $scope; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector) { diff --git a/src/ui/public/binder/__tests__/binder.js b/src/ui/public/binder/__tests__/binder.js index 6bd2a3406de9..f879ea3b6960 100644 --- a/src/ui/public/binder/__tests__/binder.js +++ b/src/ui/public/binder/__tests__/binder.js @@ -6,7 +6,7 @@ import Binder from 'ui/binder'; import $ from 'jquery'; describe('Binder class', function () { - var $scope; + let $scope; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($rootScope) { 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 d09f9aaf909d..5420c8881c8f 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 @@ import 'ui/chrome'; import '../app_switcher'; 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 4d5506ad5fcf..e02801e6c6b4 100644 --- a/src/ui/public/compile_recursive_directive.js +++ b/src/ui/public/compile_recursive_directive.js @@ -26,7 +26,7 @@ uiModules // 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 29c88060788d..f4cf07d86741 100644 --- a/src/ui/public/config/__tests__/config.js +++ b/src/ui/public/config/__tests__/config.js @@ -2,9 +2,9 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import ConfigDefaultsProvider from 'ui/config/defaults'; describe('config component', function () { - var $scope; - var config; - var defaults; + let $scope; + let config; + let defaults; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector, Private) { diff --git a/src/ui/public/config/_delayed_updater.js b/src/ui/public/config/_delayed_updater.js index 76cdb67e16e1..7997120e3373 100644 --- a/src/ui/public/config/_delayed_updater.js +++ b/src/ui/public/config/_delayed_updater.js @@ -12,7 +12,7 @@ export default function DelayedUpdaterFactory(Private, $rootScope, Promise) { var updater = this; var queue = []; var log = {}; - var timer; + let timer; updater.fire = function () { clearTimeout(timer); @@ -21,8 +21,8 @@ export default function DelayedUpdaterFactory(Private, $rootScope, Promise) { 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 8bb289a0aae7..9291de9e0fc2 100644 --- a/src/ui/public/config/config.js +++ b/src/ui/public/config/config.js @@ -28,7 +28,7 @@ module.service('config', function (Private, kbnVersion, kbnIndex, $rootScope, bu // 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(DocSourceProvider); var doc = (new DocSource()) @@ -82,7 +82,7 @@ module.service('config', function (Private, kbnVersion, kbnIndex, $rootScope, bu }); 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 64b2f7b9b146..c8ff6b846091 100644 --- a/src/ui/public/courier/data_source/__tests__/decorate_query.js +++ b/src/ui/public/courier/data_source/__tests__/decorate_query.js @@ -6,13 +6,13 @@ import DecorateQueryProvider from 'ui/courier/data_source/_decorate_query'; describe('Query decorator', function () { - 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 b891b986ce56..4b11ad8e3e4f 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 @@ import NormalizeSortRequestProvider from 'ui/courier/data_source/_normalize_sort import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('SearchSource#normalizeSortRequest', function () { - 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 97a2ce64004e..ac2aea1e9c4c 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 @@ -33,7 +33,7 @@ export default function (Promise, Private, es) { 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 f43a4fc2ccbe..f3bc6a31a436 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 @@ export default function normalizeSortRequest(config) { 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 128f922b8a6c..045dc0611c3c 100644 --- a/src/ui/public/courier/data_source/_root_search_source.js +++ b/src/ui/public/courier/data_source/_root_search_source.js @@ -12,7 +12,7 @@ export default function RootSearchSource(Private, $rootScope, timefilter, Notifi 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/saved_object/saved_object.js b/src/ui/public/courier/saved_object/saved_object.js index 4aae5a210cd1..477c6c76b959 100644 --- a/src/ui/public/courier/saved_object/saved_object.js +++ b/src/ui/public/courier/saved_object/saved_object.js @@ -151,7 +151,7 @@ export default function SavedObjectFactory(es, kbnIndex, Promise, Private, Notif 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 137de3df7144..eec6762a4589 100644 --- a/src/ui/public/debounce/__tests__/debounce.js +++ b/src/ui/public/debounce/__tests__/debounce.js @@ -3,9 +3,9 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ng_mock'; -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 8669fc73e704..f317ee51b85c 100644 --- a/src/ui/public/debounce/debounce.js +++ b/src/ui/public/debounce/debounce.js @@ -7,10 +7,10 @@ var module = uiModules.get('kibana'); 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 a6ad20f40c99..21c2f53fd794 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 @@ import ngMock from 'ng_mock'; import '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 3a6c695f601a..8435eae9b7db 100644 --- a/src/ui/public/directives/__tests__/confirm-click.js +++ b/src/ui/public/directives/__tests__/confirm-click.js @@ -7,11 +7,11 @@ import 'ui/directives/confirm_click'; import '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 eceee7700010..417c5a3125e8 100644 --- a/src/ui/public/directives/__tests__/css_truncate.js +++ b/src/ui/public/directives/__tests__/css_truncate.js @@ -4,11 +4,11 @@ import ngMock from 'ng_mock'; import $ from 'jquery'; import '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__/fixed_scroll.js b/src/ui/public/directives/__tests__/fixed_scroll.js index 3d345e549f61..d3ca2fed7f13 100644 --- a/src/ui/public/directives/__tests__/fixed_scroll.js +++ b/src/ui/public/directives/__tests__/fixed_scroll.js @@ -8,7 +8,7 @@ import Promise from 'bluebird'; describe('FixedScroll directive', function () { - 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 d7b7c5578ba1..cb822a9e5d61 100644 --- a/src/ui/public/directives/__tests__/inequality.js +++ b/src/ui/public/directives/__tests__/inequality.js @@ -4,9 +4,9 @@ import ngMock from 'ng_mock'; import '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 3104be8e46d3..a252ddd97176 100644 --- a/src/ui/public/directives/__tests__/input_focus.js +++ b/src/ui/public/directives/__tests__/input_focus.js @@ -5,13 +5,13 @@ import $ from 'jquery'; import '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 6aaa4cb52bdb..56c375c147c5 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 @@ import ngMock from 'ng_mock'; import '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 8f89ce2b55b2..12713fdaafa8 100644 --- a/src/ui/public/directives/__tests__/json_input.js +++ b/src/ui/public/directives/__tests__/json_input.js @@ -5,10 +5,10 @@ import '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 8f726e83b405..3e78f1e614ac 100644 --- a/src/ui/public/directives/__tests__/parse_query.js +++ b/src/ui/public/directives/__tests__/parse_query.js @@ -5,18 +5,18 @@ import ngMock from 'ng_mock'; // Load the kibana app dependencies. -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; import toUser from 'ui/parse_query/lib/to_user'; import 'ui/parse_query'; import ParseQueryLibFromUserProvider from 'ui/parse_query/lib/from_user'; @@ -102,7 +102,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__/timepicker.js b/src/ui/public/directives/__tests__/timepicker.js index bd8f9f6fe7be..9d59f9d16675 100644 --- a/src/ui/public/directives/__tests__/timepicker.js +++ b/src/ui/public/directives/__tests__/timepicker.js @@ -12,13 +12,13 @@ import 'plugins/kibana/discover/index'; // TODO: This should not be needed, timefilter is only included here, it should move -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 1c9e1256051b..695f6d912f64 100644 --- a/src/ui/public/directives/__tests__/truncate.js +++ b/src/ui/public/directives/__tests__/truncate.js @@ -5,11 +5,11 @@ import $ from 'jquery'; import '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 f6d90ed8ad1f..4a5cf3798f3f 100644 --- a/src/ui/public/directives/__tests__/typeahead.js +++ b/src/ui/public/directives/__tests__/typeahead.js @@ -9,12 +9,12 @@ import '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 95681f8fe608..d55b52cc64be 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 @@ import '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 117977b9b242..61d179356b98 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 @@ import '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 759004a7764f..16bca26e4546 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 @@ import 'ui/directives/validate_index_name'; // Load the kibana app dependencies. 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 81a03be15d0c..bf5bb8669dd5 100644 --- a/src/ui/public/directives/__tests__/validate_ip.js +++ b/src/ui/public/directives/__tests__/validate_ip.js @@ -5,8 +5,8 @@ import '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 b182e5906f6f..99755a9897f7 100644 --- a/src/ui/public/directives/__tests__/validate_json.js +++ b/src/ui/public/directives/__tests__/validate_json.js @@ -5,9 +5,9 @@ import 'ui/directives/validate_json'; // Load the kibana app dependencies. -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 e46f29e1ae8e..50df93f06136 100644 --- a/src/ui/public/directives/infinite_scroll.js +++ b/src/ui/public/directives/infinite_scroll.js @@ -10,7 +10,7 @@ module.directive('kbnInfiniteScroll', function () { }, 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 08a9934753d3..1ffbf5e7468f 100644 --- a/src/ui/public/directives/paginate.js +++ b/src/ui/public/directives/paginate.js @@ -106,7 +106,7 @@ uiModules.get('kibana') 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 a463c215d1ab..79e5bc25c71d 100644 --- a/src/ui/public/directives/pretty_duration.js +++ b/src/ui/public/directives/pretty_duration.js @@ -23,7 +23,7 @@ module.directive('prettyDuration', function (config, quickRanges, timeUnits) { }); 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 4b1a02e1624b..becf923d5ee0 100644 --- a/src/ui/public/directives/saved_object_finder.js +++ b/src/ui/public/directives/saved_object_finder.js @@ -38,7 +38,7 @@ module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Pr 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 9df39fe9d7df..62b1bc365b5e 100644 --- a/src/ui/public/doc_table/__tests__/doc_table.js +++ b/src/ui/public/doc_table/__tests__/doc_table.js @@ -12,16 +12,16 @@ import FixturesStubbedSearchSourceProvider from 'fixtures/stubbed_search_source' // Load the kibana app dependencies. -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_) { @@ -47,7 +47,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 a1ad3811b796..52ed51913cce 100644 --- a/src/ui/public/doc_table/__tests__/lib/get_sort.js +++ b/src/ui/public/doc_table/__tests__/lib/get_sort.js @@ -3,7 +3,7 @@ var defaultSort = {time: 'desc'}; import expect from 'expect.js'; import ngMock from 'ng_mock'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -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 b33ee202291c..fa92ccbec6ad 100644 --- a/src/ui/public/doc_table/__tests__/lib/rows_headers.js +++ b/src/ui/public/doc_table/__tests__/lib/rows_headers.js @@ -10,14 +10,14 @@ import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logsta describe('Doc Table', function () { - 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) { @@ -53,7 +53,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(); @@ -245,7 +245,7 @@ describe('Doc Table', function () { }); describe('expanded', function () { - var $details; + let $details; beforeEach(function () { // Open the row $scope.toggleRow(); @@ -278,7 +278,7 @@ describe('Doc Table', function () { 'index-pattern="indexPattern"' + '>' ); - var $details; + let $details; beforeEach(function () { var row = getFakeRow(0, mapping); @@ -312,10 +312,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 88371a0acb51..168e71a52ea7 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 @@ module.directive('kbnTableRow', function ($compile) { }; // 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 0e97f87d74ba..a92572a6eae3 100644 --- a/src/ui/public/doc_table/lib/get_sort.js +++ b/src/ui/public/doc_table/lib/get_sort.js @@ -8,8 +8,8 @@ import _ from 'lodash'; */ 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 5313063e2b22..09acbb8abb7d 100644 --- a/src/ui/public/doc_title/__tests__/doc_title.js +++ b/src/ui/public/doc_title/__tests__/doc_title.js @@ -5,11 +5,11 @@ import ngMock from 'ng_mock'; import DocTitleProvider from 'ui/doc_title'; describe('docTitle Service', function () { - var initialDocTitle; + let initialDocTitle; var MAIN_TITLE = 'Kibana 4'; - var docTitle; - var $rootScope; + let docTitle; + let $rootScope; beforeEach(function () { initialDocTitle = document.title; @@ -61,7 +61,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 8366387036d9..5cff0b94fe56 100644 --- a/src/ui/public/doc_title/doc_title.js +++ b/src/ui/public/doc_title/doc_title.js @@ -14,7 +14,7 @@ uiModules.get('kibana') var baseTitle = document.title; var self = this; - var lastChange; + let lastChange; function render() { lastChange = lastChange || []; diff --git a/src/ui/public/es.js b/src/ui/public/es.js index 0dffbbf83172..e9ba0438d346 100644 --- a/src/ui/public/es.js +++ b/src/ui/public/es.js @@ -2,7 +2,7 @@ import 'elasticsearch-browser'; import _ from 'lodash'; import uiModules from 'ui/modules'; -var es; // share the client amoungst all apps +let es; // share the client amoungst all apps uiModules .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 c19ffc10a67f..dcebde2c7010 100644 --- a/src/ui/public/factories/__tests__/base_object.js +++ b/src/ui/public/factories/__tests__/base_object.js @@ -6,8 +6,8 @@ import ngMock from 'ng_mock'; import '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 2d37485791e0..148b6d193def 100644 --- a/src/ui/public/factories/__tests__/events.js +++ b/src/ui/public/factories/__tests__/events.js @@ -10,10 +10,10 @@ import EventsProvider from 'ui/events'; describe('Events', function () { require('test_utils/no_digest_promises').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) { @@ -185,7 +185,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 c24240521684..5fc992873c17 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 @@ import expect from 'expect.js'; import $ from 'jquery'; 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 d5aae3c231e0..afdd29e24ea1 100644 --- a/src/ui/public/field_editor/__tests__/field_editor.js +++ b/src/ui/public/field_editor/__tests__/field_editor.js @@ -6,13 +6,13 @@ import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('FieldEditor directive', function () { - 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) { @@ -47,7 +47,7 @@ describe('FieldEditor directive', function () { }); describe('$scope.editor', function () { - var editor; + let editor; beforeEach(function () { compile(); @@ -63,8 +63,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__/_add_filters.js b/src/ui/public/filter_bar/__tests__/_add_filters.js index 13c3ab0353c2..82f2de3c6449 100644 --- a/src/ui/public/filter_bar/__tests__/_add_filters.js +++ b/src/ui/public/filter_bar/__tests__/_add_filters.js @@ -9,11 +9,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__/_get_filters.js b/src/ui/public/filter_bar/__tests__/_get_filters.js index 94c68e19f883..ed0d11ae36d1 100644 --- a/src/ui/public/filter_bar/__tests__/_get_filters.js +++ b/src/ui/public/filter_bar/__tests__/_get_filters.js @@ -8,10 +8,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', @@ -35,7 +35,7 @@ describe('get filters', function () { })); describe('getFilters method', function () { - var filters; + let filters; beforeEach(function () { filters = [ @@ -110,7 +110,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__/_invert_filters.js b/src/ui/public/filter_bar/__tests__/_invert_filters.js index b99189b5e5c6..760147fd173b 100644 --- a/src/ui/public/filter_bar/__tests__/_invert_filters.js +++ b/src/ui/public/filter_bar/__tests__/_invert_filters.js @@ -9,11 +9,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__/_pin_filters.js b/src/ui/public/filter_bar/__tests__/_pin_filters.js index d8f962869f1d..acc69a69da48 100644 --- a/src/ui/public/filter_bar/__tests__/_pin_filters.js +++ b/src/ui/public/filter_bar/__tests__/_pin_filters.js @@ -9,11 +9,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__/_remove_filters.js b/src/ui/public/filter_bar/__tests__/_remove_filters.js index 7b311c84fd27..32b5c40aa20f 100644 --- a/src/ui/public/filter_bar/__tests__/_remove_filters.js +++ b/src/ui/public/filter_bar/__tests__/_remove_filters.js @@ -9,11 +9,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__/_toggle_filters.js b/src/ui/public/filter_bar/__tests__/_toggle_filters.js index b81abe52eea5..a6fe906f4ee6 100644 --- a/src/ui/public/filter_bar/__tests__/_toggle_filters.js +++ b/src/ui/public/filter_bar/__tests__/_toggle_filters.js @@ -9,11 +9,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__/_update_filters.js b/src/ui/public/filter_bar/__tests__/_update_filters.js index 99244cc11136..081e4473efa5 100644 --- a/src/ui/public/filter_bar/__tests__/_update_filters.js +++ b/src/ui/public/filter_bar/__tests__/_update_filters.js @@ -9,10 +9,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', @@ -39,8 +39,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 f1c450bc0459..78e2b1c9da30 100644 --- a/src/ui/public/filter_bar/__tests__/filter_bar.js +++ b/src/ui/public/filter_bar/__tests__/filter_bar.js @@ -11,15 +11,15 @@ import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/map_filter'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; 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('test_utils/no_digest_promises').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 aebc3651b4c0..8ed95cdbe3c2 100644 --- a/src/ui/public/filter_bar/__tests__/push_filter.js +++ b/src/ui/public/filter_bar/__tests__/push_filter.js @@ -4,7 +4,7 @@ import ngMock from 'ng_mock'; import FilterBarPushFilterProvider from 'ui/filter_bar/push_filter'; describe('Filter Bar pushFilter()', function () { - var pushFilterFn; + let pushFilterFn; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { @@ -21,9 +21,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:[]}; @@ -40,7 +40,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 f8411ed469f4..4d454e48fc41 100644 --- a/src/ui/public/filter_bar/__tests__/query_filter.js +++ b/src/ui/public/filter_bar/__tests__/query_filter.js @@ -10,9 +10,9 @@ import './_invert_filters'; import './_pin_filters'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; import EventsProvider from 'ui/events'; -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 8f2c7eb004a1..cb7eafc8ff60 100644 --- a/src/ui/public/filter_bar/filter_bar_click_handler.js +++ b/src/ui/public/filter_bar/filter_bar_click_handler.js @@ -9,7 +9,7 @@ export default function (Notifier) { 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__/change_time_filter.js b/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js index bbda04ddebe9..8d8e9208a1a8 100644 --- a/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js +++ b/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js @@ -6,9 +6,9 @@ import FilterBarLibChangeTimeFilterProvider from 'ui/filter_bar/lib/change_time_ 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__/extract_time_filter.js b/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js index 23bc5e141741..5aa2071d8df3 100644 --- a/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js +++ b/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js @@ -5,8 +5,8 @@ import FilterBarLibExtractTimeFilterProvider from 'ui/filter_bar/lib/extract_tim describe('Filter Bar Directive', function () { describe('extractTimeFilter()', function () { - var extractTimeFilter; - var $rootScope; + let extractTimeFilter; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js b/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js index 9d103438d190..9ed699f3d840 100644 --- a/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js +++ b/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js @@ -6,8 +6,8 @@ import FilterBarLibFilterOutTimeBasedFilterProvider from 'ui/filter_bar/lib/filt describe('Filter Bar Directive', function () { describe('filterOutTimeBasedFilter()', function () { - var filterOutTimeBasedFilter; - var $rootScope; + let filterOutTimeBasedFilter; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js b/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js index 03b5c564f730..54b6c33bb4b3 100644 --- a/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js +++ b/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js @@ -6,10 +6,10 @@ import FilterBarLibGenerateMappingChainProvider from 'ui/filter_bar/lib/generate 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__/map_and_flatten_filters.js b/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js index bfc8116982a6..2ba1d23b2e9c 100644 --- a/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js @@ -5,8 +5,8 @@ import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_ describe('Filter Bar Directive', function () { describe('mapAndFlattenFilters()', function () { - var mapAndFlattenFilters; - var $rootScope; + let mapAndFlattenFilters; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/map_default.js b/src/ui/public/filter_bar/lib/__tests__/map_default.js index d03ea3e481ff..112503f0fce3 100644 --- a/src/ui/public/filter_bar/lib/__tests__/map_default.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_default.js @@ -4,8 +4,8 @@ import FilterBarLibMapDefaultProvider from 'ui/filter_bar/lib/map_default'; describe('Filter Bar Directive', function () { describe('mapDefault()', function () { - 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__/map_exists.js b/src/ui/public/filter_bar/lib/__tests__/map_exists.js index f3c494223626..d1a4d3306f7a 100644 --- a/src/ui/public/filter_bar/lib/__tests__/map_exists.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_exists.js @@ -4,8 +4,8 @@ import FilterBarLibMapExistsProvider from 'ui/filter_bar/lib/map_exists'; describe('Filter Bar Directive', function () { describe('mapExists()', function () { - 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__/map_filter.js b/src/ui/public/filter_bar/lib/__tests__/map_filter.js index 5931a00b7b28..5542d39d6893 100644 --- a/src/ui/public/filter_bar/lib/__tests__/map_filter.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_filter.js @@ -4,8 +4,8 @@ import ngMock from 'ng_mock'; import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/map_filter'; describe('Filter Bar Directive', function () { - var mapFilter; - var $rootScope; + let mapFilter; + let $rootScope; beforeEach(ngMock.module( diff --git a/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js b/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js index 46b8c6a01c43..1650302a515b 100644 --- a/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js @@ -6,8 +6,8 @@ import ngMock from 'ng_mock'; import FilterBarLibMapFlattenAndWrapFiltersProvider from 'ui/filter_bar/lib/map_flatten_and_wrap_filters'; describe('Filter Bar Directive', function () { describe('mapFlattenAndWrapFilters()', function () { - var mapFlattenAndWrapFilters; - var $rootScope; + let mapFlattenAndWrapFilters; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js b/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js index 11acded334c2..2ef867e20755 100644 --- a/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js @@ -5,8 +5,8 @@ import FilterBarLibMapGeoBoundingBoxProvider from 'ui/filter_bar/lib/map_geo_bou describe('Filter Bar Directive', function () { describe('mapGeoBoundingBox()', function () { - var mapGeoBoundingBox; - var $rootScope; + let mapGeoBoundingBox; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/map_missing.js b/src/ui/public/filter_bar/lib/__tests__/map_missing.js index 8566b41c07cb..c2a5247122c1 100644 --- a/src/ui/public/filter_bar/lib/__tests__/map_missing.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_missing.js @@ -4,9 +4,9 @@ import FilterBarLibMapMissingProvider from 'ui/filter_bar/lib/map_missing'; 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__/map_query_string.js b/src/ui/public/filter_bar/lib/__tests__/map_query_string.js index 89f5a5786685..0d0272f2f0c2 100644 --- a/src/ui/public/filter_bar/lib/__tests__/map_query_string.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_query_string.js @@ -3,8 +3,8 @@ import ngMock from 'ng_mock'; import FilterBarLibMapQueryStringProvider from 'ui/filter_bar/lib/map_query_string'; describe('Filter Bar Directive', function () { describe('mapQueryString()', function () { - 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__/map_range.js b/src/ui/public/filter_bar/lib/__tests__/map_range.js index c6338bc4ff59..db43bcf44c63 100644 --- a/src/ui/public/filter_bar/lib/__tests__/map_range.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_range.js @@ -5,8 +5,8 @@ import FilterBarLibMapRangeProvider from 'ui/filter_bar/lib/map_range'; describe('Filter Bar Directive', function () { describe('mapRange()', function () { - var mapRange; - var $rootScope; + let mapRange; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/map_script.js b/src/ui/public/filter_bar/lib/__tests__/map_script.js index c2e7c94b9687..33ef7b3947f3 100644 --- a/src/ui/public/filter_bar/lib/__tests__/map_script.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_script.js @@ -5,8 +5,8 @@ import FilterBarLibMapScriptProvider from 'ui/filter_bar/lib/map_script'; describe('Filter Bar Directive', function () { describe('mapScript()', function () { - var mapScript; - var $rootScope; + let mapScript; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/__tests__/map_terms.js b/src/ui/public/filter_bar/lib/__tests__/map_terms.js index 71818e8c3a38..7956cbe31300 100644 --- a/src/ui/public/filter_bar/lib/__tests__/map_terms.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_terms.js @@ -5,8 +5,8 @@ import FilterBarLibMapTermsProvider from 'ui/filter_bar/lib/map_terms'; describe('Filter Bar Directive', function () { describe('mapTerms()', function () { - var mapTerms; - var $rootScope; + let mapTerms; + let $rootScope; beforeEach(ngMock.module( 'kibana', diff --git a/src/ui/public/filter_bar/lib/compare_filters.js b/src/ui/public/filter_bar/lib/compare_filters.js index 1e4c31db46f9..a9edc75c9a04 100644 --- a/src/ui/public/filter_bar/lib/compare_filters.js +++ b/src/ui/public/filter_bar/lib/compare_filters.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import angular from '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/map_exists.js b/src/ui/public/filter_bar/lib/map_exists.js index 2b94005b4f6e..84021d9d9add 100644 --- a/src/ui/public/filter_bar/lib/map_exists.js +++ b/src/ui/public/filter_bar/lib/map_exists.js @@ -1,7 +1,7 @@ export default 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/map_geo_bounding_box.js b/src/ui/public/filter_bar/lib/map_geo_bounding_box.js index fd4c183734e6..3418186d0656 100644 --- a/src/ui/public/filter_bar/lib/map_geo_bounding_box.js +++ b/src/ui/public/filter_bar/lib/map_geo_bounding_box.js @@ -1,11 +1,11 @@ import _ from 'lodash'; export default 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/map_missing.js b/src/ui/public/filter_bar/lib/map_missing.js index 407a4909d313..154cec7adb70 100644 --- a/src/ui/public/filter_bar/lib/map_missing.js +++ b/src/ui/public/filter_bar/lib/map_missing.js @@ -1,7 +1,7 @@ export default 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/map_query_string.js b/src/ui/public/filter_bar/lib/map_query_string.js index 22487c07c681..32e471f46f98 100644 --- a/src/ui/public/filter_bar/lib/map_query_string.js +++ b/src/ui/public/filter_bar/lib/map_query_string.js @@ -1,7 +1,7 @@ export default 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/map_script.js b/src/ui/public/filter_bar/lib/map_script.js index b25835b21cf4..dd4f7a6cb6b0 100644 --- a/src/ui/public/filter_bar/lib/map_script.js +++ b/src/ui/public/filter_bar/lib/map_script.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/map_terms.js b/src/ui/public/filter_bar/lib/map_terms.js index ba2d706a07ac..8bd009a4be3a 100644 --- a/src/ui/public/filter_bar/lib/map_terms.js +++ b/src/ui/public/filter_bar/lib/map_terms.js @@ -1,9 +1,9 @@ import _ from 'lodash'; export default 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 37557030d201..501de4a26f18 100644 --- a/src/ui/public/filter_bar/query_filter.js +++ b/src/ui/public/filter_bar/query_filter.js @@ -81,8 +81,8 @@ export default function (Private, $rootScope, getAppState, globalState, config) 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) { @@ -297,7 +297,7 @@ export default function (Private, $rootScope, getAppState, globalState, config) * @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 7a11b80de4c3..084678921c02 100644 --- a/src/ui/public/filter_manager/__tests__/filter_manager.js +++ b/src/ui/public/filter_manager/__tests__/filter_manager.js @@ -5,10 +5,10 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import FilterManagerProvider from 'ui/filter_manager'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; -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 3f121148a692..9f4584fdb91a 100644 --- a/src/ui/public/filter_manager/filter_manager.js +++ b/src/ui/public/filter_manager/filter_manager.js @@ -15,7 +15,7 @@ export default function (Private) { // 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 983cf5a91885..d3c4328b95e8 100644 --- a/src/ui/public/filter_manager/lib/__tests__/phrase.js +++ b/src/ui/public/filter_manager/lib/__tests__/phrase.js @@ -4,8 +4,8 @@ import expect from 'expect.js'; import _ from 'lodash'; import ngMock from 'ng_mock'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -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 798fa0937dc5..703514a4fa8a 100644 --- a/src/ui/public/filter_manager/lib/__tests__/query.js +++ b/src/ui/public/filter_manager/lib/__tests__/query.js @@ -4,8 +4,8 @@ import expect from 'expect.js'; import _ from 'lodash'; import ngMock from 'ng_mock'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -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 f1d97f179bcf..bcef22244290 100644 --- a/src/ui/public/filter_manager/lib/__tests__/range.js +++ b/src/ui/public/filter_manager/lib/__tests__/range.js @@ -4,8 +4,8 @@ import expect from 'expect.js'; import _ from 'lodash'; import ngMock from 'ng_mock'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -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__/comma_list.js b/src/ui/public/filters/__tests__/comma_list.js index d54e39c8e9d4..685b5b60993c 100644 --- a/src/ui/public/filters/__tests__/comma_list.js +++ b/src/ui/public/filters/__tests__/comma_list.js @@ -4,7 +4,7 @@ import 'ui/filters/comma_list'; 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 ff2816855ce9..1dd63bd1ab8f 100644 --- a/src/ui/public/filters/__tests__/field_type.js +++ b/src/ui/public/filters/__tests__/field_type.js @@ -5,9 +5,9 @@ import ngMock from 'ng_mock'; import 'plugins/kibana/discover/index'; import '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 d4cdd3bf5c40..4e02b009b504 100644 --- a/src/ui/public/filters/__tests__/label.js +++ b/src/ui/public/filters/__tests__/label.js @@ -7,7 +7,7 @@ import 'plugins/kibana/discover/index'; // Load kibana and its applications -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 72f1bb98203b..781a5d8362e1 100644 --- a/src/ui/public/filters/__tests__/moment.js +++ b/src/ui/public/filters/__tests__/moment.js @@ -6,11 +6,11 @@ import ngMock from 'ng_mock'; import '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 768203f25768..4ecfe3015997 100644 --- a/src/ui/public/filters/__tests__/rison.js +++ b/src/ui/public/filters/__tests__/rison.js @@ -5,8 +5,8 @@ import 'plugins/kibana/discover/index'; // Load kibana and its applications -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 c4de34d12ce2..febc2a144639 100644 --- a/src/ui/public/filters/__tests__/short_dots.js +++ b/src/ui/public/filters/__tests__/short_dots.js @@ -6,9 +6,9 @@ import 'plugins/kibana/discover/index'; import '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 408b4396a7c2..32484c9094ac 100644 --- a/src/ui/public/filters/__tests__/start_from.js +++ b/src/ui/public/filters/__tests__/start_from.js @@ -4,7 +4,7 @@ import ngMock from 'ng_mock'; import '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 6702c7713dd5..f186614186a1 100644 --- a/src/ui/public/filters/__tests__/uriescape.js +++ b/src/ui/public/filters/__tests__/uriescape.js @@ -5,7 +5,7 @@ import ngMock from 'ng_mock'; import '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 8a82c290bebf..0b0fd5651646 100644 --- a/src/ui/public/filters/short_dots.js +++ b/src/ui/public/filters/short_dots.js @@ -11,7 +11,7 @@ uiModules }); function shortDotsFilterProvider(config, $rootScope) { - var filter; + let filter; function updateFilter() { filter = config.get('shortDots:enable') ? _.shortenDottedString : _.identity; diff --git a/src/ui/public/fixed_scroll.js b/src/ui/public/fixed_scroll.js index fcf6708cc57a..692bb74606ad 100644 --- a/src/ui/public/fixed_scroll.js +++ b/src/ui/public/fixed_scroll.js @@ -36,7 +36,7 @@ uiModules 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 b66f3b1d38eb..fcf65da5fa34 100644 --- a/src/ui/public/highlight/__tests__/highlight.js +++ b/src/ui/public/highlight/__tests__/highlight.js @@ -5,9 +5,9 @@ import 'ui/highlight'; describe('Highlight', function () { - 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__/_cast_mapping_type.js b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js index 4e55b1d613ad..73148fe90944 100644 --- a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js +++ b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js @@ -4,8 +4,8 @@ import expect from 'expect.js'; import IndexPatternsCastMappingTypeProvider from 'ui/index_patterns/_cast_mapping_type'; describe('type normalizer (castMappingType)', function () { - var fn; - var fields; + let fn; + let fields; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { fn = Private(IndexPatternsCastMappingTypeProvider); diff --git a/src/ui/public/index_patterns/__tests__/_field_format.js b/src/ui/public/index_patterns/__tests__/_field_format.js index 504a1eb2f93a..710b0738ac96 100644 --- a/src/ui/public/index_patterns/__tests__/_field_format.js +++ b/src/ui/public/index_patterns/__tests__/_field_format.js @@ -4,8 +4,8 @@ import ngMock from 'ng_mock'; import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format'; describe('FieldFormat class', function () { - 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__/_get_computed_fields.js b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js index 0d5309fe0c99..bd03519dea95 100644 --- a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js +++ b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js @@ -4,11 +4,11 @@ import ngMock from 'ng_mock'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('get computed fields', function () { - var indexPattern; + let indexPattern; - var getComputedFields; + let getComputedFields; - var fn; + let fn; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); diff --git a/src/ui/public/index_patterns/__tests__/_index_pattern.js b/src/ui/public/index_patterns/__tests__/_index_pattern.js index cc39abe9462a..f11650ec7188 100644 --- a/src/ui/public/index_patterns/__tests__/_index_pattern.js +++ b/src/ui/public/index_patterns/__tests__/_index_pattern.js @@ -13,18 +13,18 @@ import UtilsMappingSetupProvider from 'ui/utils/mapping_setup'; import IndexPatternsIntervalsProvider from 'ui/index_patterns/_intervals'; import IndexPatternsIndexPatternProvider from 'ui/index_patterns/_index_pattern'; describe('index pattern', function () { - 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_) { @@ -148,9 +148,9 @@ describe('index pattern', function () { // override the default indexPattern, with a truncated field list require('test_utils/no_digest_promises').activateForSuite(); var indexPatternId = 'test-pattern'; - var indexPattern; - var fieldLength; - var truncatedFields; + let indexPattern; + let fieldLength; + let truncatedFields; beforeEach(function () { fieldLength = mockLogstashFields.length; @@ -303,7 +303,7 @@ describe('index pattern', function () { describe('#toDetailedIndexList', function () { require('test_utils/no_digest_promises').activateForSuite(); context('when index pattern is an interval', function () { - var interval; + let interval; beforeEach(function () { interval = 'result:getInterval'; sinon.stub(indexPattern, 'getInterval').returns(interval); @@ -382,7 +382,7 @@ describe('index pattern', function () { context('when index pattern is an interval', function () { require('test_utils/no_digest_promises').activateForSuite(); - var interval; + let interval; beforeEach(function () { interval = 'result:getInterval'; sinon.stub(indexPattern, 'getInterval').returns(interval); @@ -453,7 +453,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 cbc7b783334c..feaf6b4c6dae 100644 --- a/src/ui/public/index_patterns/__tests__/_map_field.js +++ b/src/ui/public/index_patterns/__tests__/_map_field.js @@ -4,8 +4,8 @@ import ngMock from 'ng_mock'; import IndexPatternsMapFieldProvider from 'ui/index_patterns/_map_field'; describe('field mapping normalizer (mapField)', function () { - 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 9fda8bd0411d..427ef3f07458 100644 --- a/src/ui/public/index_patterns/__tests__/flatten_hit.js +++ b/src/ui/public/index_patterns/__tests__/flatten_hit.js @@ -6,10 +6,10 @@ import IndexPatternsFlattenHitProvider from 'ui/index_patterns/_flatten_hit'; describe('IndexPattern#flattenHit()', function () { - 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 73e2d376e928..241cdda7e53e 100644 --- a/src/ui/public/index_patterns/__tests__/intervals.js +++ b/src/ui/public/index_patterns/__tests__/intervals.js @@ -7,7 +7,7 @@ import IndexPatternsIntervalsProvider from 'ui/index_patterns/_intervals'; describe('Index Patterns', function () { describe('interval.toIndexList()', function () { - var intervals; + let intervals; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { intervals = Private(IndexPatternsIntervalsProvider); diff --git a/src/ui/public/index_patterns/_get_ids.js b/src/ui/public/index_patterns/_get_ids.js index 13934396c915..a02d338f95d1 100644 --- a/src/ui/public/index_patterns/_get_ids.js +++ b/src/ui/public/index_patterns/_get_ids.js @@ -3,7 +3,7 @@ export default function GetIndexPatternIdsFn(es, kbnIndex) { // 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 b43f060757fe..a58a4dccb266 100644 --- a/src/ui/public/index_patterns/_intervals.js +++ b/src/ui/public/index_patterns/_intervals.js @@ -35,7 +35,7 @@ export default function IndexNameIntervalsService(timefilter) { }); 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/indexed_array/__tests__/indexed_array.js b/src/ui/public/indexed_array/__tests__/indexed_array.js index 86cd49613584..f0ee09fc1fce 100644 --- a/src/ui/public/indexed_array/__tests__/indexed_array.js +++ b/src/ui/public/indexed_array/__tests__/indexed_array.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/indexed_array/indexed_array.js b/src/ui/public/indexed_array/indexed_array.js index c63d0b157528..aa042fd3312f 100644 --- a/src/ui/public/indexed_array/indexed_array.js +++ b/src/ui/public/indexed_array/indexed_array.js @@ -74,7 +74,7 @@ IndexedArray.prototype._setupIndices = function (props, inflect, op) { 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/indexed_array/inflector.js b/src/ui/public/indexed_array/inflector.js index de221ea533c6..17cebbbc6d1b 100644 --- a/src/ui/public/indexed_array/inflector.js +++ b/src/ui/public/indexed_array/inflector.js @@ -16,7 +16,7 @@ function endsWith(str, test) { function inflector(prefix, postfix) { return function inflect(key) { - var inflected; + let inflected; if (key.indexOf('.') !== -1) { inflected = key diff --git a/src/ui/public/listen/__tests__/listen.js b/src/ui/public/listen/__tests__/listen.js index b81480e2276f..261139420b4c 100644 --- a/src/ui/public/listen/__tests__/listen.js +++ b/src/ui/public/listen/__tests__/listen.js @@ -6,8 +6,8 @@ import EventsProvider from 'ui/events'; describe('listen component', function () { - var $rootScope; - var Events; + let $rootScope; + let Events; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/notify/__tests__/notifier.js b/src/ui/public/notify/__tests__/notifier.js index cfbb6aeb4cfb..7c180c3580c8 100644 --- a/src/ui/public/notify/__tests__/notifier.js +++ b/src/ui/public/notify/__tests__/notifier.js @@ -5,10 +5,10 @@ import sinon from 'sinon'; import Notifier from 'ui/notify/notifier'; describe('Notifier', function () { - var $interval; + let $interval; 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 a4a8630ec0d7..e72740d18945 100644 --- a/src/ui/public/notify/notifier.js +++ b/src/ui/public/notify/notifier.js @@ -16,7 +16,7 @@ var log = _.bindKey(console, 'log'); var firstFatal = true; var fatalToastTemplate = (function lazyTemplate(tmpl) { - var compiled; + let compiled; return function (vars) { return (compiled || (compiled = _.template(tmpl)))(vars); }; @@ -332,9 +332,9 @@ function createGroupLogger(type, opts) { 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 1507c74b7b87..cbf6324455b2 100644 --- a/src/ui/public/paginated_table/__tests__/index.js +++ b/src/ui/public/paginated_table/__tests__/index.js @@ -7,12 +7,12 @@ import 'ui/paginated_table'; import $ from 'jquery'; 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 e69831c27d60..91947f9b060a 100644 --- a/src/ui/public/paginated_table/paginated_table.js +++ b/src/ui/public/paginated_table/paginated_table.js @@ -31,7 +31,7 @@ uiModules 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 1c8c1d8303f5..41ad7e078a3b 100644 --- a/src/ui/public/persisted_log/__tests__/persisted_log.js +++ b/src/ui/public/persisted_log/__tests__/persisted_log.js @@ -4,9 +4,9 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import 'ui/persisted_log'; -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 dc7d8515dc89..e79f36a3bac9 100644 --- a/src/ui/public/persisted_state/__tests__/persisted_state.js +++ b/src/ui/public/persisted_state/__tests__/persisted_state.js @@ -7,8 +7,8 @@ import errors from 'ui/errors'; import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state'; import EventsProvider from 'ui/events'; -var PersistedState; -var Events; +let PersistedState; +let Events; describe('Persisted State', function () { noDigestPromises.activateForSuite(); @@ -23,7 +23,7 @@ describe('Persisted State', function () { }); describe('state creation', function () { - var persistedState; + let persistedState; it('should create an empty state instance', function () { persistedState = new PersistedState(); @@ -101,7 +101,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); @@ -114,7 +114,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'; @@ -371,7 +371,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 }; @@ -496,7 +496,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' }); @@ -532,7 +532,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' } }); @@ -576,8 +576,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 be8321b7799a..873a22ad2871 100644 --- a/src/ui/public/private/__tests__/private.js +++ b/src/ui/public/private/__tests__/private.js @@ -3,7 +3,7 @@ import ngMock from 'ng_mock'; describe('Private module loader', function () { - var Private; + let Private; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector) { diff --git a/src/ui/public/private/private.js b/src/ui/public/private/private.js index 51657e56bc1d..ead3fbbde6c3 100644 --- a/src/ui/public/private/private.js +++ b/src/ui/public/private/private.js @@ -152,7 +152,7 @@ uiModules.get('kibana') function get(id, prov, $delegateId, $delegateProv) { if (cache[id]) return cache[id]; - var instance; + let instance; if ($delegateId != null && $delegateProv != null) { instance = instantiate(prov, { @@ -168,8 +168,8 @@ uiModules.get('kibana') // 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 fb7eddf6afae..af9f21212d6a 100644 --- a/src/ui/public/promises/promises.js +++ b/src/ui/public/promises/promises.js @@ -74,7 +74,7 @@ module.service('Promise', function ($q, $timeout) { 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 5b206662b0a0..7e46bb6705fd 100644 --- a/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js +++ b/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js @@ -17,10 +17,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) { @@ -51,7 +51,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 7b448660eacd..fb39dc64c961 100644 --- a/src/ui/public/registry/__tests__/index.js +++ b/src/ui/public/registry/__tests__/index.js @@ -4,8 +4,8 @@ import registry from 'ui/registry/_registry'; import expect from 'expect.js'; import ngMock from 'ng_mock'; describe('Registry', function () { - 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 437025cf9935..7b376f2b8a4d 100644 --- a/src/ui/public/registry/field_formats.js +++ b/src/ui/public/registry/field_formats.js @@ -8,7 +8,7 @@ export default uiRegistry({ constructor: function (config, $rootScope) { var self = this; - var defaultMap; + let defaultMap; function init() { parseDefaultTypeMap(); diff --git a/src/ui/public/routes/__tests__/_route_manager.js b/src/ui/public/routes/__tests__/_route_manager.js index f015e98b6323..29f99f49a119 100644 --- a/src/ui/public/routes/__tests__/_route_manager.js +++ b/src/ui/public/routes/__tests__/_route_manager.js @@ -4,14 +4,14 @@ import sinon from 'auto-release-sinon'; import RouteManager from 'ui/routes/route_manager'; import expect from '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/route_manager', function () { beforeEach(ngMock.module('kibana', function ($routeProvider) { $rp = $routeProvider; diff --git a/src/ui/public/routes/__tests__/_work_queue.js b/src/ui/public/routes/__tests__/_work_queue.js index 91ff1fe92181..1321ec0fd81e 100644 --- a/src/ui/public/routes/__tests__/_work_queue.js +++ b/src/ui/public/routes/__tests__/_work_queue.js @@ -6,8 +6,8 @@ import sinon from 'auto-release-sinon'; import '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__/_wrap_route_with_prep.js b/src/ui/public/routes/__tests__/_wrap_route_with_prep.js index 6de90f2a40d4..d1e915abf4d2 100644 --- a/src/ui/public/routes/__tests__/_wrap_route_with_prep.js +++ b/src/ui/public/routes/__tests__/_wrap_route_with_prep.js @@ -9,7 +9,7 @@ import { stub } from 'auto-release-sinon'; import 'ui/private'; -var routes; +let routes; describe('wrapRouteWithPrep fn', function () { require('test_utils/no_digest_promises').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/routes/route_manager.js b/src/ui/public/routes/route_manager.js index df5ef1562ffb..01ec0a6aa644 100644 --- a/src/ui/public/routes/route_manager.js +++ b/src/ui/public/routes/route_manager.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/safe_confirm/__tests__/safe_confirm.js b/src/ui/public/safe_confirm/__tests__/safe_confirm.js index be7fbf86f35a..e30201d534f7 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 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; describe('ui/safe_confirm', function () { - 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/stack_trace_mapper/stack_line_format.js b/src/ui/public/stack_trace_mapper/stack_line_format.js index 8b698d982fa1..e1486aee635e 100644 --- a/src/ui/public/stack_trace_mapper/stack_line_format.js +++ b/src/ui/public/stack_trace_mapper/stack_line_format.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/state_management/__tests__/app_state.js b/src/ui/public/state_management/__tests__/app_state.js index 2e3fca03912d..5de4631512a2 100644 --- a/src/ui/public/state_management/__tests__/app_state.js +++ b/src/ui/public/state_management/__tests__/app_state.js @@ -5,8 +5,8 @@ import 'ui/state_management/app_state'; import StateManagementAppStateProvider from '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) { @@ -15,7 +15,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 1bb5b6dcb92f..40f5073cfcc6 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 @@ import ngMock from 'ng_mock'; import '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 fa3aed0288ff..9af33460604c 100644 --- a/src/ui/public/state_management/__tests__/state.js +++ b/src/ui/public/state_management/__tests__/state.js @@ -8,10 +8,10 @@ import StateManagementStateProvider from 'ui/state_management/state'; import EventsProvider from 'ui/events'; 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) { @@ -138,7 +138,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 90ee457b19af..5f20cacef96a 100644 --- a/src/ui/public/state_management/app_state.js +++ b/src/ui/public/state_management/app_state.js @@ -7,8 +7,8 @@ var urlParam = '_a'; function AppStateProvider(Private, $rootScope, getAppState) { var State = Private(StateManagementStateProvider); var PersistedState = Private(PersistedStatePersistedStateProvider); - var persistedStates; - var eventUnsubscribers; + let persistedStates; + let eventUnsubscribers; _.class(AppState).inherits(State); function AppState(defaults) { @@ -72,7 +72,7 @@ modules.get('kibana/global_state') 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 30ff6c0c885c..907c16dd7c01 100644 --- a/src/ui/public/storage/__tests__/storage.js +++ b/src/ui/public/storage/__tests__/storage.js @@ -3,8 +3,8 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import 'ui/storage'; -var storage; -var $window; +let storage; +let $window; var payload = { first: 'john', last: 'smith' }; diff --git a/src/ui/public/stringify/__tests__/_color.js b/src/ui/public/stringify/__tests__/_color.js index d3be85b28665..652ef54ffefd 100644 --- a/src/ui/public/stringify/__tests__/_color.js +++ b/src/ui/public/stringify/__tests__/_color.js @@ -2,8 +2,8 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; describe('Color Format', function () { - var fieldFormats; - var ColorFormat; + let fieldFormats; + let ColorFormat; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/stringify/__tests__/_conformance.js b/src/ui/public/stringify/__tests__/_conformance.js index b96d0df9883b..f1da188ef28f 100644 --- a/src/ui/public/stringify/__tests__/_conformance.js +++ b/src/ui/public/stringify/__tests__/_conformance.js @@ -4,9 +4,9 @@ import ngMock from 'ng_mock'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format'; -var fieldFormats; -var FieldFormat; -var config; +let fieldFormats; +let FieldFormat; +let config; var formatIds = [ 'bytes', @@ -31,8 +31,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 ecc848df93e0..f1975e0ce259 100644 --- a/src/ui/public/stringify/__tests__/_date.js +++ b/src/ui/public/stringify/__tests__/_date.js @@ -3,11 +3,11 @@ import ngMock from 'ng_mock'; import moment from 'moment-timezone'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; describe('Date Format', function () { - 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 b3c98cceb3df..f49294c97d9c 100644 --- a/src/ui/public/stringify/__tests__/_ip.js +++ b/src/ui/public/stringify/__tests__/_ip.js @@ -2,7 +2,7 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; describe('IP Address Format', function () { - var fieldFormats; + let fieldFormats; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/stringify/__tests__/_source.js b/src/ui/public/stringify/__tests__/_source.js index 11b3a67466e2..8d2b9ae5de94 100644 --- a/src/ui/public/stringify/__tests__/_source.js +++ b/src/ui/public/stringify/__tests__/_source.js @@ -7,7 +7,7 @@ import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logsta import FixturesHitsProvider from 'fixtures/hits'; describe('_source formatting', function () { - var fieldFormats; + let fieldFormats; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -15,10 +15,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(FixturesStubbedLogstashIndexPatternProvider); diff --git a/src/ui/public/stringify/__tests__/_string.js b/src/ui/public/stringify/__tests__/_string.js index 7a04c3ddfb07..a293abd83bc9 100644 --- a/src/ui/public/stringify/__tests__/_string.js +++ b/src/ui/public/stringify/__tests__/_string.js @@ -2,7 +2,7 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; describe('String Format', function () { - var fieldFormats; + let fieldFormats; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/stringify/__tests__/_truncate.js b/src/ui/public/stringify/__tests__/_truncate.js index 5a6af9eeae95..a92a111f4463 100644 --- a/src/ui/public/stringify/__tests__/_truncate.js +++ b/src/ui/public/stringify/__tests__/_truncate.js @@ -2,7 +2,7 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; describe('String Truncate Format', function () { - var fieldFormats; + let fieldFormats; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/stringify/__tests__/_url.js b/src/ui/public/stringify/__tests__/_url.js index 1c081add2615..c9b7e2c23038 100644 --- a/src/ui/public/stringify/__tests__/_url.js +++ b/src/ui/public/stringify/__tests__/_url.js @@ -4,7 +4,7 @@ import ngMock from 'ng_mock'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; describe('Url Format', function () { - var fieldFormats; + let fieldFormats; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -12,7 +12,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/style_compile/__tests__/style_compile.js b/src/ui/public/style_compile/__tests__/style_compile.js index 6c9d34431d13..f68a27c6c471 100644 --- a/src/ui/public/style_compile/__tests__/style_compile.js +++ b/src/ui/public/style_compile/__tests__/style_compile.js @@ -3,8 +3,8 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; describe('styleCompile directive', function () { - var config; - var $rootScope; + let config; + let $rootScope; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector) { diff --git a/src/ui/public/test_harness/test_harness.js b/src/ui/public/test_harness/test_harness.js index 0568a98f340e..4fb4a3e77964 100644 --- a/src/ui/public/test_harness/test_harness.js +++ b/src/ui/public/test_harness/test_harness.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 00c76b88a856..69e2ad3150c2 100644 --- a/src/ui/public/time_buckets/calc_auto_interval.js +++ b/src/ui/public/time_buckets/calc_auto_interval.js @@ -27,7 +27,7 @@ export default function DateIntervalRoundingRulesProvider() { 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 2fb604cfa519..24c3bdd7a348 100644 --- a/src/ui/public/time_buckets/time_buckets.js +++ b/src/ui/public/time_buckets/time_buckets.js @@ -43,7 +43,7 @@ export default function IntervalHelperProvider(Private, timefilter, config) { 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]; @@ -214,7 +214,7 @@ export default function IntervalHelperProvider(Private, timefilter, config) { 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 fd70dfde0670..cfc784a1e805 100644 --- a/src/ui/public/timefilter/__tests__/diff_interval.js +++ b/src/ui/public/timefilter/__tests__/diff_interval.js @@ -6,10 +6,10 @@ import TimefilterLibDiffIntervalProvider from 'ui/timefilter/lib/diff_interval'; 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 b5d6d7dbfb31..e783e1d5b2a5 100644 --- a/src/ui/public/timefilter/__tests__/diff_time.js +++ b/src/ui/public/timefilter/__tests__/diff_time.js @@ -5,10 +5,10 @@ import TimefilterLibDiffTimeProvider from 'ui/timefilter/lib/diff_time'; 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 6573b82d90cf..55da9e55a992 100644 --- a/src/ui/public/timefilter/timefilter.js +++ b/src/ui/public/timefilter/timefilter.js @@ -84,7 +84,7 @@ uiModules } 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 2d89fde6a049..3e99ed56ae7a 100644 --- a/src/ui/public/url/__tests__/url.js +++ b/src/ui/public/url/__tests__/url.js @@ -8,12 +8,12 @@ import MockState from 'fixtures/mock_state'; import 'ui/url'; // 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; function init() { @@ -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 ec248631fe2e..a5c7cf0eebf3 100644 --- a/src/ui/public/url/url.js +++ b/src/ui/public/url/url.js @@ -140,7 +140,7 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA ///// // private api ///// - var reloading; + let reloading; self._changeLocation = function (type, url, paramObj, replace) { var prev = { diff --git a/src/ui/public/utils/__tests__/datemath.js b/src/ui/public/utils/__tests__/datemath.js index 80b190ba6872..b50fe9c1f151 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 e3e5494f8336..5299d36c9bb8 100644 --- a/src/ui/public/utils/__tests__/diff_time_picker_vals.js +++ b/src/ui/public/utils/__tests__/diff_time_picker_vals.js @@ -5,7 +5,7 @@ import expect from 'expect.js'; import UtilsDiffTimePickerValsProvider from 'ui/utils/diff_time_picker_vals'; 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/__tests__/simple_emitter.js b/src/ui/public/utils/__tests__/simple_emitter.js index 3c4ebcc9022d..ae031d5c6356 100644 --- a/src/ui/public/utils/__tests__/simple_emitter.js +++ b/src/ui/public/utils/__tests__/simple_emitter.js @@ -2,7 +2,7 @@ import SimpleEmitter from 'ui/utils/simple_emitter'; import expect from 'expect.js'; import sinon from 'auto-release-sinon'; describe('SimpleEmitter class', function () { - var emitter; + let emitter; beforeEach(function () { emitter = new SimpleEmitter(); diff --git a/src/ui/public/utils/date_math.js b/src/ui/public/utils/date_math.js index e312acde71bc..76be3e72b2c1 100644 --- a/src/ui/public/utils/date_math.js +++ b/src/ui/public/utils/date_math.js @@ -13,10 +13,10 @@ function parse(text, roundUp) { 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(); @@ -48,9 +48,9 @@ function parseDateMath(mathString, time, roundUp) { 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 0380ce9cc5e0..df317284e009 100644 --- a/src/ui/public/utils/query_string.js +++ b/src/ui/public/utils/query_string.js @@ -38,8 +38,8 @@ function encodeUriQuery(val, pctEncodeSpaces) { */ 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 2dd955105f59..c4932355e62f 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/vis/__tests__/_agg_config.js b/src/ui/public/vis/__tests__/_agg_config.js index 2a908485b95f..168843af7e55 100644 --- a/src/ui/public/vis/__tests__/_agg_config.js +++ b/src/ui/public/vis/__tests__/_agg_config.js @@ -8,11 +8,11 @@ import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logsta import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; describe('AggConfig', function () { - 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__/_agg_config_result.js b/src/ui/public/vis/__tests__/_agg_config_result.js index 7106942c15b0..e4c5b03bef14 100644 --- a/src/ui/public/vis/__tests__/_agg_config_result.js +++ b/src/ui/public/vis/__tests__/_agg_config_result.js @@ -7,9 +7,9 @@ import VisAggConfigProvider from 'ui/vis/agg_config'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('AggConfigResult', function () { - 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__/_agg_configs.js b/src/ui/public/vis/__tests__/_agg_configs.js index 6c8c11d2b33f..ac94ecb61981 100644 --- a/src/ui/public/vis/__tests__/_agg_configs.js +++ b/src/ui/public/vis/__tests__/_agg_configs.js @@ -10,13 +10,13 @@ import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logsta import VisSchemasProvider from 'ui/vis/schemas'; describe('AggConfigs', function () { - 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) { @@ -100,7 +100,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 dcdd84a38a15..cb39bbaf45b4 100644 --- a/src/ui/public/vis/__tests__/_renderbot.js +++ b/src/ui/public/vis/__tests__/_renderbot.js @@ -2,7 +2,7 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import VisRenderbotProvider from 'ui/vis/renderbot'; describe('renderbot', function () { - var Renderbot; + let Renderbot; function init() { ngMock.module('kibana'); @@ -13,10 +13,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 dba6c56f79ac..79b937fd58fa 100644 --- a/src/ui/public/vis/__tests__/_vis.js +++ b/src/ui/public/vis/__tests__/_vis.js @@ -7,11 +7,11 @@ import RegistryVisTypesProvider from 'ui/registry/vis_types'; describe('Vis Class', function () { - 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/vis/agg_config.js b/src/ui/public/vis/agg_config.js index 362e7c60bfdd..8e5f76772931 100644 --- a/src/ui/public/vis/agg_config.js +++ b/src/ui/public/vis/agg_config.js @@ -141,7 +141,7 @@ export default function AggConfigFactory(Private, fieldTypeFilter) { */ 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/agg_configs.js b/src/ui/public/vis/agg_configs.js index 05fcdf4f23a2..a112144ba803 100644 --- a/src/ui/public/vis/agg_configs.js +++ b/src/ui/public/vis/agg_configs.js @@ -49,8 +49,8 @@ export default function AggConfigsFactory(Private) { 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 @@ -86,7 +86,7 @@ export default function AggConfigsFactory(Private) { } 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/vislib/__tests__/components/color.js b/src/ui/public/vislib/__tests__/components/color.js index 118dd34518ea..744d32d3d99a 100644 --- a/src/ui/public/vislib/__tests__/components/color.js +++ b/src/ui/public/vislib/__tests__/components/color.js @@ -9,13 +9,13 @@ import VislibComponentsColorMappedColorsProvider from 'ui/vislib/components/colo import VislibComponentsColorColorPaletteProvider from 'ui/vislib/components/color/color_palette'; 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]; @@ -24,8 +24,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) => { @@ -251,9 +251,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 39a58c2f73b9..d76dfe9c49e1 100644 --- a/src/ui/public/vislib/__tests__/components/labels.js +++ b/src/ui/public/vislib/__tests__/components/labels.js @@ -7,13 +7,13 @@ import VislibComponentsLabelsDataArrayProvider from 'ui/vislib/components/labels import VislibComponentsLabelsUniqLabelsProvider from 'ui/vislib/components/labels/uniq_labels'; import VislibComponentsLabelsFlattenSeriesProvider from 'ui/vislib/components/labels/flatten_series'; -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': '', @@ -169,10 +169,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) { @@ -266,7 +266,7 @@ describe('Vislib Labels Module Test Suite', function () { }); describe('Unique labels', function () { - var uniqLabels; + let uniqLabels; var arrObj = [ {'label': 'a'}, {'label': 'b'}, @@ -282,9 +282,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) { @@ -352,12 +352,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 8f00bc01cd1d..a055c0a9fb7a 100644 --- a/src/ui/public/vislib/__tests__/components/zero_injection.js +++ b/src/ui/public/vislib/__tests__/components/zero_injection.js @@ -252,13 +252,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) { @@ -362,9 +362,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) { @@ -422,8 +422,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) { @@ -471,8 +471,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) { @@ -496,11 +496,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) { @@ -577,12 +577,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) { @@ -643,8 +643,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 58f9155b2cea..d684baf0f15c 100644 --- a/src/ui/public/vislib/__tests__/index.js +++ b/src/ui/public/vislib/__tests__/index.js @@ -9,7 +9,7 @@ import 'ui/vislib/styles/main.less'; import VislibProvider from 'ui/vislib'; 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 74471fa721b7..b2dc19f9e279 100644 --- a/src/ui/public/vislib/__tests__/lib/axis_title.js +++ b/src/ui/public/vislib/__tests__/lib/axis_title.js @@ -9,14 +9,14 @@ import VislibLibDataProvider from 'ui/vislib/lib/data'; import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state'; 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 a24d0ea6e9a0..1340146ab334 100644 --- a/src/ui/public/vislib/__tests__/lib/chart_title.js +++ b/src/ui/public/vislib/__tests__/lib/chart_title.js @@ -9,12 +9,12 @@ import VislibLibDataProvider from 'ui/vislib/lib/data'; import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state'; 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 5326cbf3f843..6903192f3ac4 100644 --- a/src/ui/public/vislib/__tests__/lib/data.js +++ b/src/ui/public/vislib/__tests__/lib/data.js @@ -102,8 +102,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) { @@ -202,7 +202,7 @@ describe('Vislib Data Class Test Suite', function () { describe('_removeZeroSlices', function () { - var data; + let data; var pieData = { slices: { children: [ @@ -224,12 +224,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); @@ -263,9 +263,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; @@ -300,9 +300,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; @@ -337,7 +337,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 e984c35d722c..daee015c5f4c 100644 --- a/src/ui/public/vislib/__tests__/lib/dispatch.js +++ b/src/ui/public/vislib/__tests__/lib/dispatch.js @@ -22,9 +22,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) { @@ -48,8 +48,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) { @@ -119,9 +119,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(FixturesVislibVisFixtureProvider)(); @@ -139,9 +139,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(FixturesVislibVisFixtureProvider)(); diff --git a/src/ui/public/vislib/__tests__/lib/error_handler.js b/src/ui/public/vislib/__tests__/lib/error_handler.js index c0e4518401e6..8685371682b5 100644 --- a/src/ui/public/vislib/__tests__/lib/error_handler.js +++ b/src/ui/public/vislib/__tests__/lib/error_handler.js @@ -5,8 +5,8 @@ import ngMock from 'ng_mock'; import VislibLibErrorHandlerProvider from 'ui/vislib/lib/_error_handler'; 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 52f97e60a816..5c73a1dc6eed 100644 --- a/src/ui/public/vislib/__tests__/lib/handler/handler.js +++ b/src/ui/public/vislib/__tests__/lib/handler/handler.js @@ -27,9 +27,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' @@ -58,7 +58,7 @@ dateHistogramArray.forEach(function (data, i) { }); describe('enable Method', function () { - var charts; + let charts; beforeEach(function () { charts = vis.handler.charts; @@ -80,7 +80,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 c82d506df531..54cf3afe338b 100644 --- a/src/ui/public/vislib/__tests__/lib/layout/layout.js +++ b/src/ui/public/vislib/__tests__/lib/layout/layout.js @@ -27,11 +27,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 d25635d8364e..9d0b10c6d098 100644 --- a/src/ui/public/vislib/__tests__/lib/layout/layout_types.js +++ b/src/ui/public/vislib/__tests__/lib/layout/layout_types.js @@ -5,8 +5,8 @@ import expect from 'expect.js'; import VislibLibLayoutLayoutTypesProvider from 'ui/vislib/lib/layout/layout_types'; 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 7b16c4e53f34..07e05721c7f8 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 @@ -10,11 +10,11 @@ import VislibLibLayoutSplitsColumnChartYAxisSplitProvider from 'ui/vislib/lib/la 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: [ { @@ -153,7 +153,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); @@ -173,8 +173,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'); @@ -213,8 +213,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') @@ -235,8 +235,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 de12d92b730b..f4836cfa966e 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 @@ -6,9 +6,9 @@ import expect from 'expect.js'; import VislibLibLayoutLayoutTypesProvider from 'ui/vislib/lib/layout/layout_types'; 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 1c6415d3148e..68e916b5dc31 100644 --- a/src/ui/public/vislib/__tests__/lib/resize_checker.js +++ b/src/ui/public/vislib/__tests__/lib/resize_checker.js @@ -12,10 +12,10 @@ describe('Vislib Resize Checker', function () { require('test_utils/no_digest_promises').activateForSuite(); - var ResizeChecker; - var EventEmitter; - var checker; - var reflowWatcher; + let ResizeChecker; + let EventEmitter; + let checker; + let reflowWatcher; var reflowSpies = {}; beforeEach(ngMock.module('kibana')); @@ -96,7 +96,7 @@ describe('Vislib Resize Checker', function () { }); describe('#check()', function () { - var emit; + let emit; beforeEach(function () { emit = sinon.stub(checker, 'emit'); @@ -161,8 +161,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 387f4ce6371c..e0dd324eab1b 100644 --- a/src/ui/public/vislib/__tests__/lib/x_axis.js +++ b/src/ui/public/vislib/__tests__/lib/x_axis.js @@ -9,13 +9,13 @@ import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_s import VislibLibXAxisProvider from 'ui/vislib/lib/x_axis'; 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: '', @@ -127,13 +127,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(); @@ -176,8 +176,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(); @@ -200,8 +200,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 2aad3631d903..8c97e7af9897 100644 --- a/src/ui/public/vislib/__tests__/lib/y_axis.js +++ b/src/ui/public/vislib/__tests__/lib/y_axis.js @@ -7,13 +7,13 @@ import VislibLibDataProvider from 'ui/vislib/lib/data'; import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state'; import VislibLibYAxisProvider from 'ui/vislib/lib/y_axis'; -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, @@ -130,9 +130,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) { @@ -159,8 +159,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'; @@ -325,9 +325,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 6ad76605189c..d80730ecfca7 100644 --- a/src/ui/public/vislib/__tests__/vis.js +++ b/src/ui/public/vislib/__tests__/vis.js @@ -30,10 +30,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) { @@ -133,9 +133,9 @@ dataArray.forEach(function (data, i) { beforeEvent, afterEvent ]; - var listeners; - var listener1; - var listener2; + let listeners; + let listener1; + let listener2; beforeEach(function () { listeners = [ @@ -183,9 +183,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 32816ba83fb8..6c8bb24f5b52 100644 --- a/src/ui/public/vislib/__tests__/visualizations/area_chart.js +++ b/src/ui/public/vislib/__tests__/visualizations/area_chart.js @@ -27,8 +27,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) { @@ -76,8 +76,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) { @@ -105,12 +105,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 9bdf27b449bf..e2c9601e0d25 100644 --- a/src/ui/public/vislib/__tests__/visualizations/chart.js +++ b/src/ui/public/vislib/__tests__/visualizations/chart.js @@ -9,16 +9,16 @@ import VislibVisualizationsColumnChartProvider from 'ui/vislib/visualizations/co import VislibVisualizationsChartProvider from 'ui/vislib/visualizations/_chart'; 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 368b3f2cd75f..57ebe0cea8cb 100644 --- a/src/ui/public/vislib/__tests__/visualizations/column_chart.js +++ b/src/ui/public/vislib/__tests__/visualizations/column_chart.js @@ -32,8 +32,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, @@ -56,8 +56,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) { @@ -78,9 +78,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 6190309eb817..59248dd6390d 100644 --- a/src/ui/public/vislib/__tests__/visualizations/line_chart.js +++ b/src/ui/public/vislib/__tests__/visualizations/line_chart.js @@ -30,8 +30,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) { @@ -54,12 +54,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 6cd93a5d9649..741b3ec6260b 100644 --- a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js +++ b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js @@ -65,14 +65,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) { @@ -162,12 +162,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) { @@ -197,10 +197,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) { @@ -227,10 +227,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 645c22f98e1a..cbad9bfc54c5 100644 --- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js +++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js @@ -26,7 +26,7 @@ import VislibVisualizationsMapProvider from 'ui/vislib/visualizations/_map'; describe('TileMap Map Tests', function () { var $mockMapEl = $('
'); - var TileMapMap; + let TileMapMap; var leafletStubs = {}; var leafletMocks = {}; @@ -44,8 +44,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); @@ -66,8 +66,8 @@ describe('TileMap Map Tests', function () { }); describe('createMap', function () { - var map; - var mapStubs; + let map; + let mapStubs; beforeEach(function () { mapStubs = { @@ -110,7 +110,7 @@ describe('TileMap Map Tests', function () { }); describe('attachEvents', function () { - var map; + let map; beforeEach(function () { sinon.stub(TileMapMap.prototype, '_createMap', function () { @@ -145,8 +145,8 @@ describe('TileMap Map Tests', function () { describe('addMarkers', function () { - var map; - var createStub; + let map; + let createStub; beforeEach(function () { sinon.stub(TileMapMap.prototype, '_createMap'); @@ -173,7 +173,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 b36c4ccdb954..5e9c7b5609b2 100644 --- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js +++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js @@ -15,8 +15,8 @@ import VislibVisualizationsMarkerTypesHeatmapProvider from 'ui/vislib/visualizat 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']); @@ -39,8 +39,8 @@ var mockMap = { }; describe('Marker Tests', function () { - var mapData; - var markerLayer; + let mapData; + let markerLayer; function createMarker(MarkerClass, geoJson) { mapData = _.assign({}, geoJsonData.geoJson, geoJson || {}); @@ -64,7 +64,7 @@ describe('Marker Tests', function () { }); describe('Base Methods', function () { - var MarkerClass; + let MarkerClass; beforeEach(ngMock.module('MarkerFactory')); beforeEach(ngMock.inject(function (Private) { @@ -143,7 +143,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) { @@ -158,8 +158,8 @@ describe('Marker Tests', function () { }); describe('addLegend', function () { - var addToSpy; - var leafletControlStub; + let addToSpy; + let leafletControlStub; beforeEach(function () { addToSpy = sinon.spy(); @@ -218,7 +218,7 @@ describe('Marker Tests', function () { }); describe('Scaled Circles', function () { - var zoom; + let zoom; beforeEach(ngMock.module('MarkerFactory')); beforeEach(ngMock.inject(function (Private) { @@ -274,7 +274,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 bf807fd8ca49..6f75ac8e05f5 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 @@ -10,8 +10,8 @@ import $ from 'jquery'; import VislibVisualizationsTileMapProvider from 'ui/vislib/visualizations/tile_map'; var mockChartEl = $('
'); -var TileMap; -var extentsStub; +let TileMap; +let extentsStub; function createTileMap(handler, chartEl, chartData) { handler = handler || {}; @@ -23,7 +23,7 @@ function createTileMap(handler, chartEl, chartData) { } describe('TileMap Tests', function () { - var tilemap; + let tilemap; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { @@ -59,7 +59,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 4385e1f72b9c..08fe6475b1de 100644 --- a/src/ui/public/vislib/__tests__/visualizations/time_marker.js +++ b/src/ui/public/vislib/__tests__/visualizations/time_marker.js @@ -33,14 +33,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) { @@ -63,8 +63,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); @@ -79,7 +79,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 2b8268d98c1a..a025fe13a728 100644 --- a/src/ui/public/vislib/__tests__/visualizations/vis_types.js +++ b/src/ui/public/vislib/__tests__/visualizations/vis_types.js @@ -5,8 +5,8 @@ import _ from 'lodash'; import VislibVisualizationsVisTypesProvider from 'ui/vislib/visualizations/vis_types'; 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 a755dd0ab3fa..cce03b6df453 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 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/position_tooltip.js b/src/ui/public/vislib/components/tooltip/position_tooltip.js index 4f97f49e3a7b..47cdbaa5b3c0 100644 --- a/src/ui/public/vislib/components/tooltip/position_tooltip.js +++ b/src/ui/public/vislib/components/tooltip/position_tooltip.js @@ -2,7 +2,7 @@ import _ from 'lodash'; import $ from '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 de766880ae9a..1992014dfb92 100644 --- a/src/ui/public/vislib/components/zero_injection/flatten_data.js +++ b/src/ui/public/vislib/components/zero_injection/flatten_data.js @@ -7,7 +7,7 @@ export default function FlattenDataObjectUtilService() { */ 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 34e057e18cf8..49fe26f96aee 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 @@ export default function UniqueXValuesUtilService(Private) { 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 5d603ca6407b..21e98e1b9f74 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 @@ -12,9 +12,9 @@ export default function ZeroFillDataArrayUtilService(Private) { 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 26fc5eb5e6ed..e5aacec2d163 100644 --- a/src/ui/public/vislib/lib/chart_title.js +++ b/src/ui/public/vislib/lib/chart_title.js @@ -57,9 +57,9 @@ export default function ChartTitleFactory(Private) { 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 b37ae3ad2e78..cf7f41e79daa 100644 --- a/src/ui/public/vislib/lib/data.js +++ b/src/ui/public/vislib/lib/data.js @@ -29,7 +29,7 @@ export default function DataFactory(Private) { this.uiState = uiState; var self = this; - var offset; + let offset; if (attr.mode === 'stacked') { offset = 'zero'; @@ -215,7 +215,7 @@ export default function DataFactory(Private) { Data.prototype.getDataType = function () { var data = this.getVisData(); - var type; + let type; data.forEach(function (obj) { if (obj.series) { @@ -252,7 +252,7 @@ export default function DataFactory(Private) { * @returns {*} Array of chart data objects */ Data.prototype.getVisData = function () { - var visData; + let visData; if (this.data.rows) { visData = this.data.rows; @@ -701,7 +701,7 @@ export default function DataFactory(Private) { * @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 ada731f4ad50..24f77165df7c 100644 --- a/src/ui/public/vislib/lib/handler/types/point_series.js +++ b/src/ui/public/vislib/lib/handler/types/point_series.js @@ -26,7 +26,7 @@ export default function ColumnHandler(Private) { 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 3e30a63c420c..31061a919cfc 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 2394f912616f..21988890a6ad 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 b1492d07d2aa..6accb5f596bb 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 2f93f93bb93f..dc3326722561 100644 --- a/src/ui/public/vislib/lib/x_axis.js +++ b/src/ui/public/vislib/lib/x_axis.js @@ -236,12 +236,12 @@ export default function XAxisFactory(Private) { */ 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 @@ export default function XAxisFactory(Private) { 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 @@ export default function XAxisFactory(Private) { */ 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 @@ export default function XAxisFactory(Private) { 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 @@ export default function XAxisFactory(Private) { */ 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 cda249b458b8..778048faf48c 100644 --- a/src/ui/public/vislib/visualizations/area_chart.js +++ b/src/ui/public/vislib/visualizations/area_chart.js @@ -173,8 +173,8 @@ export default function AreaChartFactory(Private) { 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) @@ -297,14 +297,14 @@ export default function AreaChartFactory(Private) { 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 1a2214314c51..000776c9fa7e 100644 --- a/src/ui/public/vislib/visualizations/column_chart.js +++ b/src/ui/public/vislib/visualizations/column_chart.js @@ -51,8 +51,8 @@ export default function ColumnChartFactory(Private) { 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) @@ -120,7 +120,7 @@ export default function ColumnChartFactory(Private) { 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(); @@ -185,7 +185,7 @@ export default function ColumnChartFactory(Private) { var groupSpacingPercentage = 0.15; var isTimeScale = (data.ordered && data.ordered.date); var minWidth = 1; - var barWidth; + let barWidth; // update bars @@ -270,13 +270,13 @@ export default function ColumnChartFactory(Private) { 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 b501e16ccbde..c2b88058bbd5 100644 --- a/src/ui/public/vislib/visualizations/line_chart.js +++ b/src/ui/public/vislib/visualizations/line_chart.js @@ -204,7 +204,7 @@ export default function LineChartFactory(Private) { .y(function y(d) { return yScale(d.y); }); - var lines; + let lines; lines = svg .selectAll('.lines') @@ -277,13 +277,13 @@ export default function LineChartFactory(Private) { 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 4272342a6720..575169cb627c 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 @@ export default function HeatmapMarkerFactory(Private) { */ HeatmapMarker.prototype._nearestFeature = function (latLng) { var self = this; - var nearest; + let nearest; if (latLng.lng < -180 || latLng.lng > 180) { return; @@ -192,7 +192,7 @@ export default function HeatmapMarkerFactory(Private) { 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 5e70e953f914..111ccb0d63c0 100644 --- a/src/ui/public/vislib/visualizations/pie_chart.js +++ b/src/ui/public/vislib/visualizations/pie_chart.js @@ -184,7 +184,7 @@ export default function PieChartFactory(Private) { 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__/_build_chart_data.js b/src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js index 62ec8a1a1ace..2df792b2da08 100644 --- a/src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js +++ b/src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js @@ -8,10 +8,10 @@ import AggResponseIndexProvider from 'ui/agg_response/index'; import VislibVisTypeBuildChartDataProvider from 'ui/vislib_vis_type/build_chart_data'; describe('renderbot#buildChartData', function () { - 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/__tests__/_vislib_renderbot.js b/src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js index 9805fc5af46c..7f11ef76313c 100644 --- a/src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js +++ b/src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js @@ -10,12 +10,12 @@ import VislibVisTypeVislibRenderbotProvider from 'ui/vislib_vis_type/vislib_rend import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state'; import AggResponseIndexProvider from 'ui/agg_response/index'; describe('renderbot', function exportWrapper() { - 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' }; @@ -38,8 +38,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); @@ -65,8 +65,8 @@ describe('renderbot', function exportWrapper() { } }; var $el = $('
testing
'); - var listenerSpy; - var renderbot; + let listenerSpy; + let renderbot; beforeEach(function () { sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _.constant({})); @@ -91,9 +91,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'); @@ -151,8 +151,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/build_chart_data.js b/src/ui/public/vislib_vis_type/build_chart_data.js index e1ad9ec6b8de..8b584653ada6 100644 --- a/src/ui/public/vislib_vis_type/build_chart_data.js +++ b/src/ui/public/vislib_vis_type/build_chart_data.js @@ -45,7 +45,7 @@ export default function VislibVisBuildChartData(Private) { if (!tables.length) return; var out = {}; - var outList; + let outList; tables.forEach(function (table) { if (!outList) { @@ -54,7 +54,7 @@ export default function VislibVisBuildChartData(Private) { 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 1a1a80e63a69..8b91ed0d0a77 100644 --- a/src/ui/public/visualize/spy.js +++ b/src/ui/public/visualize/spy.js @@ -14,7 +14,7 @@ uiModules restrict: 'E', template: spyTemplate, 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 171c967810bd..8b02f5d6fb5b 100644 --- a/src/ui/public/visualize/visualize.js +++ b/src/ui/public/visualize/visualize.js @@ -29,7 +29,7 @@ uiModules }, template: visualizeTemplate, 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 ed0f60a2e9a0..fe39adb2e428 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 @@ import sinon from 'auto-release-sinon'; describe('$scope.$watchMulti', function () { - 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/package_json.js b/src/utils/package_json.js index 1a7cb5c05fb2..d85a159ddff1 100644 --- a/src/utils/package_json.js +++ b/src/utils/package_json.js @@ -1,8 +1,8 @@ import { existsSync } from 'fs'; import { join } from 'path'; -var packageDir; -var packagePath; +let packageDir; +let packagePath; while (!packagePath || !existsSync(packagePath)) { var prev = packageDir;