From 54cc6c73fd9e600a10412cc38f4a99e7915f1852 Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Mon, 30 Dec 2013 10:48:45 -0700 Subject: [PATCH 1/2] Added jslint to default task --- tasks/default_task.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/default_task.js b/tasks/default_task.js index e7b70d2c8546..0bca713ddfd6 100644 --- a/tasks/default_task.js +++ b/tasks/default_task.js @@ -1,3 +1,3 @@ module.exports = function(grunt) { - grunt.registerTask('default', []); + grunt.registerTask('default', ['jshint']); }; \ No newline at end of file From 10226684942a8a3266fdb2a2f77a627aa6a161b9 Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Mon, 30 Dec 2013 10:50:42 -0700 Subject: [PATCH 2/2] Fixed selection of nodes on refresh. Fixed filter when infinity is returned by facet. --- panels/stats_table/module.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/panels/stats_table/module.js b/panels/stats_table/module.js index 75c68c039192..1fec0ac93d2b 100644 --- a/panels/stats_table/module.js +++ b/panels/stats_table/module.js @@ -14,15 +14,16 @@ define([ app.useModule(module); var y_format_metric_value = function (value, metric) { + // If this isn't a number, change nothing + if(!_.isNaN(value) || !_.isFinite(value)) { + return value; + } if (metric.y_format === 'bytes') { return kbn.byteFormat(value, metric.decimals); } if (metric.y_format === 'short') { return kbn.shortFormat(value, metric.decimals); } - if (typeof value !== 'number') { - return value; - } return value.toFixed(metric.decimals); }; @@ -168,7 +169,6 @@ define([ if (_.isNumber(m.warning)) { m.warning = { threshold: m.warning, type: "upper_bound"}; } - return m; }; @@ -279,10 +279,10 @@ define([ newRows.push({ display_name: display_name || persistent_name, id: persistent_name, - selected: ($scope.rows[persistent_name] || {}).selected + // using findWhere here, though its not very efficient + selected: (_.findWhere($scope.rows,{id:persistent_name}) || {}).selected }); }); - $scope.get_data(newRows); }); });