mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-06-16 12:45:49 +02:00
Merge pull request #479 from koalyptus/remove-external_flt_grid-option
Removed external_flt_grid_option setting, make paths properties functions
This commit is contained in:
commit
acf6678619
4
dist/starter.html
vendored
4
dist/starter.html
vendored
|
@ -1,10 +1,10 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>tablefilter v0.5.28 - Starter</title>
|
||||
<title>tablefilter v0.5.29 - Starter</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>tablefilter v0.5.28</h1>
|
||||
<h1>tablefilter v0.5.29</h1>
|
||||
|
||||
|
||||
|
||||
|
|
4
dist/tablefilter/style/colsVisibility.css
vendored
4
dist/tablefilter/style/colsVisibility.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.5.28 by Max Guglielmi
|
||||
* build date: 2017-07-09T04:58:54.832Z
|
||||
* tablefilter v0.5.29 by Max Guglielmi
|
||||
* build date: 2017-07-16T00:45:36.944Z
|
||||
* 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}
|
4
dist/tablefilter/style/filtersVisibility.css
vendored
4
dist/tablefilter/style/filtersVisibility.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.5.28 by Max Guglielmi
|
||||
* build date: 2017-07-09T04:58:54.832Z
|
||||
* tablefilter v0.5.29 by Max Guglielmi
|
||||
* build date: 2017-07-16T00:45:36.944Z
|
||||
* 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}
|
4
dist/tablefilter/style/tablefilter.css
vendored
4
dist/tablefilter/style/tablefilter.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.5.28 by Max Guglielmi
|
||||
* build date: 2017-07-09T04:58:54.832Z
|
||||
* tablefilter v0.5.29 by Max Guglielmi
|
||||
* build date: 2017-07-16T00:45:36.944Z
|
||||
* MIT License
|
||||
*/
|
||||
.activeHeader{background-color:#66afe9 !important;color:#fff !important}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.5.28 by Max Guglielmi
|
||||
* build date: 2017-07-09T04:58:54.832Z
|
||||
* tablefilter v0.5.29 by Max Guglielmi
|
||||
* build date: 2017-07-16T00:45:36.944Z
|
||||
* 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}
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.5.28 by Max Guglielmi
|
||||
* build date: 2017-07-09T04:58:54.832Z
|
||||
* tablefilter v0.5.29 by Max Guglielmi
|
||||
* build date: 2017-07-16T00:45:36.944Z
|
||||
* 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}
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.5.28 by Max Guglielmi
|
||||
* build date: 2017-07-09T04:58:54.832Z
|
||||
* tablefilter v0.5.29 by Max Guglielmi
|
||||
* build date: 2017-07-16T00:45:36.944Z
|
||||
* 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}
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.5.28 by Max Guglielmi
|
||||
* build date: 2017-07-09T04:58:54.832Z
|
||||
* tablefilter v0.5.29 by Max Guglielmi
|
||||
* build date: 2017-07-16T00:45:36.944Z
|
||||
* MIT License
|
||||
*/
|
||||
table.TF{padding:0;color:inherit;border-right:1px solid transparent;border-top:1px solid transparent;border-left:1px solid transparent;border-bottom:0;}table.TF th{margin:0;color:inherit;background-color:transparent;border-color:transparent;border-width:1px;border-style:solid;}table.TF th:last-child{border-right:1px solid transparent}table.TF td{margin:0;padding:5px;color:inherit;border-bottom:1px solid transparent;border-left:0;border-top:0;border-right:0}.fltrow{background-color:transparent;}.fltrow th,.fltrow td{padding:1px 3px 1px 3px;border-bottom:1px solid transparent !important;}.fltrow th:last-child,.fltrow td:last-child{border-right:1px solid transparent}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #a4bed4}input.flt{width:99% !important}.inf{background-color:transparent;border:1px solid transparent;height:$min-height;color:inherit}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:#f7f7f7 url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid #f7f7f7 !important}.previousPage{background:transparent url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.previousPage:hover{background:#f7f7f7 url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid #f7f7f7 !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.firstPage:hover{background:#f7f7f7 url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid #f7f7f7 !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.lastPage:hover{background:#f7f7f7 url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid #f7f7f7 !important}.activeHeader{background:#f7f7f7 !important;border:1px solid transparent;color:inherit !important}div.grd_Cont{-webkit-box-shadow:0 0 0 0 rgba(50,50,50,0.75);-moz-box-shadow:0 0 0 0 rgba(50,50,50,0.75);box-shadow:0 0 0 0 rgba(50,50,50,0.75);background-color:transparent;border:1px solid transparent;padding:0 !important;}div.grd_Cont .even{background-color:transparent}div.grd_Cont .odd{background-color:#f7f7f7}div.grd_headTblCont{background-color:transparent;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:transparent;border-bottom:1px solid transparent;border-right:1px solid transparent !important;border-left:1px solid transparent;border-top:1px solid transparent}div.grd_tblCont table td{border-bottom:1px solid transparent;border-right:0 !important;border-left:0 !important;border-top:0 !important}.grd_inf{background-color:transparent;color:inherit;border-top:1px solid transparent;}.grd_inf a{text-decoration:none;font-weight:bold}.loader{background-color:#f7f7f7;border:1px solid #f7f7f7;border-radius:5px;color:#000;text-shadow:none}.even{background-color:transparent}.odd{background-color:#f7f7f7}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.ezActiveRow{background-color:#ccc !important;color:inherit}.ezSelectedRow{background-color:#ccc !important;color:inherit}.ezActiveCell{background-color:transparent;color:inherit;font-weight:bold}.ezETSelectedCell{background-color:transparent;font-weight:bold;color:inherit}
|
6
dist/tablefilter/tablefilter.js
vendored
6
dist/tablefilter/tablefilter.js
vendored
File diff suppressed because one or more lines are too long
2
dist/tablefilter/tablefilter.js.map
vendored
2
dist/tablefilter/tablefilter.js.map
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
8
dist/tablefilter/tf-0-70d44eff53c210197694.js
vendored
Normal file
8
dist/tablefilter/tf-0-70d44eff53c210197694.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/tablefilter/tf-0-70d44eff53c210197694.js.map
vendored
Normal file
1
dist/tablefilter/tf-0-70d44eff53c210197694.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "tablefilter",
|
||||
"version": "0.5.28",
|
||||
"version": "0.5.29",
|
||||
"description": "A Javascript library making HTML tables filterable and a bit more",
|
||||
"license": "MIT",
|
||||
"author": {
|
||||
|
|
|
@ -283,7 +283,7 @@ export default class ColsVisibility extends Feature {
|
|||
}
|
||||
|
||||
//Loads extension stylesheet
|
||||
tf.import(f.name + 'Style', tf.stylePath + this.stylesheet, null,
|
||||
tf.import(f.name + 'Style', tf.getStylePath() + this.stylesheet, null,
|
||||
'link');
|
||||
|
||||
this.enable();
|
||||
|
|
|
@ -172,7 +172,7 @@ export default class FiltersVisibility extends Feature {
|
|||
this.onAfterHide = defaultsFn(f.on_after_hide, EMPTY_FN);
|
||||
|
||||
//Import extension's stylesheet
|
||||
tf.import(f.name + 'Style', tf.stylePath + this.stylesheet, null,
|
||||
tf.import(f.name + 'Style', tf.getStylePath() + this.stylesheet, null,
|
||||
'link');
|
||||
|
||||
this.enable();
|
||||
|
|
|
@ -296,7 +296,6 @@ export class GridLayout extends Feature {
|
|||
tf.refRow = 0;
|
||||
tf.headersRow = 0;
|
||||
tf.filtersRowIndex = 1;
|
||||
tf.isExternalFlt = true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -197,7 +197,6 @@ export class PopupFilter extends Feature {
|
|||
let tf = this.tf;
|
||||
|
||||
// Enable external filters
|
||||
tf.isExternalFlt = true;
|
||||
tf.externalFltTgtIds = [];
|
||||
|
||||
// Override headers row index if no grouped headers
|
||||
|
|
|
@ -280,14 +280,13 @@ export class TableFilter {
|
|||
* Path for stylesheets
|
||||
* @type {String}
|
||||
*/
|
||||
this.stylePath = defaultsStr(f.style_path, this.basePath + 'style/');
|
||||
this.stylePath = this.getStylePath();
|
||||
|
||||
/**
|
||||
* Main stylesheet path
|
||||
* @type {String}
|
||||
*/
|
||||
this.stylesheet = defaultsStr(f.stylesheet,
|
||||
this.stylePath + 'tablefilter.css');
|
||||
this.stylesheet = this.getStylesheetPath();
|
||||
|
||||
/**
|
||||
* Main stylesheet ID
|
||||
|
@ -430,12 +429,6 @@ export class TableFilter {
|
|||
*/
|
||||
this.visibleRows = this.hasVisibleRows ? f.rows_always_visible : [];
|
||||
|
||||
/**
|
||||
* Enable/disable external filters generation
|
||||
* @type {Boolean}
|
||||
*/
|
||||
this.isExternalFlt = Boolean(f.external_flt_grid);
|
||||
|
||||
/**
|
||||
* List of containers IDs where external filters will be generated
|
||||
* @type {Array}
|
||||
|
@ -961,7 +954,7 @@ export class TableFilter {
|
|||
* themes: [{ name: 'skyblue' }]
|
||||
* @type {Array}
|
||||
*/
|
||||
this.themesPath = f.themes_path || this.stylePath + 'themes/';
|
||||
this.themesPath = this.getThemesPath();
|
||||
|
||||
/**
|
||||
* Enable responsive layout
|
||||
|
@ -985,9 +978,6 @@ export class TableFilter {
|
|||
this.instantiateFeatures(
|
||||
Object.keys(FEATURES).map((item) => FEATURES[item])
|
||||
);
|
||||
|
||||
//load styles if necessary
|
||||
this.import(this.stylesheetId, this.stylesheet, null, 'link');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -998,6 +988,9 @@ export class TableFilter {
|
|||
return;
|
||||
}
|
||||
|
||||
// import main stylesheet
|
||||
this.import(this.stylesheetId, this.getStylesheetPath(), null, 'link');
|
||||
|
||||
this.nbCells = this.getCellsNb(this.refRow);
|
||||
let Mod = this.Mod;
|
||||
let n = this.singleSearchFlt ? 1 : this.nbCells;
|
||||
|
@ -1055,12 +1048,12 @@ export class TableFilter {
|
|||
//drop-down filters
|
||||
if (col === SELECT || col === MULTIPLE) {
|
||||
Mod.dropdown = Mod.dropdown || new Dropdown(this);
|
||||
Mod.dropdown.init(i, this.isExternalFlt, fltcell);
|
||||
Mod.dropdown.init(i, this.isExternalFlt(), fltcell);
|
||||
}
|
||||
// checklist
|
||||
else if (col === CHECKLIST) {
|
||||
Mod.checkList = Mod.checkList || new CheckList(this);
|
||||
Mod.checkList.init(i, this.isExternalFlt, fltcell);
|
||||
Mod.checkList.init(i, this.isExternalFlt(), fltcell);
|
||||
} else {
|
||||
this._buildInputFilter(i, inpclass, fltcell);
|
||||
}
|
||||
|
@ -1224,7 +1217,7 @@ export class TableFilter {
|
|||
|
||||
fltrow.className = this.fltsRowCssClass;
|
||||
|
||||
if (this.isExternalFlt) {
|
||||
if (this.isExternalFlt()) {
|
||||
fltrow.style.display = NONE;
|
||||
}
|
||||
|
||||
|
@ -1251,7 +1244,7 @@ export class TableFilter {
|
|||
*/
|
||||
_buildInputFilter(colIndex, cssClass, container) {
|
||||
let col = this.getFilterType(colIndex);
|
||||
let externalFltTgtId = this.isExternalFlt ?
|
||||
let externalFltTgtId = this.isExternalFlt() ?
|
||||
this.externalFltTgtIds[colIndex] : null;
|
||||
let inpType = col === INPUT ? 'text' : 'hidden';
|
||||
let inp = createElm(INPUT,
|
||||
|
@ -1288,7 +1281,7 @@ export class TableFilter {
|
|||
* @param {DOMElement} container Container DOM element
|
||||
*/
|
||||
_buildSubmitButton(colIndex, container) {
|
||||
let externalFltTgtId = this.isExternalFlt ?
|
||||
let externalFltTgtId = this.isExternalFlt() ?
|
||||
this.externalFltTgtIds[colIndex] : null;
|
||||
let btn = createElm(INPUT,
|
||||
['type', 'button'],
|
||||
|
@ -1510,7 +1503,7 @@ export class TableFilter {
|
|||
|
||||
let emitter = this.emitter;
|
||||
|
||||
if (this.isExternalFlt && !this.popupFilters) {
|
||||
if (this.isExternalFlt() && !this.popupFilters) {
|
||||
this.removeExternalFlts();
|
||||
}
|
||||
|
||||
|
@ -1623,7 +1616,7 @@ export class TableFilter {
|
|||
* Remove all the external column filters
|
||||
*/
|
||||
removeExternalFlts() {
|
||||
if (!this.isExternalFlt) {
|
||||
if (!this.isExternalFlt()) {
|
||||
return;
|
||||
}
|
||||
let ids = this.externalFltTgtIds,
|
||||
|
@ -2618,7 +2611,7 @@ export class TableFilter {
|
|||
if (fltColType !== MULTIPLE && fltColType !== CHECKLIST) {
|
||||
if (this.loadFltOnDemand && !this.initialized) {
|
||||
this.emitter.emit('build-select-filter', this, index,
|
||||
this.linkedFilters, this.isExternalFlt);
|
||||
this.linkedFilters, this.isExternalFlt());
|
||||
}
|
||||
slc.value = query;
|
||||
}
|
||||
|
@ -2629,7 +2622,7 @@ export class TableFilter {
|
|||
|
||||
if (this.loadFltOnDemand && !this.initialized) {
|
||||
this.emitter.emit('build-select-filter', this, index,
|
||||
this.linkedFilters, this.isExternalFlt);
|
||||
this.linkedFilters, this.isExternalFlt());
|
||||
}
|
||||
|
||||
this.emitter.emit('select-options', this, index, values);
|
||||
|
@ -2758,6 +2751,44 @@ export class TableFilter {
|
|||
return `${this.prfxFlt}${colIndex}_${this.id}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if has external filters
|
||||
* @returns {Boolean}
|
||||
* @private
|
||||
*/
|
||||
isExternalFlt() {
|
||||
return this.externalFltTgtIds.length > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns styles path
|
||||
* @returns {String}
|
||||
* @private
|
||||
*/
|
||||
getStylePath() {
|
||||
return defaultsStr(this.config.style_path, this.basePath + 'style/');
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns main stylesheet path
|
||||
* @returns {String}
|
||||
* @private
|
||||
*/
|
||||
getStylesheetPath() {
|
||||
return defaultsStr(this.config.stylesheet,
|
||||
this.getStylePath() + 'tablefilter.css');
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns themes path
|
||||
* @returns {String}
|
||||
* @private
|
||||
*/
|
||||
getThemesPath() {
|
||||
return defaultsStr(this.config.themes_path,
|
||||
this.getStylePath() + 'themes/');
|
||||
}
|
||||
|
||||
/**
|
||||
* Make specified column's filter active
|
||||
* @param colIndex Index of a column
|
||||
|
|
|
@ -106,7 +106,7 @@ var tfConfig = {
|
|||
col_8: "none",
|
||||
|
||||
/* external filters */
|
||||
external_flt_grid: true,
|
||||
// external_flt_grid: true,
|
||||
external_flt_grid_ids: [
|
||||
'slcCountry',
|
||||
'slcCode',
|
||||
|
|
|
@ -7,7 +7,6 @@ var tf = new TableFilter('demo', {
|
|||
col_3: 'multiple',
|
||||
col_4: 'checklist',
|
||||
/* external filters */
|
||||
external_flt_grid: true,
|
||||
external_flt_grid_ids: [
|
||||
'extFrom',
|
||||
'extDestination',
|
||||
|
@ -21,7 +20,7 @@ tf.init();
|
|||
module('Sanity checks');
|
||||
test('External filters', function() {
|
||||
deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
|
||||
deepEqual(tf.isExternalFlt, true, 'Has external filters');
|
||||
deepEqual(tf.isExternalFlt(), true, 'Has external filters');
|
||||
deepEqual(tf.externalFltTgtIds.length, 5,
|
||||
'External filters ids length');
|
||||
deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
|
||||
|
@ -82,7 +81,6 @@ test('Sanity checks', function() {
|
|||
col_3: 'multiple',
|
||||
col_4: 'checklist',
|
||||
/* external filters */
|
||||
external_flt_grid: true,
|
||||
external_flt_grid_ids: [
|
||||
'extFrom',
|
||||
'extDestination',
|
||||
|
@ -95,7 +93,7 @@ test('Sanity checks', function() {
|
|||
tf.init();
|
||||
|
||||
deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
|
||||
deepEqual(tf.isExternalFlt, true, 'Has external filters');
|
||||
deepEqual(tf.isExternalFlt(), true, 'Has external filters');
|
||||
deepEqual(tf.externalFltTgtIds.length, 5,
|
||||
'External filters ids length');
|
||||
deepEqual(tf.getFiltersRowIndex(), 1, 'Filters row index');
|
||||
|
@ -154,7 +152,6 @@ test('Sanity checks', function() {
|
|||
col_3: 'multiple',
|
||||
col_4: 'checklist',
|
||||
/* external filters */
|
||||
external_flt_grid: true,
|
||||
external_flt_grid_ids: [
|
||||
'extFrom',
|
||||
'extDestination',
|
||||
|
@ -167,7 +164,7 @@ test('Sanity checks', function() {
|
|||
tf.init();
|
||||
|
||||
deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
|
||||
deepEqual(tf.isExternalFlt, true, 'Has external filters');
|
||||
deepEqual(tf.isExternalFlt(), true, 'Has external filters');
|
||||
deepEqual(tf.externalFltTgtIds.length, 5,
|
||||
'External filters ids length');
|
||||
deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
|
||||
|
|
80
test/test-no-config.html
Normal file
80
test/test-no-config.html
Normal file
|
@ -0,0 +1,80 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>TableFilter no configuration tests</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">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>From</th>
|
||||
<th>Destination</th>
|
||||
<th>Road Distance (km)</th>
|
||||
<th>By Air (hrs)</th>
|
||||
<th>By Rail (hrs)</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<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-no-config.js"></script>
|
||||
|
||||
<div id="qunit"></div>
|
||||
<div id="qunit-fixture"></div>
|
||||
</body>
|
||||
</html>
|
63
test/test-no-config.js
Normal file
63
test/test-no-config.js
Normal file
|
@ -0,0 +1,63 @@
|
|||
(function(win, TableFilter){
|
||||
|
||||
var tf = new TableFilter('demo');
|
||||
tf.basePath = '../dist/tablefilter/';
|
||||
tf.init();
|
||||
|
||||
module('Sanity checks');
|
||||
test('Features', function() {
|
||||
deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
|
||||
deepEqual(tf.fltGrid, true, 'fltGrid property');
|
||||
notEqual(tf.getFilterElement(0), null,
|
||||
'Filter element for column 0');
|
||||
deepEqual(tf.refRow, 2, 'Reference row index');
|
||||
deepEqual(Object.keys(tf.Mod).length, 14, 'Features instantiated');
|
||||
notEqual(tf.feature('rowsCounter'), null, 'RowsCounter instantiated');
|
||||
deepEqual(tf.rowsCounter, false, 'RowsCounter not enabled');
|
||||
});
|
||||
|
||||
module('Feature life cycle');
|
||||
test('Can init', function() {
|
||||
// setup
|
||||
var rowsCounter = tf.feature('rowsCounter');
|
||||
tf.rowsCounter = true;
|
||||
rowsCounter.enable();
|
||||
|
||||
// act
|
||||
rowsCounter.init();
|
||||
|
||||
// assert
|
||||
deepEqual(rowsCounter.enabled, true, 'rowsCounter enabled');
|
||||
deepEqual(rowsCounter.initialized, true, 'rowsCounter initialized');
|
||||
});
|
||||
|
||||
test('Can destroy', function() {
|
||||
// setup
|
||||
var rowsCounter = tf.feature('rowsCounter');
|
||||
|
||||
// act
|
||||
rowsCounter.destroy();
|
||||
|
||||
// assert
|
||||
deepEqual(rowsCounter.initialized, false, 'rowsCounter initialized');
|
||||
});
|
||||
|
||||
test('Can reset', function() {
|
||||
// setup
|
||||
var rowsCounter = tf.feature('rowsCounter');
|
||||
|
||||
// act
|
||||
rowsCounter.reset();
|
||||
|
||||
// assert
|
||||
deepEqual(rowsCounter.enabled, true, 'rowsCounter enabled');
|
||||
deepEqual(rowsCounter.initialized, true, 'rowsCounter initialized');
|
||||
});
|
||||
|
||||
module('Tear-down');
|
||||
test('TableFilter removed', function() {
|
||||
tf.destroy();
|
||||
deepEqual(tf.isInitialized(), false, 'Filters removed');
|
||||
});
|
||||
|
||||
})(window, TableFilter);
|
|
@ -27,7 +27,6 @@ test('Sanity checks', function() {
|
|||
tf = new TableFilter('demo', {
|
||||
base_path: '../dist/tablefilter/',
|
||||
single_filter: true,
|
||||
external_flt_grid: true,
|
||||
external_flt_grid_ids: ['single-search']
|
||||
});
|
||||
tf.init();
|
||||
|
|
Loading…
Reference in a new issue