Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[internal] Replace var with let in ui/public/vislib #6911

Merged
merged 1 commit into from
Apr 14, 2016
Merged
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
2 changes: 1 addition & 1 deletion src/ui/public/vislib/components/color/color.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import _ from 'lodash';
import VislibComponentsColorMappedColorsProvider from 'ui/vislib/components/color/mapped_colors';
export default function ColorUtilService(Private) {
var mappedColors = Private(VislibComponentsColorMappedColorsProvider);
let mappedColors = Private(VislibComponentsColorMappedColorsProvider);

/*
* Accepts an array of strings or numbers that are used to create a
Expand Down
14 changes: 7 additions & 7 deletions src/ui/public/vislib/components/color/color_palette.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import _ from 'lodash';
import VislibComponentsColorSeedColorsProvider from 'ui/vislib/components/color/seed_colors';
export default function ColorPaletteUtilService(Private) {

var seedColors = Private(VislibComponentsColorSeedColorsProvider);
let seedColors = Private(VislibComponentsColorSeedColorsProvider);


/*
Expand All @@ -12,10 +12,10 @@ export default function ColorPaletteUtilService(Private) {
* new colors are generated up to the value of the input number.
*/

var offset = 300; // Hue offset to start at
let offset = 300; // Hue offset to start at

var fraction = function (goal) {
var walkTree = function (numerator, denominator, bytes) {
let fraction = function (goal) {
let walkTree = function (numerator, denominator, bytes) {
if (bytes.length) {
return walkTree(
(numerator * 2) + (bytes.pop() ? 1 : -1),
Expand All @@ -28,7 +28,7 @@ export default function ColorPaletteUtilService(Private) {
}
};

var b = (goal + 2)
let b = (goal + 2)
.toString(2)
.split('')
.map(function (num) {
Expand All @@ -45,9 +45,9 @@ export default function ColorPaletteUtilService(Private) {
throw new TypeError('ColorPaletteUtilService expects a number');
}

var colors = seedColors;
let colors = seedColors;

var seedLength = seedColors.length;
let seedLength = seedColors.length;

_.times(num - seedLength, function (i) {
colors.push(d3.hsl((fraction(i + seedLength + 1) * 360 + offset) % 360, 0.5, 0.5).toString());
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/vislib/components/labels/data_array.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import _ from 'lodash';
import VislibComponentsLabelsFlattenSeriesProvider from 'ui/vislib/components/labels/flatten_series';
export default function GetArrayUtilService(Private) {
var flattenSeries = Private(VislibComponentsLabelsFlattenSeriesProvider);
let flattenSeries = Private(VislibComponentsLabelsFlattenSeriesProvider);

/*
* Accepts a Kibana data object and returns an array of values objects.
Expand Down
6 changes: 3 additions & 3 deletions src/ui/public/vislib/components/labels/labels.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import VislibComponentsLabelsUniqLabelsProvider from 'ui/vislib/components/label
import VislibComponentsLabelsPiePieLabelsProvider from 'ui/vislib/components/labels/pie/pie_labels';
export default function LabelUtilService(Private) {

var createArr = Private(VislibComponentsLabelsDataArrayProvider);
var getArrOfUniqLabels = Private(VislibComponentsLabelsUniqLabelsProvider);
var getPieLabels = Private(VislibComponentsLabelsPiePieLabelsProvider);
let createArr = Private(VislibComponentsLabelsDataArrayProvider);
let getArrOfUniqLabels = Private(VislibComponentsLabelsUniqLabelsProvider);
let getPieLabels = Private(VislibComponentsLabelsPiePieLabelsProvider);

/*
* Accepts a Kibana data object and returns an array of unique labels (strings).
Expand Down
4 changes: 2 additions & 2 deletions src/ui/public/vislib/components/labels/pie/get_pie_names.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import _ from 'lodash';
import VislibComponentsLabelsPieReturnPieNamesProvider from 'ui/vislib/components/labels/pie/return_pie_names';

export default function GetPieNames(Private) {
var returnNames = Private(VislibComponentsLabelsPieReturnPieNamesProvider);
let returnNames = Private(VislibComponentsLabelsPieReturnPieNamesProvider);

return function (data, columns) {
var slices = data.slices;
let slices = data.slices;

if (slices.children) {
return _(returnNames(slices.children, 0, columns))
Expand Down
10 changes: 5 additions & 5 deletions src/ui/public/vislib/components/labels/pie/pie_labels.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ import VislibComponentsLabelsPieRemoveZeroSlicesProvider from 'ui/vislib/compone
import VislibComponentsLabelsPieGetPieNamesProvider from 'ui/vislib/components/labels/pie/get_pie_names';

export default function PieLabels(Private) {
var removeZeroSlices = Private(VislibComponentsLabelsPieRemoveZeroSlicesProvider);
var getNames = Private(VislibComponentsLabelsPieGetPieNamesProvider);
let removeZeroSlices = Private(VislibComponentsLabelsPieRemoveZeroSlicesProvider);
let getNames = Private(VislibComponentsLabelsPieGetPieNamesProvider);

return function (obj) {
if (!_.isObject(obj)) { throw new TypeError('PieLabel expects an object'); }

var data = obj.columns || obj.rows || [obj];
var names = [];
let data = obj.columns || obj.rows || [obj];
let names = [];

data.forEach(function (obj) {
var columns = obj.raw ? obj.raw.columns : undefined;
let columns = obj.raw ? obj.raw.columns : undefined;
obj.slices = removeZeroSlices(obj.slices);

getNames(obj, columns).forEach(function (name) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
define(function () {
return function ReturnPieNames() {
return function returnNames(array, index, columns) {
var names = [];
let names = [];

array.forEach(function (obj) {
names.push({ key: obj.name, index: index });
Expand Down
40 changes: 20 additions & 20 deletions src/ui/public/vislib/components/tooltip/position_tooltip.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
import _ from 'lodash';
import $ from 'jquery';

var OFFSET = 10;
let OFFSET = 10;
let $clone;

// translate css properties into their basic direction
var propDirs = {
let propDirs = {
top: 'north',
left: 'west'
};

function positionTooltip(opts, html) {
if (!opts) return;
var $chart = $(opts.$chart);
var $el = $(opts.$el);
var $window = $(opts.$window || window);
var $sizer = $(opts.$sizer);
var prev = $chart.data('previousPlacement') || {};
var event = opts.event;
let $chart = $(opts.$chart);
let $el = $(opts.$el);
let $window = $(opts.$window || window);
let $sizer = $(opts.$sizer);
let prev = $chart.data('previousPlacement') || {};
let event = opts.event;

if (!$chart.size() || !$el.size()) return;

var size = getTtSize(html || $el.html(), $sizer);
var pos = getBasePosition(size, event);
var overflow = getOverflow(size, pos, [$chart, $window]);
let size = getTtSize(html || $el.html(), $sizer);
let pos = getBasePosition(size, event);
let overflow = getOverflow(size, pos, [$chart, $window]);

var placement = placeToAvoidOverflow(pos, prev, overflow);
let placement = placeToAvoidOverflow(pos, prev, overflow);
$chart.data('previousPlacement', placement);
return placement;
}
Expand All @@ -35,7 +35,7 @@ function getTtSize(ttHtml, $sizer) {
$sizer.html(ttHtml);
}

var size = {
let size = {
width: $sizer.outerWidth(),
height: $sizer.outerHeight()
};
Expand All @@ -55,7 +55,7 @@ function getBasePosition(size, event) {
function getBounds($el) {
// in testing, $window is not actually a window, so we need to add
// the offsets to make it work right.
var bounds = $el.offset() || { top: 0, left: 0 };
let bounds = $el.offset() || { top: 0, left: 0 };
bounds.top += $el.scrollTop();
bounds.left += $el.scrollLeft();
bounds.bottom = bounds.top + $el.outerHeight();
Expand All @@ -64,7 +64,7 @@ function getBounds($el) {
}

function getOverflow(size, pos, containers) {
var overflow = {};
let overflow = {};

containers.map(getBounds).forEach(function (bounds) {
// number of pixels that the toolip would overflow it's far
Expand All @@ -90,16 +90,16 @@ function mergeOverflows(dest, src) {
}

function pickPlacement(prop, pos, overflow, prev, pref, fallback, placement) {
var stash = '_' + prop;
let stash = '_' + prop;

// list of directions in order of preference
var dirs = _.unique([prev[stash], pref, fallback].filter(Boolean));
let dirs = _.unique([prev[stash], pref, fallback].filter(Boolean));

let dir;
let value;

// find the first direction that doesn't overflow
for (var i = 0; i < dirs.length; i++) {
for (let i = 0; i < dirs.length; i++) {
dir = dirs[i];
if (overflow[dir] > 0) continue;
value = pos[dir];
Expand All @@ -111,7 +111,7 @@ function pickPlacement(prop, pos, overflow, prev, pref, fallback, placement) {
if (value == null) {
dir = dirs[0];

var offset = overflow[dir];
let offset = overflow[dir];
if (propDirs[prop] === dir) {
// when the property represents the same direction
// as dir, we flip the overflow
Expand All @@ -126,7 +126,7 @@ function pickPlacement(prop, pos, overflow, prev, pref, fallback, placement) {
}

function placeToAvoidOverflow(pos, prev, overflow) {
var placement = {};
let placement = {};
pickPlacement('top', pos, overflow, prev, 'south', 'north', placement);
pickPlacement('left', pos, overflow, prev, 'east', 'west', placement);
return placement;
Expand Down
32 changes: 16 additions & 16 deletions src/ui/public/vislib/components/tooltip/tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Binder from 'ui/binder';
import positionTooltip from './position_tooltip';
import $ from 'jquery';

var allContents = [];
let allContents = [];

/**
* Add tooltip and listeners to visualization elements
Expand Down Expand Up @@ -59,13 +59,13 @@ Tooltip.prototype.$getSizer = _.once(function () {
* Show the tooltip, positioning it based on the content and chart container
*/
Tooltip.prototype.show = function () {
var $tooltip = this.$get();
var $chart = this.$getChart();
var html = $tooltip.html();
let $tooltip = this.$get();
let $chart = this.$getChart();
let html = $tooltip.html();

if (!$chart) return;

var placement = positionTooltip({
let placement = positionTooltip({
$window: $(window),
$chart: $chart,
$el: $tooltip,
Expand All @@ -84,7 +84,7 @@ Tooltip.prototype.show = function () {
* Hide the tooltip, clearing its contents
*/
Tooltip.prototype.hide = function () {
var $tooltip = this.$get();
let $tooltip = this.$get();
allContents = [];
$tooltip.css({
visibility: 'hidden',
Expand All @@ -100,7 +100,7 @@ Tooltip.prototype.hide = function () {
* @return {Object} jQuery node for the chart
*/
Tooltip.prototype.$getChart = function () {
var chart = $(this.container && this.container.node());
let chart = $(this.container && this.container.node());
return chart.size() ? chart : false;
};

Expand All @@ -111,25 +111,25 @@ Tooltip.prototype.$getChart = function () {
* @return {Function} Renders tooltip on a D3 selection
*/
Tooltip.prototype.render = function () {
var self = this;
let self = this;

/**
* Calculates values for the tooltip placement
*
* @param {Object} selection D3 selection object
*/
return function (selection) {
var $tooltip = self.$get();
var id = self.id;
var order = self.order;
let $tooltip = self.$get();
let id = self.id;
let order = self.order;

var tooltipSelection = d3.select($tooltip.get(0));
let tooltipSelection = d3.select($tooltip.get(0));

if (self.container === undefined || self.container !== d3.select(self.el).select('.' + self.containerClass)) {
self.container = d3.select(self.el).select('.' + self.containerClass);
}

var $chart = self.$getChart();
let $chart = self.$getChart();
if ($chart) {
self.binder.jqOn($chart, 'mouseleave', function (event) {
// only clear when we leave the chart, so that
Expand All @@ -139,7 +139,7 @@ Tooltip.prototype.render = function () {
}

selection.each(function (d, i) {
var element = d3.select(this);
let element = d3.select(this);

function render(html) {
allContents = _.filter(allContents, function (content) {
Expand All @@ -148,7 +148,7 @@ Tooltip.prototype.render = function () {

if (html) allContents.push({ id: id, html: html, order: order });

var allHtml = _(allContents)
let allHtml = _(allContents)
.sortBy('order')
.pluck('html')
.compact()
Expand All @@ -167,7 +167,7 @@ Tooltip.prototype.render = function () {
return render();
}

var events = self.events ? self.events.eventResponse(d, i) : d;
let events = self.events ? self.events.eventResponse(d, i) : d;
return render(self.formatter(events));
});

Expand Down
12 changes: 6 additions & 6 deletions src/ui/public/vislib/components/zero_injection/inject_zeros.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import VislibComponentsZeroInjectionZeroFilledArrayProvider from 'ui/vislib/comp
import VislibComponentsZeroInjectionZeroFillDataArrayProvider from 'ui/vislib/components/zero_injection/zero_fill_data_array';
export default function ZeroInjectionUtilService(Private) {

var orderXValues = Private(VislibComponentsZeroInjectionOrderedXKeysProvider);
var createZeroFilledArray = Private(VislibComponentsZeroInjectionZeroFilledArrayProvider);
var zeroFillDataArray = Private(VislibComponentsZeroInjectionZeroFillDataArrayProvider);
let orderXValues = Private(VislibComponentsZeroInjectionOrderedXKeysProvider);
let createZeroFilledArray = Private(VislibComponentsZeroInjectionZeroFilledArrayProvider);
let zeroFillDataArray = Private(VislibComponentsZeroInjectionZeroFillDataArrayProvider);

/*
* A Kibana data object may have multiple series with different array lengths.
Expand Down Expand Up @@ -34,12 +34,12 @@ export default function ZeroInjectionUtilService(Private) {
throw new TypeError('ZeroInjectionUtilService expects an object with a series, rows, or columns key');
}

var keys = orderXValues(obj);
var arr = getDataArray(obj);
let keys = orderXValues(obj);
let arr = getDataArray(obj);

arr.forEach(function (object) {
object.series.forEach(function (series) {
var zeroArray = createZeroFilledArray(keys);
let zeroArray = createZeroFilledArray(keys);

series.values = zeroFillDataArray(zeroArray, series.values);
});
Expand Down
Loading