fix: add grid object to all Formatter calls (#558)

* fix: add grid object to all Formatter calls * refactor: remove unused function
6pac · Nov 29, 2020 · 8d957f1 · 8d957f1
1 parent 702c793
commit 8d957f1
Showing 1 changed file with 2 additions and 21 deletions.
diff --git 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);