1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-04-30 22:02:49 +02:00

Merge pull request #240 from koalyptus/issue-233-dom-changes-unit-tests

Issue 233 dom changes unit tests
This commit is contained in:
koalyptus 2016-06-13 19:28:39 +10:00 committed by GitHub
commit bb289549c8
17 changed files with 520 additions and 152 deletions

4
dist/starter.html vendored
View file

@ -1,10 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.2.36 - Starter</title>
<title>tablefilter v0.2.37 - Starter</title>
</head>
<body>
<h1>tablefilter v0.2.36</h1>
<h1>tablefilter v0.2.37</h1>

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.36 by Max Guglielmi
* build date: 2016-06-05T02:10:25.935Z
* tablefilter v0.2.37 by Max Guglielmi
* build date: 2016-06-13T09:12:36.292Z
* MIT License
*/
span.colVisSpan{text-align:left;}span.colVisSpan a.colVis{display:inline-block;padding:7px 5px 0;font-size:inherit;font-weight:inherit;vertical-align:top}div.colVisCont{position:relative;background:#fff;-webkit-box-shadow:3px 3px 2px #888;-moz-box-shadow:3px 3px 2px #888;box-shadow:3px 3px 2px #888;position:absolute;display:none;border:1px solid #ccc;height:auto;width:250px;background-color:#fff;margin:35px 0 0 -100px;z-index:10000;padding:10px 10px 10px 10px;text-align:left;font-size:12px;}div.colVisCont:after,div.colVisCont:before{bottom:100%;left:50%;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}div.colVisCont:after{border-color:rgba(255,255,255,0);border-bottom-color:#fff;border-width:10px;margin-left:-10px}div.colVisCont:before{border-color:rgba(255,255,255,0);border-bottom-color:#ccc;border-width:12px;margin-left:-12px}div.colVisCont p{margin:6px auto 6px auto}div.colVisCont a.colVis{display:initial;font-weight:inherit}ul.cols_checklist{padding:0;margin:0;list-style:none;}ul.cols_checklist label{display:block}ul.cols_checklist input{vertical-align:middle;margin:2px 5px 2px 1px}li.cols_checklist_item{padding:4px;margin:0;}li.cols_checklist_item:hover{background-color:#335ea8;color:#fff}.cols_checklist_slc_item{background-color:#335ea8;color:#fff}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.36 by Max Guglielmi
* build date: 2016-06-05T02:10:25.935Z
* tablefilter v0.2.37 by Max Guglielmi
* build date: 2016-06-13T09:12:36.292Z
* 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}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.36 by Max Guglielmi
* build date: 2016-06-05T02:10:25.935Z
* tablefilter v0.2.37 by Max Guglielmi
* build date: 2016-06-13T09:12:36.292Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.36 by Max Guglielmi
* build date: 2016-06-05T02:10:25.935Z
* tablefilter v0.2.37 by Max Guglielmi
* build date: 2016-06-13T09:12:36.292Z
* MIT License
*/
table.TF{border-left:1px solid #ccc;border-top:none;border-right:none;border-bottom:none;}table.TF th{background:#ebecee url("images/bg_th.jpg") left top repeat-x;border-bottom:1px solid #d0d0d0;border-right:1px solid #d0d0d0;border-left:1px solid #fff;border-top:1px solid #fff;color:#333}table.TF td{border-bottom:1px dotted #999;padding:5px}.fltrow{background-color:#ebecee !important;}.fltrow th,.fltrow td{border-bottom:1px dotted #666 !important;padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #999 !important}input.flt{width:99% !important}.inf{height:$min-height;background:#d7d7d7 url("images/bg_infDiv.jpg") 0 0 repeat-x !important}input.reset{background:transparent url("images/btn_eraser.gif") center center no-repeat !important}.helpBtn:hover{background-color:transparent}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important;}.nextPage:hover{background:transparent url("images/btn_over_next_page.gif") center center no-repeat !important}.previousPage{background:transparent url("images/btn_previous_page.gif") center center no-repeat !important;}.previousPage:hover{background:transparent url("images/btn_over_previous_page.gif") center center no-repeat !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;}.firstPage:hover{background:transparent url("images/btn_over_first_page.gif") center center no-repeat !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;}.lastPage:hover{background:transparent url("images/btn_over_last_page.gif") center center no-repeat !important}div.grd_Cont{background-color:#ebecee !important;border:1px solid #ccc !important;padding:0 !important;}div.grd_Cont .even{background-color:#fff}div.grd_Cont .odd{background-color:#d5d5d5}div.grd_headTblCont{background-color:#ebecee !important;border-bottom:none !important;}div.grd_headTblCont table{border-right:none !important}div.grd_tblCont table th,div.grd_headTblCont table th,div.grd_headTblCont table td{background:#ebecee url("images/bg_th.jpg") left top repeat-x !important;border-bottom:1px solid #d0d0d0 !important;border-right:1px solid #d0d0d0 !important;border-left:1px solid #fff !important;border-top:1px solid #fff !important}div.grd_tblCont table td{border-bottom:1px solid #999 !important}.grd_inf{background:#d7d7d7 url("images/bg_infDiv.jpg") 0 0 repeat-x !important;border-top:1px solid #d0d0d0 !important}.loader{border:1px solid #999}.defaultLoader{width:32px;height:32px;background:transparent url("images/img_loading.gif") 0 0 no-repeat !important}.even{background-color:#fff}.odd{background-color:#d5d5d5}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.activeHeader{background:#999 !important}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.36 by Max Guglielmi
* build date: 2016-06-05T02:10:25.935Z
* tablefilter v0.2.37 by Max Guglielmi
* build date: 2016-06-13T09:12:36.292Z
* MIT License
*/
table.TF{border-left:1px dotted #81963b;border-top:none;border-right:0;border-bottom:none;}table.TF th{background:#39424b url("images/bg_headers.jpg") left top repeat-x;border-bottom:0;border-right:1px dotted #d0d0d0;border-left:0;border-top:0;color:#fff}table.TF td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b;padding:5px}.fltrow{background-color:#81963b !important;}.fltrow th,.fltrow td{border-bottom:1px dotted #39424b !important;border-right:1px dotted #fff !important;border-left:0 !important;border-top:0 !important;padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #687830 !important}input.flt{width:99% !important}.inf{background:#d8d8d8;height:$min-height}input.reset{width:53px;background:transparent url("images/btn_filter.png") center center no-repeat !important}.helpBtn:hover{background-color:transparent}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important}.previousPage{background:transparent url("images/btn_previous_page.gif") center center no-repeat !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important}div.grd_Cont{background:#81963b url("images/bg_headers.jpg") left top repeat-x !important;border:1px solid #ccc !important;padding:0 1px 1px 1px !important;}div.grd_Cont .even{background-color:#bccd83}div.grd_Cont .odd{background-color:#fff}div.grd_headTblCont{background-color:#ebecee !important;border-bottom:none !important}div.grd_tblCont table{border-right:none !important;}div.grd_tblCont table td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b}div.grd_tblCont table th,div.grd_headTblCont table th{background:transparent url("images/bg_headers.jpg") 0 0 repeat-x !important;border-bottom:0 !important;border-right:1px dotted #d0d0d0 !important;border-left:0 !important;border-top:0 !important;padding:0 4px 0 4px !important;color:#fff !important;height:35px !important}div.grd_headTblCont table td{border-bottom:1px dotted #39424b !important;border-right:1px dotted #fff !important;border-left:0 !important;border-top:0 !important;background-color:#81963b !important;padding:1px 3px 1px 3px !important}.grd_inf{background-color:#d8d8d8;border-top:1px solid #d0d0d0 !important}.loader{border:0 !important;background:#81963b !important}.defaultLoader{width:32px;height:32px;background:transparent url("images/img_loading.gif") 0 0 no-repeat !important}.even{background-color:#bccd83}.odd{background-color:#fff}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.activeHeader{background:#81963b !important}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.36 by Max Guglielmi
* build date: 2016-06-05T02:10:25.935Z
* tablefilter v0.2.37 by Max Guglielmi
* build date: 2016-06-13T09:12:36.292Z
* MIT License
*/
table.TF{padding:0;color:#000;border-right:1px solid #a4bed4;border-top:1px solid #a4bed4;border-left:1px solid #a4bed4;border-bottom:0;}table.TF th{margin:0;color:inherit;background:#d1e5fe url("images/bg_skyblue.gif") 0 0 repeat-x;border-color:#fdfdfd #a4bed4 #a4bed4 #fdfdfd;border-width:1px;border-style:solid}table.TF td{margin:0;padding:5px;color:inherit;border-bottom:1px solid #a4bed4;border-left:0;border-top:0;border-right:0}.fltrow{background-color:#d1e5fe !important;}.fltrow th,.fltrow td{padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #a4bed4 !important}input.flt{width:99% !important}.inf{background-color:#e3efff !important;border:1px solid #a4bed4;height:$min-height;color:#004a6f}div.tot,div.status{border-right:0 !important}.helpBtn:hover{background-color:transparent}input.reset{background:transparent url("images/icn_clear_filters.png") center center no-repeat !important}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.nextPage:hover{background:#ffe4ab url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.previousPage{background:transparent url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.previousPage:hover{background:#ffe4ab url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.firstPage:hover{background:#ffe4ab url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.lastPage:hover{background:#ffe4ab url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.activeHeader{background:#ffe4ab !important;border:1px solid #ffb552 !important;color:inherit !important}div.grd_Cont{background-color:#d9eaed !important;border:1px solid #9cc !important;padding:0 !important;}div.grd_Cont .even{background-color:#fff}div.grd_Cont .odd{background-color:#e3efff}div.grd_headTblCont{background-color:#d9eaed !important;border-bottom:none !important}div.grd_tblCont table{border-right:none !important}div.grd_tblCont table th,div.grd_headTblCont table th,div.grd_headTblCont table td{background:#d9eaed url("images/bg_skyblue.gif") left top repeat-x;border-bottom:1px solid #a4bed4;border-right:1px solid #a4bed4 !important;border-left:1px solid #fff !important;border-top:1px solid #fff !important}div.grd_tblCont table td{border-bottom:1px solid #a4bed4 !important;border-right:0 !important;border-left:0 !important;border-top:0 !important}.grd_inf{background-color:#cce2fe;color:#004a6f;border-top:1px solid #9cc !important;}.grd_inf a{text-decoration:none;font-weight:bold}.loader{background-color:#2d8eef;border:1px solid #cce2fe;border-radius:5px}.even{background-color:#fff}.odd{background-color:#e3efff}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.ezActiveRow{background-color:#ffdc61 !important;color:inherit}.ezSelectedRow{background-color:#ffe4ab !important;color:inherit}.ezActiveCell{background-color:#fff !important;color:#000 !important;font-weight:bold}.ezETSelectedCell{background-color:#fff !important;font-weight:bold;color:#000 !important}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
{
"name": "tablefilter",
"version": "0.2.36",
"version": "0.2.37",
"description": "A Javascript library making HTML tables filterable and a bit more",
"license": "MIT",
"author": {

View file

@ -1,28 +1,84 @@
/**
* Filter types
*/
/**
* Input filter type
* @type {String}
*/
export const INPUT = 'input';
/**
* Select filter type
* @type {String}
*/
export const SELECT = 'select';
/**
* Multiple select filter type
* @type {String}
*/
export const MULTIPLE = 'multiple';
/**
* Checklist filter type
* @type {String}
*/
export const CHECKLIST = 'checklist';
/**
* None filter type
* @type {String}
*/
export const NONE = 'none';
/**
* Key codes
*/
/**
* Enter key code
* @type {Number}
*/
export const ENTER_KEY = 13;
/**
* Tab key code
* @type {Number}
*/
export const TAB_KEY = 9;
/**
* Escape key code
* @type {Number}
*/
export const ESC_KEY = 27;
/**
* Up arrow key code
* @type {Number}
*/
export const UP_ARROW_KEY = 38;
/**
* Down arrow key code
* @type {Number}
*/
export const DOWN_ARROW_KEY = 40;
/**
* HTML tags
*/
/**
* Header cell tag
* @type {String}
*/
export const HEADER_TAG = 'TH';
/**
* Cell tag
* @type {String}
*/
export const CELL_TAG = 'TD';
/**
* Numeric values
* Default values
*/
/**
* Auto filter delay in milliseconds
* @type {Number}
*/
export const AUTO_FILTER_DELAY = 750;

View file

@ -48,7 +48,7 @@ export default class AdapterEzEditTable extends Feature {
this._setAdvancedGrid();
} else {
var path = this.vendorPath + this.filename;
tf.import(this.filename, path, () => { this._setAdvancedGrid(); });
tf.import(this.filename, path, () => this._setAdvancedGrid());
}
if (this.loadStylesheet && !tf.isImported(this.stylesheet, 'link')) {
tf.import(this.stylesheetName, this.stylesheet, null, 'link');
@ -64,6 +64,7 @@ export default class AdapterEzEditTable extends Feature {
/**
* Instantiate ezEditTable component for advanced grid features
* @private
*/
_setAdvancedGrid() {
var tf = this.tf;

View file

@ -376,7 +376,7 @@ export default class ColsVisibility extends Feature {
if (tf.gridLayout) {
gridLayout = tf.feature('gridLayout');
headTbl = gridLayout.headTbl;
gridColElms = gridLayout.gridColElms;
gridColElms = gridLayout.colElms;
let hiddenWidth = parseInt(
gridColElms[colIndex].style.width, 10);
@ -399,7 +399,7 @@ export default class ColsVisibility extends Feature {
if (tf.gridLayout) {
gridLayout = tf.feature('gridLayout');
headTbl = gridLayout.headTbl;
gridColElms = gridLayout.gridColElms;
gridColElms = gridLayout.colElms;
let width = parseInt(gridColElms[colIndex].style.width, 10);
headTbl.style.width =
(parseInt(headTbl.style.width, 10) + width) + 'px';

View file

@ -1,14 +1,17 @@
import {Feature} from '../feature';
import {createElm, removeElm, elm, tag} from '../dom';
import {isFn, isNull, isUndef} from '../types';
import {isNull} from '../types';
import {addEvt, targetEvt} from '../event';
import {contains} from '../string';
import {NONE} from '../const';
/**
* Grid layout, table with fixed headers
*/
export class GridLayout extends Feature {
/**
* Grid layout, table with fixed headers
* Creates an instance of GridLayout
* @param {Object} tf TableFilter instance
*/
constructor(tf) {
@ -16,53 +19,138 @@ export class GridLayout extends Feature {
let f = this.config;
//defines grid width
this.gridWidth = f.grid_width || null;
//defines grid height
this.gridHeight = f.grid_height || null;
//defines css class for main container
this.gridMainContCssClass = f.grid_cont_css_class || 'grd_Cont';
//defines css class for div containing table
this.gridContCssClass = f.grid_tbl_cont_css_class || 'grd_tblCont';
//defines css class for div containing headers' table
this.gridHeadContCssClass = f.grid_tblHead_cont_css_class ||
/**
* Grid-layout container width as CSS string
* @type {String}
*/
this.width = f.grid_width || null;
/**
* Grid-layout container height as CSS string
* @type {String}
*/
this.height = f.grid_height || null;
/**
* Css class for main container element
* @type {String}
*/
this.mainContCssClass = f.grid_cont_css_class || 'grd_Cont';
/**
* Css class for body table container element
* @type {String}
*/
this.contCssClass = f.grid_tbl_cont_css_class || 'grd_tblCont';
/**
* Css class for headers table container element
* @type {String}
*/
this.headContCssClass = f.grid_tblHead_cont_css_class ||
'grd_headTblCont';
//defines css class for div containing rows counter, paging etc.
this.gridInfDivCssClass = f.grid_inf_grid_css_class || 'grd_inf';
//defines which row contains column headers
this.gridHeadRowIndex = f.grid_headers_row_index || 0;
//array of headers row indexes to be placed in header table
this.gridHeadRows = f.grid_headers_rows || [0];
//generate filters in table headers
this.gridEnableFilters = !isUndef(f.grid_enable_default_filters) ?
f.grid_enable_default_filters : true;
/**
* Css class for toolbar container element (rows counter, paging etc.)
* @type {String}
*/
this.infDivCssClass = f.grid_inf_grid_css_class || 'grd_inf';
/**
* Index of the headers row, default: 0
* @type {Number}
*/
this.headRowIndex = f.grid_headers_row_index || 0;
/**
* Collection of the header row indexes to be moved into headers table
* @type {Array}
*/
this.headRows = f.grid_headers_rows || [0];
/**
* Enable or disable column filters generation, default: true
* @type {Boolean}
*/
this.enableFilters = f.grid_enable_default_filters === false ?
false : true;
/**
* Enable or disable column headers, default: false
* @type {Boolean}
*/
this.noHeaders = Boolean(f.grid_no_headers);
//default col width
this.gridDefaultColWidth = f.grid_default_col_width || '100px';
this.gridColElms = [];
/**
* Grid-layout default column widht as CSS string
* @type {String}
*/
this.defaultColWidth = f.grid_default_col_width || '100px';
//div containing grid elements if grid_layout true
/**
* List of column elements
* @type {Array}
* @private
*/
this.colElms = [];
/**
* Prefix for grid-layout main container ID
* @type {String}
* @private
*/
this.prfxMainTblCont = 'gridCont_';
//div containing table if grid_layout true
/**
* Prefix for grid-layout body table container ID
* @type {String}
* @private
*/
this.prfxTblCont = 'tblCont_';
//div containing headers table if grid_layout true
/**
* Prefix for grid-layout headers table container ID
* @type {String}
* @private
*/
this.prfxHeadTblCont = 'tblHeadCont_';
//headers' table if grid_layout true
/**
* Prefix for grid-layout headers table ID
* @type {String}
* @private
*/
this.prfxHeadTbl = 'tblHead_';
//id of td containing the filter if grid_layout true
/**
* Prefix for grid-layout filter's cell ID
* @type {String}
* @private
*/
this.prfxGridFltTd = '_td_';
//id of th containing column header if grid_layout true
/**
* Prefix for grid-layout header's cell ID
* @type {String}
* @private
*/
this.prfxGridTh = 'tblHeadTh_';
/**
* Mark-up of original HTML table
* @type {String}
* @private
*/
this.sourceTblHtml = tf.tbl.outerHTML;
// filters flag at TF level
tf.fltGrid = this.gridEnableFilters;
tf.fltGrid = this.enableFilters;
}
/**
* Generates a grid with fixed headers
*
* TODO: reduce size of init by extracting single purposed methods
*/
init() {
let tf = this.tf;
@ -80,24 +168,8 @@ export class GridLayout extends Feature {
tf.isExternalFlt = true;
// default width of 100px if column widths not set
if (!tf.hasColWidths) {
tf.colWidths = [];
for (let k = 0; k < tf.nbCells; k++) {
let colW,
cell = tbl.rows[this.gridHeadRowIndex].cells[k];
if (cell.width !== '') {
colW = cell.width;
} else if (cell.style.width !== '') {
colW = parseInt(cell.style.width, 10);
} else {
colW = this.gridDefaultColWidth;
}
tf.colWidths[k] = colW;
}
tf.hasColWidths = true;
}
tf.setColWidths();
// Assign default column widths
this.setDefaultColWidths();
let tblW;//initial table width
if (tbl.width !== '') {
@ -112,24 +184,24 @@ export class GridLayout extends Feature {
//Main container: it will contain all the elements
this.tblMainCont = createElm('div',
['id', this.prfxMainTblCont + tf.id]);
this.tblMainCont.className = this.gridMainContCssClass;
if (this.gridWidth) {
this.tblMainCont.style.width = this.gridWidth;
this.tblMainCont.className = this.mainContCssClass;
if (this.width) {
this.tblMainCont.style.width = this.width;
}
tbl.parentNode.insertBefore(this.tblMainCont, tbl);
//Table container: div wrapping content table
this.tblCont = createElm('div', ['id', this.prfxTblCont + tf.id]);
this.tblCont.className = this.gridContCssClass;
if (this.gridWidth) {
if (this.gridWidth.indexOf('%') !== -1) {
this.tblCont.className = this.contCssClass;
if (this.width) {
if (this.width.indexOf('%') !== -1) {
this.tblCont.style.width = '100%';
} else {
this.tblCont.style.width = this.gridWidth;
this.tblCont.style.width = this.width;
}
}
if (this.gridHeight) {
this.tblCont.style.height = this.gridHeight;
if (this.height) {
this.tblCont.style.height = this.height;
}
tbl.parentNode.insertBefore(this.tblCont, tbl);
let t = removeElm(tbl);
@ -147,12 +219,12 @@ export class GridLayout extends Feature {
//Headers table container: div wrapping headers table
this.headTblCont = createElm(
'div', ['id', this.prfxHeadTblCont + tf.id]);
this.headTblCont.className = this.gridHeadContCssClass;
if (this.gridWidth) {
if (this.gridWidth.indexOf('%') !== -1) {
this.headTblCont.className = this.headContCssClass;
if (this.width) {
if (this.width.indexOf('%') !== -1) {
this.headTblCont.style.width = '100%';
} else {
this.headTblCont.style.width = this.gridWidth;
this.headTblCont.style.width = this.width;
}
}
@ -162,7 +234,7 @@ export class GridLayout extends Feature {
//1st row should be headers row, ids are added if not set
//Those ids are used by the sort feature
let hRow = tbl.rows[this.gridHeadRowIndex];
let hRow = tbl.rows[this.headRowIndex];
let sortTriggers = [];
for (let n = 0; n < tf.nbCells; n++) {
let c = hRow.cells[n];
@ -176,7 +248,7 @@ export class GridLayout extends Feature {
//Filters row is created
let filtersRow = createElm('tr');
if (this.gridEnableFilters && tf.fltGrid) {
if (this.enableFilters && tf.fltGrid) {
tf.externalFltTgtIds = [];
for (let j = 0; j < tf.nbCells; j++) {
let fltTdId = tf.prfxFlt + j + this.prfxGridFltTd + tf.id;
@ -188,8 +260,8 @@ export class GridLayout extends Feature {
//Headers row are moved from content table to headers table
if (!this.noHeaders) {
for (let i = 0; i < this.gridHeadRows.length; i++) {
let headRow = tbl.rows[this.gridHeadRows[0]];
for (let i = 0; i < this.headRows.length; i++) {
let headRow = tbl.rows[this.headRows[i]];
tH.appendChild(headRow);
}
} else {
@ -273,7 +345,7 @@ export class GridLayout extends Feature {
let col = createElm('col', ['id', tf.id + '_col_' + k]);
tbl.insertBefore(col, tbl.firstChild);
col.style.width = tf.colWidths[k];
this.gridColElms[k] = col;
this.colElms[k] = col;
}
this.tblHasColTag = true;
};
@ -285,32 +357,10 @@ export class GridLayout extends Feature {
for (let ii = 0; ii < tf.nbCells; ii++) {
cols[ii].setAttribute('id', tf.id + '_col_' + ii);
cols[ii].style.width = tf.colWidths[ii];
this.gridColElms.push(cols[ii]);
this.colElms.push(cols[ii]);
}
}
let afterColResizedFn = isFn(f.on_after_col_resized) ?
f.on_after_col_resized : null;
f.on_after_col_resized = function (o, colIndex) {
if (!colIndex) {
return;
}
let w = o.crWColsRow.cells[colIndex].style.width;
let col = o.gridColElms[colIndex];
col.style.width = w;
let thCW = o.crWColsRow.cells[colIndex].clientWidth;
let tdCW = o.crWRowDataTbl.cells[colIndex].clientWidth;
if (thCW !== tdCW) {
o.headTbl.style.width = tbl.clientWidth + 'px';
}
if (afterColResizedFn) {
afterColResizedFn.call(null, o, colIndex);
}
};
if (tf.popupFilters) {
filtersRow.style.display = NONE;
}
@ -322,6 +372,31 @@ export class GridLayout extends Feature {
this.initialized = true;
}
/**
* Set grid-layout default column widths if column widths are not defined
* @private
*/
setDefaultColWidths() {
let tf = this.tf;
if (tf.hasColWidths) {
return;
}
for (let k = 0, len = tf.getCellsNb(); k < len; k++) {
let colW;
let cell = tf.tbl.rows[tf.getHeadersRowIndex()].cells[k];
if (cell.width !== '') {
colW = cell.width;
} else if (cell.style.width !== '') {
colW = parseInt(cell.style.width, 10);
} else {
colW = this.defaultColWidth;
}
tf.colWidths[k] = colW;
}
tf.hasColWidths = true;
tf.setColWidths();
}
/**
* Removes the grid layout
*/

View file

@ -148,7 +148,7 @@ export class TableFilter {
this.alternateRows = Boolean(f.alternate_rows);
//defines widths of columns
this.hasColWidths = isArray(f.col_widths);
this.colWidths = this.hasColWidths ? f.col_widths : null;
this.colWidths = this.hasColWidths ? f.col_widths : [];
//defines css class for filters
this.fltCssClass = f.flt_css_class || 'flt';
//defines css class for multiple selects filters
@ -997,7 +997,7 @@ export class TableFilter {
else if (this.gridLayout) {
let gridLayout = this.Mod.gridLayout;
gridLayout.tblMainCont.appendChild(infdiv);
infdiv.className = gridLayout.gridInfDivCssClass;
infdiv.className = gridLayout.infDivCssClass;
}
//default location: just above the table
else {
@ -1887,27 +1887,23 @@ export class TableFilter {
}
tbl = tbl || this.tbl;
setWidths.call(this);
function setWidths() {
let nbCols = this.nbCells;
let colWidths = this.colWidths;
let colTags = tag(tbl, 'col');
let tblHasColTag = colTags.length > 0;
let frag = !tblHasColTag ? doc.createDocumentFragment() : null;
for (let k = 0; k < nbCols; k++) {
let col;
if (tblHasColTag) {
col = colTags[k];
} else {
col = createElm('col', ['id', this.id + '_col_' + k]);
frag.appendChild(col);
}
col.style.width = colWidths[k];
}
if (!tblHasColTag) {
tbl.insertBefore(frag, tbl.firstChild);
let nbCols = this.nbCells;
let colWidths = this.colWidths;
let colTags = tag(tbl, 'col');
let tblHasColTag = colTags.length > 0;
let frag = !tblHasColTag ? doc.createDocumentFragment() : null;
for (let k = 0; k < nbCols; k++) {
let col;
if (tblHasColTag) {
col = colTags[k];
} else {
col = createElm('col', ['id', this.id + '_col_' + k]);
frag.appendChild(col);
}
col.style.width = colWidths[k];
}
if (!tblHasColTag) {
tbl.insertBefore(frag, tbl.firstChild);
}
}
@ -2084,13 +2080,12 @@ export class TableFilter {
* @param {String} type Possible values: 'script' or 'link'
* @return {Boolean}
*/
isImported(filePath, type) {
isImported(filePath, type = 'script') {
let imported = false,
importType = !type ? 'script' : type,
attr = importType === 'script' ? 'src' : 'href',
files = tag(doc, importType);
attr = type === 'script' ? 'src' : 'href',
files = tag(doc, type);
for (let i = 0, len = files.length; i < len; i++) {
if (files[i][attr] === undefined) {
if (isUndef(files[i][attr])) {
continue;
}
if (files[i][attr].match(filePath)) {
@ -2108,10 +2103,8 @@ export class TableFilter {
* @param {Function} callback Callback
* @param {String} type Possible values: 'script' or 'link'
*/
import(fileId, filePath, callback, type) {
let ftype = !type ? 'script' : type,
imported = this.isImported(filePath, ftype);
if (imported) {
import(fileId, filePath, callback, type = 'script') {
if (this.isImported(filePath, type)) {
return;
}
let o = this,
@ -2119,7 +2112,7 @@ export class TableFilter {
file,
head = tag(doc, 'head')[0];
if (ftype.toLowerCase() === 'link') {
if (type.toLowerCase() === 'link') {
file = createElm('link',
['id', fileId], ['type', 'text/css'],
['rel', 'stylesheet'], ['href', filePath]
@ -2132,7 +2125,7 @@ export class TableFilter {
}
//Browser <> IE onload event works only for scripts, not for stylesheets
file.onload = file.onreadystatechange = function () {
file.onload = file.onreadystatechange = () => {
if (!isLoaded &&
(!this.readyState || this.readyState === 'loaded' ||
this.readyState === 'complete')) {
@ -2143,7 +2136,7 @@ export class TableFilter {
}
};
file.onerror = function () {
throw new Error('TableFilter could not load: ' + filePath);
throw new Error(`TableFilter could not load: ${filePath}`);
};
head.appendChild(file);
}

View file

@ -0,0 +1,78 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>TableFilter DOM changes</title>
<link rel="stylesheet" href="libs/qunit/qunit.css">
<script src="libs/qunit/qunit.js"></script>
<script src="libs/polyfill.js"></script>
</head>
<body>
<table id="demo" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<th>From</th>
<th>Destination</th>
<th>Road Distance (km)</th>
<th>By Air (hrs)</th>
<th>By Rail (hrs)</th>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Adelaide</td>
<td>1412</td>
<td>1.4</td>
<td>25.3</td>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Brisbane</td>
<td>982</td>
<td>1.5</td>
<td>16</td>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Canberra</td>
<td>286</td>
<td>.6</td>
<td>4.3</td>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Melbourne</td>
<td>872</td>
<td>1.1</td>
<td>10.5</td>
</tr>
<tr>
<td><strong>Adelaide</strong></td>
<td>Perth</td>
<td>2781</td>
<td>3.1</td>
<td>38</td>
</tr>
<tr>
<td><strong>Adelaide</strong></td>
<td>Alice Springs</td>
<td>1533</td>
<td>2</td>
<td>20.25</td>
</tr>
<tr>
<td><strong>Adelaide</strong></td>
<td>Brisbane</td>
<td>2045</td>
<td>2.15</td>
<td>40</td>
</tr>
</tbody>
</table>
<script src="../dist/tablefilter/tablefilter.js"></script>
<script src="test-dom-changes.js"></script>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
</body>
</html>

165
test/test-dom-changes.js Normal file
View file

@ -0,0 +1,165 @@
var tf = new TableFilter('demo', {
base_path: '../dist/tablefilter/',
rows_counter: true
});
tf.init();
var rowsCounter = tf.feature('rowsCounter');
var rowToAdd = tf.tbl.rows[8];
var tf1 = new TableFilter('demo', {
base_path: '../dist/tablefilter/',
rows_counter: true,
paging: true,
paging_length: 3
});
module('Sanity checks');
test('Initial verifications', function() {
deepEqual(tf instanceof TableFilter, true, 'TableFilter instance');
deepEqual(tf.getFilterableRowsNb(), 7, 'Initial number of filterable rows');
deepEqual(tf.getValidRowsNb(), 0, 'Initial number of valid rows');
notEqual(rowsCounter, null, 'RowsCounter instanciated');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '7', 'Initial rows count');
});
module('DOM changes');
test('Can filter after row is removed', function() {
// setup
tf.clearFilters();
tf.tbl.deleteRow(-1);
// act
tf.filter();
// assert
deepEqual(tf.getFilterableRowsNb(), 6,
'Number of filterable rows after row is removed');
deepEqual(tf.getValidRowsNb(), 6,
'Number of valid rows after row is removed');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '6',
'Rows count after row is removed');
});
test('Can filter after row is added', function() {
// setup
tf.clearFilters();
tf.tbl.tBodies[0].appendChild(rowToAdd);
// act
tf.filter();
// assert
deepEqual(tf.getFilterableRowsNb(), 7,
'Number of filterable rows after row is added');
deepEqual(tf.getValidRowsNb(), 7,
'Number of valid rows after row is added');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '7',
'Rows count after row is added');
});
test('Can filter the added row', function() {
// setup
tf.clearFilters();
tf.setFilterValue(0, 'Adelaide');
tf.setFilterValue(1, 'Brisbane');
// act
tf.filter();
// assert
deepEqual(tf.getFilterableRowsNb(), 7,
'Number of filterable rows after row is added');
deepEqual(tf.getValidRowsNb(), 1,
'Number of valid rows after row is added');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '1',
'Rows count after row is added');
});
test('can destroy TableFilter', function() {
tf.clearFilters();
tf.destroy();
deepEqual(tf.isInitialized(), false, 'tf instance destroyed');
});
module('DOM changes with paging');
test('Sanity checks', function() {
// setup
tf1.init();
var rowsCounter = tf1.feature('rowsCounter');
// assert
deepEqual(tf1 instanceof TableFilter, true, 'TableFilter instance');
deepEqual(tf1.paging, true, 'Paging is enabled');
deepEqual(tf1.getFilterableRowsNb(), 7,
'Initial number of filterable rows');
deepEqual(tf1.getValidRowsNb(), 7, 'Initial number of valid rows');
notEqual(rowsCounter, null, 'RowsCounter instanciated');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '1-3 / 7',
'Initial rows count');
});
test('Can filter and change a page after row is removed', function() {
// setup
var paging = tf1.feature('paging');
var rowsCounter = tf1.feature('rowsCounter');
tf1.clearFilters();
tf1.tbl.deleteRow(-1);
// act
tf1.filter();
paging.setPage(2);
// assert
deepEqual(tf1.getFilterableRowsNb(), 6,
'Number of filterable rows after row is removed');
deepEqual(tf1.getValidRowsNb(), 6,
'Number of valid rows after row is removed');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '4-6 / 6',
'Rows count after row is removed');
});
test('Can filter and change page after row is added', function() {
// setup
var paging = tf1.feature('paging');
var rowsCounter = tf1.feature('rowsCounter');
tf1.clearFilters();
tf1.tbl.tBodies[0].appendChild(rowToAdd);
// act
tf1.filter();
paging.setPage(3);
// assert
deepEqual(tf1.getFilterableRowsNb(), 7,
'Number of filterable rows after row is added');
deepEqual(tf1.getValidRowsNb(), 7,
'Number of valid rows after row is added');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '7-7 / 7',
'Rows count after row is added');
});
test('Can filter the added row with paging', function() {
// setup
var paging = tf1.feature('paging');
var rowsCounter = tf1.feature('rowsCounter');
tf1.setFilterValue(0, 'Adelaide');
tf1.setFilterValue(1, 'Brisbane');
// act
paging.setPage(0);
tf1.filter();
// assert
deepEqual(tf1.getFilterableRowsNb(), 7,
'Number of filterable rows after row is added');
deepEqual(tf1.getValidRowsNb(), 1,
'Number of valid rows after row is added');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '1-1 / 1',
'Rows count after row is added');
});
test('can destroy TableFilter DOM elements', function() {
tf1.destroy();
deepEqual(tf1.isInitialized(), false, 'tf1 instance destroyed');
});