1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-05-18 06:16:39 +02:00

Fixed tests

This commit is contained in:
Max Guglielmi 2016-03-18 17:58:32 +11:00
parent 6334667767
commit ad04da9051
15 changed files with 10314 additions and 64 deletions

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.0 by Max Guglielmi
* build date: 2016-03-16T07:04:47.841Z
* build date: 2016-03-18T05:56:15.430Z
* 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.0 by Max Guglielmi
* build date: 2016-03-16T07:04:47.841Z
* build date: 2016-03-18T05:56:15.430Z
* 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.0 by Max Guglielmi
* build date: 2016-03-16T07:04:47.841Z
* build date: 2016-03-18T05:56:15.430Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.0 by Max Guglielmi
* build date: 2016-03-16T07:04:47.841Z
* build date: 2016-03-18T05:56:15.430Z
* 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.0 by Max Guglielmi
* build date: 2016-03-16T07:04:47.841Z
* build date: 2016-03-18T05:56:15.430Z
* 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.0 by Max Guglielmi
* build date: 2016-03-16T07:04:47.841Z
* build date: 2016-03-18T05:56:15.430Z
* 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

2279
dist/tablefilter/tf-1.js vendored

File diff suppressed because one or more lines are too long

View file

@ -336,6 +336,10 @@ export class Paging extends Feature{
this.emitter.on(['after-filtering'], ()=> this.resetPagingInfo());
this.emitter.on(['initialized'], ()=> this.resetValues());
this.emitter.on(['change-page'],
(tf, pageNumber) => this.setPage(pageNumber));
this.emitter.on(['change-page-results'],
(tf, pageLength) => this.changeResultsPerPage(pageLength));
this.initialized = true;
}
@ -502,7 +506,7 @@ export class Paging extends Feature{
}
evt.slcResultsChange = (ev) => {
this.changeResultsPerPage();
this.onChangeResultsPerPage();
ev.target.blur();
};
@ -570,7 +574,7 @@ export class Paging extends Feature{
return;
}
this.emitter.emit('before-page-change', tf, index);
this.emitter.emit('before-page-change', tf, (index + 1));
if(index === null){
index = this.pageSelectorType === tf.fltTypeSlc ?
@ -578,7 +582,7 @@ export class Paging extends Feature{
}
if( index>=0 && index<=(this.nbPages-1) ){
if(this.onBeforeChangePage){
this.onBeforeChangePage.call(null, this, index);
this.onBeforeChangePage.call(null, this, (index + 1));
}
this.currentPageNb = parseInt(index, 10)+1;
if(this.pageSelectorType===tf.fltTypeSlc){
@ -593,18 +597,26 @@ export class Paging extends Feature{
this.groupByPage();
if(this.onAfterChangePage){
this.onAfterChangePage.call(null, this, index);
this.onAfterChangePage.call(null, this, (index + 1));
}
}
this.emitter.emit('after-page-change', tf, index);
this.emitter.emit('after-page-change', tf, (index + 1));
}
changeResultsPerPage(val){
if(!this.isEnabled() || isNaN(val)){
return;
}
this.resultsPerPageSlc.value = val;
this.onChangeResultsPerPage();
}
/**
* Change rows according to page results drop-down
* TODO: accept a parameter setting the results per page length
*/
changeResultsPerPage(){
onChangeResultsPerPage(){
var tf = this.tf;
if(!this.isEnabled()){
@ -635,7 +647,7 @@ export class Paging extends Feature{
}
}
this.emitter.emit('after-page-length-change', tf, slcIndex);
this.emitter.emit('after-page-length-change', tf, this.pagingLength);
}
/**
@ -756,6 +768,10 @@ export class Paging extends Feature{
this.emitter.off(['after-filtering'], ()=> this.resetPagingInfo());
this.emitter.off(['initialized'], ()=> this.resetValues());
this.emitter.off(['change-page'],
(tf, pageNumber) => this.setPage(pageNumber));
this.emitter.off(['change-page-results'],
(tf, pageLength) => this.changeResultsPerPage(pageLength));
this.pagingSlc = null;
this.nbPages = 0;

View file

@ -1,6 +1,7 @@
import {Feature} from './feature';
import Str from '../string';
import Event from '../event';
import Types from '../types';
const global = window;
const JSON = global.JSON;
@ -13,8 +14,9 @@ const hasHashChange = () => {
export class Stateful extends Feature {
/**
* Makes features stateful via URL hash
* @param {Object} tf TableFilter instance
* Creates an instance of Stateful.
*
* @param tf TableFilter instance
*/
constructor(tf) {
super(tf, 'stateful');
@ -26,11 +28,13 @@ export class Stateful extends Feature {
this.persistPageLength = Boolean(cfg.page_length);
this.pageNb = null;
this.pageLength = null;
this.lastHash = null;
this.state = {};
this.prfxCol = 'col_';
this.pageNbKey = 'page';
this.pageResultsKey = 'results';
this.pageLengthKey = 'results';
}
init() {
@ -39,14 +43,15 @@ export class Stateful extends Feature {
}
this.emitter.on(['initialized'], () => this.sync());
this.emitter.on([
'after-filtering',
'after-page-change',
'after-page-length-change'
], () => this.update());
this.emitter.on(['after-filtering'], () => this.update());
this.emitter.on(['after-page-change'],
(tf, pageNb) => this.updatePage(pageNb));
this.emitter.on(['after-page-length-change'],
(tf, index) => this.updatePageLength(index));
Event.add(global, 'hashchange', () => this.sync());
this.lastHash = location.hash;
this.initialized = true;
}
@ -72,12 +77,19 @@ export class Stateful extends Feature {
}
if (this.persistPageNumber) {
let pageNumber = tf.feature('paging').getPage();
this.state[this.pageNbKey] = pageNumber;
if(Types.isNull(this.pageNb)){
this.state[this.pageNbKey] = undefined;
} else {
this.state[this.pageNbKey] = this.pageNb;
}
}
if (this.persistPageLength) {
if(Types.isNull(this.pageLength)){
this.state[this.pageLengthKey] = undefined;
} else {
this.state[this.pageLengthKey] = this.pageLength;
}
}
return `#${JSON.stringify(this.state)}`;
@ -103,8 +115,19 @@ export class Stateful extends Feature {
this.lastHash = hash;
}
updatePage(pageNb){
this.pageNb = pageNb;
this.update();
}
updatePageLength(pageLength){
this.pageLength = pageLength;
this.update();
}
sync() {
let state = this.parse(location.hash);
console.log('sync',state);
let tf = this.tf;
if (this.persistFilters) {
@ -121,7 +144,12 @@ export class Stateful extends Feature {
if (this.persistPageNumber) {
let pageNumber = state[this.pageNbKey];
tf.feature('paging').setPage(pageNumber);
this.emitter.emit('change-page', this.tf, pageNumber);
}
if(this.persistPageLength){
let pageLength = state[this.pageLengthKey];
this.emitter.emit('change-page-results', this.tf, pageLength);
}
}
@ -130,15 +158,14 @@ export class Stateful extends Feature {
return;
}
this.emitter.on(['initialized'], () => this.sync());
this.emitter.off([
'after-filtering',
'after-page-change',
'after-page-length-change'
], () => this.update());
this.emitter.off(['initialized'], () => this.sync());
this.emitter.off(['after-filtering'], () => this.update());
this.emitter.off(['after-page-change'],
(tf, pageNb) => this.updatePage(pageNb));
this.emitter.off(['after-page-length-change'],
(tf, index) => this.updatePageLength(index));
Event.remove(global, 'hashchange', () => this.sync());
this.initialized = false;
}
}

View file

@ -82,15 +82,15 @@ export class Store{
/**
* Store page number in cookie
* @param {Number} index page index to persist
* @param {Number} pageIndex page index to persist
*/
savePageNb(index){
savePageNb(pageIndex){
if(!this.tf.rememberPageNb){
return;
}
Cookie.write(
this.pgNbCookie,
(index+1),
pageIndex,
this.duration
);
}

View file

@ -1495,7 +1495,7 @@ export class TableFilter {
this.onAfterFilter.call(null, this);
}
this.emitter.emit('after-filtering', this);
this.emitter.emit('after-filtering', this, searchArgs);
}
/**

View file

@ -30,7 +30,7 @@
<script data-config>
var filtersConfig = {
base_path: '../dist/tablefilter/',
stateful: { page_number: true },
stateful: { page_number: true, page_length: true },
paging: true,
results_per_page: ['Records: ', [10,25,50,100]],
// remember_grid_values: true,

View file

@ -130,12 +130,10 @@ test('Filter with dummy value', function() {
test('Set results per page', function() {
tf.clearFilters();
paging.resultsPerPageSlc.options[1].selected = true;
paging.changeResultsPerPage();
paging.changeResultsPerPage('4');
deepEqual(paging.pagingLength, 4, 'Expected page length');
deepEqual(paging.nbPages, 2, 'Expected number of pages');
paging.resultsPerPageSlc.options[2].selected = true;
paging.changeResultsPerPage();
paging.changeResultsPerPage('6');
deepEqual(paging.pagingLength, 6, 'Expected page length');
deepEqual(paging.nbPages, 2, 'Expected number of pages');
});
@ -200,12 +198,10 @@ test('Filter with dummy value', function() {
test('Set results per page', function() {
tf.clearFilters();
paging.resultsPerPageSlc.options[1].selected = true;
paging.changeResultsPerPage();
paging.changeResultsPerPage('4');
deepEqual(paging.pagingLength, 4, 'Expected page length');
deepEqual(paging.nbPages, 2, 'Expected number of pages');
paging.resultsPerPageSlc.options[2].selected = true;
paging.changeResultsPerPage();
paging.changeResultsPerPage('6');
deepEqual(paging.pagingLength, 6, 'Expected page length');
deepEqual(paging.nbPages, 2, 'Expected number of pages');
});

View file

@ -66,8 +66,8 @@ test('Page number value', function() {
module('Check page length persistence');
test('Page length value', function() {
var paging = tf.feature('paging');
paging.resultsPerPageSlc.options[2].selected = true;
paging.changeResultsPerPage();
// paging.resultsPerPageSlc.options[2].selected = true;
paging.changeResultsPerPage('2');
deepEqual(tf.feature('store').getPageLength(), '2', 'Page length value');
tf.clearFilters();