From 5d166dc8cb52e2c63e7fb342c9b7a06cfbc06db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 9 Nov 2015 09:46:49 +0100
Subject: [PATCH] feat(tablepanel): added new renderer spec
---
public/app/panels/table/renderer.ts | 4 ++++
public/app/panels/table/specs/renderer_specs.ts | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/public/app/panels/table/renderer.ts b/public/app/panels/table/renderer.ts
index a2c86d940b9..acfef961f07 100644
--- a/public/app/panels/table/renderer.ts
+++ b/public/app/panels/table/renderer.ts
@@ -48,6 +48,10 @@ export class TableRenderer {
return '-';
}
+ if (_.isString(v)) {
+ return v;
+ }
+
if (style.colorMode) {
this.colorState[style.colorMode] = this.getColorForValue(v, style);
}
diff --git a/public/app/panels/table/specs/renderer_specs.ts b/public/app/panels/table/specs/renderer_specs.ts
index 08f63dfe799..fad4f993acf 100644
--- a/public/app/panels/table/specs/renderer_specs.ts
+++ b/public/app/panels/table/specs/renderer_specs.ts
@@ -50,6 +50,11 @@ describe('when rendering table', () => {
expect(html).to.be('<td>1.230 s</td>');
});
+ it('number style should ignore string values', () => {
+ var html = renderer.renderCell(1, 'asd');
+ expect(html).to.be('<td>asd</td>');
+ });
+
it('colored cell should have style', () => {
var html = renderer.renderCell(2, 55);
expect(html).to.be('<td style="color:orange">55.0</td>');