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

Revert "Merge pull request #6931 from elastic/jasper/backport/6908/6926/4.5"

Browse source 
This reverts commit 8930ce3ca6, reversing
changes made to e10f821644.
This commit is contained in:
Court Ewing 2016-07-21 10:29:31 -04:00
parent 90cb5788bc
commit f5460c0f18
74 changed files with 472 additions and 472 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/ui/public/IndexedArray/IndexedArray.js
View file

@ -1,14 +1,14 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
let inflector = require('ui/IndexedArray/inflector');
let pathGetter = _(_.get).rearg(1, 0).ary(2);
let inflectIndex = inflector('by');
let inflectOrder = inflector('in', 'Order');
var inflector = require('ui/IndexedArray/inflector');
var pathGetter = _(_.get).rearg(1, 0).ary(2);
var inflectIndex = inflector('by');
var inflectOrder = inflector('in', 'Order');
let CLEAR_CACHE = {};
let OPT_NAMES = IndexedArray.OPT_NAMES = ['index', 'group', 'order', 'initialSet', 'immutable'];
var CLEAR_CACHE = {};
var OPT_NAMES = IndexedArray.OPT_NAMES = ['index', 'group', 'order', 'initialSet', 'immutable'];
/**
* Generic extension of Array class, which will index (and reindex) the
@ -70,11 +70,11 @@ define(function (require) {
// shortcut for empty props
if (!props || props.length === 0) return;
let self = this;
var self = this;
return props.map(function (prop) {
let from = pathGetter.partial(prop).value();
let to = inflect(prop);
var from = pathGetter.partial(prop).value();
var to = inflect(prop);
let cache;
Object.defineProperty(self, to, {
@ -106,7 +106,7 @@ define(function (require) {
* @return {undefined}
*/
IndexedArray.prototype._clearIndices = function () {
let self = this;
var self = this;
self._indexNames.forEach(function (name) {
self[name] = CLEAR_CACHE;
});
@ -121,7 +121,7 @@ define(function (require) {
* @return {[type]} [description]
*/
'pop push shift splice unshift reverse'.split(' ').forEach(function (method) {
let orig = Array.prototype[method];
var orig = Array.prototype[method];
IndexedArray.prototype[method] = function (/* args... */) {
// call the original method with this context
@ -142,7 +142,7 @@ define(function (require) {
* @return {array} - the removed data
*/
IndexedArray.prototype.remove = function (predicate, context) {
let out = _.remove(this, predicate, context);
var out = _.remove(this, predicate, context);
_.remove(this.raw, predicate, context);
this._clearIndices();
return out;

2
src/ui/public/IndexedArray/inflector.js
View file

@ -9,7 +9,7 @@ define(function (require) {
}
function endsWith(str, test) {
let tooShort = str.length < test.length;
var tooShort = str.length < test.length;
if (tooShort) return;
return str.substr(str.length - test.length).toLowerCase() === test.toLowerCase();

10
src/ui/public/fancy_forms/KbnFormController.js
View file

@ -1,5 +1,5 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
/**
* Extension of Angular's FormController class
@ -8,7 +8,7 @@ define(function (require) {
* @param {$scope} $scope
*/
function KbnFormController($scope, $element) {
let self = this;
var self = this;
self.errorCount = function (predicate) {
return self.$$invalidModels().length;
@ -22,14 +22,14 @@ define(function (require) {
};
self.describeErrors = function () {
let count = self.softErrorCount();
var count = self.softErrorCount();
return count + ' Error' + (count === 1 ? '' : 's');
};
self.$$invalidModels = function (predicate) {
predicate = _.callback(predicate);
let invalid = [];
var invalid = [];
_.forOwn(self.$error, function collect(models) {
if (!models) return;
@ -41,7 +41,7 @@ define(function (require) {
} else {
if (predicate(model)) {
// prevent dups
let len = invalid.length;
var len = invalid.length;
while (len--) if (invalid[len] === model) return;
invalid.push(model);

14
src/ui/public/fancy_forms/fancy_forms.js
View file

@ -1,8 +1,8 @@
define(function (require) {
let _ = require('lodash');
let $ = require('jquery');
var _ = require('lodash');
var $ = require('jquery');
let KbnFormController = require('ui/fancy_forms/KbnFormController');
var KbnFormController = require('ui/fancy_forms/KbnFormController');
require('ui/modules')
.get('kibana')
@ -12,16 +12,16 @@ define(function (require) {
// directive providers are arrays
$delegate.forEach(function (directive) {
// get metadata about all init fns
let chain = [directive.controller, DecorativeController].map(function (fn) {
let deps = $injector.annotate(fn);
var chain = [directive.controller, DecorativeController].map(function (fn) {
var deps = $injector.annotate(fn);
return { deps: deps, fn: _.isArray(fn) ? _.last(fn) : fn };
});
// replace the controller with one that will setup the actual controller
directive.controller = function stub() {
let allDeps = _.toArray(arguments);
var allDeps = _.toArray(arguments);
return chain.reduce(function (controller, link, i) {
let deps = allDeps.splice(0, link.deps.length);
var deps = allDeps.splice(0, link.deps.length);
return link.fn.apply(controller, deps) || controller;
}, this);
};

40
src/ui/public/field_editor/field_editor.js
View file

@ -7,11 +7,11 @@ define(function (require) {
require('ui/modules')
.get('kibana', ['colorpicker.module'])
.directive('fieldEditor', function (Private, $sce) {
let _ = require('lodash');
let fieldFormats = Private(require('ui/registry/field_formats'));
let Field = Private(require('ui/index_patterns/_field'));
let scriptingInfo = $sce.trustAsHtml(require('ui/field_editor/scripting_info.html'));
let scriptingWarning = $sce.trustAsHtml(require('ui/field_editor/scripting_warning.html'));
var _ = require('lodash');
var fieldFormats = Private(require('ui/registry/field_formats'));
var Field = Private(require('ui/index_patterns/_field'));
var scriptingInfo = $sce.trustAsHtml(require('ui/field_editor/scripting_info.html'));
var scriptingWarning = $sce.trustAsHtml(require('ui/field_editor/scripting_warning.html'));
return {
restrict: 'E',
@ -22,8 +22,8 @@ define(function (require) {
},
controllerAs: 'editor',
controller: function ($scope, Notifier, kbnUrl) {
let self = this;
let notify = new Notifier({ location: 'Field Editor' });
var self = this;
var notify = new Notifier({ location: 'Field Editor' });
self.scriptingInfo = scriptingInfo;
self.scriptingWarning = scriptingWarning;
@ -40,9 +40,9 @@ define(function (require) {
self.cancel = redirectAway;
self.save = function () {
let indexPattern = self.indexPattern;
let fields = indexPattern.fields;
let field = self.field.toActualField();
var indexPattern = self.indexPattern;
var fields = indexPattern.fields;
var field = self.field.toActualField();
fields.remove({ name: field.name });
fields.push(field);
@ -61,8 +61,8 @@ define(function (require) {
};
self.delete = function () {
let indexPattern = self.indexPattern;
let field = self.field;
var indexPattern = self.indexPattern;
var field = self.field;
indexPattern.fields.remove({ name: field.name });
return indexPattern.save()
@ -73,9 +73,9 @@ define(function (require) {
};
$scope.$watch('editor.selectedFormatId', function (cur, prev) {
let format = self.field.format;
let changedFormat = cur !== prev;
let missingFormat = cur && (!format || format.type.id !== cur);
var format = self.field.format;
var changedFormat = cur !== prev;
var missingFormat = cur && (!format || format.type.id !== cur);
if (!changedFormat || !missingFormat) return;
@ -84,15 +84,15 @@ define(function (require) {
});
$scope.$watch('editor.formatParams', function () {
let FieldFormat = getFieldFormatType();
var FieldFormat = getFieldFormatType();
self.field.format = new FieldFormat(self.formatParams);
}, true);
// copy the defined properties of the field to a plain object
// which is mutable, and capture the changed seperately.
function shadowCopy(field) {
let changes = {};
let shadowProps = {
var changes = {};
var shadowProps = {
toActualField: {
// bring the shadow copy out of the shadows
value: function toActualField() {
@ -102,7 +102,7 @@ define(function (require) {
};
Object.getOwnPropertyNames(field).forEach(function (prop) {
let desc = Object.getOwnPropertyDescriptor(field, prop);
var desc = Object.getOwnPropertyDescriptor(field, prop);
shadowProps[prop] = {
enumerable: desc.enumerable,
get: function () {
@ -127,7 +127,7 @@ define(function (require) {
}
function initDefaultFormat() {
let def = Object.create(fieldFormats.getDefaultType(self.field.type));
var def = Object.create(fieldFormats.getDefaultType(self.field.type));
// explicitly set to undefined to prevent inheritting the prototypes id
def.id = undefined;

26
src/ui/public/field_format_editor/field_format_editor.js
View file

@ -1,6 +1,6 @@
define(function (require) {
let _ = require('lodash');
let $ = require('jquery');
var _ = require('lodash');
var $ = require('jquery');
require('ui/modules')
.get('app/settings')
@ -13,7 +13,7 @@ define(function (require) {
},
controllerAs: 'editor',
controller: function ($scope) {
let self = this;
var self = this;
// bind the scope values to the controller, down with $scope.values
$scope.editor = this;
@ -40,7 +40,7 @@ define(function (require) {
* @return {undefined}
*/
$scope.$watch('editor.field.format.type', function (FieldFormat) {
let opts = FieldFormat && FieldFormat.editor;
var opts = FieldFormat && FieldFormat.editor;
if (!opts) {
delete self.$$pseudoDirective;
@ -67,14 +67,14 @@ define(function (require) {
},
link: function ($scope, $el) {
let scopesToTeardown = [];
var scopesToTeardown = [];
function setupScope(opts) {
if (typeof opts !== 'object') {
return scopesToTeardown[scopesToTeardown.push($scope.$new()) - 1];
}
let isolate = scopesToTeardown[scopesToTeardown.push($scope.$new(true)) - 1];
var isolate = scopesToTeardown[scopesToTeardown.push($scope.$new(true)) - 1];
_.forOwn(opts, function (from, to) {
isolate.$bind(to, from, $scope);
});
@ -88,21 +88,21 @@ define(function (require) {
if (!directive) return $el.hide();
else $el.show();
let askedForChild = !!directive.scope;
let reuseScope = !askedForChild && !directive.controller;
var askedForChild = !!directive.scope;
var reuseScope = !askedForChild && !directive.controller;
let $formatEditor = $('<div>').html(directive.template);
let $formatEditorScope = reuseScope ? $scope : setupScope(directive.scope);
var $formatEditor = $('<div>').html(directive.template);
var $formatEditorScope = reuseScope ? $scope : setupScope(directive.scope);
if (directive.controller) {
// bind the controller to the injected element
let cntrlAs = (directive.controllerAs ? ' as ' + directive.controllerAs : '');
var cntrlAs = (directive.controllerAs ? ' as ' + directive.controllerAs : '');
$formatEditorScope.Controller = directive.controller;
$formatEditor.attr('ng-controller', 'Controller' + cntrlAs);
}
let attrs = {};
let linkFns = directive.compile && directive.compile($el, attrs);
var attrs = {};
var linkFns = directive.compile && directive.compile($el, attrs);
if (!linkFns || _.isFunction(linkFns)) {
linkFns = {
pre: _.noop,

2
src/ui/public/field_format_editor/pattern/pattern.js
View file

@ -10,7 +10,7 @@ define(function (require) {
require: ['ngModel', '^fieldEditor'],
scope: true,
link: function ($scope, $el, attrs, cntrls) {
let ngModelCntrl = cntrls[0];
var ngModelCntrl = cntrls[0];
$scope.$bind('inputs', attrs.inputs);
$scope.$bind('placeholder', attrs.placeholder);

8
src/ui/public/field_format_editor/samples/samples.js
View file

@ -1,5 +1,5 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
require('ui/modules')
.get('kibana')
@ -10,7 +10,7 @@ define(function (require) {
require: ['?^ngModel', '^fieldEditor'],
scope: true,
link: function ($scope, $el, attrs, cntrls) {
let ngModelCntrl = cntrls[0];
var ngModelCntrl = cntrls[0];
$scope.samples = null;
$scope.$bind('inputs', attrs.inputs);
@ -20,14 +20,14 @@ define(function (require) {
'[]inputs'
], function () {
$scope.samples = null;
let field = $scope.editor.field;
var field = $scope.editor.field;
if (!field || !field.format) {
return;
}
Promise.try(function () {
let converter = field.format.getConverterFor('html');
var converter = field.format.getConverterFor('html');
$scope.samples = _.map($scope.inputs, function (input) {
return [input, $sce.trustAsHtml(converter(input))];
});

30
src/ui/public/filter_bar/filter_bar.js
View file

@ -1,21 +1,21 @@
define(function (require) {
let _ = require('lodash');
let module = require('ui/modules').get('kibana');
let template = require('ui/filter_bar/filter_bar.html');
let moment = require('moment');
let angular = require('angular');
var _ = require('lodash');
var module = require('ui/modules').get('kibana');
var template = require('ui/filter_bar/filter_bar.html');
var moment = require('moment');
var angular = require('angular');
require('ui/directives/json_input');
module.directive('filterBar', function (Private, Promise, getAppState) {
let mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
let mapFlattenAndWrapFilters = Private(require('ui/filter_bar/lib/mapFlattenAndWrapFilters'));
let extractTimeFilter = Private(require('ui/filter_bar/lib/extractTimeFilter'));
let filterOutTimeBasedFilter = Private(require('ui/filter_bar/lib/filterOutTimeBasedFilter'));
let filterAppliedAndUnwrap = require('ui/filter_bar/lib/filterAppliedAndUnwrap');
let changeTimeFilter = Private(require('ui/filter_bar/lib/changeTimeFilter'));
let queryFilter = Private(require('ui/filter_bar/query_filter'));
let privateFilterFieldRegex = /(^\$|meta)/;
var mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
var mapFlattenAndWrapFilters = Private(require('ui/filter_bar/lib/mapFlattenAndWrapFilters'));
var extractTimeFilter = Private(require('ui/filter_bar/lib/extractTimeFilter'));
var filterOutTimeBasedFilter = Private(require('ui/filter_bar/lib/filterOutTimeBasedFilter'));
var filterAppliedAndUnwrap = require('ui/filter_bar/lib/filterAppliedAndUnwrap');
var changeTimeFilter = Private(require('ui/filter_bar/lib/changeTimeFilter'));
var queryFilter = Private(require('ui/filter_bar/query_filter'));
var privateFilterFieldRegex = /(^\$|meta)/;
return {
restrict: 'E',
@ -42,7 +42,7 @@ define(function (require) {
$scope.aceLoaded = function (editor) {
editor.$blockScrolling = Infinity;
let session = editor.getSession();
var session = editor.getSession();
session.setTabSize(2);
session.setUseSoftTabs(true);
};
@ -135,7 +135,7 @@ define(function (require) {
}
function updateFilters() {
let filters = queryFilter.getFilters();
var filters = queryFilter.getFilters();
mapAndFlattenFilters(filters).then(function (results) {
// used to display the current filters in the state
$scope.filters = _.sortBy(results, function (filter) {

18
src/ui/public/filter_bar/filter_bar_click_handler.js
View file

@ -1,13 +1,13 @@
define(function (require) {
let _ = require('lodash');
let dedupFilters = require('./lib/dedupFilters');
let uniqFilters = require('./lib/uniqFilters');
let findByParam = require('ui/utils/find_by_param');
var _ = require('lodash');
var dedupFilters = require('./lib/dedupFilters');
var uniqFilters = require('./lib/uniqFilters');
var findByParam = require('ui/utils/find_by_param');
return function (Notifier) {
return function ($state) {
return function (event, simulate) {
let notify = new Notifier({
var notify = new Notifier({
location: 'Filter bar'
});
let aggConfigResult;
@ -24,18 +24,18 @@ define(function (require) {
}
if (aggConfigResult) {
let isLegendLabel = !!event.point.values;
let aggBuckets = _.filter(aggConfigResult.getPath(), { type: 'bucket' });
var isLegendLabel = !!event.point.values;
var aggBuckets = _.filter(aggConfigResult.getPath(), { type: 'bucket' });
// For legend clicks, use the last bucket in the path
if (isLegendLabel) {
// series data has multiple values, use aggConfig on the first
// hierarchical data values is an object with the addConfig
let aggConfig = findByParam(event.point.values, 'aggConfig');
var aggConfig = findByParam(event.point.values, 'aggConfig');
aggBuckets = aggBuckets.filter((result) => result.aggConfig && result.aggConfig === aggConfig);
}
let filters = _(aggBuckets)
var filters = _(aggBuckets)
.map(function (result) {
try {
return result.createFilter();

8
src/ui/public/filter_bar/lib/changeTimeFilter.js
View file

@ -1,10 +1,10 @@
define(function (require) {
let moment = require('moment');
let _ = require('lodash');
var moment = require('moment');
var _ = require('lodash');
return function changeTimeFilterProvider(timefilter) {
return function (filter) {
let key = _.keys(filter.range)[0];
let values = filter.range[key];
var key = _.keys(filter.range)[0];
var values = filter.range[key];
timefilter.time.from = moment(values.gt || values.gte);
timefilter.time.to = moment(values.lt || values.lte);
timefilter.time.mode = 'absolute';

6
src/ui/public/filter_bar/lib/compareFilters.js
View file

@ -1,6 +1,6 @@
define(function (require) {
let _ = require('lodash');
let angular = require('angular');
var _ = require('lodash');
var angular = require('angular');
let excludedAttributes;
let comparators;
@ -25,7 +25,7 @@ define(function (require) {
};
function mapFilter(filter) {
let cleaned = _.omit(filter, excludedAttributes);
var cleaned = _.omit(filter, excludedAttributes);
if (comparators.negate) cleaned.negate = filter.meta && !!filter.meta.negate;
if (comparators.disabled) cleaned.disabled = filter.meta && !!filter.meta.disabled;
return cleaned;

6
src/ui/public/filter_bar/lib/dedupFilters.js
View file

@ -1,7 +1,7 @@
define(function (require) {
let _ = require('lodash');
let angular = require('angular');
let compareFilters = require('ui/filter_bar/lib/compareFilters');
var _ = require('lodash');
var angular = require('angular');
var compareFilters = require('ui/filter_bar/lib/compareFilters');
/**
* Combine 2 filter collections, removing duplicates

8
src/ui/public/filter_bar/lib/extractTimeFilter.js
View file

@ -1,15 +1,15 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function extractTimeFilterProvider(courier, Promise) {
return Promise.method(function (filters) {
// Assume all the index patterns are the same since they will be added
// from the same visualization.
let id = _.get(filters, '[0].meta.index');
var id = _.get(filters, '[0].meta.index');
if (id == null) return;
return courier.indexPatterns.get(id).then(function (indexPattern) {
let filter = _.find(filters, function (obj) {
let key = _.keys(obj.range)[0];
var filter = _.find(filters, function (obj) {
var key = _.keys(obj.range)[0];
return key === indexPattern.timeFieldName;
});
if (filter && filter.range) {

2
src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js
View file

@ -1,5 +1,5 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function (filters) {
return _.filter(filters, 'meta.apply');
};

4
src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js
View file

@ -1,8 +1,8 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function filterOutTimeBaseFilter(courier, Promise) {
return Promise.method(function (filters) {
let id = _.get(filters, '[0].meta.index');
var id = _.get(filters, '[0].meta.index');
if (id == null) return;
return courier.indexPatterns.get(id).then(function (indexPattern) {

4
src/ui/public/filter_bar/lib/generateMappingChain.js
View file

@ -1,8 +1,8 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function generateMappingChainProvider(Promise) {
let noop = function () {
var noop = function () {
return Promise.reject(new Error('No mappings have been found for filter.'));
};

4
src/ui/public/filter_bar/lib/mapAndFlattenFilters.js
View file

@ -1,7 +1,7 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function mapAndFlattenFiltersProvider(Private, Promise) {
let mapFilter = Private(require('ui/filter_bar/lib/mapFilter'));
var mapFilter = Private(require('ui/filter_bar/lib/mapFilter'));
return function (filters) {
return _(filters)
.flatten()

10
src/ui/public/filter_bar/lib/mapDefault.js
View file

@ -1,17 +1,17 @@
define(function (require) {
return function mapDefaultProvider(Promise) {
let angular = require('angular');
let _ = require('lodash');
var angular = require('angular');
var _ = require('lodash');
let metaProperty = /(^\$|meta)/;
var metaProperty = /(^\$|meta)/;
return function (filter) {
let key = _.find(_.keys(filter), function (key) {
var key = _.find(_.keys(filter), function (key) {
return !key.match(metaProperty);
});
if (key) {
let value = angular.toJson(filter[key]);
var value = angular.toJson(filter[key]);
return Promise.resolve({ key: key, value: value });
}
return Promise.reject(filter);

12
src/ui/public/filter_bar/lib/mapFilter.js
View file

@ -1,8 +1,8 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function mapFilterProvider(Promise, Private) {
let generateMappingChain = Private(require('./generateMappingChain'));
var generateMappingChain = Private(require('./generateMappingChain'));
/** Mappers **/
@ -20,7 +20,7 @@ define(function (require) {
// To create a new mapper you just need to create a function
// that either handles the mapping operation or not
// and add it here. ProTip: These are executed in order listed
let mappers = [
var mappers = [
Private(require('./mapMatchAll')),
Private(require('./mapTerms')),
Private(require('./mapRange')),
@ -32,14 +32,14 @@ define(function (require) {
Private(require('./mapDefault'))
];
let noop = function () {
var noop = function () {
return Promise.reject(new Error('No mappings have been found for filter.'));
};
// Create a chain of responsibility by reducing all the
// mappers down into one function.
let mapFn = _.reduceRight(mappers, function (memo, map) {
let filterChainFn = generateMappingChain(map);
var mapFn = _.reduceRight(mappers, function (memo, map) {
var filterChainFn = generateMappingChain(map);
return filterChainFn(memo);
}, noop);

4
src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js
View file

@ -1,7 +1,7 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function mapFlattenAndWrapFilters(Private) {
let mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
var mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
return function (filters) {
return mapAndFlattenFilters(filters).then(function (filters) {
return _.map(filters, function (filter) {

2
src/ui/public/filter_bar/lib/mapGeoBoundingBox.js
View file

@ -1,5 +1,5 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function mapGeoBoundBoxProvider(Promise, courier) {
return function (filter) {
let key;

10
src/ui/public/filter_bar/lib/mapRange.js
View file

@ -8,14 +8,14 @@ define(function (require) {
.indexPatterns
.get(filter.meta.index)
.then(function (indexPattern) {
let key = Object.keys(filter.range)[0];
let convert = indexPattern.fields.byName[key].format.getConverterFor('text');
let range = filter.range[key];
var key = Object.keys(filter.range)[0];
var convert = indexPattern.fields.byName[key].format.getConverterFor('text');
var range = filter.range[key];
let left = has(range, 'gte') ? range.gte : range.gt;
var left = has(range, 'gte') ? range.gte : range.gt;
if (left == null) left = -Infinity;
let right = has(range, 'lte') ? range.lte : range.lt;
var right = has(range, 'lte') ? range.lte : range.lt;
if (right == null) right = Infinity;
return {

2
src/ui/public/filter_bar/lib/mapTerms.js
View file

@ -1,5 +1,5 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function mapTermsProvider(Promise, courier) {
return function (filter) {
let key;

4
src/ui/public/filter_bar/lib/onlyDisabled.js
View file

@ -1,7 +1,7 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
let pluckDisabled = function (filter) {
var pluckDisabled = function (filter) {
return _.get(filter, 'meta.disabled');
};

8
src/ui/public/filter_bar/lib/onlyStateChanged.js
View file

@ -1,7 +1,7 @@
define(function (require) {
let _ = require('lodash');
let compareFilters = require('ui/filter_bar/lib/compareFilters');
let compareOptions = { disabled: true, negate: true };
var _ = require('lodash');
var compareFilters = require('ui/filter_bar/lib/compareFilters');
var compareOptions = { disabled: true, negate: true };
/**
* Checks to see if only disabled filters have been changed
@ -9,7 +9,7 @@ define(function (require) {
*/
return function (newFilters, oldFilters) {
return _.every(newFilters, function (newFilter, i) {
let match = _.find(oldFilters, function (oldFilter) {
var match = _.find(oldFilters, function (oldFilter) {
return compareFilters(newFilter, oldFilter, compareOptions);
});
return !!match;

6
src/ui/public/filter_bar/lib/uniqFilters.js
View file

@ -1,6 +1,6 @@
define(function (require) {
let _ = require('lodash');
let dedupFilters = require('ui/filter_bar/lib/dedupFilters');
var _ = require('lodash');
var dedupFilters = require('ui/filter_bar/lib/dedupFilters');
/**
* Remove duplicate filters from an array of filters
@ -8,7 +8,7 @@ define(function (require) {
* @returns {object} The original filters array with duplicates removed
*/
return function (filters, comparatorOptions) {
let results = [];
var results = [];
_.each(filters, function (filter) {
results = _.union(results, dedupFilters(results, [filter], comparatorOptions));
});

6
src/ui/public/filter_bar/push_filter.js
View file

@ -1,5 +1,5 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function () {
return function ($state) {
@ -8,8 +8,8 @@ define(function (require) {
// Hierarchical and tabular data set their aggConfigResult parameter
// differently because of how the point is rewritten between the two. So
// we need to check if the point.orig is set, if not use try the point.aggConfigResult
let filters = _.clone($state.filters || []);
let pendingFilter = { meta: { negate: negate, index: index }};
var filters = _.clone($state.filters || []);
var pendingFilter = { meta: { negate: negate, index: index }};
_.extend(pendingFilter, filter);
filters.push(pendingFilter);
$state.filters = filters;

90
src/ui/public/filter_bar/query_filter.js
View file

@ -1,27 +1,27 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function (Private, $rootScope, getAppState, globalState) {
let EventEmitter = Private(require('ui/events'));
let onlyDisabled = require('ui/filter_bar/lib/onlyDisabled');
let onlyStateChanged = require('ui/filter_bar/lib/onlyStateChanged');
let uniqFilters = require('ui/filter_bar/lib/uniqFilters');
let compareFilters = require('ui/filter_bar/lib/compareFilters');
let mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
let angular = require('angular');
var EventEmitter = Private(require('ui/events'));
var onlyDisabled = require('ui/filter_bar/lib/onlyDisabled');
var onlyStateChanged = require('ui/filter_bar/lib/onlyStateChanged');
var uniqFilters = require('ui/filter_bar/lib/uniqFilters');
var compareFilters = require('ui/filter_bar/lib/compareFilters');
var mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
var angular = require('angular');
let queryFilter = new EventEmitter();
var queryFilter = new EventEmitter();
queryFilter.getFilters = function () {
let compareOptions = { disabled: true, negate: true };
let appFilters = queryFilter.getAppFilters();
let globalFilters = queryFilter.getGlobalFilters();
var compareOptions = { disabled: true, negate: true };
var appFilters = queryFilter.getAppFilters();
var globalFilters = queryFilter.getGlobalFilters();
return uniqFilters(globalFilters.concat(appFilters), compareOptions);
};
queryFilter.getAppFilters = function () {
let appState = getAppState();
var appState = getAppState();
if (!appState || !appState.filters) return [];
// Work around for https://github.com/elastic/kibana/issues/5896
@ -46,8 +46,8 @@ define(function (require) {
* @retuns {Promise} filter map promise
*/
queryFilter.addFilters = function (filters, global) {
let appState = getAppState();
let state = (global) ? globalState : appState;
var appState = getAppState();
var state = (global) ? globalState : appState;
if (!_.isArray(filters)) {
filters = [filters];
@ -70,8 +70,8 @@ define(function (require) {
* @param {object} matchFilter The filter to remove
*/
queryFilter.removeFilter = function (matchFilter) {
let appState = getAppState();
let filter = _.omit(matchFilter, ['$$hashKey']);
var appState = getAppState();
var filter = _.omit(matchFilter, ['$$hashKey']);
let state;
let index;
@ -99,11 +99,11 @@ define(function (require) {
* @returns {object} Promise that resolves to the new filter on a successful merge
*/
queryFilter.updateFilter = function (filter) {
let mergedFilter = _.assign({}, filter.source, filter.model);
var mergedFilter = _.assign({}, filter.source, filter.model);
mergedFilter.meta.alias = filter.alias;
//If the filter type is changed we want to discard the old type
//when merging changes back in
let filterTypeReplaced = filter.model[filter.type] !== mergedFilter[filter.type];
var filterTypeReplaced = filter.model[filter.type] !== mergedFilter[filter.type];
if (filterTypeReplaced) {
delete mergedFilter[filter.type];
}
@ -115,7 +115,7 @@ define(function (require) {
* Removes all filters
*/
queryFilter.removeAll = function () {
let appState = getAppState();
var appState = getAppState();
appState.filters = [];
globalState.filters = [];
};
@ -128,7 +128,7 @@ define(function (require) {
*/
queryFilter.toggleFilter = function (filter, force) {
// Toggle the disabled flag
let disabled = _.isUndefined(force) ? !filter.meta.disabled : !!force;
var disabled = _.isUndefined(force) ? !filter.meta.disabled : !!force;
filter.meta.disabled = disabled;
return filter;
};
@ -173,20 +173,20 @@ define(function (require) {
* @returns {object} updated filter
*/
queryFilter.pinFilter = function (filter, force) {
let appState = getAppState();
var appState = getAppState();
if (!appState) return filter;
// ensure that both states have a filters property
if (!_.isArray(globalState.filters)) globalState.filters = [];
if (!_.isArray(appState.filters)) appState.filters = [];
let appIndex = _.indexOf(appState.filters, filter);
var appIndex = _.indexOf(appState.filters, filter);
if (appIndex !== -1 && force !== false) {
appState.filters.splice(appIndex, 1);
globalState.filters.push(filter);
} else {
let globalIndex = _.indexOf(globalState.filters, filter);
var globalIndex = _.indexOf(globalState.filters, filter);
if (globalIndex === -1 || force === true) return filter;
@ -217,7 +217,7 @@ define(function (require) {
* Rids filter list of null values and replaces state if any nulls are found
*/
function validateStateFilters(state) {
let compacted = _.compact(state.filters);
var compacted = _.compact(state.filters);
if (state.filters.length !== compacted.length) {
state.filters = compacted;
state.replace();
@ -231,7 +231,7 @@ define(function (require) {
* @returns {object} Resulting filter list, app and global combined
*/
function saveState() {
let appState = getAppState();
var appState = getAppState();
if (appState) appState.save();
globalState.save();
}
@ -247,9 +247,9 @@ define(function (require) {
// helper to run a function on all filters in all states
function executeOnFilters(fn) {
let appState = getAppState();
let globalFilters = [];
let appFilters = [];
var appState = getAppState();
var globalFilters = [];
var appFilters = [];
if (globalState.filters) globalFilters = globalState.filters;
if (appState && appState.filters) appFilters = appState.filters;
@ -259,13 +259,13 @@ define(function (require) {
function mergeStateFilters(gFilters, aFilters, compareOptions) {
// ensure we don't mutate the filters passed in
let globalFilters = gFilters ? _.cloneDeep(gFilters) : [];
let appFilters = aFilters ? _.cloneDeep(aFilters) : [];
var globalFilters = gFilters ? _.cloneDeep(gFilters) : [];
var appFilters = aFilters ? _.cloneDeep(aFilters) : [];
compareOptions = _.defaults(compareOptions || {}, { disabled: true });
// existing globalFilters should be mutated by appFilters
_.each(appFilters, function (filter, i) {
let match = _.find(globalFilters, function (globalFilter) {
var match = _.find(globalFilters, function (globalFilter) {
return compareFilters(globalFilter, filter, compareOptions);
});
@ -297,7 +297,7 @@ define(function (require) {
function initAppStateWatchers() {
// multi watch on the app and global states
let stateWatchers = [{
var stateWatchers = [{
fn: $rootScope.$watch,
deep: true,
get: queryFilter.getGlobalFilters
@ -312,18 +312,18 @@ define(function (require) {
// prevent execution on watcher instantiation
if (_.isEqual(next, prev)) return;
let doUpdate = false;
let doFetch = false;
var doUpdate = false;
var doFetch = false;
// reconcile filter in global and app states
let filters = mergeStateFilters(next[0], next[1]);
let globalFilters = filters[0];
let appFilters = filters[1];
let appState = getAppState();
var filters = mergeStateFilters(next[0], next[1]);
var globalFilters = filters[0];
var appFilters = filters[1];
var appState = getAppState();
// save the state, as it may have updated
let globalChanged = !_.isEqual(next[0], globalFilters);
let appChanged = !_.isEqual(next[1], appFilters);
var globalChanged = !_.isEqual(next[0], globalFilters);
var appChanged = !_.isEqual(next[1], appFilters);
// the filters were changed, apply to state (re-triggers this watcher)
if (globalChanged || appChanged) {
@ -346,12 +346,12 @@ define(function (require) {
// iterate over each state type, checking for changes
function getActions() {
let newFilters = [];
let oldFilters = [];
var newFilters = [];
var oldFilters = [];
stateWatchers.forEach(function (watcher, i) {
let nextVal = next[i];
let prevVal = prev[i];
var nextVal = next[i];
var prevVal = prev[i];
newFilters = newFilters.concat(nextVal);
oldFilters = oldFilters.concat(prevVal);

16
src/ui/public/filter_manager/filter_manager.js
View file

@ -1,22 +1,22 @@
// Adds a filter to a passed state
define(function (require) {
return function (Private) {
let _ = require('lodash');
let queryFilter = Private(require('ui/filter_bar/query_filter'));
let filterManager = {};
var _ = require('lodash');
var queryFilter = Private(require('ui/filter_bar/query_filter'));
var filterManager = {};
filterManager.add = function (field, values, operation, index) {
values = _.isArray(values) ? values : [values];
let fieldName = _.isObject(field) ? field.name : field;
let filters = _.flatten([queryFilter.getAppFilters()]);
let newFilters = [];
var fieldName = _.isObject(field) ? field.name : field;
var filters = _.flatten([queryFilter.getAppFilters()]);
var newFilters = [];
let negate = (operation === '-');
var negate = (operation === '-');
// TODO: On array fields, negating does not negate the combination, rather all terms
_.each(values, function (value) {
let filter;
let existing = _.find(filters, function (filter) {
var existing = _.find(filters, function (filter) {
if (!filter) return;
if (fieldName === '_exists_' && filter.exists) {

4
src/ui/public/filter_manager/lib/phrase.js
View file

@ -1,7 +1,7 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function buildPhraseFilter(field, value, indexPattern) {
let filter = { meta: { index: indexPattern.id} };
var filter = { meta: { index: indexPattern.id} };
if (field.scripted) {
filter.script = {

2
src/ui/public/filter_manager/lib/query.js
View file

@ -1,5 +1,5 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function buildQueryFilter(query, index) {
return {
query: query,

14
src/ui/public/filters/_prop_filter.js
View file

@ -1,5 +1,5 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
/**
* Filters out a list by a given filter. This is currently used to impelment:
@ -24,9 +24,9 @@ define(function (require) {
if (!_.isArray(filters)) filters = filters.split(',');
if (_.contains(filters, '*')) return list;
let options = filters.reduce(function (options, filter) {
let type = 'include';
let value = filter;
var options = filters.reduce(function (options, filter) {
var type = 'include';
var value = filter;
if (filter.charAt(0) === '!') {
type = 'exclude';
@ -39,12 +39,12 @@ define(function (require) {
}, {});
return list.filter(function (item) {
let value = item[prop];
var value = item[prop];
let excluded = options.exclude && _.contains(options.exclude, value);
var excluded = options.exclude && _.contains(options.exclude, value);
if (excluded) return false;
let included = !options.include || _.contains(options.include, value);
var included = !options.include || _.contains(options.include, value);
if (included) return true;
return false;

6
src/ui/public/filters/commaList.js
View file

@ -1,5 +1,5 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
require('ui/modules')
.get('kibana')
@ -13,12 +13,12 @@ define(function (require) {
* @return {String}
*/
return function (input, inclusive) {
let list = _.commaSeperatedList(input);
var list = _.commaSeperatedList(input);
if (list.length < 2) {
return list.join('');
}
let conj = inclusive ? ' and ' : ' or ';
var conj = inclusive ? ' and ' : ' or ';
return list.slice(0, -1).join(', ') + conj + _.last(list);
};

4
src/ui/public/filters/field_type.js
View file

@ -2,8 +2,8 @@
// You may also pass "*" to get all types
// Or an array of types to get all fields of that type
define(function (require) {
let _ = require('lodash');
let propFilter = require('ui/filters/_prop_filter');
var _ = require('lodash');
var propFilter = require('ui/filters/_prop_filter');
require('ui/modules')
.get('kibana')

6
src/ui/public/filters/label.js
View file

@ -3,14 +3,14 @@ define(function (require) {
.get('kibana')
.filter('label', function () {
return function (str) {
let words = str.split(' ');
var words = str.split(' ');
return words.map(capFirst).join(' ');
};
});
function capFirst(str) {
let i = str[0];
let r = new RegExp(i, 'i');
var i = str[0];
var r = new RegExp(i, 'i');
return str.replace(r, i.toUpperCase());
}
});

4
src/ui/public/filters/match_any.js
View file

@ -2,7 +2,7 @@
// You may also pass "*" to get all types
// Or an array of types to get all fields of that type
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
require('ui/modules')
.get('kibana')
@ -13,7 +13,7 @@ define(function (require) {
}
return _.filter(items, function (item) {
for (let i = 0; i < rules.length; i++) {
for (var i = 0; i < rules.length; i++) {
if (_.some([item], rules[i])) {
return true;
}

6
src/ui/public/filters/moment.js
View file

@ -1,12 +1,12 @@
define(function (require) {
let moment = require('moment');
let _ = require('lodash');
var moment = require('moment');
var _ = require('lodash');
require('ui/modules')
.get('kibana')
.filter('moment', function (config) {
return function (datetime) {
let format = config.get('dateFormat');
var format = config.get('dateFormat');
if (moment.isMoment(datetime)) return datetime.format(format);
if (_.isDate(datetime)) return moment(datetime).format(format);
return datetime;

4
src/ui/public/filters/rison.js
View file

@ -1,6 +1,6 @@
define(function (require) {
let rison = require('ui/utils/rison');
let module = require('ui/modules').get('kibana');
var rison = require('ui/utils/rison');
var module = require('ui/modules').get('kibana');
module.filter('rison', function () {
return function (str) {

2
src/ui/public/filters/short_dots.js
View file

@ -2,7 +2,7 @@
// eg: foo.bar.baz becomes f.b.baz
// 'foo.bar.baz'.replace(/(.+?\.)/g,function(v) {return v[0]+'.';});
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
require('ui/modules')
.get('kibana')

4
src/ui/public/filters/trust_as_html.js
View file

@ -1,6 +1,6 @@
define(function (require) {
let angular = require('angular');
let module = require('ui/modules').get('kibana');
var angular = require('angular');
var module = require('ui/modules').get('kibana');
// Simple filter to allow using ng-bind-html without explicitly calling $sce.trustAsHtml in a controller
// (See http://goo.gl/mpj9o2)

4
src/ui/public/filters/unique.js
View file

@ -1,12 +1,12 @@
// Filters out all duplicate items in an array
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
require('ui/modules')
.get('kibana')
.filter('unique', function () {
return function (arr) {
let list = _.unique(arr);
var list = _.unique(arr);
return list;
};
});

10
src/ui/public/highlight/highlight.js
View file

@ -1,9 +1,9 @@
define(function (require) {
require('ui/highlight/highlight_tags');
let _ = require('lodash');
let angular = require('angular');
let module = require('ui/modules').get('kibana');
var _ = require('lodash');
var angular = require('angular');
var module = require('ui/modules').get('kibana');
module.filter('highlight', function (highlightTags) {
return function (formatted, highlight) {
@ -13,12 +13,12 @@ define(function (require) {
section = _.escape(section);
// Strip out the highlight tags to compare against the formatted string
let untagged = section
var untagged = section
.split(highlightTags.pre).join('')
.split(highlightTags.post).join('');
// Replace all highlight tags with proper html tags
let tagged = section
var tagged = section
.split(highlightTags.pre).join('<mark>')
.split(highlightTags.post).join('</mark>');

2
src/ui/public/highlight/highlight_tags.js
View file

@ -1,5 +1,5 @@
define(function (require) {
let module = require('ui/modules').get('kibana');
var module = require('ui/modules').get('kibana');
// By default, ElasticSearch surrounds matched values in <em></em>. This is not ideal because it is possible that
// the value could contain <em></em> in the value. We define these custom tags that we would never expect to see

4
src/ui/public/index_patterns/_cast_mapping_type.js
View file

@ -1,6 +1,6 @@
define(function (require) {
return function CastMappingTypeFn() {
let IndexedArray = require('ui/IndexedArray');
var IndexedArray = require('ui/IndexedArray');
castMappingType.types = new IndexedArray({
index: ['name'],
@ -33,7 +33,7 @@ define(function (require) {
function castMappingType(name) {
if (!name) return 'unknown';
let match = castMappingType.types.byName[name];
var match = castMappingType.types.byName[name];
return match ? match.type : 'string';
}

4
src/ui/public/index_patterns/_ensure_some.js
View file

@ -1,7 +1,7 @@
define(function (require) {
return function EnsureSomeIndexPatternsFn(Private, Notifier, $location, kbnUrl) {
let errors = require('ui/errors');
let notify = new Notifier();
var errors = require('ui/errors');
var notify = new Notifier();
return function ensureSomeIndexPatterns() {
return function promiseHandler(patterns) {

26
src/ui/public/index_patterns/_field.js
View file

@ -1,10 +1,10 @@
define(function (require) {
return function FieldObjectProvider(Private, shortDotsFilter, $rootScope, Notifier) {
let notify = new Notifier({ location: 'IndexPattern Field' });
let FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
let fieldTypes = Private(require('ui/index_patterns/_field_types'));
let fieldFormats = Private(require('ui/registry/field_formats'));
let ObjDefine = require('ui/utils/ObjDefine');
var notify = new Notifier({ location: 'IndexPattern Field' });
var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
var fieldTypes = Private(require('ui/index_patterns/_field_types'));
var fieldFormats = Private(require('ui/registry/field_formats'));
var ObjDefine = require('ui/utils/ObjDefine');
function Field(indexPattern, spec) {
// unwrap old instances of Field
@ -13,14 +13,14 @@ define(function (require) {
// constuct this object using ObjDefine class, which
// extends the Field.prototype but gets it's properties
// defined using the logic below
let obj = new ObjDefine(spec, Field.prototype);
var obj = new ObjDefine(spec, Field.prototype);
if (spec.name === '_source') {
spec.type = '_source';
}
// find the type for this field, fallback to unknown type
let type = fieldTypes.byName[spec.type];
var type = fieldTypes.byName[spec.type];
if (spec.type && !type) {
notify.error(
'Unknown field type "' + spec.type + '"' +
@ -31,16 +31,16 @@ define(function (require) {
if (!type) type = fieldTypes.byName.unknown;
let format = spec.format;
var format = spec.format;
if (!format || !(format instanceof FieldFormat)) {
format = indexPattern.fieldFormatMap[spec.name] || fieldFormats.getDefaultInstance(spec.type);
}
let indexed = !!spec.indexed;
let scripted = !!spec.scripted;
let sortable = spec.name === '_score' || ((indexed || scripted) && type.sortable);
let bucketable = indexed || scripted;
let filterable = spec.name === '_id' || scripted || (indexed && type.filterable);
var indexed = !!spec.indexed;
var scripted = !!spec.scripted;
var sortable = spec.name === '_score' || ((indexed || scripted) && type.sortable);
var bucketable = indexed || scripted;
var filterable = spec.name === '_id' || scripted || (indexed && type.filterable);
obj.fact('name');
obj.fact('type');

14
src/ui/public/index_patterns/_field_format/FieldFormat.js
View file

@ -1,10 +1,10 @@
define(function (require) {
return function FieldFormatClassProvider(config, $rootScope, Private) {
let _ = require('lodash');
let contentTypes = Private(require('ui/index_patterns/_field_format/contentTypes'));
var _ = require('lodash');
var contentTypes = Private(require('ui/index_patterns/_field_format/contentTypes'));
function FieldFormat(params) {
let self = this;
var self = this;
// give the constructor a more appropriate name
self.type = self.constructor;
@ -59,7 +59,7 @@ define(function (require) {
* @return {any}
*/
FieldFormat.prototype.param = function (name) {
let val = this._params[name];
var val = this._params[name];
if (val || val === false || val === 0) {
// truthy, false, or 0 are fine
// '', NaN, null, undefined, etc are not
@ -84,10 +84,10 @@ define(function (require) {
* @return {object}
*/
FieldFormat.prototype.toJSON = function () {
let type = this.type;
let defaults = this._paramDefaults;
var type = this.type;
var defaults = this._paramDefaults;
let params = _.transform(this._params, function (uniqParams, val, param) {
var params = _.transform(this._params, function (uniqParams, val, param) {
if (val !== defaults[param]) {
uniqParams[param] = val;
}

16
src/ui/public/index_patterns/_field_format/contentTypes.js
View file

@ -1,20 +1,20 @@
define(function (require) {
return function contentTypesProvider(highlightFilter) {
let _ = require('lodash');
let angular = require('angular');
var _ = require('lodash');
var angular = require('angular');
require('ui/highlight');
let types = {
var types = {
html: function (format, convert) {
return function recurse(value, field, hit) {
if (!value || typeof value.map !== 'function') {
return convert.call(format, value, field, hit);
}
let subVals = value.map(function (v) {
var subVals = value.map(function (v) {
return recurse(v, field, hit);
});
let useMultiLine = subVals.some(function (sub) {
var useMultiLine = subVals.some(function (sub) {
return sub.indexOf('\n') > -1;
});
@ -39,7 +39,7 @@ define(function (require) {
}
function fallbackHtml(value, field, hit) {
let formatted = _.escape(this.convert(value, 'text'));
var formatted = _.escape(this.convert(value, 'text'));
if (!hit || !hit.highlight || !hit.highlight[field.name]) {
return formatted;
@ -49,8 +49,8 @@ define(function (require) {
}
function setup(format) {
let src = format._convert || {};
let converters = format._convert = {};
var src = format._convert || {};
var converters = format._convert = {};
converters.text = types.text(format, src.text || fallbackText);
converters.html = types.html(format, src.html || fallbackHtml);

6
src/ui/public/index_patterns/_field_list.js
View file

@ -1,8 +1,8 @@
define(function (require) {
return function FieldListProvider(Private) {
let Field = Private(require('ui/index_patterns/_field'));
let IndexedArray = require('ui/IndexedArray');
let _ = require('lodash');
var Field = Private(require('ui/index_patterns/_field'));
var IndexedArray = require('ui/IndexedArray');
var _ = require('lodash');
_.class(FieldList).inherits(IndexedArray);
function FieldList(indexPattern, specs) {

2
src/ui/public/index_patterns/_field_types.js
View file

@ -1,6 +1,6 @@
define(function (require) {
return function IndexPatternFieldTypes() {
let IndexedArray = require('ui/IndexedArray');
var IndexedArray = require('ui/IndexedArray');
return new IndexedArray({
index: ['name'],

12
src/ui/public/index_patterns/_flatten_hit.js
View file

@ -2,18 +2,18 @@
// returns a flattened version
define(function (require) {
return function FlattenHitProvider(config, $rootScope) {
let _ = require('lodash');
var _ = require('lodash');
let metaFields = config.get('metaFields');
var metaFields = config.get('metaFields');
$rootScope.$on('change:config.metaFields', function () {
metaFields = config.get('metaFields');
});
function flattenHit(indexPattern, hit) {
let flat = {};
var flat = {};
// recursively merge _source
let fields = indexPattern.fields.byName;
var fields = indexPattern.fields.byName;
(function flatten(obj, keyPrefix) {
keyPrefix = keyPrefix ? keyPrefix + '.' : '';
_.forOwn(obj, function (val, key) {
@ -21,8 +21,8 @@ define(function (require) {
if (flat[key] !== void 0) return;
let hasValidMapping = (fields[key] && fields[key].type !== 'conflict');
let isValue = !_.isPlainObject(val);
var hasValidMapping = (fields[key] && fields[key].type !== 'conflict');
var isValue = !_.isPlainObject(val);
if (hasValidMapping || isValue) {
flat[key] = val;

14
src/ui/public/index_patterns/_format_hit.js
View file

@ -1,12 +1,12 @@
// Takes a hit, merges it with any stored/scripted fields, and with the metaFields
// returns a formated version
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function (indexPattern, defaultFormat) {
function convert(hit, val, fieldName) {
let field = indexPattern.fields.byName[fieldName];
var field = indexPattern.fields.byName[fieldName];
if (!field) return defaultFormat.convert(val, 'html');
return field.format.getConverterFor('html')(val, field, hit);
}
@ -16,12 +16,12 @@ define(function (require) {
// use and update the partial cache, but don't rewrite it. _source is stored in partials
// but not $$_formatted
let partials = hit.$$_partialFormatted || (hit.$$_partialFormatted = {});
let cache = hit.$$_formatted = {};
var partials = hit.$$_partialFormatted || (hit.$$_partialFormatted = {});
var cache = hit.$$_formatted = {};
_.forOwn(indexPattern.flattenHit(hit), function (val, fieldName) {
// sync the formatted and partial cache
let formatted = partials[fieldName] == null ? convert(hit, val, fieldName) : partials[fieldName];
var formatted = partials[fieldName] == null ? convert(hit, val, fieldName) : partials[fieldName];
cache[fieldName] = partials[fieldName] = formatted;
});
@ -29,7 +29,7 @@ define(function (require) {
}
formatHit.formatField = function (hit, fieldName) {
let partials = hit.$$_partialFormatted;
var partials = hit.$$_partialFormatted;
if (partials && partials[fieldName] != null) {
return partials[fieldName];
}
@ -38,7 +38,7 @@ define(function (require) {
partials = hit.$$_partialFormatted = {};
}
let val = fieldName === '_source' ? hit._source : indexPattern.flattenHit(hit)[fieldName];
var val = fieldName === '_source' ? hit._source : indexPattern.flattenHit(hit)[fieldName];
return partials[fieldName] = convert(hit, val, fieldName);
};

8
src/ui/public/index_patterns/_get_computed_fields.js
View file

@ -1,11 +1,11 @@
// Takes a hit, merges it with any stored/scripted fields, and with the metaFields
// returns a flattened version
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
return function () {
let self = this;
let scriptFields = {};
let fielddataFields = [];
var self = this;
var scriptFields = {};
var fielddataFields = [];
fielddataFields = _.pluck(self.fields.byType.date, 'name');

4
src/ui/public/index_patterns/_get_ids.js
View file

@ -1,12 +1,12 @@
define(function (require) {
return function GetIndexPatternIdsFn(es, kbnIndex) {
let _ = require('lodash');
var _ = require('lodash');
// many places may require the id list, so we will cache it seperately
// didn't incorportate with the indexPattern cache to prevent id collisions.
let cachedPromise;
let getIds = function () {
var getIds = function () {
if (cachedPromise) {
// retrun a clone of the cached response
return cachedPromise.then(function (cachedResp) {

64
src/ui/public/index_patterns/_index_pattern.js
View file

@ -1,28 +1,28 @@
define(function (require) {
return function IndexPatternFactory(Private, timefilter, Notifier, config, kbnIndex, Promise, $rootScope, safeConfirm) {
let _ = require('lodash');
let errors = require('ui/errors');
let angular = require('angular');
var _ = require('lodash');
var errors = require('ui/errors');
var angular = require('angular');
let fieldformats = Private(require('ui/registry/field_formats'));
let getIds = Private(require('ui/index_patterns/_get_ids'));
let mapper = Private(require('ui/index_patterns/_mapper'));
let intervals = Private(require('ui/index_patterns/_intervals'));
let getComputedFields = require('ui/index_patterns/_get_computed_fields');
let DocSource = Private(require('ui/courier/data_source/doc_source'));
let mappingSetup = Private(require('ui/utils/mapping_setup'));
let FieldList = Private(require('ui/index_patterns/_field_list'));
var fieldformats = Private(require('ui/registry/field_formats'));
var getIds = Private(require('ui/index_patterns/_get_ids'));
var mapper = Private(require('ui/index_patterns/_mapper'));
var intervals = Private(require('ui/index_patterns/_intervals'));
var getComputedFields = require('ui/index_patterns/_get_computed_fields');
var DocSource = Private(require('ui/courier/data_source/doc_source'));
var mappingSetup = Private(require('ui/utils/mapping_setup'));
var FieldList = Private(require('ui/index_patterns/_field_list'));
let flattenHit = Private(require('ui/index_patterns/_flatten_hit'));
let formatHit = require('ui/index_patterns/_format_hit');
let calculateIndices = Private(require('ui/index_patterns/_calculate_indices'));
let patternCache = Private(require('ui/index_patterns/_pattern_cache'));
var flattenHit = Private(require('ui/index_patterns/_flatten_hit'));
var formatHit = require('ui/index_patterns/_format_hit');
var calculateIndices = Private(require('ui/index_patterns/_calculate_indices'));
var patternCache = Private(require('ui/index_patterns/_pattern_cache'));
let type = 'index-pattern';
var type = 'index-pattern';
let notify = new Notifier();
var notify = new Notifier();
let mapping = mappingSetup.expandShorthand({
var mapping = mappingSetup.expandShorthand({
title: 'string',
timeFieldName: 'string',
notExpandable: 'boolean',
@ -33,8 +33,8 @@ define(function (require) {
_serialize: function (map) {
if (map == null) return;
let count = 0;
let serialized = _.transform(map, function (flat, format, field) {
var count = 0;
var serialized = _.transform(map, function (flat, format, field) {
if (!format) return;
count++;
flat[field] = format;
@ -45,7 +45,7 @@ define(function (require) {
_deserialize: function (map) {
if (map == null) return {};
return _.mapValues(angular.fromJson(map), function (mapping) {
let FieldFormat = fieldformats.byId[mapping.id];
var FieldFormat = fieldformats.byId[mapping.id];
return FieldFormat && new FieldFormat(mapping.params);
});
}
@ -53,11 +53,11 @@ define(function (require) {
});
function IndexPattern(id) {
let self = this;
var self = this;
setId(id);
let docSource = new DocSource();
var docSource = new DocSource();
self.init = function () {
// tell the docSource where to find the doc
@ -125,7 +125,7 @@ define(function (require) {
self.addScriptedField = function (name, script, type, lang) {
type = type || 'string';
let scriptFields = _.pluck(self.getScriptedFields(), 'name');
var scriptFields = _.pluck(self.getScriptedFields(), 'name');
if (_.contains(scriptFields, name)) {
throw new errors.DuplicateField(name);
@ -143,7 +143,7 @@ define(function (require) {
};
self.removeScriptedField = function (name) {
let fieldIndex = _.findIndex(self.fields, {
var fieldIndex = _.findIndex(self.fields, {
name: name,
scripted: true
});
@ -156,10 +156,10 @@ define(function (require) {
self.popularizeField = function (fieldName, unit) {
if (unit == null) unit = 1;
let field = _.get(self, ['fields', 'byName', fieldName]);
var field = _.get(self, ['fields', 'byName', fieldName]);
if (!field) return;
let count = Math.max((field.count || 0) + unit, 0);
var count = Math.max((field.count || 0) + unit, 0);
if (field.count !== count) {
field.count = count;
self.save();
@ -191,7 +191,7 @@ define(function (require) {
};
self.toDetailedIndexList = Promise.method(function (start, stop, sortDirection) {
let interval = self.getInterval();
var interval = self.getInterval();
if (interval) {
return intervals.toIndexList(self.id, interval, start, stop, sortDirection);
@ -221,7 +221,7 @@ define(function (require) {
};
self.prepBody = function () {
let body = {};
var body = {};
// serialize json fields
_.forOwn(mapping, function (fieldMapping, fieldName) {
@ -245,12 +245,12 @@ define(function (require) {
}
self.create = function () {
let body = self.prepBody();
var body = self.prepBody();
return docSource.doCreate(body)
.then(setId)
.catch(function (err) {
if (_.get(err, 'origError.status') === 409) {
let confirmMessage = 'Are you sure you want to overwrite this?';
var confirmMessage = 'Are you sure you want to overwrite this?';
return safeConfirm(confirmMessage).then(
function () {
@ -271,7 +271,7 @@ define(function (require) {
};
self.save = function () {
let body = self.prepBody();
var body = self.prepBody();
return docSource.doIndex(body).then(setId);
};

24
src/ui/public/index_patterns/_intervals.js
View file

@ -1,10 +1,10 @@
define(function (require) {
return function IndexNameIntervalsService(timefilter) {
let _ = require('lodash');
let moment = require('moment');
let IndexedArray = require('ui/IndexedArray');
var _ = require('lodash');
var moment = require('moment');
var IndexedArray = require('ui/IndexedArray');
let intervals = new IndexedArray({
var intervals = new IndexedArray({
index: ['name'],
initialSet: [
{
@ -41,10 +41,10 @@ define(function (require) {
// 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)
// a certain number of times, based on the interval
let range = [[a, 'min', 'startOf'], [b, 'max', 'startOf']].map(function (v) {
let val = v[0];
let bound = v[1];
let extend = v[2];
var range = [[a, 'min', 'startOf'], [b, 'max', 'startOf']].map(function (v) {
var val = v[0];
var bound = v[1];
var extend = v[2];
// grab a bound from the time filter
if (val == null) {
@ -65,12 +65,12 @@ define(function (require) {
if (!interval) throw new Error('Interval must be one of ' + _.pluck(intervals, 'name'));
}
let indexList = [];
let start = range.shift();
var indexList = [];
var start = range.shift();
// turn stop into milliseconds to that it's not constantly converted by the while condition
let stop = range.shift().valueOf();
var stop = range.shift().valueOf();
let add = sortDirection === 'desc' ? 'unshift' : 'push';
var add = sortDirection === 'desc' ? 'unshift' : 'push';
while (start <= stop) {
const index = start.format(format);

16
src/ui/public/index_patterns/_local_cache.js
View file

@ -1,21 +1,21 @@
define(function (require) {
let _ = require('lodash');
let angular = require('angular');
var _ = require('lodash');
var angular = require('angular');
return function LocalCacheFactory() {
function LocalCache(opts) {
opts = opts || {};
let _id = opts.id || function (o) { return '' + o; };
let _cache = {};
var _id = opts.id || function (o) { return '' + o; };
var _cache = {};
this.get = function (obj) {
let id = _id(obj);
var id = _id(obj);
return _cache[id] ? JSON.parse(_cache[id]) : null;
};
this.set = function (obj, val) {
let id = _id(obj);
let clean = !_cache.hasOwnProperty(id);
var id = _id(obj);
var clean = !_cache.hasOwnProperty(id);
_cache[id] = angular.toJson(val);
return clean;
};
@ -26,7 +26,7 @@ define(function (require) {
return;
}
let id = _id(obj);
var id = _id(obj);
delete _cache[id];
};
}

10
src/ui/public/index_patterns/_map_field.js
View file

@ -1,7 +1,7 @@
define(function (require) {
return function MapFieldFn(Private, config) {
let _ = require('lodash');
let castMappingType = Private(require('ui/index_patterns/_cast_mapping_type'));
var _ = require('lodash');
var castMappingType = Private(require('ui/index_patterns/_cast_mapping_type'));
/**
* Accepts a field object and its name, and tries to give it a mapping
@ -10,14 +10,14 @@ define(function (require) {
* @return {Object} - the resulting field after overrides and tweaking
*/
return function mapField(field, name) {
let keys = Object.keys(field.mapping);
var keys = Object.keys(field.mapping);
if (keys.length === 0 || (name[0] === '_') && !_.contains(config.get('metaFields'), name)) return;
let mapping = _.cloneDeep(field.mapping[keys.shift()]);
var mapping = _.cloneDeep(field.mapping[keys.shift()]);
mapping.type = castMappingType(mapping.type);
// Override the mapping, even if elasticsearch says otherwise
let mappingOverrides = {
var mappingOverrides = {
_source: { type: '_source' },
_index: { type: 'string' },
_type: { type: 'string' },

32
src/ui/public/index_patterns/_mapper.js
View file

@ -1,22 +1,22 @@
define(function (require) {
return function MapperService(Private, Promise, es, config, kbnIndex) {
let _ = require('lodash');
let moment = require('moment');
var _ = require('lodash');
var moment = require('moment');
let IndexPatternMissingIndices = require('ui/errors').IndexPatternMissingIndices;
let transformMappingIntoFields = Private(require('ui/index_patterns/_transform_mapping_into_fields'));
let intervals = Private(require('ui/index_patterns/_intervals'));
let patternToWildcard = Private(require('ui/index_patterns/_pattern_to_wildcard'));
var IndexPatternMissingIndices = require('ui/errors').IndexPatternMissingIndices;
var transformMappingIntoFields = Private(require('ui/index_patterns/_transform_mapping_into_fields'));
var intervals = Private(require('ui/index_patterns/_intervals'));
var patternToWildcard = Private(require('ui/index_patterns/_pattern_to_wildcard'));
let LocalCache = Private(require('ui/index_patterns/_local_cache'));
var LocalCache = Private(require('ui/index_patterns/_local_cache'));
function Mapper() {
// Save a reference to mapper
let self = this;
var self = this;
// proper-ish cache, keeps a clean copy of the object, only returns copies of it's copy
let fieldCache = self.cache = new LocalCache();
var fieldCache = self.cache = new LocalCache();
/**
* Gets an object containing all fields with their mappings
@ -26,9 +26,9 @@ define(function (require) {
* @async
*/
self.getFieldsForIndexPattern = function (indexPattern, skipIndexPatternCache) {
let id = indexPattern.id;
var id = indexPattern.id;
let cache = fieldCache.get(id);
var cache = fieldCache.get(id);
if (cache) return Promise.resolve(cache);
if (!skipIndexPatternCache) {
@ -46,7 +46,7 @@ define(function (require) {
});
}
let promise = Promise.resolve(id);
var promise = Promise.resolve(id);
if (indexPattern.intervalName) {
promise = self.getIndicesForIndexPattern(indexPattern)
.then(function (existing) {
@ -77,8 +77,8 @@ define(function (require) {
index: patternToWildcard(indexPattern.id)
})
.then(function (resp) {
// let all = Object.keys(resp).sort();
let all = _(resp)
// var all = Object.keys(resp).sort();
var all = _(resp)
.map(function (index, key) {
if (index.aliases) {
return [Object.keys(index.aliases), key];
@ -91,8 +91,8 @@ define(function (require) {
.uniq(true)
.value();
let matches = all.filter(function (existingIndex) {
let parsed = moment(existingIndex, indexPattern.id);
var matches = all.filter(function (existingIndex) {
var parsed = moment(existingIndex, indexPattern.id);
return existingIndex === parsed.format(indexPattern.id);
});

6
src/ui/public/index_patterns/_pattern_cache.js
View file

@ -1,10 +1,10 @@
define(function (require) {
return function PatternCache() {
let _ = require('lodash');
var _ = require('lodash');
let vals = {};
var vals = {};
let validId = function (id) {
var validId = function (id) {
return typeof id !== 'object';
};

10
src/ui/public/index_patterns/_pattern_to_wildcard.js
View file

@ -1,12 +1,12 @@
define(function (require) {
return function PatternToWildcardFn() {
return function (format) {
let wildcard = '';
let inEscape = false;
let inPattern = false;
var wildcard = '';
var inEscape = false;
var inPattern = false;
for (let i = 0; i < format.length; i++) {
let ch = format.charAt(i);
for (var i = 0; i < format.length; i++) {
var ch = format.charAt(i);
switch (ch) {
case '[':
inPattern = false;

12
src/ui/public/index_patterns/_transform_mapping_into_fields.js
View file

@ -1,7 +1,7 @@
define(function (require) {
return function transformMappingIntoFields(Private, kbnIndex, config) {
let _ = require('lodash');
let mapField = Private(require('ui/index_patterns/_map_field'));
var _ = require('lodash');
var mapField = Private(require('ui/index_patterns/_map_field'));
/**
@ -14,15 +14,15 @@ define(function (require) {
* use-cases
*/
return function (response) {
let fields = {};
var fields = {};
_.each(response, function (index, indexName) {
if (indexName === kbnIndex) return;
_.each(index.mappings, function (mappings) {
_.each(mappings, function (field, name) {
let keys = Object.keys(field.mapping);
var keys = Object.keys(field.mapping);
if (keys.length === 0 || (name[0] === '_') && !_.contains(config.get('metaFields'), name)) return;
let mapping = mapField(field, name);
var mapping = mapField(field, name);
if (fields[name]) {
if (fields[name].type !== mapping.type) {
@ -39,7 +39,7 @@ define(function (require) {
config.get('metaFields').forEach(function (meta) {
if (fields[meta]) return;
let field = { mapping: {} };
var field = { mapping: {} };
field.mapping[meta] = {};
fields[meta] = mapField(field, meta);
});

16
src/ui/public/index_patterns/index_patterns.js
View file

@ -1,21 +1,21 @@
define(function (require) {
let module = require('ui/modules').get('kibana/index_patterns');
var module = require('ui/modules').get('kibana/index_patterns');
require('ui/filters/short_dots');
function IndexPatternsProvider(es, Notifier, Private, Promise, kbnIndex) {
let self = this;
let _ = require('lodash');
let errors = require('ui/errors');
var self = this;
var _ = require('lodash');
var errors = require('ui/errors');
let IndexPattern = Private(require('ui/index_patterns/_index_pattern'));
let patternCache = Private(require('ui/index_patterns/_pattern_cache'));
var IndexPattern = Private(require('ui/index_patterns/_index_pattern'));
var patternCache = Private(require('ui/index_patterns/_pattern_cache'));
let notify = new Notifier({ location: 'IndexPatterns Service'});
var notify = new Notifier({ location: 'IndexPatterns Service'});
self.get = function (id) {
if (!id) return self.make();
let cache = patternCache.get(id);
var cache = patternCache.get(id);
return cache || patternCache.set(id, self.make(id));
};

16
src/ui/public/jquery/findTestSubject.js vendored
View file

@ -1,4 +1,4 @@
let testSubjSelector = require('@spalger/test-subj-selector');
var testSubjSelector = require('@spalger/test-subj-selector');
module.exports = function bindToJquery($) {
@ -7,28 +7,28 @@ module.exports = function bindToJquery($) {
*
* ```js
* // this
* let $button = $('[data-test-subj~="saveButton"]');
* var $button = $('[data-test-subj~="saveButton"]');
*
* // becomes this
* let $button = $.findTestSubject('saveButton');
* var $button = $.findTestSubject('saveButton');
* ```
*
* Supports multiple subjects
* ```js
* // find any saveButton or cancelButton
* let $buttons = $.findTestSubject('saveButton', 'cancelButton');
* var $buttons = $.findTestSubject('saveButton', 'cancelButton');
* ```
*
* Supports subject "selectors"
* ```js
* // find any saveButton inside a savedObjectForm
* let $button = $.findTestSubject('savedObjectForm saveButton');
* var $button = $.findTestSubject('savedObjectForm saveButton');
* ```
*
* Supports selecting compound subjects
* ```js
* // find any smallButton that is also a saveButton inside a savedObjectForm
* let $input = $.findTestSubject('savedObjectForm smallButton&saveButton');
* var $input = $.findTestSubject('savedObjectForm smallButton&saveButton');
* ```
*
* @return {jQueryCollection}
@ -44,8 +44,8 @@ module.exports = function bindToJquery($) {
$.fn.findTestSubject = findTestSubject;
function findTestSubject(...subjectSelectors) {
let $els = $();
let $context = this;
var $els = $();
var $context = this;
subjectSelectors.forEach(function (selector) {
$els = $els.add($context.find(testSubjSelector(selector)));

2
src/ui/public/listen/listen.js
View file

@ -1,5 +1,5 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
require('ui/modules').get('kibana')
.run(function ($rootScope) {

4
src/ui/public/notify/directives.js
View file

@ -1,6 +1,6 @@
define(function (require) {
let notify = require('ui/modules').get('kibana/notify');
let _ = require('lodash');
var notify = require('ui/modules').get('kibana/notify');
var _ = require('lodash');
notify.directive('kbnNotifications', function () {
return {

8
src/ui/public/notify/errors.js
View file

@ -1,9 +1,9 @@
define(function (require) {
let errors = {};
let _ = require('lodash');
var errors = {};
var _ = require('lodash');
let canStack = (function () {
let err = new Error();
var canStack = (function () {
var err = new Error();
return !!err.stack;
}());

6
src/ui/public/notify/lib/_format_es_msg.js
View file

@ -1,5 +1,5 @@
define(function (require) {
let _ = require('lodash');
var _ = require('lodash');
/**
* Utilize the extended error information returned from elasticsearch
@ -7,12 +7,12 @@ define(function (require) {
* @returns {string}
*/
return function formatESMsg(err) {
let rootCause = _.get(err, 'resp.error.root_cause');
var rootCause = _.get(err, 'resp.error.root_cause');
if (!rootCause) {
return; //undefined
}
let result = _.pluck(rootCause, 'reason').join('\n');
var result = _.pluck(rootCause, 'reason').join('\n');
return result;
};
});

10
src/ui/public/notify/lib/_format_msg.js
View file

@ -1,7 +1,7 @@
define(function (require) {
let _ = require('lodash');
let has = _.has;
let formatESMsg = require('ui/notify/lib/_format_es_msg');
var _ = require('lodash');
var has = _.has;
var formatESMsg = require('ui/notify/lib/_format_es_msg');
/**
* Formats the error message from an error object, extended elasticsearch
@ -11,12 +11,12 @@ define(function (require) {
* @returns {string}
*/
function formatMsg(err, from) {
let rtn = '';
var rtn = '';
if (from) {
rtn += from + ': ';
}
let esMsg = formatESMsg(err);
var esMsg = formatESMsg(err);
if (typeof err === 'string') {
rtn += err;

56
src/ui/public/notify/notifier.js
View file

@ -1,26 +1,26 @@
define(function (require) {
let _ = require('lodash');
let $ = require('jquery');
var _ = require('lodash');
var $ = require('jquery');
let metadata = require('ui/metadata');
let formatMsg = require('ui/notify/lib/_format_msg');
var metadata = require('ui/metadata');
var formatMsg = require('ui/notify/lib/_format_msg');
let notifs = [];
let setTO = setTimeout;
let clearTO = clearTimeout;
let version = metadata.version;
let buildNum = metadata.buildNum;
let consoleGroups = ('group' in window.console) && ('groupCollapsed' in window.console) && ('groupEnd' in window.console);
var notifs = [];
var setTO = setTimeout;
var clearTO = clearTimeout;
var version = metadata.version;
var buildNum = metadata.buildNum;
var consoleGroups = ('group' in window.console) && ('groupCollapsed' in window.console) && ('groupEnd' in window.console);
let fatalSplashScreen = require('ui/notify/partials/fatal_splash_screen.html');
var fatalSplashScreen = require('ui/notify/partials/fatal_splash_screen.html');
let log = _.bindKey(console, 'log');
var log = _.bindKey(console, 'log');
// used to identify the first call to fatal, set to false there
let firstFatal = true;
var firstFatal = true;
let fatalToastTemplate = (function lazyTemplate(tmpl) {
var fatalToastTemplate = (function lazyTemplate(tmpl) {
let compiled;
return function (vars) {
return (compiled || (compiled = _.template(tmpl)))(vars);
@ -37,7 +37,7 @@ define(function (require) {
function closeNotif(cb, key) {
return function () {
// this === notif
let i = notifs.indexOf(this);
var i = notifs.indexOf(this);
if (i !== -1) notifs.splice(i, 1);
if (this.timerId) this.timerId = clearTO(this.timerId);
if (typeof cb === 'function') cb(key);
@ -63,7 +63,7 @@ define(function (require) {
notif.count = (notif.count || 0) + 1;
let dup = _.find(notifs, function (item) {
var dup = _.find(notifs, function (item) {
return item.content === notif.content && item.lifetime === notif.lifetime;
});
@ -79,7 +79,7 @@ define(function (require) {
}
function formatInfo() {
let info = [];
var info = [];
if (!_.isUndefined(version)) {
info.push(`Version: ${version}`);
@ -104,7 +104,7 @@ define(function (require) {
* Functionality to check that
*/
function Notifier(opts) {
let self = this;
var self = this;
opts = opts || {};
// label type thing to say where notifications came from
@ -153,7 +153,7 @@ define(function (require) {
* @return {function} - the wrapped function
*/
Notifier.prototype.timed = function (name, fn) {
let self = this;
var self = this;
if (typeof name === 'function') {
fn = name;
@ -161,8 +161,8 @@ define(function (require) {
}
return function WrappedNotifierFunction() {
let cntx = this;
let args = arguments;
var cntx = this;
var args = arguments;
return self.event(name, function () {
return fn.apply(cntx, args);
@ -198,13 +198,13 @@ define(function (require) {
});
}
let html = fatalToastTemplate({
var html = fatalToastTemplate({
info: formatInfo(),
msg: formatMsg(err, this.from),
stack: formatStack(err)
});
let $container = $('#fatal-splash-screen');
var $container = $('#fatal-splash-screen');
if (!$container.size()) {
$(document.body)
@ -273,7 +273,7 @@ define(function (require) {
Notifier.prototype.log = _.noop;
} else {
Notifier.prototype.log = function () {
let args = [].slice.apply(arguments);
var args = [].slice.apply(arguments);
if (this.from) args.unshift(this.from + ':');
log.apply(null, args);
};
@ -282,15 +282,15 @@ define(function (require) {
// general functionality used by .event() and .lifecycle()
function createGroupLogger(type, opts) {
// Track the groups managed by this logger
let groups = window[type + 'Groups'] = {};
var groups = window[type + 'Groups'] = {};
return function logger(name, success) {
let status; // status of the timer
let exec; // function to execute and wrap
let ret; // return value
let complete = function (val) { logger(name, true); return val; };
let failure = function (err) { logger(name, false); throw err; };
var complete = function (val) { logger(name, true); return val; };
var failure = function (err) { logger(name, false); throw err; };
if (typeof success === 'function' || success === void 0) {
// start
@ -306,7 +306,7 @@ define(function (require) {
}
else {
groups[name] = now() - (groups[name] || 0);
let time = ' in ' + groups[name].toFixed(2) + 'ms';
var time = ' in ' + groups[name].toFixed(2) + 'ms';
// end
if (success) {

14
src/ui/public/notify/notify.js
View file

@ -1,11 +1,11 @@
define(function (require) {
let _ = require('lodash');
let $ = require('jquery');
let modules = require('ui/modules');
let module = modules.get('kibana/notify');
let errors = require('ui/notify/errors');
let Notifier = require('ui/notify/notifier');
let rootNotifier = new Notifier();
var _ = require('lodash');
var $ = require('jquery');
var modules = require('ui/modules');
var module = modules.get('kibana/notify');
var errors = require('ui/notify/errors');
var Notifier = require('ui/notify/notifier');
var rootNotifier = new Notifier();
require('ui/notify/directives');

12
src/ui/public/number_list/number_list.js
View file

@ -1,6 +1,6 @@
define(function (require) {
let _ = require('lodash');
let parseRange = require('ui/utils/range');
var _ = require('lodash');
var parseRange = require('ui/utils/range');
require('ui/number_list/number_list_input');
require('ui/modules')
@ -12,7 +12,7 @@ define(function (require) {
controllerAs: 'numberListCntr',
require: 'ngModel',
controller: function ($scope, $attrs, $parse) {
let self = this;
var self = this;
// Called from the pre-link function once we have the controllers
self.init = function (modelCntr) {
@ -24,7 +24,7 @@ define(function (require) {
self.getUnitName = _.partial($parse($attrs.unit), $scope);
let defaultRange = self.range = parseRange('[0,Infinity)');
var defaultRange = self.range = parseRange('[0,Infinity)');
$scope.$watch(function () {
return $attrs.range;
@ -47,7 +47,7 @@ define(function (require) {
* @return {undefined}
*/
self.remove = function (index) {
let list = self.getList();
var list = self.getList();
if (!list) return;
list.splice(index, 1);
@ -58,7 +58,7 @@ define(function (require) {
* @return {undefined}
*/
self.add = function () {
let list = self.getList();
var list = self.getList();
if (!list) return;
list.push(_.last(list) + 1);

56
src/ui/public/number_list/number_list_input.js
View file

@ -1,13 +1,13 @@
define(function (require) {
let $ = require('jquery');
let _ = require('lodash');
let keyMap = require('ui/utils/key_map');
var $ = require('jquery');
var _ = require('lodash');
var keyMap = require('ui/utils/key_map');
let INVALID = {}; // invalid flag
let FLOATABLE = /^[\d\.e\-\+]+$/i;
var INVALID = {}; // invalid flag
var FLOATABLE = /^[\d\.e\-\+]+$/i;
let VALIDATION_ERROR = 'numberListRangeAndOrder';
let DIRECTIVE_ATTR = 'kbn-number-list-input';
var VALIDATION_ERROR = 'numberListRangeAndOrder';
var DIRECTIVE_ATTR = 'kbn-number-list-input';
require('ui/modules')
.get('kibana')
@ -16,13 +16,13 @@ define(function (require) {
restrict: 'A',
require: ['ngModel', '^kbnNumberList'],
link: function ($scope, $el, attrs, controllers) {
let ngModelCntr = controllers[0];
let numberListCntr = controllers[1];
var ngModelCntr = controllers[0];
var numberListCntr = controllers[1];
let $setModel = $parse(attrs.ngModel).assign;
let $repeater = $el.closest('[ng-repeat]');
var $setModel = $parse(attrs.ngModel).assign;
var $repeater = $el.closest('[ng-repeat]');
let handlers = {
var handlers = {
up: change(add, 1),
'shift-up': change(addTenth, 1),
@ -54,14 +54,14 @@ define(function (require) {
function go(dir) {
return function () {
let $to = $get(dir);
var $to = $get(dir);
if ($to.size()) $to.focus();
else return false;
};
}
function idKey(event) {
let id = [];
var id = [];
if (event.ctrlKey) id.push('ctrl');
if (event.shiftKey) id.push('shift');
if (event.metaKey) id.push('meta');
@ -75,8 +75,8 @@ define(function (require) {
}
function addTenth(n, val, str) {
let int = Math.floor(val);
let dec = parseInt(str.split('.')[1] || 0, 10);
var int = Math.floor(val);
var dec = parseInt(str.split('.')[1] || 0, 10);
dec = dec + parseInt(n, 10);
if (dec < 0 || dec > 9) {
@ -93,11 +93,11 @@ define(function (require) {
function change(using, mod) {
return function () {
let str = String(ngModelCntr.$viewValue);
let val = parse(str);
var str = String(ngModelCntr.$viewValue);
var val = parse(str);
if (val === INVALID) return;
let next = using(mod, val, str);
var next = using(mod, val, str);
if (next === INVALID) return;
$el.val(next);
@ -106,7 +106,7 @@ define(function (require) {
}
function onKeydown(event) {
let handler = handlers[idKey(event)];
var handler = handlers[idKey(event)];
if (!handler) return;
if (handler(event) !== false) {
@ -122,7 +122,7 @@ define(function (require) {
});
function parse(viewValue) {
let num = viewValue;
var num = viewValue;
if (typeof num !== 'number' || isNaN(num)) {
// parse non-numbers
@ -133,13 +133,13 @@ define(function (require) {
if (isNaN(num)) return INVALID;
}
let range = numberListCntr.range;
var range = numberListCntr.range;
if (!range.within(num)) return INVALID;
if ($scope.$index > 0) {
let i = $scope.$index - 1;
let list = numberListCntr.getList();
let prev = list[i];
var i = $scope.$index - 1;
var list = numberListCntr.getList();
var prev = list[i];
if (num <= prev) return INVALID;
}
@ -155,14 +155,14 @@ define(function (require) {
}
}
], function () {
let valid = parse(ngModelCntr.$viewValue) !== INVALID;
var valid = parse(ngModelCntr.$viewValue) !== INVALID;
ngModelCntr.$setValidity(VALIDATION_ERROR, valid);
});
function validate(then) {
return function (input) {
let value = parse(input);
let valid = value !== INVALID;
var value = parse(input);
var valid = value !== INVALID;
value = valid ? value : input;
ngModelCntr.$setValidity(VALIDATION_ERROR, valid);
then && then(input, value);