diff options
Diffstat (limited to 'interface/js/app')
| -rw-r--r-- | interface/js/app/history.js | 10 | ||||
| -rw-r--r-- | interface/js/app/stats.js | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/interface/js/app/history.js b/interface/js/app/history.js index a7d656f27..1bee39543 100644 --- a/interface/js/app/history.js +++ b/interface/js/app/history.js @@ -22,10 +22,10 @@ THE SOFTWARE. */ -/* global FooTable:false */ +/* global d3:false FooTable:false */ -define(["jquery", "footable", "humanize"], - function ($, _, Humanize) { +define(["jquery", "footable"], + function ($) { "use strict"; var ui = {}; var prevVersion = null; @@ -157,7 +157,7 @@ define(["jquery", "footable", "humanize"], "font-size": "11px", "minwidth": 50, }, - formatter: Humanize.compactInteger + formatter: d3.format(".3~s") }, { name: "time_real", title: "Scan time", @@ -245,7 +245,7 @@ define(["jquery", "footable", "humanize"], "width": 120, "maxWidth": 120 }, - formatter: Humanize.compactInteger + formatter: d3.format(".3~s") }, { name: "scan_time", title: "Scan time", diff --git a/interface/js/app/stats.js b/interface/js/app/stats.js index c7b0228c0..5cce2ecb9 100644 --- a/interface/js/app/stats.js +++ b/interface/js/app/stats.js @@ -22,8 +22,10 @@ THE SOFTWARE. */ -define(["jquery", "d3pie", "humanize"], - function ($, d3pie, Humanize) { +/* global d3:false */ + +define(["jquery", "d3pie"], + function ($) { "use strict"; // @ ms to date function msToTime(seconds) { @@ -77,9 +79,9 @@ define(["jquery", "d3pie", "humanize"], "</strong>" + i + "</div>"; $(widget).appendTo(widgets); } else { - var titleAtt = Humanize.intComma(item) + " " + i; + var titleAtt = d3.format(",")(item) + " " + i; widget = "<li class=\"stat-box\"><div class=\"widget\" title=\"" + titleAtt + "\"><strong>" + - Humanize.compactInteger(item) + "</strong>" + i + "</div></li>"; + d3.format(".3~s")(item) + "</strong>" + i + "</div></li>"; if (i === "scanned") { stat_w[0] = widget; } else if (i === "clean") { |