Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/ui/public/url/url.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ uiModules.get('kibana/url')
.service('kbnUrl', function (Private) { return Private(KbnUrlProvider); });

function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getAppState) {
var self = this;
let self = this;

/**
* Navigate to a url
Expand Down Expand Up @@ -70,10 +70,10 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA

return template.replace(/\{\{([^\}]+)\}\}/g, function (match, expr) {
// remove filters
var key = expr.split('|')[0].trim();
let key = expr.split('|')[0].trim();

// verify that the expression can be evaluated
var p = $parse(key)(paramObj);
let p = $parse(key)(paramObj);

// if evaluation can't be made, throw
if (_.isUndefined(p)) {
Expand Down Expand Up @@ -109,7 +109,7 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA
* @return {string} - the computed url
*/
self.getRouteUrl = function (obj, route) {
var template = obj && obj.routes && obj.routes[route];
let template = obj && obj.routes && obj.routes[route];
if (template) return self.eval(template, obj);
};

Expand Down Expand Up @@ -143,7 +143,7 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA
let reloading;

self._changeLocation = function (type, url, paramObj, replace) {
var prev = {
let prev = {
path: $location.path(),
search: $location.search()
};
Expand All @@ -152,13 +152,13 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA
$location[type](url);
if (replace) $location.replace();

var next = {
let next = {
path: $location.path(),
search: $location.search()
};

if (self._shouldAutoReload(next, prev)) {
var appState = getAppState();
let appState = getAppState();
if (appState) appState.destroy();

reloading = $rootScope.$on('$locationChangeSuccess', function () {
Expand All @@ -174,13 +174,13 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA
self._shouldAutoReload = function (next, prev) {
if (reloading) return false;

var route = $route.current && $route.current.$$route;
let route = $route.current && $route.current.$$route;
if (!route) return false;

if (next.path !== prev.path) return false;

var reloadOnSearch = route.reloadOnSearch;
var searchSame = _.isEqual(next.search, prev.search);
let reloadOnSearch = route.reloadOnSearch;
let searchSame = _.isEqual(next.search, prev.search);

return (reloadOnSearch && searchSame) || !reloadOnSearch;
};
Expand Down
12 changes: 6 additions & 6 deletions src/ui/public/utils/add_word_breaks.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
define(function () {
return function addWordBreaks(text, minLineLength) {
text = text || '';
var lineSize = 0;
var newText = '';
var inHtmlTag = false;
var inHtmlChar = false;
let lineSize = 0;
let newText = '';
let inHtmlTag = false;
let inHtmlChar = false;

for (var i = 0, len = text.length; i < len; i++) {
var chr = text.charAt(i);
for (let i = 0, len = text.length; i < len; i++) {
let chr = text.charAt(i);
newText += chr;

switch (chr) {
Expand Down
4 changes: 2 additions & 2 deletions src/ui/public/utils/brush_event.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import moment from 'moment';
export default function brushEventProvider(timefilter) {
return function (event) {
var from = moment(event.range[0]);
var to = moment(event.range[1]);
let from = moment(event.range[0]);
let to = moment(event.range[1]);

if (to - from === 0) return;

Expand Down
10 changes: 5 additions & 5 deletions src/ui/public/utils/cidr_mask.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import Ipv4Address from 'ui/utils/ipv4_address';
var NUM_BITS = 32;
let NUM_BITS = 32;

function throwError(mask) {
throw Error('Invalid CIDR mask: ' + mask);
}

function CidrMask(mask) {
var splits = mask.split('\/');
let splits = mask.split('\/');
if (splits.length !== 2) throwError(mask);
this.initialAddress = new Ipv4Address(splits[0]);
this.prefixLength = Number(splits[1]);
if (this.prefixLength < 1 || this.prefixLength > NUM_BITS) throwError(mask);
}

CidrMask.prototype.getRange = function () {
var variableBits = NUM_BITS - this.prefixLength;
var fromAddress = this.initialAddress.valueOf() >> variableBits << variableBits >>> 0; // >>> 0 coerces to unsigned
var numAddresses = Math.pow(2, variableBits);
let variableBits = NUM_BITS - this.prefixLength;
let fromAddress = this.initialAddress.valueOf() >> variableBits << variableBits >>> 0; // >>> 0 coerces to unsigned
let numAddresses = Math.pow(2, variableBits);
return {
from: new Ipv4Address(fromAddress).toString(),
to: new Ipv4Address(fromAddress + numAddresses - 1).toString()
Expand Down
18 changes: 9 additions & 9 deletions src/ui/public/utils/date_math.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import _ from 'lodash';
import moment from 'moment';

var units = ['y', 'M', 'w', 'd', 'h', 'm', 's', 'ms'];
var unitsAsc = _.sortBy(units, function (unit) {
let units = ['y', 'M', 'w', 'd', 'h', 'm', 's', 'ms'];
let unitsAsc = _.sortBy(units, function (unit) {
return moment.duration(1, unit).valueOf();
});
var unitsDesc = unitsAsc.reverse();
let unitsDesc = unitsAsc.reverse();

/* This is a simplified version of elasticsearch's date parser */
function parse(text, roundUp) {
Expand All @@ -14,7 +14,7 @@ function parse(text, roundUp) {
if (_.isDate(text)) return moment(text);

let time;
var mathString = '';
let mathString = '';
let index;
let parseString;

Expand Down Expand Up @@ -42,12 +42,12 @@ function parse(text, roundUp) {
}

function parseDateMath(mathString, time, roundUp) {
var dateTime = time;
var i = 0;
var len = mathString.length;
let dateTime = time;
let i = 0;
let len = mathString.length;

while (i < len) {
var c = mathString.charAt(i++);
let c = mathString.charAt(i++);
let type;
let num;
let unit;
Expand All @@ -67,7 +67,7 @@ function parseDateMath(mathString, time, roundUp) {
} else if (mathString.length === 2) {
num = mathString.charAt(i);
} else {
var numFrom = i;
let numFrom = i;
while (!isNaN(mathString.charAt(i))) {
i++;
if (i > 10) return undefined;
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/utils/date_range.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default {
}
},
parse: function (rangeString, format) {
var chunks = rangeString.split(' to ');
let chunks = rangeString.split(' to ');
if (chunks.length === 2) return {from: moment(chunks[0], format), to: moment(chunks[1], format)};

chunks = rangeString.split('Before ');
Expand Down
24 changes: 12 additions & 12 deletions src/ui/public/utils/decode_geo_hash.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@
* @return {Object} interval
*/
function decodeGeoHash(geohash) {
var BITS = [16, 8, 4, 2, 1];
var BASE32 = '0123456789bcdefghjkmnpqrstuvwxyz';
var is_even = 1;
var lat = [];
var lon = [];
let BITS = [16, 8, 4, 2, 1];
let BASE32 = '0123456789bcdefghjkmnpqrstuvwxyz';
let is_even = 1;
let lat = [];
let lon = [];
lat[0] = -90.0;
lat[1] = 90.0;
lon[0] = -180.0;
lon[1] = 180.0;
var lat_err = 90.0;
var lon_err = 180.0;
for (var i = 0; i < geohash.length; i++) {
var c = geohash[i];
var cd = BASE32.indexOf(c);
for (var j = 0; j < 5; j++) {
var mask = BITS[j];
let lat_err = 90.0;
let lon_err = 180.0;
for (let i = 0; i < geohash.length; i++) {
let c = geohash[i];
let cd = BASE32.indexOf(c);
for (let j = 0; j < 5; j++) {
let mask = BITS[j];
if (is_even) {
lon_err /= 2;
refine_interval(lon, cd, mask);
Expand Down
8 changes: 4 additions & 4 deletions src/ui/public/utils/diff_object.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ import angular from 'angular';

export default function (target, source) {

var diff = {};
let diff = {};

/**
* Filter the private vars
* @param {string} key The keys
* @returns {boolean}
*/
var filterPrivateAndMethods = function (obj) {
let filterPrivateAndMethods = function (obj) {
return function (key) {
if (_.isFunction(obj[key])) return false;
if (key.charAt(0) === '$') return false;
return key.charAt(0) !== '_';
};
};

var targetKeys = _.keys(target).filter(filterPrivateAndMethods(target));
var sourceKeys = _.keys(source).filter(filterPrivateAndMethods(source));
let targetKeys = _.keys(target).filter(filterPrivateAndMethods(target));
let sourceKeys = _.keys(source).filter(filterPrivateAndMethods(source));

// Find the keys to be removed
diff.removed = _.difference(targetKeys, sourceKeys);
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/utils/diff_time_picker_vals.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import _ from 'lodash';
import angular from 'angular';
export default function DiffTimePickerValuesFn() {

var valueOf = function (o) {
let valueOf = function (o) {
if (o) return o.valueOf();
};

Expand Down
4 changes: 2 additions & 2 deletions src/ui/public/utils/es_bool.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define(function () {
var map = {
let map = {
'false': false,
'off': false,
'no': false,
Expand All @@ -11,7 +11,7 @@ define(function () {
};

return function (str) {
var bool = map[String(str)];
let bool = map[String(str)];

if (typeof bool !== 'boolean') {
throw new TypeError('"' + str + '" does not map to an esBool');
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/utils/find_by_param.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import _ from 'lodash';
// if the param is missing, return undefined
export default function findByParam(values, param) {
if (_.isArray(values)) { // point series chart
var index = _.findIndex(values, param);
let index = _.findIndex(values, param);
if (index === -1) return;
return values[index][param];
}
Expand Down
16 changes: 8 additions & 8 deletions src/ui/public/utils/ipv4_address.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
define(function () {
var NUM_BYTES = 4;
var BYTE_SIZE = 256;
let NUM_BYTES = 4;
let BYTE_SIZE = 256;

function throwError(ipAddress) {
throw Error('Invalid IPv4 address: ' + ipAddress);
Expand All @@ -19,11 +19,11 @@ define(function () {
if (typeof ipAddress === 'string') {
this.value = 0;

var bytes = ipAddress.split('.');
let bytes = ipAddress.split('.');
if (bytes.length !== NUM_BYTES) throwError(ipAddress);

for (var i = 0; i < bytes.length; i++) {
var byte = Number(bytes[i]);
for (let i = 0; i < bytes.length; i++) {
let byte = Number(bytes[i]);
if (!isIntegerInRange(byte, 0, BYTE_SIZE)) throwError(ipAddress);
this.value += Math.pow(BYTE_SIZE, NUM_BYTES - 1 - i) * byte;
}
Expand All @@ -33,9 +33,9 @@ define(function () {
}

Ipv4Address.prototype.toString = function () {
var value = this.value;
var bytes = [];
for (var i = 0; i < NUM_BYTES; i++) {
let value = this.value;
let bytes = [];
for (let i = 0; i < NUM_BYTES; i++) {
bytes.unshift(value % 256);
value = Math.floor(value / 256);
}
Expand Down
22 changes: 11 additions & 11 deletions src/ui/public/utils/lodash-mixins/collection.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function (_) {
* @return {array} - the objs argument
*/
move: function (objs, obj, below, qualifier) {
var origI = _.isNumber(obj) ? obj : objs.indexOf(obj);
let origI = _.isNumber(obj) ? obj : objs.indexOf(obj);
if (origI === -1) return objs;

if (_.isNumber(below)) {
Expand All @@ -27,11 +27,11 @@ export default function (_) {
below = !!below;
qualifier = _.callback(qualifier);

var above = !below;
var finder = below ? _.findIndex : _.findLastIndex;
let above = !below;
let finder = below ? _.findIndex : _.findLastIndex;

// find the index of the next/previous obj that meets the qualifications
var targetI = finder(objs, function (otherAgg, otherI) {
let targetI = finder(objs, function (otherAgg, otherI) {
if (below && otherI <= origI) return;
if (above && otherI >= origI) return;
return !!qualifier(otherAgg, otherI);
Expand All @@ -58,23 +58,23 @@ export default function (_) {
* @return {object}
*/
organizeBy: function (collection, callback) {
var buckets = {};
var prop = typeof callback === 'function' ? false : callback;
let buckets = {};
let prop = typeof callback === 'function' ? false : callback;

function add(key, obj) {
if (!buckets[key]) buckets[key] = [];
buckets[key].push(obj);
}

_.each(collection, function (obj) {
var keys = prop === false ? callback(obj) : obj[prop];
let keys = prop === false ? callback(obj) : obj[prop];

if (!_.isArray(keys)) {
add(keys, obj);
return;
}

var length = keys.length;
let length = keys.length;
while (length-- > 0) {
add(keys[length], obj);
}
Expand Down Expand Up @@ -108,14 +108,14 @@ export default function (_) {
* @return {Array} dest
*/
pushAll: function (source, dest) {
var start = dest.length;
var adding = source.length;
let start = dest.length;
let adding = source.length;

// allocate - http://goo.gl/e2i0S0
dest.length = start + adding;

// fill sparse positions
var i = -1;
let i = -1;
while (++i < adding) dest[start + i] = source[i];

return dest;
Expand Down
Loading