deblan-mirror/TableFilter
1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-05-21 15:56:40 +02:00
Code Issues Releases Wiki Activity

Improved store module interface

Browse source
This commit is contained in:
Max Guglielmi 2016-02-06 14:08:46 +11:00
parent 40069e9652
commit 279bc1ca60
13 changed files with 82 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/tablefilter/style/colsVisibility.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.13 by Max Guglielmi
* build date: 2016-02-06T01:01:12.649Z
* build date: 2016-02-06T03:05:34.563Z
* 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}

2
dist/tablefilter/style/filtersVisibility.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.13 by Max Guglielmi
* build date: 2016-02-06T01:01:12.649Z
* build date: 2016-02-06T03:05:34.563Z
* 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}

2
dist/tablefilter/style/tablefilter.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.13 by Max Guglielmi
* build date: 2016-02-06T01:01:12.649Z
* build date: 2016-02-06T03:05:34.563Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

2
dist/tablefilter/style/themes/default/default.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.13 by Max Guglielmi
* build date: 2016-02-06T01:01:12.649Z
* build date: 2016-02-06T03:05:34.563Z
* 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}

2
dist/tablefilter/style/themes/mytheme/mytheme.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.13 by Max Guglielmi
* build date: 2016-02-06T01:01:12.649Z
* build date: 2016-02-06T03:05:34.563Z
* 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}

2
dist/tablefilter/style/themes/skyblue/skyblue.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.13 by Max Guglielmi
* build date: 2016-02-06T01:01:12.649Z
* build date: 2016-02-06T03:05:34.563Z
* 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}

10
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/tablefilter/tf-1.js vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.13 by Max Guglielmi
* build date: 2016-02-06T01:01:12.539Z
* build date: 2016-02-06T03:05:34.485Z
* MIT License
*/

45
src/modules/paging.js
View file

@ -351,7 +351,7 @@ export class Paging extends Feature{
}
this.enable();
this.init();
// tf.resetValues();
if(filterTable){
tf.filter();
}
@ -573,7 +573,7 @@ export class Paging extends Feature{
this.emitter.emit('before-changing-page', tf, index);
if(index === null){
index = this.pageSelectorType===tf.fltTypeSlc ?
index = this.pageSelectorType === tf.fltTypeSlc ?
this.pagingSlc.options.selectedIndex : (this.pagingSlc.value-1);
}
if( index>=0 && index<=(this.nbPages-1) ){
@ -587,10 +587,7 @@ export class Paging extends Feature{
this.pagingSlc.value = this.currentPageNb;
}
if(tf.rememberPageNb){
tf.feature('store').savePageNb(tf.pgNbCookie);
}
this.startPagingRow = (this.pageSelectorType===tf.fltTypeSlc) ?
this.startPagingRow = (this.pageSelectorType === tf.fltTypeSlc) ?
this.pagingSlc.value : (index*this.pagingLength);
this.groupByPage();
@ -617,10 +614,11 @@ export class Paging extends Feature{
this.emitter.emit('before-changing-results-per-page', tf);
var slcR = this.resultsPerPageSlc;
var slcPagesSelIndex = (this.pageSelectorType===tf.fltTypeSlc) ?
var slcIndex = slcR.selectedIndex;
var slcPagesSelIndex = (this.pageSelectorType === tf.fltTypeSlc) ?
this.pagingSlc.selectedIndex :
parseInt(this.pagingSlc.value-1, 10);
this.pagingLength = parseInt(slcR.options[slcR.selectedIndex].value,10);
this.pagingLength = parseInt(slcR.options[slcIndex].value, 10);
this.startPagingRow = this.pagingLength*slcPagesSelIndex;
if(!isNaN(this.pagingLength)){
@ -629,18 +627,15 @@ export class Paging extends Feature{
}
this.setPagingInfo();
if(this.pageSelectorType===tf.fltTypeSlc){
var slcIndex =
(this.pagingSlc.options.length-1<=slcPagesSelIndex ) ?
if(this.pageSelectorType === tf.fltTypeSlc){
var slcIdx =
(this.pagingSlc.options.length-1<=slcPagesSelIndex) ?
(this.pagingSlc.options.length-1) : slcPagesSelIndex;
this.pagingSlc.options[slcIndex].selected = true;
}
if(tf.rememberPageLen){
tf.feature('store').savePageLength(tf.pgLenCookie);
this.pagingSlc.options[slcIdx].selected = true;
}
}
this.emitter.emit('after-changing-results-per-page', tf);
this.emitter.emit('after-changing-results-per-page', tf, slcIndex);
}
/**
@ -649,39 +644,39 @@ export class Paging extends Feature{
resetValues(){
var tf = this.tf;
if(tf.rememberPageLen){
this.resetPageLength(tf.pgLenCookie);
this.resetPageLength();
}
if(tf.rememberPageNb){
this.resetPage(tf.pgNbCookie);
this.resetPage();
}
}
/**
* Re-set page nb at page re-load
*/
resetPage(name){
resetPage(){
var tf = this.tf;
if(!this.isEnabled()){
return;
}
this.emitter.emit('before-reset-page', tf);
var pgnb = tf.feature('store').getPageNb(name);
if(pgnb !== ''){
this.changePage((pgnb-1));
var pgNb = tf.feature('store').getPageNb();
if(pgNb !== ''){
this.changePage((pgNb-1));
}
this.emitter.emit('after-reset-page', tf, pgnb);
this.emitter.emit('after-reset-page', tf, pgNb);
}
/**
* Re-set page length value at page re-load
*/
resetPageLength(name){
resetPageLength(){
var tf = this.tf;
if(!this.isEnabled()){
return;
}
this.emitter.emit('before-reset-page-length', tf);
var pglenIndex = tf.feature('store').getPageLength(name);
var pglenIndex = tf.feature('store').getPageLength();
if(pglenIndex!==''){
this.resultsPerPageSlc.options[pglenIndex].selected = true;

50
src/modules/store.js
View file

@ -20,16 +20,18 @@ export class Store{
}
init(){
this.emitter.on(['after-filtering'],
()=> this.saveFilterValues(this.tf.fltsValuesCookie));
this.emitter.on(['after-filtering'], ()=> this.saveFilterValues());
this.emitter.on(['after-clearing-filters'], ()=> this.clearCookies());
this.emitter.on(['after-changing-page'],
(tf, index)=> this.savePageNb(index));
this.emitter.on(['after-changing-results-per-page'],
(tf, index)=> this.savePageLength(index));
}
/**
* Store filters' values in cookie
* @param {String} cookie name
*/
saveFilterValues(name){
saveFilterValues(){
let tf = this.tf;
let fltValues = [];
@ -54,7 +56,7 @@ export class Store{
//write cookie
Cookie.write(
name,
tf.fltsValuesCookie,
fltValues.join(tf.separator),
this.duration
);
@ -62,11 +64,10 @@ export class Store{
/**
* Retrieve filters' values from cookie
* @param {String} cookie name
* @return {Array}
*/
getFilterValues(name){
let flts = Cookie.read(name);
getFilterValues(){
let flts = Cookie.read(this.tf.fltsValuesCookie);
let rgx = new RegExp(this.tf.separator, 'g');
// filters' values array
return flts.split(rgx);
@ -74,50 +75,48 @@ export class Store{
/**
* Store page number in cookie
* @param {String} cookie name
* @param {Number} index page index to persist
*/
savePageNb(name){
savePageNb(index){
if(!this.tf.rememberPageNb){
return;
}
Cookie.write(
name,
this.tf.feature('paging').currentPageNb,
this.tf.pgNbCookie,
(index+1),
this.duration
);
}
/**
* Retrieve page number from cookie
* @param {String} cookie name
* @return {String}
*/
getPageNb(name){
return Cookie.read(name);
getPageNb(){
return Cookie.read(this.tf.pgNbCookie);
}
/**
* Store page length in cookie
* @param {String} cookie name
* @param {Number} index page length index to persist
*/
savePageLength(name){
savePageLength(index){
if(!this.tf.rememberPageLen){
return;
}
Cookie.write(
name,
this.tf.feature('paging').resultsPerPageSlc.selectedIndex,
this.tf.pgLenCookie,
index,
this.duration
);
}
/**
* Retrieve page length from cookie
* @param {String} cookie name
* @return {String}
*/
getPageLength(name){
return Cookie.read(name);
getPageLength(){
return Cookie.read(this.tf.pgLenCookie);
}
/**
@ -130,8 +129,11 @@ export class Store{
}
destroy(){
this.emitter.off(['after-filtering'],
()=> this.saveFilterValues(this.tf.fltsValuesCookie));
this.emitter.off(['after-filtering'], ()=> this.saveFilterValues());
this.emitter.off(['after-clearing-filters'], ()=> this.clearCookies());
this.emitter.off(['after-changing-page'],
(tf, index)=> this.savePageNb(index));
this.emitter.off(['after-changing-results-per-page'],
(tf, index)=> this.savePageLength(index));
}
}

11
src/tablefilter.js
View file

@ -640,7 +640,7 @@ export class TableFilter {
if(this.rememberGridValues || this.rememberPageLen ||
this.rememberPageNb){
this.resetValues();
this.resetFilterValues();
}
//TF css class is added to table
@ -1130,13 +1130,13 @@ export class TableFilter {
/**
* Reset persisted filter values
*/
resetValues(){
resetFilterValues(){
if(!this.rememberGridValues){
return;
}
let fltValues = this.Mod.store.getFilterValues(this.fltsValuesCookie);
fltValues.forEach((val, idx)=> {
let storeValues = this.Mod.store.getFilterValues();
storeValues.forEach((val, idx)=> {
if(val !== ' '){
this.setFilterValue(idx, val);
}
@ -1992,9 +1992,6 @@ export class TableFilter {
for(let i=0, len=this.fltIds.length; i<len; i++){
this.setFilterValue(i, '');
}
// if(this.linkedFilters){
// this.linkFilters();
// }
this.filter();

2
test/test-store.html
View file

@ -8,7 +8,7 @@
<script src="libs/polyfill.js"></script>
</head>
<body>
<table id="demo" cellpadding="0" cellspacing="0">
<table id="store" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<th>From</th>

39
test/test-store.js
View file

@ -27,11 +27,11 @@ function readCookie(name){
return cookieValue;
}
var tf = new TableFilter('demo', {
var tf = new TableFilter('store', {
base_path: '../dist/tablefilter/',
paging: true,
paging_length: 2,
results_per_page: ['Results per page', [2,4,6]],
results_per_page: ['Results per page', [2, 4, 6]],
remember_grid_values: true,
remember_page_number: true,
remember_page_length: true
@ -57,8 +57,8 @@ test('Page number value', function() {
tf.clearFilters();
tf.filter();
tf.feature('paging').changePage(1);
var cookieName = tf.pgNbCookie;
deepEqual(tf.feature('store').getPageNb(cookieName), '2', 'Page number value');
deepEqual(tf.feature('store').getPageNb(), '2', 'Page number value');
tf.clearFilters();
});
@ -67,8 +67,8 @@ test('Page length value', function() {
var paging = tf.feature('paging');
paging.resultsPerPageSlc.options[2].selected = true;
paging.changeResultsPerPage();
var cookieName = tf.pgLenCookie;
deepEqual(tf.feature('store').getPageLength(cookieName), '2', 'Page length value');
deepEqual(tf.feature('store').getPageLength(), '2', 'Page length value');
tf.clearFilters();
});
@ -77,18 +77,18 @@ test('Filters value in cookie', function() {
tf.setFilterValue(0, 'Sydney');
tf.setFilterValue(3, '1.5');
tf.filter();
var cookieName = tf.fltsValuesCookie;
deepEqual(tf.feature('store').getFilterValues(cookieName)[0], 'Sydney', 'Filter 0 value');
deepEqual(tf.feature('store').getFilterValues(cookieName)[3], '1.5', 'Filter 3 value');
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();
var cookieName = tf.fltsValuesCookie;
deepEqual(tf.feature('store').getFilterValues(cookieName)[0], 'Sydney', 'Filter 0 value');
deepEqual(tf.feature('store').getFilterValues(cookieName)[3], '1.5', 'Filter 3 value');
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() {
@ -96,11 +96,10 @@ test('Filters value with operators in cookie', function() {
tf.setFilterValue(1, 'Canberra || Perth');
tf.setFilterValue(3, '>.6');
tf.filter();
var cookieName = tf.fltsValuesCookie;
deepEqual(tf.feature('store').getFilterValues(cookieName)[0], ' ', 'Filter 0 value');
deepEqual(tf.feature('store').getFilterValues(cookieName)[1], 'Canberra || Perth', 'Filter 1 value');
deepEqual(tf.feature('store').getFilterValues(cookieName)[3], '>.6', 'Filter 3 value');
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');
});
@ -127,7 +126,7 @@ test('Can remove cookies on clearFilters', function() {
module('Multiple and checklist filters persistence');
test('Filters value in cookie', function() {
tf.destroy();
tf = new TableFilter('demo', {
tf = new TableFilter('store', {
base_path: '../dist/tablefilter/',
remember_grid_values: true,
col_0: 'multiple',
@ -138,9 +137,9 @@ test('Filters value in cookie', function() {
tf.setFilterValue(0, ['Sydney', 'Adelaide']);
tf.setFilterValue(1, ['Alice Springs', 'Brisbane']);
tf.filter();
var cookieName = tf.fltsValuesCookie;
deepEqual(tf.feature('store').getFilterValues(cookieName)[0], 'Adelaide || Sydney', 'Filter 0 value');
deepEqual(tf.feature('store').getFilterValues(cookieName)[1], 'Alice Springs || Brisbane', 'Filter 1 value');
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');
});