deblan-mirror/TableFilter
1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-04-26 04:01:33 +02:00
Code Issues Releases Wiki Activity

Issue #313 Made locale.addFormat more defensive

Browse source
This commit is contained in:
Max Guglielmi 2016-10-19 13:39:59 +11:00
parent 9cbc364a92
commit a885c8caab
13 changed files with 83 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dist/starter.html vendored
View file

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

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.3.3 by Max Guglielmi
* build date: 2016-10-12T07:00:20.282Z
* tablefilter v0.3.4 by Max Guglielmi
* build date: 2016-10-19T02:34:56.902Z
* 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
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.3.3 by Max Guglielmi
* build date: 2016-10-12T07:00:20.282Z
* tablefilter v0.3.4 by Max Guglielmi
* build date: 2016-10-19T02:34:56.902Z
* 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
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.3.3 by Max Guglielmi
* build date: 2016-10-12T07:00:20.282Z
* tablefilter v0.3.4 by Max Guglielmi
* build date: 2016-10-19T02:34:56.902Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.3.3 by Max Guglielmi
* build date: 2016-10-12T07:00:20.282Z
* tablefilter v0.3.4 by Max Guglielmi
* build date: 2016-10-19T02:34:56.902Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.3.3 by Max Guglielmi
* build date: 2016-10-12T07:00:20.282Z
* tablefilter v0.3.4 by Max Guglielmi
* build date: 2016-10-19T02:34:56.902Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.3.3 by Max Guglielmi
* build date: 2016-10-12T07:00:20.282Z
* tablefilter v0.3.4 by Max Guglielmi
* build date: 2016-10-19T02:34:56.902Z
* 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}

14
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.3.3 by Max Guglielmi
* build date: 2016-10-12T07:00:20.265Z
* tablefilter v0.3.4 by Max Guglielmi
* build date: 2016-10-19T02:34:56.886Z
* MIT License
*/

2
package.json
View file

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

13
src/modules/dateType.js
View file

@ -3,6 +3,7 @@ import 'sugar-date/locales';
import {Feature} from '../feature';
import {isObj, isArray} from '../types';
import {DATE} from '../const';
import {root} from '../root';
/**
* Wrapper for Sugar Date module providing datetime helpers and locales
@ -111,12 +112,16 @@ export class DateType extends Feature {
let locale = this.datetime.getLocale(
options.locale || this.locale
);
if (isArray(options.format)) {
options.format.forEach((format) => {
let formats = isArray(options.format) ?
options.format : [options.format];
// Sugar date module throws exceptions with locale.addFormat
try {
formats.forEach((format) => {
locale.addFormat(format);
});
} else {
locale.addFormat(options.format);
} catch (ex) {
root.console.error(ex);
}
}
});

21
test/test-data-types.html
View file

@ -21,6 +21,7 @@
<th>US Date</th>
<th>DD-MMM-YYYY Date</th>
<th>IP</th>
<th>{yyyy|yy}-{MM}-{dd} {HH}:{mm}:{ss}</th>
</tr>
</thead>
<tbody>
@ -39,6 +40,7 @@
<td>12/14/1988</td>
<td>14-Dec-1988</td>
<td>186.114.137.213</td>
<td>2016-10-14 08:01:04</td>
</tr>
<tr>
<td>henry@mountdev.net</td>
@ -55,6 +57,7 @@
<td>1/19/1984</td>
<td>19-Jan-1984</td>
<td>170.138.54.12</td>
<td>2001-11-03 12:01:04</td>
</tr>
<tr>
<td>christian@reno.gov</td>
@ -71,6 +74,7 @@
<td>3/25/2000</td>
<td>25-Mar-2000</td>
<td>219.115.156.141</td>
<td>2002-01-08 08:01:04</td>
</tr>
<tr>
<td>muffins@donuts.com</td>
@ -87,6 +91,7 @@
<td>1/24/1993</td>
<td>24-Jan-1993</td>
<td>252.253.244.189</td>
<td>1999-01-08 23:01:04</td>
</tr>
<tr>
<td>muffins@reno.gov</td>
@ -103,6 +108,7 @@
<td>4/4/1988</td>
<td>4-Apr-1988</td>
<td>88.233.9.89</td>
<td>2015-07-24 14:27:53</td>
</tr>
<tr>
<td>mendez@gmail.com</td>
@ -119,6 +125,7 @@
<td>12/12/1985</td>
<td>12-Dec-1985</td>
<td>88.233.9.89</td>
<td>2007-05-14 01:01:04</td>
</tr>
<tr>
<td>dev@gmail.com</td>
@ -135,6 +142,7 @@
<td>7/3/2002</td>
<td>3-Jul-2002</td>
<td>219.115.156.145</td>
<td>2006-06-03 11:59:48</td>
</tr>
<tr>
<td>foo@polyester.se</td>
@ -151,6 +159,7 @@
<td>8/4/1987</td>
<td>4-Aug-1987</td>
<td>88.233.9.87</td>
<td>07-05-14 01:01:04</td>
</tr>
<tr>
<td>adam@aftonbladet.se</td>
@ -167,6 +176,7 @@
<td>7/27/1995</td>
<td>27-Jul-1995</td>
<td>170.138.54.16</td>
<td>03-11-21 12:02:04</td>
</tr>
<tr>
<td>devo@donuts.com</td>
@ -183,6 +193,7 @@
<td>1/5/1986</td>
<td>5-Jan-1986</td>
<td>252.253.244.186</td>
<td>2001-01-27 03:24:11</td>
</tr>
<tr>
<td>henry@samba.org</td>
@ -199,6 +210,7 @@
<td>3/7/1990</td>
<td>7-Mar-1990</td>
<td>88.233.9.85</td>
<td>13-07-11 02:02:04</td>
</tr>
<tr>
<td>found@dotnet.ca</td>
@ -215,6 +227,7 @@
<td>7/22/1993</td>
<td>22-Jul-1993</td>
<td>113.231.1.44</td>
<td>2000-01-01 01:01:01</td>
</tr>
<tr>
<td>carl@fish.org</td>
@ -231,6 +244,7 @@
<td>7/14/1984</td>
<td>14-Jul-1984</td>
<td>219.115.156.137</td>
<td>1997-02-27 02:02:04</td>
</tr>
<tr>
<td>found@mountdev.net</td>
@ -247,6 +261,7 @@
<td>8/6/2000</td>
<td>6-Aug-2000</td>
<td>88.233.9.86</td>
<td>1999-12-31 11:59:59</td>
</tr>
<tr>
<td>lost@fish.org</td>
@ -263,6 +278,7 @@
<td>7/14/1994</td>
<td>14-Jul-1994</td>
<td>252.253.244.184</td>
<td>2005-03-09 12:11:10</td>
</tr>
<tr>
<td>mendez@dotnet.ca</td>
@ -279,6 +295,7 @@
<td>10/20/1997</td>
<td>20-Oct-1997</td>
<td>113.231.1.79</td>
<td>2006-06-06 06:06:06</td>
</tr>
<tr>
<td>carl@donuts.com</td>
@ -295,6 +312,7 @@
<td>8/23/1997</td>
<td>23-Aug-1997</td>
<td>170.138.54.19</td>
<td>2009-09-27 14:12:58</td>
</tr>
<tr>
<td>foo@fish.org</td>
@ -311,6 +329,7 @@
<td>11/24/1991</td>
<td>24-Nov-1991</td>
<td>88.233.9.89</td>
<td>2000-01-01 01:01:01</td>
</tr>
<tr>
<td>found@fish.org</td>
@ -327,6 +346,7 @@
<td>7/12/1987</td>
<td>12-Jul-1987</td>
<td>88.233.9.90</td>
<td>1994-09-19 19:19:19</td>
</tr>
<tr>
<td>found@flexomat.com</td>
@ -343,6 +363,7 @@
<td>6/10/1988</td>
<td>10-Jun-1988</td>
<td>88.233.19.89</td>
<td>1899-11-27 02:02:04</td>
</tr>
</tbody>
</table>

30
test/test-data-types.js
View file

@ -9,7 +9,11 @@
{ type: 'date', locale: 'fr', },
{ type: 'date', locale: 'en', format: '{dd}-{MM}-{yyyy|yy}' },
{ type: 'date', locale: 'en', format: ['{dd}-{months}-{yyyy|yy}'] },
'IpAddress'
'IpAddress',
{
type: 'date', locale: 'en',
format: ['{yyyy|yy}-{MM}-{dd} {HH}:{mm}:{ss}']
}
]
});
tf.init();
@ -242,6 +246,30 @@
deepEqual(tf.getValidRows(), [4, 8, 14], 'Expected rows');
});
test('Can filter datetime format', function() {
// setup
tf.clearFilters();
// act
tf.setFilterValue(10, '2006-06-03 11:59:48');
tf.filter();
// assert
deepEqual(tf.getValidRows(), [8], 'Expected rows');
});
test('Can filter datetime format with operator', function() {
// setup
tf.clearFilters();
// act
tf.setFilterValue(10, '>2006-06-03 11:59:48');
tf.filter();
// assert
deepEqual(tf.getValidRows().length, 8, 'Expected rows');
});
module('Tear-down');
test('can destroy TableFilter DOM elements', function() {
tf.destroy();