mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-05-11 19:06:50 +02:00
Merged master in and fixed conflicts
This commit is contained in:
Max Guglielmi
commit
6afef2915b
|
|
@ -3,8 +3,8 @@
|
|||
"rules": {
|
||||
"max-len": [2, 80, 2, {"ignoreUrls": true}],
|
||||
"max-depth": [2, 7],
|
||||
"max-statements": [2, 172],
|
||||
"complexity": [2, 88],
|
||||
"max-statements": [2, 166],
|
||||
"complexity": [2, 86],
|
||||
"no-unused-vars": 2,
|
||||
"no-eval": 2,
|
||||
"no-underscore-dangle": 0,
|
||||
|
|
@ -27,5 +27,8 @@
|
|||
"es6": true,
|
||||
"browser": true,
|
||||
"node": false
|
||||
},
|
||||
"globals": {
|
||||
"__webpack_public_path__": false
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -122,12 +122,14 @@ Find exhaustive documentation on the configuration options in the [WIKI](https:/
|
|||
|
||||
Autogenerated documentation of the ES6 modules is available on the website: [docs](http://koalyptus.github.io/TableFilter/docs)
|
||||
|
||||
If you previously used the HTML Table Filter Generator plugin, verify the configuration
|
||||
options you are using are still supported: [Obsolete](https://github.com/koalyptus/TableFilter/wiki/--Obsolete)
|
||||
|
||||
Run this task to generate the documentation in the ``docs/docs`` directory:
|
||||
```shell
|
||||
grunt esdoc
|
||||
```
|
||||
|
||||
|
||||
## Support
|
||||
* GitHub for reporting bugs and feature requests.
|
||||
|
||||
|
|
|
|||
4
dist/starter.html
vendored
4
dist/starter.html
vendored
|
|
@ -1,10 +1,10 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>tablefilter v0.2.13 - Starter</title>
|
||||
<title>tablefilter v0.2.17 - Starter</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>tablefilter v0.2.13</h1>
|
||||
<h1>tablefilter v0.2.17</h1>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
4
dist/tablefilter/style/colsVisibility.css
vendored
4
dist/tablefilter/style/colsVisibility.css
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.13 by Max Guglielmi
|
||||
* build date: 2016-04-24T17:01:50.967Z
|
||||
* tablefilter v0.2.17 by Max Guglielmi
|
||||
* build date: 2016-05-01T09:47:23.351Z
|
||||
* 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.2.13 by Max Guglielmi
|
||||
* build date: 2016-04-24T17:01:50.967Z
|
||||
* tablefilter v0.2.17 by Max Guglielmi
|
||||
* build date: 2016-05-01T09:47:23.351Z
|
||||
* 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.2.13 by Max Guglielmi
|
||||
* build date: 2016-04-24T17:01:50.967Z
|
||||
* tablefilter v0.2.17 by Max Guglielmi
|
||||
* build date: 2016-05-01T09:47:23.351Z
|
||||
* MIT License
|
||||
*/
|
||||
.activeHeader{background-color:#66afe9 !important;color:#fff !important}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.13 by Max Guglielmi
|
||||
* build date: 2016-04-24T17:01:50.967Z
|
||||
* tablefilter v0.2.17 by Max Guglielmi
|
||||
* build date: 2016-05-01T09:47:23.351Z
|
||||
* 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.2.13 by Max Guglielmi
|
||||
* build date: 2016-04-24T17:01:50.967Z
|
||||
* tablefilter v0.2.17 by Max Guglielmi
|
||||
* build date: 2016-05-01T09:47:23.351Z
|
||||
* 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.2.13 by Max Guglielmi
|
||||
* build date: 2016-04-24T17:01:50.967Z
|
||||
* tablefilter v0.2.17 by Max Guglielmi
|
||||
* build date: 2016-05-01T09:47:23.351Z
|
||||
* 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}
|
||||
12
dist/tablefilter/tablefilter.js
vendored
12
dist/tablefilter/tablefilter.js
vendored
File diff suppressed because one or more lines are too long
8
dist/tablefilter/tf-1.js
vendored
8
dist/tablefilter/tf-1.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "tablefilter",
|
||||
"version": "0.2.13",
|
||||
"version": "0.2.17",
|
||||
"description": "A Javascript library making HTML tables filterable and a bit more",
|
||||
"license": "MIT",
|
||||
"author": {
|
||||
|
|
@ -32,12 +32,12 @@
|
|||
"babel-eslint": "6.0.4",
|
||||
"babel-loader": "^6.0.1",
|
||||
"babel-preset-es2015": "^6.5.0",
|
||||
"babel-plugin-transform-es2015-classes": "^6.6.5",
|
||||
"clean-webpack-plugin": "^0.1.3",
|
||||
"babel-plugin-transform-es2015-classes": "^6.7.7",
|
||||
"clean-webpack-plugin": "^0.1.9",
|
||||
"grunt": "^1.0.1",
|
||||
"grunt-babel": "^6.0.0",
|
||||
"grunt-contrib-clean": "^1.0.0",
|
||||
"grunt-contrib-connect": "^1.0.1",
|
||||
"grunt-contrib-connect": "^1.0.2",
|
||||
"grunt-contrib-copy": "^1.0.0",
|
||||
"grunt-contrib-qunit": "^1.1.0",
|
||||
"grunt-contrib-stylus": "^1.2.0",
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@ export default class ColsVisibility {
|
|||
this.buildManager();
|
||||
|
||||
this.initialized = true;
|
||||
this.emitter.emit('columns-visibility-initialized', tf, this);
|
||||
this.emitter.emit('columns-visibility-initialized', this.tf, this);
|
||||
|
||||
// Hide columns at start at very end of initialization
|
||||
this._hideAtStart();
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ export default class FiltersVisibility {
|
|||
this.buildUI();
|
||||
this.initialized = true;
|
||||
this.emitter.on(['show-filters'], (tf, visible) => this.show(visible));
|
||||
this.emitter.emit('filters-visibility-initialized', tf, this);
|
||||
this.emitter.emit('filters-visibility-initialized', this.tf, this);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -147,7 +147,6 @@ export default class FiltersVisibility {
|
|||
let isDisplayed = fltRow.style.display === '';
|
||||
|
||||
this.show(!isDisplayed);
|
||||
this.emitter.emit('filters-toggled', tf, this, !isDisplayed);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -179,6 +178,8 @@ export default class FiltersVisibility {
|
|||
if (this.onAfterHide && !visible) {
|
||||
this.onAfterHide.call(null, this);
|
||||
}
|
||||
|
||||
this.emitter.emit('filters-toggled', tf, this, visible);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ import Types from '../types';
|
|||
import Str from '../string';
|
||||
import Event from '../event';
|
||||
|
||||
export class Paging extends Feature{
|
||||
export class Paging extends Feature {
|
||||
|
||||
/**
|
||||
* Pagination component
|
||||
* @param {Object} tf TableFilter instance
|
||||
*/
|
||||
constructor(tf){
|
||||
constructor(tf) {
|
||||
super(tf, 'paging');
|
||||
|
||||
// Configuration object
|
||||
|
|
@ -57,23 +57,23 @@ export class Paging extends Feature{
|
|||
//defines next page button html
|
||||
this.btnNextPageHtml = f.btn_next_page_html ||
|
||||
(!tf.enableIcons ? null :
|
||||
'<input type="button" value="" class="'+this.btnPageCssClass +
|
||||
' nextPage" title="Next page" />');
|
||||
'<input type="button" value="" class="' + this.btnPageCssClass +
|
||||
' nextPage" title="Next page" />');
|
||||
//defines previous page button html
|
||||
this.btnPrevPageHtml = f.btn_prev_page_html ||
|
||||
(!tf.enableIcons ? null :
|
||||
'<input type="button" value="" class="'+this.btnPageCssClass +
|
||||
' previousPage" title="Previous page" />');
|
||||
'<input type="button" value="" class="' + this.btnPageCssClass +
|
||||
' previousPage" title="Previous page" />');
|
||||
//defines last page button html
|
||||
this.btnFirstPageHtml = f.btn_first_page_html ||
|
||||
(!tf.enableIcons ? null :
|
||||
'<input type="button" value="" class="'+this.btnPageCssClass +
|
||||
' firstPage" title="First page" />');
|
||||
'<input type="button" value="" class="' + this.btnPageCssClass +
|
||||
' firstPage" title="First page" />');
|
||||
//defines previous page button html
|
||||
this.btnLastPageHtml = f.btn_last_page_html ||
|
||||
(!tf.enableIcons ? null :
|
||||
'<input type="button" value="" class="'+this.btnPageCssClass +
|
||||
' lastPage" title="Last page" />');
|
||||
'<input type="button" value="" class="' + this.btnPageCssClass +
|
||||
' lastPage" title="Last page" />');
|
||||
//defines text preceeding page selector drop-down
|
||||
this.pageText = f.page_text || ' Page ';
|
||||
//defines text after page selector drop-down
|
||||
|
|
@ -81,7 +81,7 @@ export class Paging extends Feature{
|
|||
//css class for span containing tot nb of pages
|
||||
this.nbPgSpanCssClass = f.nb_pages_css_class || 'nbpg';
|
||||
//enables/disables paging buttons
|
||||
this.hasPagingBtns = f.paging_btns===false ? false : true;
|
||||
this.hasPagingBtns = f.paging_btns === false ? false : true;
|
||||
//defines previous page button html
|
||||
this.pageSelectorType = f.page_selector_type || tf.fltTypeSlc;
|
||||
//calls function before page is changed
|
||||
|
|
@ -123,45 +123,45 @@ export class Paging extends Feature{
|
|||
var start_row = tf.refRow;
|
||||
var nrows = tf.nbRows;
|
||||
//calculates page nb
|
||||
this.nbPages = Math.ceil((nrows-start_row)/this.pagingLength);
|
||||
this.nbPages = Math.ceil((nrows - start_row) / this.pagingLength);
|
||||
|
||||
//Paging elements events
|
||||
var o = this;
|
||||
// Paging DOM events
|
||||
this.evt = {
|
||||
slcIndex(){
|
||||
return (o.pageSelectorType===tf.fltTypeSlc) ?
|
||||
slcIndex() {
|
||||
return (o.pageSelectorType === tf.fltTypeSlc) ?
|
||||
o.pagingSlc.options.selectedIndex :
|
||||
parseInt(o.pagingSlc.value, 10)-1;
|
||||
parseInt(o.pagingSlc.value, 10) - 1;
|
||||
},
|
||||
nbOpts(){
|
||||
return (o.pageSelectorType===tf.fltTypeSlc) ?
|
||||
parseInt(o.pagingSlc.options.length, 10)-1 :
|
||||
(o.nbPages-1);
|
||||
nbOpts() {
|
||||
return (o.pageSelectorType === tf.fltTypeSlc) ?
|
||||
parseInt(o.pagingSlc.options.length, 10) - 1 :
|
||||
(o.nbPages - 1);
|
||||
},
|
||||
next(){
|
||||
next() {
|
||||
var nextIndex = o.evt.slcIndex() < o.evt.nbOpts() ?
|
||||
o.evt.slcIndex()+1 : 0;
|
||||
o.evt.slcIndex() + 1 : 0;
|
||||
o.changePage(nextIndex);
|
||||
},
|
||||
prev(){
|
||||
var prevIndex = o.evt.slcIndex()>0 ?
|
||||
o.evt.slcIndex()-1 : o.evt.nbOpts();
|
||||
prev() {
|
||||
var prevIndex = o.evt.slcIndex() > 0 ?
|
||||
o.evt.slcIndex() - 1 : o.evt.nbOpts();
|
||||
o.changePage(prevIndex);
|
||||
},
|
||||
last(){
|
||||
last() {
|
||||
o.changePage(o.evt.nbOpts());
|
||||
},
|
||||
first(){
|
||||
first() {
|
||||
o.changePage(0);
|
||||
},
|
||||
_detectKey(e){
|
||||
_detectKey(e) {
|
||||
var key = Event.keyCode(e);
|
||||
if(key===13){
|
||||
if(tf.sorted){
|
||||
if (key === 13) {
|
||||
if (tf.sorted) {
|
||||
tf.filter();
|
||||
o.changePage(o.evt.slcIndex());
|
||||
} else{
|
||||
} else {
|
||||
o.changePage();
|
||||
}
|
||||
this.blur();
|
||||
|
|
@ -178,19 +178,19 @@ export class Paging extends Feature{
|
|||
/**
|
||||
* Initialize DOM elements
|
||||
*/
|
||||
init(){
|
||||
init() {
|
||||
var slcPages;
|
||||
var tf = this.tf;
|
||||
var evt = this.evt;
|
||||
|
||||
if(this.initialized){
|
||||
if (this.initialized) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Check resultsPerPage is in expected format and initialise the
|
||||
// results per page component
|
||||
if(this.hasResultsPerPage){
|
||||
if(this.resultsPerPage.length<2){
|
||||
if (this.hasResultsPerPage) {
|
||||
if (this.resultsPerPage.length < 2) {
|
||||
this.hasResultsPerPage = false;
|
||||
} else {
|
||||
this.pagingLength = this.resultsPerPage[1][0];
|
||||
|
|
@ -204,18 +204,18 @@ export class Paging extends Feature{
|
|||
};
|
||||
|
||||
// Paging drop-down list selector
|
||||
if(this.pageSelectorType === tf.fltTypeSlc){
|
||||
if (this.pageSelectorType === tf.fltTypeSlc) {
|
||||
slcPages = Dom.create(
|
||||
tf.fltTypeSlc, ['id', this.prfxSlcPages+tf.id]);
|
||||
tf.fltTypeSlc, ['id', this.prfxSlcPages + tf.id]);
|
||||
slcPages.className = this.pgSlcCssClass;
|
||||
Event.add(slcPages, 'change', evt.slcPagesChange);
|
||||
}
|
||||
|
||||
// Paging input selector
|
||||
if(this.pageSelectorType === tf.fltTypeInp){
|
||||
if (this.pageSelectorType === tf.fltTypeInp) {
|
||||
slcPages = Dom.create(
|
||||
tf.fltTypeInp,
|
||||
['id', this.prfxSlcPages+tf.id],
|
||||
['id', this.prfxSlcPages + tf.id],
|
||||
['value', this.currentPageNb]
|
||||
);
|
||||
slcPages.className = this.pgInpCssClass;
|
||||
|
|
@ -224,20 +224,20 @@ export class Paging extends Feature{
|
|||
|
||||
// btns containers
|
||||
var btnNextSpan = Dom.create(
|
||||
'span',['id', this.prfxBtnNextSpan+tf.id]);
|
||||
'span', ['id', this.prfxBtnNextSpan + tf.id]);
|
||||
var btnPrevSpan = Dom.create(
|
||||
'span',['id', this.prfxBtnPrevSpan+tf.id]);
|
||||
'span', ['id', this.prfxBtnPrevSpan + tf.id]);
|
||||
var btnLastSpan = Dom.create(
|
||||
'span',['id', this.prfxBtnLastSpan+tf.id]);
|
||||
'span', ['id', this.prfxBtnLastSpan + tf.id]);
|
||||
var btnFirstSpan = Dom.create(
|
||||
'span',['id', this.prfxBtnFirstSpan+tf.id]);
|
||||
'span', ['id', this.prfxBtnFirstSpan + tf.id]);
|
||||
|
||||
if(this.hasPagingBtns){
|
||||
if (this.hasPagingBtns) {
|
||||
// Next button
|
||||
if(!this.btnNextPageHtml){
|
||||
if (!this.btnNextPageHtml) {
|
||||
var btn_next = Dom.create(
|
||||
tf.fltTypeInp,
|
||||
['id', this.prfxBtnNext+tf.id],
|
||||
['id', this.prfxBtnNext + tf.id],
|
||||
['type', 'button'],
|
||||
['value', this.btnNextPageText],
|
||||
['title', 'Next']
|
||||
|
|
@ -250,10 +250,10 @@ export class Paging extends Feature{
|
|||
Event.add(btnNextSpan, 'click', evt.next);
|
||||
}
|
||||
// Previous button
|
||||
if(!this.btnPrevPageHtml){
|
||||
if (!this.btnPrevPageHtml) {
|
||||
var btn_prev = Dom.create(
|
||||
tf.fltTypeInp,
|
||||
['id', this.prfxBtnPrev+tf.id],
|
||||
['id', this.prfxBtnPrev + tf.id],
|
||||
['type', 'button'],
|
||||
['value', this.btnPrevPageText],
|
||||
['title', 'Previous']
|
||||
|
|
@ -266,10 +266,10 @@ export class Paging extends Feature{
|
|||
Event.add(btnPrevSpan, 'click', evt.prev);
|
||||
}
|
||||
// Last button
|
||||
if(!this.btnLastPageHtml){
|
||||
if (!this.btnLastPageHtml) {
|
||||
var btn_last = Dom.create(
|
||||
tf.fltTypeInp,
|
||||
['id', this.prfxBtnLast+tf.id],
|
||||
['id', this.prfxBtnLast + tf.id],
|
||||
['type', 'button'],
|
||||
['value', this.btnLastPageText],
|
||||
['title', 'Last']
|
||||
|
|
@ -282,10 +282,10 @@ export class Paging extends Feature{
|
|||
Event.add(btnLastSpan, 'click', evt.last);
|
||||
}
|
||||
// First button
|
||||
if(!this.btnFirstPageHtml){
|
||||
if (!this.btnFirstPageHtml) {
|
||||
var btn_first = Dom.create(
|
||||
tf.fltTypeInp,
|
||||
['id', this.prfxBtnFirst+tf.id],
|
||||
['id', this.prfxBtnFirst + tf.id],
|
||||
['type', 'button'],
|
||||
['value', this.btnFirstPageText],
|
||||
['title', 'First']
|
||||
|
|
@ -300,7 +300,7 @@ export class Paging extends Feature{
|
|||
}
|
||||
|
||||
// paging elements (buttons+drop-down list) are added to defined element
|
||||
if(!this.pagingTgtId){
|
||||
if (!this.pagingTgtId) {
|
||||
tf.setToolbar();
|
||||
}
|
||||
var targetEl = !this.pagingTgtId ? tf.mDiv : Dom.id(this.pagingTgtId);
|
||||
|
|
@ -308,34 +308,32 @@ export class Paging extends Feature{
|
|||
targetEl.appendChild(btnPrevSpan);
|
||||
|
||||
var pgBeforeSpan = Dom.create(
|
||||
'span',['id', this.prfxPgBeforeSpan+tf.id] );
|
||||
pgBeforeSpan.appendChild( Dom.text(this.pageText) );
|
||||
'span', ['id', this.prfxPgBeforeSpan + tf.id]);
|
||||
pgBeforeSpan.appendChild(Dom.text(this.pageText));
|
||||
pgBeforeSpan.className = this.nbPgSpanCssClass;
|
||||
targetEl.appendChild(pgBeforeSpan);
|
||||
targetEl.appendChild(slcPages);
|
||||
var pgAfterSpan = Dom.create(
|
||||
'span',['id', this.prfxPgAfterSpan+tf.id]);
|
||||
pgAfterSpan.appendChild( Dom.text(this.ofText) );
|
||||
'span', ['id', this.prfxPgAfterSpan + tf.id]);
|
||||
pgAfterSpan.appendChild(Dom.text(this.ofText));
|
||||
pgAfterSpan.className = this.nbPgSpanCssClass;
|
||||
targetEl.appendChild(pgAfterSpan);
|
||||
var pgspan = Dom.create( 'span',['id', this.prfxPgSpan+tf.id] );
|
||||
var pgspan = Dom.create('span', ['id', this.prfxPgSpan + tf.id]);
|
||||
pgspan.className = this.nbPgSpanCssClass;
|
||||
pgspan.appendChild( Dom.text(' '+this.nbPages+' ') );
|
||||
pgspan.appendChild(Dom.text(' ' + this.nbPages + ' '));
|
||||
targetEl.appendChild(pgspan);
|
||||
targetEl.appendChild(btnNextSpan);
|
||||
targetEl.appendChild(btnLastSpan);
|
||||
this.pagingSlc = Dom.id(this.prfxSlcPages+tf.id);
|
||||
this.pagingSlc = Dom.id(this.prfxSlcPages + tf.id);
|
||||
|
||||
if(!tf.rememberGridValues){
|
||||
this.setPagingInfo();
|
||||
}
|
||||
if(!tf.fltGrid){
|
||||
this.setPagingInfo();
|
||||
|
||||
if (!tf.fltGrid) {
|
||||
tf.validateAllRows();
|
||||
this.setPagingInfo(tf.validRowsIndex);
|
||||
}
|
||||
|
||||
this.emitter.on(['after-filtering'], ()=> this.resetPagingInfo());
|
||||
this.emitter.on(['initialized'], ()=> this.resetValues());
|
||||
this.emitter.on(['after-filtering'], () => this.resetPagingInfo());
|
||||
this.emitter.on(['change-page'],
|
||||
(tf, pageNumber) => this.setPage(pageNumber));
|
||||
this.emitter.on(['change-page-results'],
|
||||
|
|
@ -348,15 +346,15 @@ export class Paging extends Feature{
|
|||
* Reset paging when filters are already instantiated
|
||||
* @param {Boolean} filterTable Execute filtering once paging instanciated
|
||||
*/
|
||||
reset(filterTable=false){
|
||||
reset(filterTable = false) {
|
||||
var tf = this.tf;
|
||||
if(this.isEnabled()){
|
||||
if (this.isEnabled()) {
|
||||
return;
|
||||
}
|
||||
this.enable();
|
||||
this.init();
|
||||
|
||||
if(filterTable){
|
||||
if (filterTable) {
|
||||
tf.filter();
|
||||
}
|
||||
}
|
||||
|
|
@ -364,7 +362,7 @@ export class Paging extends Feature{
|
|||
/**
|
||||
* Reset paging info from scratch after a filtering process
|
||||
*/
|
||||
resetPagingInfo(){
|
||||
resetPagingInfo() {
|
||||
this.startPagingRow = 0;
|
||||
this.currentPageNb = 1;
|
||||
this.setPagingInfo(this.tf.validRowsIndex);
|
||||
|
|
@ -375,31 +373,32 @@ export class Paging extends Feature{
|
|||
* Refresh paging select according to number of pages
|
||||
* @param {Array} validRows Collection of valid rows
|
||||
*/
|
||||
setPagingInfo(validRows){
|
||||
setPagingInfo(validRows) {
|
||||
var tf = this.tf;
|
||||
var mdiv = !this.pagingTgtId ? tf.mDiv : Dom.id(this.pagingTgtId);
|
||||
var pgspan = Dom.id(this.prfxPgSpan+tf.id);
|
||||
var pgspan = Dom.id(this.prfxPgSpan + tf.id);
|
||||
|
||||
//store valid rows indexes
|
||||
tf.validRowsIndex = validRows || tf.getValidRows(true);
|
||||
|
||||
//calculate nb of pages
|
||||
this.nbPages = Math.ceil(tf.validRowsIndex.length/this.pagingLength);
|
||||
this.nbPages = Math.ceil(tf.validRowsIndex.length / this.pagingLength);
|
||||
//refresh page nb span
|
||||
pgspan.innerHTML = this.nbPages;
|
||||
//select clearing shortcut
|
||||
if(this.pageSelectorType === tf.fltTypeSlc){
|
||||
if (this.pageSelectorType === tf.fltTypeSlc) {
|
||||
this.pagingSlc.innerHTML = '';
|
||||
}
|
||||
|
||||
if(this.nbPages>0){
|
||||
if (this.nbPages > 0) {
|
||||
mdiv.style.visibility = 'visible';
|
||||
if(this.pageSelectorType === tf.fltTypeSlc){
|
||||
for(var z=0; z<this.nbPages; z++){
|
||||
var opt = Dom.createOpt(z+1, z*this.pagingLength, false);
|
||||
if (this.pageSelectorType === tf.fltTypeSlc) {
|
||||
for (var z = 0; z < this.nbPages; z++) {
|
||||
var opt = Dom.createOpt(z + 1, z * this.pagingLength,
|
||||
false);
|
||||
this.pagingSlc.options[z] = opt;
|
||||
}
|
||||
} else{
|
||||
} else {
|
||||
//input type
|
||||
this.pagingSlc.value = this.currentPageNb;
|
||||
}
|
||||
|
|
@ -415,26 +414,27 @@ export class Paging extends Feature{
|
|||
* Group table rows by page and display valid rows
|
||||
* @param {Array} validRows Collection of valid rows
|
||||
*/
|
||||
groupByPage(validRows){
|
||||
groupByPage(validRows) {
|
||||
var tf = this.tf;
|
||||
var rows = tf.tbl.rows;
|
||||
var startPagingRow = parseInt(this.startPagingRow, 10);
|
||||
var endPagingRow = startPagingRow + parseInt(this.pagingLength, 10);
|
||||
|
||||
//store valid rows indexes
|
||||
if(validRows){
|
||||
if (validRows) {
|
||||
tf.validRowsIndex = validRows;
|
||||
}
|
||||
|
||||
//this loop shows valid rows of current page
|
||||
for(var h=0, len=tf.validRowsIndex.length; h<len; h++){
|
||||
for (var h = 0, len = tf.validRowsIndex.length; h < len; h++) {
|
||||
var validRowIdx = tf.validRowsIndex[h];
|
||||
var r = rows[validRowIdx];
|
||||
var isRowValid = r.getAttribute('validRow');
|
||||
var rowDisplayed = false;
|
||||
|
||||
if(h>=startPagingRow && h<endPagingRow){
|
||||
if(Types.isNull(isRowValid) || Boolean(isRowValid==='true')){
|
||||
if (h >= startPagingRow && h < endPagingRow) {
|
||||
if (Types.isNull(isRowValid) ||
|
||||
Boolean(isRowValid === 'true')) {
|
||||
r.style.display = '';
|
||||
rowDisplayed = true;
|
||||
}
|
||||
|
|
@ -454,24 +454,24 @@ export class Paging extends Feature{
|
|||
* Return the current page number
|
||||
* @return {Number} Page number
|
||||
*/
|
||||
getPage(){
|
||||
getPage() {
|
||||
return this.currentPageNb;
|
||||
}
|
||||
|
||||
/**
|
||||
* Show page based on passed param value (string or number):
|
||||
* Show page defined by passed argument (string or number):
|
||||
* @param {String}/{Number} cmd possible string values: 'next',
|
||||
* 'previous', 'last', 'first' or page number as per param
|
||||
*/
|
||||
setPage(cmd){
|
||||
setPage(cmd) {
|
||||
var tf = this.tf;
|
||||
if(!tf.hasGrid() || !this.isEnabled()){
|
||||
if (!tf.hasGrid() || !this.isEnabled()) {
|
||||
return;
|
||||
}
|
||||
var btnEvt = this.evt,
|
||||
cmdtype = typeof cmd;
|
||||
if(cmdtype === 'string'){
|
||||
switch(Str.lower(cmd)){
|
||||
if (cmdtype === 'string') {
|
||||
switch (Str.lower(cmd)) {
|
||||
case 'next':
|
||||
btnEvt.next();
|
||||
break;
|
||||
|
|
@ -489,19 +489,19 @@ export class Paging extends Feature{
|
|||
break;
|
||||
}
|
||||
}
|
||||
else if(cmdtype === 'number'){
|
||||
this.changePage(cmd-1);
|
||||
else if (cmdtype === 'number') {
|
||||
this.changePage(cmd - 1);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates UI elements for the number of results per page drop-down
|
||||
*/
|
||||
setResultsPerPage(){
|
||||
setResultsPerPage() {
|
||||
var tf = this.tf;
|
||||
var evt = this.evt;
|
||||
|
||||
if(this.resultsPerPageSlc || !this.resultsPerPage){
|
||||
if (this.resultsPerPageSlc || !this.resultsPerPage) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -511,16 +511,16 @@ export class Paging extends Feature{
|
|||
};
|
||||
|
||||
var slcR = Dom.create(
|
||||
tf.fltTypeSlc, ['id', this.prfxSlcResults+tf.id]);
|
||||
tf.fltTypeSlc, ['id', this.prfxSlcResults + tf.id]);
|
||||
slcR.className = this.resultsSlcCssClass;
|
||||
var slcRText = this.resultsPerPage[0],
|
||||
slcROpts = this.resultsPerPage[1];
|
||||
var slcRSpan = Dom.create(
|
||||
'span',['id', this.prfxSlcResultsTxt+tf.id]);
|
||||
'span', ['id', this.prfxSlcResultsTxt + tf.id]);
|
||||
slcRSpan.className = this.resultsSpanCssClass;
|
||||
|
||||
// results per page select is added to external element
|
||||
if(!this.resultsPerPageTgtId){
|
||||
if (!this.resultsPerPageTgtId) {
|
||||
tf.setToolbar();
|
||||
}
|
||||
var targetEl = !this.resultsPerPageTgtId ?
|
||||
|
|
@ -528,7 +528,7 @@ export class Paging extends Feature{
|
|||
slcRSpan.appendChild(Dom.text(slcRText));
|
||||
|
||||
var help = tf.feature('help');
|
||||
if(help && help.btn){
|
||||
if (help && help.btn) {
|
||||
help.btn.parentNode.insertBefore(slcRSpan, help.btn);
|
||||
help.btn.parentNode.insertBefore(slcR, help.btn);
|
||||
} else {
|
||||
|
|
@ -536,7 +536,7 @@ export class Paging extends Feature{
|
|||
targetEl.appendChild(slcR);
|
||||
}
|
||||
|
||||
for(var r=0; r<slcROpts.length; r++){
|
||||
for (var r = 0; r < slcROpts.length; r++) {
|
||||
var currOpt = new Option(slcROpts[r], slcROpts[r], false, false);
|
||||
slcR.options[r] = currOpt;
|
||||
}
|
||||
|
|
@ -547,17 +547,17 @@ export class Paging extends Feature{
|
|||
/**
|
||||
* Remove number of results per page UI elements
|
||||
*/
|
||||
removeResultsPerPage(){
|
||||
removeResultsPerPage() {
|
||||
var tf = this.tf;
|
||||
if(!tf.hasGrid() || !this.resultsPerPageSlc || !this.resultsPerPage){
|
||||
if (!tf.hasGrid() || !this.resultsPerPageSlc || !this.resultsPerPage) {
|
||||
return;
|
||||
}
|
||||
var slcR = this.resultsPerPageSlc,
|
||||
slcRSpan = Dom.id(this.prfxSlcResultsTxt+tf.id);
|
||||
if(slcR){
|
||||
slcRSpan = Dom.id(this.prfxSlcResultsTxt + tf.id);
|
||||
if (slcR) {
|
||||
Dom.remove(slcR);
|
||||
}
|
||||
if(slcRSpan){
|
||||
if (slcRSpan) {
|
||||
Dom.remove(slcRSpan);
|
||||
}
|
||||
this.resultsPerPageSlc = null;
|
||||
|
|
@ -567,36 +567,36 @@ export class Paging extends Feature{
|
|||
* Change the page according to passed index
|
||||
* @param {Number} index Index of the page (0-n)
|
||||
*/
|
||||
changePage(index){
|
||||
changePage(index) {
|
||||
var tf = this.tf;
|
||||
|
||||
if(!this.isEnabled()){
|
||||
if (!this.isEnabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.emitter.emit('before-page-change', tf, (index + 1));
|
||||
|
||||
if(index === null){
|
||||
if (index === null) {
|
||||
index = this.pageSelectorType === tf.fltTypeSlc ?
|
||||
this.pagingSlc.options.selectedIndex : (this.pagingSlc.value-1);
|
||||
this.pagingSlc.options.selectedIndex : this.pagingSlc.value - 1;
|
||||
}
|
||||
if( index>=0 && index<=(this.nbPages-1) ){
|
||||
if(this.onBeforeChangePage){
|
||||
if (index >= 0 && index <= (this.nbPages - 1)) {
|
||||
if (this.onBeforeChangePage) {
|
||||
this.onBeforeChangePage.call(null, this, (index + 1));
|
||||
}
|
||||
this.currentPageNb = parseInt(index, 10)+1;
|
||||
if(this.pageSelectorType===tf.fltTypeSlc){
|
||||
this.currentPageNb = parseInt(index, 10) + 1;
|
||||
if (this.pageSelectorType === tf.fltTypeSlc) {
|
||||
this.pagingSlc.options[index].selected = true;
|
||||
} else {
|
||||
this.pagingSlc.value = this.currentPageNb;
|
||||
}
|
||||
|
||||
this.startPagingRow = (this.pageSelectorType === tf.fltTypeSlc) ?
|
||||
this.pagingSlc.value : (index*this.pagingLength);
|
||||
this.pagingSlc.value : (index * this.pagingLength);
|
||||
|
||||
this.groupByPage();
|
||||
|
||||
if(this.onAfterChangePage){
|
||||
if (this.onAfterChangePage) {
|
||||
this.onAfterChangePage.call(null, this, (index + 1));
|
||||
}
|
||||
}
|
||||
|
|
@ -604,8 +604,8 @@ export class Paging extends Feature{
|
|||
this.emitter.emit('after-page-change', tf, (index + 1));
|
||||
}
|
||||
|
||||
changeResultsPerPage(val){
|
||||
if(!this.isEnabled() || isNaN(val)){
|
||||
changeResultsPerPage(val) {
|
||||
if (!this.isEnabled() || isNaN(val)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -616,10 +616,10 @@ export class Paging extends Feature{
|
|||
/**
|
||||
* Change rows according to page results drop-down
|
||||
*/
|
||||
onChangeResultsPerPage(){
|
||||
onChangeResultsPerPage() {
|
||||
var tf = this.tf;
|
||||
|
||||
if(!this.isEnabled()){
|
||||
if (!this.isEnabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -628,21 +628,21 @@ export class Paging extends Feature{
|
|||
var slcR = this.resultsPerPageSlc;
|
||||
var slcIndex = slcR.selectedIndex;
|
||||
var slcPagesSelIndex = (this.pageSelectorType === tf.fltTypeSlc) ?
|
||||
this.pagingSlc.selectedIndex :
|
||||
parseInt(this.pagingSlc.value-1, 10);
|
||||
this.pagingSlc.selectedIndex :
|
||||
parseInt(this.pagingSlc.value - 1, 10);
|
||||
this.pagingLength = parseInt(slcR.options[slcIndex].value, 10);
|
||||
this.startPagingRow = this.pagingLength*slcPagesSelIndex;
|
||||
this.startPagingRow = this.pagingLength * slcPagesSelIndex;
|
||||
|
||||
if(!isNaN(this.pagingLength)){
|
||||
if(this.startPagingRow >= tf.nbFilterableRows){
|
||||
this.startPagingRow = (tf.nbFilterableRows-this.pagingLength);
|
||||
if (!isNaN(this.pagingLength)) {
|
||||
if (this.startPagingRow >= tf.nbFilterableRows) {
|
||||
this.startPagingRow = (tf.nbFilterableRows - this.pagingLength);
|
||||
}
|
||||
this.setPagingInfo();
|
||||
|
||||
if(this.pageSelectorType === tf.fltTypeSlc){
|
||||
if (this.pageSelectorType === tf.fltTypeSlc) {
|
||||
var slcIdx =
|
||||
(this.pagingSlc.options.length-1<=slcPagesSelIndex) ?
|
||||
(this.pagingSlc.options.length-1) : slcPagesSelIndex;
|
||||
(this.pagingSlc.options.length - 1 <= slcPagesSelIndex) ?
|
||||
(this.pagingSlc.options.length - 1) : slcPagesSelIndex;
|
||||
this.pagingSlc.options[slcIdx].selected = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -650,31 +650,18 @@ export class Paging extends Feature{
|
|||
this.emitter.emit('after-page-length-change', tf, this.pagingLength);
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-set persisted pagination info
|
||||
*/
|
||||
resetValues(){
|
||||
var tf = this.tf;
|
||||
if(tf.rememberPageLen){
|
||||
this.resetPageLength();
|
||||
}
|
||||
if(tf.rememberPageNb){
|
||||
this.resetPage();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-set page nb at page re-load
|
||||
*/
|
||||
resetPage(){
|
||||
resetPage() {
|
||||
var tf = this.tf;
|
||||
if(!this.isEnabled()){
|
||||
if (!this.isEnabled()) {
|
||||
return;
|
||||
}
|
||||
this.emitter.emit('before-reset-page', tf);
|
||||
var pgNb = tf.feature('store').getPageNb();
|
||||
if(pgNb !== ''){
|
||||
this.changePage((pgNb-1));
|
||||
if (pgNb !== '') {
|
||||
this.changePage((pgNb - 1));
|
||||
}
|
||||
this.emitter.emit('after-reset-page', tf, pgNb);
|
||||
}
|
||||
|
|
@ -682,15 +669,15 @@ export class Paging extends Feature{
|
|||
/**
|
||||
* Re-set page length value at page re-load
|
||||
*/
|
||||
resetPageLength(){
|
||||
resetPageLength() {
|
||||
var tf = this.tf;
|
||||
if(!this.isEnabled()){
|
||||
if (!this.isEnabled()) {
|
||||
return;
|
||||
}
|
||||
this.emitter.emit('before-reset-page-length', tf);
|
||||
var pglenIndex = tf.feature('store').getPageLength();
|
||||
|
||||
if(pglenIndex!==''){
|
||||
if (pglenIndex !== '') {
|
||||
this.resultsPerPageSlc.options[pglenIndex].selected = true;
|
||||
this.changeResultsPerPage();
|
||||
}
|
||||
|
|
@ -700,74 +687,73 @@ export class Paging extends Feature{
|
|||
/**
|
||||
* Remove paging feature
|
||||
*/
|
||||
destroy(){
|
||||
destroy() {
|
||||
var tf = this.tf;
|
||||
|
||||
if(!this.initialized){
|
||||
if (!this.initialized) {
|
||||
return;
|
||||
}
|
||||
// btns containers
|
||||
var btnNextSpan = Dom.id(this.prfxBtnNextSpan+tf.id);
|
||||
var btnPrevSpan = Dom.id(this.prfxBtnPrevSpan+tf.id);
|
||||
var btnLastSpan = Dom.id(this.prfxBtnLastSpan+tf.id);
|
||||
var btnFirstSpan = Dom.id(this.prfxBtnFirstSpan+tf.id);
|
||||
var btnNextSpan = Dom.id(this.prfxBtnNextSpan + tf.id);
|
||||
var btnPrevSpan = Dom.id(this.prfxBtnPrevSpan + tf.id);
|
||||
var btnLastSpan = Dom.id(this.prfxBtnLastSpan + tf.id);
|
||||
var btnFirstSpan = Dom.id(this.prfxBtnFirstSpan + tf.id);
|
||||
//span containing 'Page' text
|
||||
var pgBeforeSpan = Dom.id(this.prfxPgBeforeSpan+tf.id);
|
||||
var pgBeforeSpan = Dom.id(this.prfxPgBeforeSpan + tf.id);
|
||||
//span containing 'of' text
|
||||
var pgAfterSpan = Dom.id(this.prfxPgAfterSpan+tf.id);
|
||||
var pgAfterSpan = Dom.id(this.prfxPgAfterSpan + tf.id);
|
||||
//span containing nb of pages
|
||||
var pgspan = Dom.id(this.prfxPgSpan+tf.id);
|
||||
var pgspan = Dom.id(this.prfxPgSpan + tf.id);
|
||||
|
||||
var evt = this.evt;
|
||||
|
||||
if(this.pagingSlc){
|
||||
if(this.pageSelectorType === tf.fltTypeSlc){
|
||||
if (this.pagingSlc) {
|
||||
if (this.pageSelectorType === tf.fltTypeSlc) {
|
||||
Event.remove(this.pagingSlc, 'change', evt.slcPagesChange);
|
||||
}
|
||||
else if(this.pageSelectorType === tf.fltTypeInp){
|
||||
else if (this.pageSelectorType === tf.fltTypeInp) {
|
||||
Event.remove(this.pagingSlc, 'keypress', evt._detectKey);
|
||||
}
|
||||
Dom.remove(this.pagingSlc);
|
||||
}
|
||||
|
||||
if(btnNextSpan){
|
||||
if (btnNextSpan) {
|
||||
Event.remove(btnNextSpan, 'click', evt.next);
|
||||
Dom.remove(btnNextSpan);
|
||||
}
|
||||
|
||||
if(btnPrevSpan){
|
||||
if (btnPrevSpan) {
|
||||
Event.remove(btnPrevSpan, 'click', evt.prev);
|
||||
Dom.remove(btnPrevSpan);
|
||||
}
|
||||
|
||||
if(btnLastSpan){
|
||||
if (btnLastSpan) {
|
||||
Event.remove(btnLastSpan, 'click', evt.last);
|
||||
Dom.remove(btnLastSpan);
|
||||
}
|
||||
|
||||
if(btnFirstSpan){
|
||||
if (btnFirstSpan) {
|
||||
Event.remove(btnFirstSpan, 'click', evt.first);
|
||||
Dom.remove(btnFirstSpan);
|
||||
}
|
||||
|
||||
if(pgBeforeSpan){
|
||||
if (pgBeforeSpan) {
|
||||
Dom.remove(pgBeforeSpan);
|
||||
}
|
||||
|
||||
if(pgAfterSpan){
|
||||
if (pgAfterSpan) {
|
||||
Dom.remove(pgAfterSpan);
|
||||
}
|
||||
|
||||
if(pgspan){
|
||||
if (pgspan) {
|
||||
Dom.remove(pgspan);
|
||||
}
|
||||
|
||||
if(this.hasResultsPerPage){
|
||||
if (this.hasResultsPerPage) {
|
||||
this.removeResultsPerPage();
|
||||
}
|
||||
|
||||
this.emitter.off(['after-filtering'], ()=> this.resetPagingInfo());
|
||||
this.emitter.off(['initialized'], ()=> this.resetValues());
|
||||
this.emitter.off(['after-filtering'], () => this.resetPagingInfo());
|
||||
this.emitter.off(['change-page'],
|
||||
(tf, pageNumber) => this.setPage(pageNumber));
|
||||
this.emitter.off(['change-page-results'],
|
||||
|
|
|
|||
|
|
@ -359,7 +359,7 @@ export class State extends Feature {
|
|||
*
|
||||
* @private
|
||||
*/
|
||||
_syncFiltersVisibility(){
|
||||
_syncFiltersVisibility() {
|
||||
if (!this.persistFiltersVisibility) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -367,6 +367,7 @@ export class State extends Feature {
|
|||
let tf = this.tf;
|
||||
let filtersVisibility = state[this.filtersVisKey];
|
||||
|
||||
this.filtersVisibility = filtersVisibility;
|
||||
this.emitter.emit('show-filters', tf, filtersVisibility);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,146 +0,0 @@
|
|||
import Cookie from '../cookie';
|
||||
import Types from '../types';
|
||||
|
||||
export class Store{
|
||||
|
||||
/**
|
||||
* Store, persistence manager
|
||||
* @param {Object} tf TableFilter instance
|
||||
*
|
||||
* TODO: use localStorage and fallback to cookie persistence
|
||||
*/
|
||||
constructor(tf){
|
||||
let f = tf.config();
|
||||
|
||||
//cookie storing filter values
|
||||
this.fltsValuesCookie = tf.prfxCookieFltsValues + tf.id;
|
||||
//cookie storing page nb
|
||||
this.pgNbCookie = tf.prfxCookiePageNb + tf.id;
|
||||
//cookie storing page length
|
||||
this.pgLenCookie = tf.prfxCookiePageLen + tf.id;
|
||||
|
||||
this.duration = !isNaN(f.set_cookie_duration) ?
|
||||
parseInt(f.set_cookie_duration, 10) : 100000;
|
||||
|
||||
this.tf = tf;
|
||||
this.emitter = tf.emitter;
|
||||
}
|
||||
|
||||
init(){
|
||||
this.emitter.on(['after-filtering'], ()=> this.saveFilterValues());
|
||||
this.emitter.on(['after-clearing-filters'], ()=> this.clearCookies());
|
||||
this.emitter.on(['after-page-change'],
|
||||
(tf, index)=> this.savePageNb(index));
|
||||
this.emitter.on(['after-page-length-change'],
|
||||
(tf, index)=> this.savePageLength(index));
|
||||
}
|
||||
|
||||
/**
|
||||
* Store filters' values in cookie
|
||||
*/
|
||||
saveFilterValues(){
|
||||
let tf = this.tf;
|
||||
let fltValues = [];
|
||||
|
||||
if(!tf.rememberGridValues){
|
||||
return;
|
||||
}
|
||||
|
||||
//store filters' values
|
||||
for(let i=0; i<tf.fltIds.length; i++){
|
||||
let value = tf.getFilterValue(i);
|
||||
//convert array to a || separated values
|
||||
if(Types.isArray(value)){
|
||||
let rgx = new RegExp(tf.separator, 'g');
|
||||
value = value.toString()
|
||||
.replace(rgx, ' ' + tf.orOperator + ' ');
|
||||
}
|
||||
if (value === ''){
|
||||
value = ' ';
|
||||
}
|
||||
fltValues.push(value);
|
||||
}
|
||||
|
||||
//write cookie
|
||||
Cookie.write(
|
||||
this.fltsValuesCookie,
|
||||
fltValues.join(tf.separator),
|
||||
this.duration
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve filters' values from cookie
|
||||
* @return {Array}
|
||||
*/
|
||||
getFilterValues(){
|
||||
let flts = Cookie.read(this.fltsValuesCookie);
|
||||
let rgx = new RegExp(this.tf.separator, 'g');
|
||||
// filters' values array
|
||||
return flts.split(rgx);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store page number in cookie
|
||||
* @param {Number} pageIndex page index to persist
|
||||
*/
|
||||
savePageNb(pageIndex){
|
||||
if(!this.tf.rememberPageNb){
|
||||
return;
|
||||
}
|
||||
Cookie.write(
|
||||
this.pgNbCookie,
|
||||
pageIndex,
|
||||
this.duration
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve page number from cookie
|
||||
* @return {String}
|
||||
*/
|
||||
getPageNb(){
|
||||
return Cookie.read(this.pgNbCookie);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store page length in cookie
|
||||
* @param {Number} index page length index to persist
|
||||
*/
|
||||
savePageLength(index){
|
||||
if(!this.tf.rememberPageLen){
|
||||
return;
|
||||
}
|
||||
Cookie.write(
|
||||
this.pgLenCookie,
|
||||
index,
|
||||
this.duration
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve page length from cookie
|
||||
* @return {String}
|
||||
*/
|
||||
getPageLength(){
|
||||
return Cookie.read(this.pgLenCookie);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove all cookies
|
||||
*/
|
||||
clearCookies(){
|
||||
Cookie.remove(this.fltsValuesCookie);
|
||||
Cookie.remove(this.pgLenCookie);
|
||||
Cookie.remove(this.pgNbCookie);
|
||||
}
|
||||
|
||||
destroy(){
|
||||
this.emitter.off(['after-filtering'], ()=> this.saveFilterValues());
|
||||
this.emitter.off(['after-clearing-filters'], ()=> this.clearCookies());
|
||||
this.emitter.off(['after-page-change'],
|
||||
(tf, index)=> this.savePageNb(index));
|
||||
this.emitter.off(['after-page-length-change'],
|
||||
(tf, index)=> this.savePageLength(index));
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -2,9 +2,6 @@ var tf = new TableFilter('demo', {
|
|||
base_path: '../dist/tablefilter/',
|
||||
paging: true,
|
||||
paging_length: 2,
|
||||
remember_grid_values: true,
|
||||
remember_page_number: true,
|
||||
remember_page_length: true,
|
||||
results_per_page: ['Results per page ', [2,4,6]],
|
||||
extensions: [{
|
||||
name: 'sort',
|
||||
|
|
@ -29,7 +26,7 @@ test('Sort extension', function() {
|
|||
deepEqual(sort.initialized, true, 'Sort initialized');
|
||||
});
|
||||
|
||||
module('Paging with persistence when a column is sorted');
|
||||
module('Paging when a column is sorted');
|
||||
test('It contains options', function() {
|
||||
var sort = tf.extension('sort');
|
||||
sort.sortByColumnIndex(0);
|
||||
|
|
@ -45,7 +42,7 @@ test('Can select a page', function() {
|
|||
});
|
||||
|
||||
module('Changing pages when column is sorted (issue #70)');
|
||||
test('It can change page', function() {
|
||||
test('Can change page', function() {
|
||||
var sort = tf.extension('sort');
|
||||
tf.setFilterValue(2, '>400');
|
||||
sort.sortByColumnIndex(1);
|
||||
|
|
|
|||
|
|
@ -1,78 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>TableFilter store</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="store" 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-store.js"></script>
|
||||
|
||||
<div id="qunit"></div>
|
||||
<div id="qunit-fixture"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,162 +0,0 @@
|
|||
|
||||
function removeCookie(name){
|
||||
var expire = '';
|
||||
var hours = -1;
|
||||
if(hours){
|
||||
expire = new Date((new Date()).getTime() + hours * 3600000);
|
||||
expire = '; expires=' + expire.toGMTString();
|
||||
}
|
||||
document.cookie = name + '=' + expire;
|
||||
}
|
||||
|
||||
function readCookie(name){
|
||||
var cookieValue = '',
|
||||
search = name + '=';
|
||||
if(document.cookie.length > 0){
|
||||
var cookie = document.cookie,
|
||||
offset = cookie.indexOf(search);
|
||||
if(offset !== -1){
|
||||
offset += search.length;
|
||||
var end = cookie.indexOf(';', offset);
|
||||
if(end === -1){
|
||||
end = cookie.length;
|
||||
}
|
||||
cookieValue = unescape(cookie.substring(offset, end));
|
||||
}
|
||||
}
|
||||
return cookieValue;
|
||||
}
|
||||
|
||||
var tf = new TableFilter('store', {
|
||||
base_path: '../dist/tablefilter/',
|
||||
paging: true,
|
||||
paging_length: 2,
|
||||
results_per_page: ['Results per page', [2, 4, 6]],
|
||||
remember_grid_values: true,
|
||||
remember_page_number: true,
|
||||
remember_page_length: true
|
||||
});
|
||||
|
||||
removeCookie(tf.fltsValuesCookie);
|
||||
removeCookie(tf.pgNbCookie);
|
||||
removeCookie(tf.pgLenCookie);
|
||||
|
||||
tf.init();
|
||||
tf.clearFilters();
|
||||
|
||||
module('Sanity checks');
|
||||
test('Store module', function() {
|
||||
var store = tf.feature('store');
|
||||
deepEqual(tf.hasPersistence, true, 'Requires persistence');
|
||||
deepEqual(typeof store, 'object', 'Store type');
|
||||
notEqual(store, null, 'Store instanciated');
|
||||
deepEqual(store.duration, 100000, 'Store duration');
|
||||
});
|
||||
|
||||
module('Check page number persistence');
|
||||
test('Page number value', function() {
|
||||
tf.clearFilters();
|
||||
tf.filter();
|
||||
tf.feature('paging').changePage(1);
|
||||
|
||||
deepEqual(tf.feature('store').getPageNb(), '2', 'Page number value');
|
||||
tf.clearFilters();
|
||||
});
|
||||
|
||||
module('Check page length persistence');
|
||||
test('Page length value', function() {
|
||||
var paging = tf.feature('paging');
|
||||
paging.changeResultsPerPage('2');
|
||||
|
||||
deepEqual(tf.feature('store').getPageLength(), '2', 'Page length value');
|
||||
tf.clearFilters();
|
||||
});
|
||||
|
||||
module('Check filters persistence');
|
||||
test('Filters value in cookie', function() {
|
||||
tf.setFilterValue(0, 'Sydney');
|
||||
tf.setFilterValue(3, '1.5');
|
||||
tf.filter();
|
||||
|
||||
deepEqual(tf.feature('store').getFilterValues()[0],
|
||||
'Sydney', 'Filter 0 value');
|
||||
deepEqual(tf.feature('store').getFilterValues()[3],
|
||||
'1.5', 'Filter 3 value');
|
||||
});
|
||||
|
||||
test('Filters value in cookie', function() {
|
||||
tf.setFilterValue(0, 'Sydney');
|
||||
tf.setFilterValue(3, '1.5');
|
||||
|
||||
tf.filter();
|
||||
deepEqual(tf.feature('store').getFilterValues()[0], 'Sydney',
|
||||
'Filter 0 value');
|
||||
deepEqual(tf.feature('store').getFilterValues()[3], '1.5',
|
||||
'Filter 3 value');
|
||||
});
|
||||
|
||||
test('Filters value with operators in cookie', function() {
|
||||
tf.setFilterValue(0, '');
|
||||
tf.setFilterValue(1, 'Canberra || Perth');
|
||||
tf.setFilterValue(3, '>.6');
|
||||
tf.filter();
|
||||
|
||||
deepEqual(tf.feature('store').getFilterValues()[0], ' ', 'Filter 0 value');
|
||||
deepEqual(tf.feature('store').getFilterValues()[1],
|
||||
'Canberra || Perth', 'Filter 1 value');
|
||||
deepEqual(tf.feature('store').getFilterValues()[3], '>.6',
|
||||
'Filter 3 value');
|
||||
deepEqual(tf.getValidRows().length, 1, 'Expected nb of filtered rows');
|
||||
});
|
||||
|
||||
test('Apply cookie filters value', function() {
|
||||
tf.setFilterValue(0, 'Adelaide');
|
||||
tf.setFilterValue(3, '>=2');
|
||||
tf.filter();
|
||||
tf.destroy();
|
||||
tf.init();
|
||||
|
||||
deepEqual(tf.getFilterValue(0), 'Adelaide', 'Applied filter value');
|
||||
deepEqual(tf.getFilterValue(3), '>=2', 'Applied filter value');
|
||||
});
|
||||
|
||||
test('Can remove cookies on clearFilters', function() {
|
||||
tf.clearFilters();
|
||||
|
||||
deepEqual(readCookie(tf.fltsValuesCookie), '',
|
||||
'fltsValuesCookie cookie removed');
|
||||
deepEqual(readCookie(tf.pgLenCookie), '', 'pgLenCookie cookie removed');
|
||||
deepEqual(readCookie(tf.pgNbCookie), '', 'pgNbCookie cookie removed');
|
||||
});
|
||||
|
||||
module('Multiple and checklist filters persistence');
|
||||
test('Filters value in cookie', function() {
|
||||
tf.destroy();
|
||||
tf = new TableFilter('store', {
|
||||
base_path: '../dist/tablefilter/',
|
||||
remember_grid_values: true,
|
||||
col_0: 'multiple',
|
||||
col_1: 'checklist'
|
||||
});
|
||||
tf.init();
|
||||
|
||||
tf.setFilterValue(0, ['Sydney', 'Adelaide']);
|
||||
tf.setFilterValue(1, ['Alice Springs', 'Brisbane']);
|
||||
tf.filter();
|
||||
|
||||
deepEqual(tf.feature('store').getFilterValues()[0],
|
||||
'Adelaide || Sydney', 'Filter 0 value');
|
||||
deepEqual(tf.feature('store').getFilterValues()[1],
|
||||
'Alice Springs || Brisbane', 'Filter 1 value');
|
||||
deepEqual(tf.getValidRows().length, 3, 'Expected nb of filtered rows');
|
||||
});
|
||||
|
||||
module('Tear-down');
|
||||
test('TableFilter removed', function() {
|
||||
tf.destroy();
|
||||
removeCookie(tf.fltsValuesCookie);
|
||||
removeCookie(tf.pgNbCookie);
|
||||
removeCookie(tf.pgLenCookie);
|
||||
|
||||
deepEqual(tf.hasGrid(), false, 'Filters removed');
|
||||
});
|
||||
Loading…
Reference in a new issue