diff --git a/.gitignore b/.gitignore index c23bea8..c7b7097 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ node_modules # npm debug logs npm-debug.log.* + +.DS_Store diff --git a/README.md b/README.md index 7d1350a..6e43fdb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ -# Frappé DataTable - -A modern datatable library for the web +
+ +

Frappe DataTables

+

+

+ A modern datatable library for the web +

+
## Features @@ -31,4 +36,4 @@ var grid = new DataTable(document.querySelector('#data-table'), { ## License -MIT \ No newline at end of file +MIT diff --git a/dist/frappe-datatable.cjs.js b/dist/frappe-datatable.cjs.js index 9b5e8ad..b74aefe 100644 --- a/dist/frappe-datatable.cjs.js +++ b/dist/frappe-datatable.cjs.js @@ -2583,7 +2583,7 @@ class CellManager { const hasDropdown = isHeader && cell.dropdown !== false; const dropdown = hasDropdown ? `
${getDropdownHTML()}
` : ''; - const customFormatter = cell.column.format || cell.format || null; + const customFormatter = (cell.column && cell.column.format) || cell.format || null; let contentHTML; if (isHeader || isFilter || !customFormatter) { diff --git a/dist/frappe-datatable.js b/dist/frappe-datatable.js index 4daf156..402d13a 100644 --- a/dist/frappe-datatable.js +++ b/dist/frappe-datatable.js @@ -2582,7 +2582,7 @@ class CellManager { const hasDropdown = isHeader && cell.dropdown !== false; const dropdown = hasDropdown ? `
${getDropdownHTML()}
` : ''; - const customFormatter = cell.column.format || cell.format || null; + const customFormatter = (cell.column && cell.column.format) || cell.format || null; let contentHTML; if (isHeader || isFilter || !customFormatter) { diff --git a/docs/assets/frappe-datatable.js b/docs/assets/frappe-datatable.js index 4daf156..402d13a 100644 --- a/docs/assets/frappe-datatable.js +++ b/docs/assets/frappe-datatable.js @@ -2582,7 +2582,7 @@ class CellManager { const hasDropdown = isHeader && cell.dropdown !== false; const dropdown = hasDropdown ? `
${getDropdownHTML()}
` : ''; - const customFormatter = cell.column.format || cell.format || null; + const customFormatter = (cell.column && cell.column.format) || cell.format || null; let contentHTML; if (isHeader || isFilter || !customFormatter) { diff --git a/src/cellmanager.js b/src/cellmanager.js index b9eb00f..2bf8eb1 100644 --- a/src/cellmanager.js +++ b/src/cellmanager.js @@ -695,7 +695,7 @@ export default class CellManager { const hasDropdown = isHeader && cell.dropdown !== false; const dropdown = hasDropdown ? `
${getDropdownHTML()}
` : ''; - const customFormatter = cell.column.format || cell.format || null; + const customFormatter = (cell.column && cell.column.format) || cell.format || null; let contentHTML; if (isHeader || isFilter || !customFormatter) {