Commit 79ed63df by Rashid Khan

Brought code back into line with existing jshint

parent 9b563d1d
...@@ -92,12 +92,13 @@ angular.module('kibana.histogram', []) ...@@ -92,12 +92,13 @@ angular.module('kibana.histogram', [])
$scope.get_time_range = function () { $scope.get_time_range = function () {
var range = $scope.range = filterSrv.timeRange('min'); var range = $scope.range = filterSrv.timeRange('min');
return range; return range;
} };
$scope.get_interval = function () { $scope.get_interval = function () {
var interval = $scope.panel.interval var interval = $scope.panel.interval,
, range; range;
if ($scope.panel.auto_int) { if ($scope.panel.auto_int) {
range = $scope.get_time_range() range = $scope.get_time_range();
if (range) { if (range) {
interval = kbn.secondsToHms( interval = kbn.secondsToHms(
kbn.calculate_interval(range.from, range.to, $scope.panel.resolution, 0) / 1000 kbn.calculate_interval(range.from, range.to, $scope.panel.resolution, 0) / 1000
...@@ -105,8 +106,8 @@ angular.module('kibana.histogram', []) ...@@ -105,8 +106,8 @@ angular.module('kibana.histogram', [])
} }
} }
$scope.panel.interval = interval || '10m'; $scope.panel.interval = interval || '10m';
return $scope.panel.interval return $scope.panel.interval;
} };
/** /**
* Fetch the data for a chunk of a queries results. Multiple segments occur when several indicies * Fetch the data for a chunk of a queries results. Multiple segments occur when several indicies
* need to be consulted (like timestamped logstash indicies) * need to be consulted (like timestamped logstash indicies)
...@@ -116,7 +117,7 @@ angular.module('kibana.histogram', []) ...@@ -116,7 +117,7 @@ angular.module('kibana.histogram', [])
*/ */
$scope.get_data = function(segment, query_id) { $scope.get_data = function(segment, query_id) {
if (_.isUndefined(segment)) { if (_.isUndefined(segment)) {
segment = 0 segment = 0;
} }
delete $scope.panel.error; delete $scope.panel.error;
...@@ -126,7 +127,7 @@ angular.module('kibana.histogram', []) ...@@ -126,7 +127,7 @@ angular.module('kibana.histogram', [])
} }
var _range = $scope.get_time_range() var _range = $scope.get_time_range();
var _interval = $scope.get_interval(_range); var _interval = $scope.get_interval(_range);
if ($scope.panel.auto_int) { if ($scope.panel.auto_int) {
...@@ -187,9 +188,9 @@ angular.module('kibana.histogram', []) ...@@ -187,9 +188,9 @@ angular.module('kibana.histogram', [])
// Make sure we're still on the same query/queries // Make sure we're still on the same query/queries
if($scope.query_id === query_id && _.difference(facetIds, $scope.panel.queries.ids).length === 0) { if($scope.query_id === query_id && _.difference(facetIds, $scope.panel.queries.ids).length === 0) {
var i = 0 var i = 0,
, time_series time_series,
, hits; hits;
_.each($scope.panel.queries.ids, function(id) { _.each($scope.panel.queries.ids, function(id) {
var query_results = results.facets[id]; var query_results = results.facets[id];
...@@ -396,9 +397,7 @@ angular.module('kibana.histogram', []) ...@@ -396,9 +397,7 @@ angular.module('kibana.histogram', [])
function tt(x, y, contents) { function tt(x, y, contents) {
// If the tool tip already exists, don't recreate it, just update it // If the tool tip already exists, don't recreate it, just update it
var tooltip = $('#pie-tooltip').length var tooltip = $('#pie-tooltip').length ? $('#pie-tooltip') : $('<div id="pie-tooltip"></div>');
? $('#pie-tooltip')
: $('<div id="pie-tooltip"></div>');
tooltip.html(contents).css({ tooltip.html(contents).css({
position: 'absolute', position: 'absolute',
...@@ -463,7 +462,7 @@ angular.module('kibana.histogram', []) ...@@ -463,7 +462,7 @@ angular.module('kibana.histogram', [])
if (end) { if (end) {
this.addValue(end, null); this.addValue(end, null);
} }
} };
/** /**
* Add a row * Add a row
* @param int time The time for the value, in * @param int time The time for the value, in
...@@ -486,11 +485,11 @@ angular.module('kibana.histogram', []) ...@@ -486,11 +485,11 @@ angular.module('kibana.histogram', [])
*/ */
this.ZeroFilled.prototype.getFlotPairs = function () { this.ZeroFilled.prototype.getFlotPairs = function () {
// var startTime = performance.now(); // var startTime = performance.now();
var times = _.map(_.keys(this._data), base10Int).sort() var times = _.map(_.keys(this._data), base10Int).sort(),
, result = [] result = [],
, i i,
, next next,
, expected_next; expected_next;
for(i = 0; i < times.length; i++) { for(i = 0; i < times.length; i++) {
result.push([ times[i], this._data[times[i]] ]); result.push([ times[i], this._data[times[i]] ]);
next = times[i + 1]; next = times[i + 1];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment