From f013e62975617bcd4885f6a210cbab4c330a69fd Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Fri, 24 Sep 2021 17:02:17 +0200 Subject: [PATCH 1/4] Fix HTMLTemplateFormatter on Tabulator --- panel/models/tabulator.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/panel/models/tabulator.ts b/panel/models/tabulator.ts index b1beab112c..c85f487d7b 100644 --- a/panel/models/tabulator.ts +++ b/panel/models/tabulator.ts @@ -340,8 +340,11 @@ export class DataTabulatorView extends PanelHTMLBoxView { else { tab_column.formatter = (cell: any) => { const formatted = column.formatter.doFormat(cell.getRow(), cell, cell.getValue(), null, null) + if (column.formatter.type === 'HTMLTemplateFormatter') + return formatted const node = div() node.innerHTML = formatted + console.log(formatted, node.children[0].innerHTML) return node.children[0].innerHTML } } From 6482cf9765bd1491eff97394032c6482d743066e Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Fri, 24 Sep 2021 17:17:32 +0200 Subject: [PATCH 2/4] Fix whitespace --- panel/models/tabulator.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panel/models/tabulator.ts b/panel/models/tabulator.ts index c85f487d7b..0a8d65f0b0 100644 --- a/panel/models/tabulator.ts +++ b/panel/models/tabulator.ts @@ -340,8 +340,8 @@ export class DataTabulatorView extends PanelHTMLBoxView { else { tab_column.formatter = (cell: any) => { const formatted = column.formatter.doFormat(cell.getRow(), cell, cell.getValue(), null, null) - if (column.formatter.type === 'HTMLTemplateFormatter') - return formatted + if (column.formatter.type === 'HTMLTemplateFormatter') + return formatted const node = div() node.innerHTML = formatted console.log(formatted, node.children[0].innerHTML) From 2655825a1ee6d63158c2609e971c86f2979aef3c Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Fri, 24 Sep 2021 17:18:25 +0200 Subject: [PATCH 3/4] Remove console.log --- panel/models/tabulator.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/panel/models/tabulator.ts b/panel/models/tabulator.ts index 0a8d65f0b0..c39f9104a2 100644 --- a/panel/models/tabulator.ts +++ b/panel/models/tabulator.ts @@ -344,8 +344,7 @@ export class DataTabulatorView extends PanelHTMLBoxView { return formatted const node = div() node.innerHTML = formatted - console.log(formatted, node.children[0].innerHTML) - return node.children[0].innerHTML + return node.children[0].innerHTML } } } From 06eec8b3fa85ca79d92fabae4afef91c92fa0d87 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Fri, 24 Sep 2021 17:23:19 +0200 Subject: [PATCH 4/4] More whitespace --- panel/models/tabulator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel/models/tabulator.ts b/panel/models/tabulator.ts index c39f9104a2..77af2cecdb 100644 --- a/panel/models/tabulator.ts +++ b/panel/models/tabulator.ts @@ -344,7 +344,7 @@ export class DataTabulatorView extends PanelHTMLBoxView { return formatted const node = div() node.innerHTML = formatted - return node.children[0].innerHTML + return node.children[0].innerHTML } } }