From 8d957f159c5cb0ece7157f0f44b29a9630c64eb4 Mon Sep 17 00:00:00 2001 From: Ghislain B Date: Sat, 28 Nov 2020 21:46:31 -0500 Subject: [PATCH] fix: add grid object to all Formatter calls (#558) * fix: add grid object to all Formatter calls * refactor: remove unused function --- slick.grid.js | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/slick.grid.js b/slick.grid.js index 437a0223..96a649c4 100644 --- a/slick.grid.js +++ b/slick.grid.js @@ -2512,10 +2512,10 @@ if (typeof Slick === "undefined") { val = (Array.isArray(row) ? row[columnDef.field] : row); if (columnDef.formatterOverride) { // use formatterOverride as first preference - formatterResult = columnDef.formatterOverride(index, colIndex, val, columnDef, row); + formatterResult = columnDef.formatterOverride(index, colIndex, val, columnDef, row, self); } else if (columnDef.formatter) { // otherwise, use formatter - formatterResult = columnDef.formatter(index, colIndex, val, columnDef, row); + formatterResult = columnDef.formatter(index, colIndex, val, columnDef, row, self); } else { // otherwise, use plain text formatterResult = '' + val; @@ -3167,25 +3167,6 @@ if (typeof Slick === "undefined") { options.defaultFormatter; } - function callFormatter( row, cell, value, m, item, grid ) { - - var result; - - // pass metadata to formatter - var metadata = data.getItemMetadata && data.getItemMetadata(row); - metadata = metadata && metadata.columns; - - if( metadata ) { - var columnData = metadata[m.id] || metadata[cell]; - result = getFormatter(row, m)(row, cell, value, m, item, columnData ); - } - else { - result = getFormatter(row, m)(row, cell, value, m, item); - } - - return result; - } - function getEditor(row, cell) { var column = columns[cell]; var rowMetadata = data.getItemMetadata && data.getItemMetadata(row);