From 1b332508a073bc942ba2257c6316b7cd3e991093 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Mon, 4 Jul 2016 10:58:26 +0200 Subject: [PATCH] Shorten device name in sidebar stats (#46) This way, version codes on TP-Link devices and processor names are visible --- lib/proportions.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/proportions.js b/lib/proportions.js index f1bbb7d..f851c49 100644 --- a/lib/proportions.js +++ b/lib/proportions.js @@ -128,7 +128,13 @@ define(["chroma-js", "virtual-dom", "numeral-intl", "filters/genericnode", "verc return d ? "online" : "offline" }) var fwDict = count(nodes, ["nodeinfo", "software", "firmware", "release"]) - var hwDict = count(nodes, ["nodeinfo", "hardware", "model"]) + var hwDict = count(nodes, ["nodeinfo", "hardware", "model"], function (d) { + if (d) { + d = d.replace(/\(r\)|\(tm\)/gi, "").replace(/AMD |Intel |TP-Link | CPU| Processor/g, "") + if (d.indexOf("@") > 0) d = d.substring(0, d.indexOf("@")) + } + return d + }) var geoDict = count(nodes, ["nodeinfo", "location"], function (d) { return d && d.longitude && d.latitude ? "ja" : "nein" })