Renamed custom_cell_data option cell_parser

koalyptus · Feb 26, 2017 · 90b5e3c · 90b5e3c
1 parent b062d44
commit 90b5e3c
Show file tree

Hide file tree

Showing 17 changed files with 244 additions and 64 deletions.
diff --git a/dist/starter.html b/dist/starter.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>tablefilter v0.4.42 - Starter</title>
+    <title>tablefilter v0.5.0 - Starter</title>
 </head>
 <body>
-<h1>tablefilter v0.4.42</h1>
+<h1>tablefilter v0.5.0</h1>
 
 
 

diff --git a/dist/tablefilter/style/colsVisibility.css b/dist/tablefilter/style/colsVisibility.css
diff --git a/dist/tablefilter/style/filtersVisibility.css b/dist/tablefilter/style/filtersVisibility.css
@@ -1,6 +1,6 @@
 /** 
- *	 tablefilter v0.4.42 by Max Guglielmi 
- *	 build date: 2017-02-21T10:17:58.442Z 
+ *	 tablefilter v0.5.0 by Max Guglielmi 
+ *	 build date: 2017-02-26T09:46:08.161Z 
  *	 MIT License  
  */ 
 span.expClpFlt a.btnExpClpFlt{width:35px;height:35px;display:inline-block;}span.expClpFlt a.btnExpClpFlt:hover{background-color:#f4f4f4}span.expClpFlt img{padding:8px 11px 11px 11px}
diff --git a/dist/tablefilter/style/tablefilter.css b/dist/tablefilter/style/tablefilter.css
diff --git a/dist/tablefilter/style/themes/default/default.css b/dist/tablefilter/style/themes/default/default.css
diff --git a/dist/tablefilter/style/themes/mytheme/mytheme.css b/dist/tablefilter/style/themes/mytheme/mytheme.css
diff --git a/dist/tablefilter/style/themes/skyblue/skyblue.css b/dist/tablefilter/style/themes/skyblue/skyblue.css
diff --git a/dist/tablefilter/style/themes/transparent/transparent.css b/dist/tablefilter/style/themes/transparent/transparent.css
diff --git a/dist/tablefilter/tablefilter.js b/dist/tablefilter/tablefilter.js
diff --git a/dist/tablefilter/tablefilter.js.map b/dist/tablefilter/tablefilter.js.map
diff --git a/dist/tablefilter/tf-0-202cbf5be111a5fa422a.js b/dist/tablefilter/tf-0-202cbf5be111a5fa422a.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tablefilter",
-  "version": "0.4.42",
+  "version": "0.5.0",
   "description": "A Javascript library making HTML tables filterable and a bit more",
   "license": "MIT",
   "author": {

diff --git a/src/tablefilter.js b/src/tablefilter.js
@@ -459,15 +459,24 @@ export class TableFilter {
          * List of columns implementing custom filtering
          * @type {Array}
          */
-        this.customCellDataCols = f.custom_cell_data_cols ?
-            f.custom_cell_data_cols : [];
-
-        /**
-         * Delegate function for retrieving cell data with custom logic
-         * @type {Function}
+        // this.cellParserCols = f.custom_cell_data_cols ?
+        //     f.custom_cell_data_cols : [];
+
+        /**
+         * Specify which column implements a custom cell parser to retrieve the
+         * cell value:
+         * cell_parser: {
+         *     cols: [0, 2],
+         *     parse: function(tf, cell, colIndex) {
+         *         // custom cell parser logic here
+         *         return cellValue;
+         *     }
+         * }
+         * @type {Object}
          */
-        this.customCellData = isFn(f.custom_cell_data) ?
-            f.custom_cell_data : EMPTY_FN;
+        this.cellParser = isObj(f.cell_parser) && isFn(f.cell_parser.parse) &&
+            isArray(f.cell_parser.cols) ?
+            f.cell_parser : { cols: [], parse: EMPTY_FN };
 
         /**
          * Global watermark text for input filter type or watermark for each
@@ -2254,9 +2263,10 @@ export class TableFilter {
      */
     getCellValue(cell) {
         let idx = cell.cellIndex;
-        //CallcustomCellData callback
-        if (this.customCellDataCols.indexOf(idx) !== -1) {
-            return this.customCellData(this, cell, idx);
+        let cellParser = this.cellParser;
+        // Invoke cellParser for this column if any
+        if (cellParser.cols.indexOf(idx) !== -1) {
+            return cellParser.parse(this, cell, idx);
         } else {
             return getText(cell);
         }

diff --git a/static/templates/filter-images.html b/static/templates/filter-images.html
@@ -36,22 +36,23 @@ <h2>Filter and sort images demo</h2>
     col_4: 'select',
     col_5: 'select',
 
-    /*  custom_cell_data delegate used for filtering
-        images in a column */
-    custom_cell_data_cols: [0, 4],
-    custom_cell_data: function(o, cell, colIndex){
-        if(colIndex === 0){
-            var img = cell.getElementsByTagName('img')[0];
-            if(!img){
-                return '';
-            }
-            return img.alt;
-        } else if(colIndex === 4){
-            var chk = cell.getElementsByTagName('input')[0];
-            if(chk.checked){
-                return 'yes';
-            } else {
-                return 'no';
+    /*  cell parser for filtering images in a column */
+    cell_parser: {
+        cols: [0, 4],
+        parse: function(o, cell, colIndex){
+            if(colIndex === 0){
+                var img = cell.getElementsByTagName('img')[0];
+                if(!img){
+                    return '';
+                }
+                return img.alt;
+            } else if(colIndex === 4){
+                var chk = cell.getElementsByTagName('input')[0];
+                if(chk.checked){
+                    return 'yes';
+                } else {
+                    return 'no';
+                }
             }
         }
     },