diff options
author | jasplin <qt-info@nokia.com> | 2011-01-21 11:43:52 +0100 |
---|---|---|
committer | jasplin <qt-info@nokia.com> | 2011-01-21 11:43:52 +0100 |
commit | c336344bf4b4e45fd35d1490efae3b1f30f7a4fe (patch) | |
tree | bca137ae2293de2f4d255aac653fce1b1ab86ad4 /web | |
parent | 505549045868c2d7d079805b65734d1fdedb4393 (diff) |
Fixed bug.
The JavaScript function isNaN returns true for null, since that value
is implicitly converted to the numeric value 0. For some cases
we need a stricter function that refuses such a conversion.
Diffstat (limited to 'web')
-rw-r--r-- | web/getstats/global.js | 4 | ||||
-rw-r--r-- | web/getstats/tsbmbody.js | 34 |
2 files changed, 22 insertions, 16 deletions
diff --git a/web/getstats/global.js b/web/getstats/global.js index 1b966bf..d7543dc 100644 --- a/web/getstats/global.js +++ b/web/getstats/global.js @@ -49,6 +49,10 @@ function extractArg(args, name) { return arg; } +function isNonNullNumber(x) { + return (x != null) && (!isNaN(x)); +} + // Assigns tooltip with text 'text' to jQuery object 'obj'. function setTooltip(obj, text) { obj.attr( diff --git a/web/getstats/tsbmbody.js b/web/getstats/tsbmbody.js index 4fa263e..f35b025 100644 --- a/web/getstats/tsbmbody.js +++ b/web/getstats/tsbmbody.js @@ -928,32 +928,34 @@ function createPlot( $("#benchmark").html(benchmark.replace(anySpace, " ")); $("#metric").text(metric); - if (!isNaN(ms)) $("#bmstats_ms").text(ms); - if (!isNaN(lsd)) $("#bmstats_lsd").text(lsd); - if (!isNaN(ni)) $("#bmstats_ni").text(ni); - if (!isNaN(nz)) $("#bmstats_nz").text(nz); - if (!isNaN(nc)) $("#bmstats_nc").text(nc); - if (!isNaN(mdrse)) $("#bmstats_mdrse").text(parseFloat(mdrse).toFixed(2)); - if (!isNaN(rsemd)) $("#bmstats_rsemd").text(parseFloat(rsemd).toFixed(2)); - if (!isNaN(lc)) { + if (isNonNullNumber(ms)) $("#bmstats_ms").text(ms); + if (isNonNullNumber(lsd)) $("#bmstats_lsd").text(lsd); + if (isNonNullNumber(ni)) $("#bmstats_ni").text(ni); + if (isNonNullNumber(nz)) $("#bmstats_nz").text(nz); + if (isNonNullNumber(nc)) $("#bmstats_nc").text(nc); + if (isNonNullNumber(mdrse)) + $("#bmstats_mdrse").text(parseFloat(mdrse).toFixed(2)); + if (isNonNullNumber(rsemd)) + $("#bmstats_rsemd").text(parseFloat(rsemd).toFixed(2)); + if (isNonNullNumber(lc)) { $("#bmstats_lc").text(lc); $("#bmstats_lc").css( "color", ((lc < 1) ? "#a00" : ((lc > 1) ? "#0a0" : "#000"))); } - if (!isNaN(lcda)) { + if (isNonNullNumber(lcda)) { $("#bmstats_lcda").html( parseFloat(lcda).toFixed(2) + " (" + lcd + ")"); var secsAgo = daysToSecs(lcda); var ageColor_ = ageColor(secsAgo); $("#bmstats_lcda").css("background-color", ageColor_); } - if (!isNaN(lcms)) $("#bmstats_lcms").text(lcms); - if (!isNaN(lcss)) $("#bmstats_lcss").text(lcss); - if (!isNaN(lcss1)) $("#bmstats_lcss1").text(lcss1); - if (!isNaN(lcgss)) $("#bmstats_lcgss").text(lcgss); - if (!isNaN(lclss)) $("#bmstats_lclss").text(lclss); - if (!isNaN(lcds1)) $("#bmstats_lcds1").text(lcds1); - if (!isNaN(lcds2)) $("#bmstats_lcds2").text(lcds2); + if (isNonNullNumber(lcms)) $("#bmstats_lcms").text(lcms); + if (isNonNullNumber(lcss)) $("#bmstats_lcss").text(lcss); + if (isNonNullNumber(lcss1)) $("#bmstats_lcss1").text(lcss1); + if (isNonNullNumber(lcgss)) $("#bmstats_lcgss").text(lcgss); + if (isNonNullNumber(lclss)) $("#bmstats_lclss").text(lclss); + if (isNonNullNumber(lcds1)) $("#bmstats_lcds1").text(lcds1); + if (isNonNullNumber(lcds2)) $("#bmstats_lcds2").text(lcds2); } // ### REFACTOR: Similar function in stats2.js! 2 B DONE! |