IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Restored the "required_times" functionality so that stacking will work as expected.

Browse Source
This commit is contained in:
Spencer Alger 2013-08-26 16:21:26 -07:00
parent 0af2549712
commit 7252800c53
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
panels/histogram/module.js
View File

@ -392,9 +392,9 @@ angular.module('kibana.histogram', [])
// so that the stacking happens in the proper order
var required_times = [];
if (scope.panel.bars && stack) {
required_times = Array.prototype.concat.apply([], _.map(scope.data, function (series) {
return series.time_series.getOrderedTimes();
}));
required_times = _.uniq(Array.prototype.concat.apply([], _.map(scope.data, function (query) {
return query.time_series.getOrderedTimes();
})).sort(), true);
}
for (var i = 0; i < scope.data.length; i++) {
@ -532,11 +532,11 @@ angular.module('kibana.histogram', [])
* @return {array} An array of integer times.
*/
this.ZeroFilled.prototype.getOrderedTimes = function (include) {
var times = _.map(_.keys(this._data), base10Int).sort();
var times = _.map(_.keys(this._data), base10Int);
if (_.isArray(include)) {
times = times.concat(include);
}
return times;
return _.uniq(times.sort(), true);
};
/**