From 8daef08323733649ce2c1c368dd7bee3b149f7cc Mon Sep 17 00:00:00 2001 From: "rniwa@webkit.org" Date: Thu, 5 Feb 2015 00:32:27 +0000 Subject: [PATCH] New perf dashboard shows null as the aggregator name if no aggregation is done https://bugs.webkit.org/show_bug.cgi?id=141256 Reviewed by Chris Dumez. Don't show the aggregator name if there isn't one. * public/v2/manifest.js: (App.Metric.label): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@179647 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Websites/perf.webkit.org/ChangeLog | 12 ++++++++++++ Websites/perf.webkit.org/public/v2/manifest.js | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog index 973db47..56d51bf 100644 --- a/Websites/perf.webkit.org/ChangeLog +++ b/Websites/perf.webkit.org/ChangeLog @@ -1,5 +1,17 @@ 2015-02-04 Ryosuke Niwa + New perf dashboard shows null as the aggregator name if no aggregation is done + https://bugs.webkit.org/show_bug.cgi?id=141256 + + Reviewed by Chris Dumez. + + Don't show the aggregator name if there isn't one. + + * public/v2/manifest.js: + (App.Metric.label): + +2015-02-04 Ryosuke Niwa + Unreviewed build fix after r179611. * public/v2/interactive-chart.js: diff --git a/Websites/perf.webkit.org/public/v2/manifest.js b/Websites/perf.webkit.org/public/v2/manifest.js index a3d0b07..c04d180 100755 --- a/Websites/perf.webkit.org/public/v2/manifest.js +++ b/Websites/perf.webkit.org/public/v2/manifest.js @@ -20,7 +20,7 @@ App.Metric = App.NameLabelModel.extend({ aggregator: DS.attr('string'), label: function () { - return this.get('name') + ' : ' + this.get('aggregator'); + return this.get('name') + (this.get('aggregator') ? ' : ' + this.get('aggregator') : ''); }.property('name', 'aggregator'), path: function () { -- 1.8.3.1