From c90ee239df016b83255589997d220cbe0e4fb1b0 Mon Sep 17 00:00:00 2001 From: Max Guglielmi Date: Sun, 20 Sep 2015 22:31:09 +1000 Subject: [PATCH] Renamed fill_slc_on_demand configuration option load_filters_on_demand --- dist/tablefilter/style/colsVisibility.css | 2 +- dist/tablefilter/style/filtersVisibility.css | 2 +- dist/tablefilter/style/tablefilter.css | 2 +- .../style/themes/default/default.css | 2 +- .../style/themes/mytheme/mytheme.css | 2 +- .../style/themes/skyblue/skyblue.css | 2 +- dist/tablefilter/tablefilter.js | 2 +- dist/tablefilter/tf-1.js | 2 +- test/test-linked-filters.js | 2 +- test/test-load-filters-on-demand.html | 78 +++++++++++ test/test-load-filters-on-demand.js | 124 ++++++++++++++++++ 11 files changed, 211 insertions(+), 9 deletions(-) create mode 100644 test/test-load-filters-on-demand.html create mode 100644 test/test-load-filters-on-demand.js diff --git a/dist/tablefilter/style/colsVisibility.css b/dist/tablefilter/style/colsVisibility.css index 9b78f1f1..1173d9ec 100644 --- a/dist/tablefilter/style/colsVisibility.css +++ b/dist/tablefilter/style/colsVisibility.css @@ -1,6 +1,6 @@ /** * TableFilter v0.0.0 by Max Guglielmi - * build date: 2015-09-20T08:38:36.859Z + * build date: 2015-09-20T12:26:57.987Z * 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} \ No newline at end of file diff --git a/dist/tablefilter/style/filtersVisibility.css b/dist/tablefilter/style/filtersVisibility.css index 5c2cd4b8..d2884095 100644 --- a/dist/tablefilter/style/filtersVisibility.css +++ b/dist/tablefilter/style/filtersVisibility.css @@ -1,6 +1,6 @@ /** * TableFilter v0.0.0 by Max Guglielmi - * build date: 2015-09-20T08:38:36.859Z + * build date: 2015-09-20T12:26:57.987Z * 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} \ No newline at end of file diff --git a/dist/tablefilter/style/tablefilter.css b/dist/tablefilter/style/tablefilter.css index b2478d2b..f05528a4 100644 --- a/dist/tablefilter/style/tablefilter.css +++ b/dist/tablefilter/style/tablefilter.css @@ -1,6 +1,6 @@ /** * TableFilter v0.0.0 by Max Guglielmi - * build date: 2015-09-20T08:38:36.859Z + * build date: 2015-09-20T12:26:57.987Z * MIT License */ .activeHeader{background-color:#66afe9 !important;color:#fff !important} diff --git a/dist/tablefilter/style/themes/default/default.css b/dist/tablefilter/style/themes/default/default.css index a19b600d..89831e56 100644 --- a/dist/tablefilter/style/themes/default/default.css +++ b/dist/tablefilter/style/themes/default/default.css @@ -1,6 +1,6 @@ /** * TableFilter v0.0.0 by Max Guglielmi - * build date: 2015-09-20T08:38:36.859Z + * build date: 2015-09-20T12:26:57.987Z * MIT License */ table.TF{border-left:1px solid #ccc !important;border-top:none !important;border-right:none !important;border-bottom:none !important;}table.TF th{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;padding:2px !important;color:#333 !important;height:25px !important}table.TF td{border-bottom:1px dotted #999 !important;padding:5px !important}.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} \ No newline at end of file diff --git a/dist/tablefilter/style/themes/mytheme/mytheme.css b/dist/tablefilter/style/themes/mytheme/mytheme.css index 80efedff..e21416e5 100644 --- a/dist/tablefilter/style/themes/mytheme/mytheme.css +++ b/dist/tablefilter/style/themes/mytheme/mytheme.css @@ -1,6 +1,6 @@ /** * TableFilter v0.0.0 by Max Guglielmi - * build date: 2015-09-20T08:38:36.859Z + * build date: 2015-09-20T12:26:57.987Z * MIT License */ table.TF{border-left:1px dotted #81963b !important;border-top:none !important;border-right:0 !important;border-bottom:none !important;}table.TF th{background:#39424b url("images/bg_headers.jpg") left top 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}table.TF td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b;padding:5px !important}.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} \ No newline at end of file diff --git a/dist/tablefilter/style/themes/skyblue/skyblue.css b/dist/tablefilter/style/themes/skyblue/skyblue.css index 61a20625..2a02abd9 100644 --- a/dist/tablefilter/style/themes/skyblue/skyblue.css +++ b/dist/tablefilter/style/themes/skyblue/skyblue.css @@ -1,6 +1,6 @@ /** * TableFilter v0.0.0 by Max Guglielmi - * build date: 2015-09-20T08:38:36.859Z + * build date: 2015-09-20T12:26:57.987Z * 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;padding:5px;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{border-top:1px dotted #666 !important;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 #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} \ No newline at end of file diff --git a/dist/tablefilter/tablefilter.js b/dist/tablefilter/tablefilter.js index 5b5a81bf..c446f44f 100644 --- a/dist/tablefilter/tablefilter.js +++ b/dist/tablefilter/tablefilter.js @@ -1,6 +1,6 @@ /** * TableFilter v0.0.0 by Max Guglielmi - * build date: 2015-09-20T08:38:36.796Z + * build date: 2015-09-20T12:26:57.921Z * MIT License */ diff --git a/dist/tablefilter/tf-1.js b/dist/tablefilter/tf-1.js index 7f604e21..c5232be2 100644 --- a/dist/tablefilter/tf-1.js +++ b/dist/tablefilter/tf-1.js @@ -1,6 +1,6 @@ /** * TableFilter v0.0.0 by Max Guglielmi - * build date: 2015-09-20T08:38:36.796Z + * build date: 2015-09-20T12:26:57.921Z * MIT License */ diff --git a/test/test-linked-filters.js b/test/test-linked-filters.js index 2382577c..f9c259d7 100644 --- a/test/test-linked-filters.js +++ b/test/test-linked-filters.js @@ -16,7 +16,7 @@ deepEqual(tf.linkedFilters, true, 'Linked filters enabled'); }); - var option = document.getElementById('flt1_demo_1'); + var option = id('flt1_demo_1'); option.click(); function testLinked(tf) { diff --git a/test/test-load-filters-on-demand.html b/test/test-load-filters-on-demand.html new file mode 100644 index 00000000..a99fb799 --- /dev/null +++ b/test/test-load-filters-on-demand.html @@ -0,0 +1,78 @@ + + + + + TableFilter load filters on demand + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FromDestinationRoad Distance (km)By Air (hrs)By Rail (hrs)
SydneyAdelaide14121.425.3
SydneyBrisbane9821.516
SydneyCanberra286.64.3
SydneyMelbourne8721.110.5
AdelaidePerth27813.138
AdelaideAlice Springs1533220.25
AdelaideBrisbane20452.1540
+ + + + +
+
+ + \ No newline at end of file diff --git a/test/test-load-filters-on-demand.js b/test/test-load-filters-on-demand.js new file mode 100644 index 00000000..167f46ba --- /dev/null +++ b/test/test-load-filters-on-demand.js @@ -0,0 +1,124 @@ + +var id = function (id){ return document.getElementById(id); }; + +var tf = new TableFilter('demo', { + base_path: '../dist/tablefilter/', + col_0: 'multiple', + col_1: 'select', + col_2: 'checklist', + load_filters_on_demand: true +}); +tf.init(); + +var flt1 = tf.getFilterElement(0); +var flt2 = tf.getFilterElement(1); +var flt3 = null; +var flt3ContId = tf.feature('checkList').prfxCheckListDiv+'2_'+tf.id; +var flt3Cont = id(flt3ContId); + +function buildChecklist(tf, colIdx){ + var checkList = tf.feature('checkList'); + checkList._build(colIdx); + checkList.checkListDiv[colIdx].onclick = null; + checkList.checkListDiv[colIdx].title = ''; +} + + +module('Sanity checks'); +test('Selet type filters exist', function() { + deepEqual(tf.loadFltOnDemand, true, 'loadFltOnDemand property'); + notEqual(flt1, null, 'Filter 1 element exists'); + notEqual(flt2, null, 'Filter 2 element exists'); + deepEqual(flt3, null, 'Filter 3 element exists'); + deepEqual(tf.getFilterType(0), 'multiple', 'Expected filter type 1'); + deepEqual(tf.getFilterType(1), 'select', 'Expected filter type 2'); + deepEqual(tf.getFilterType(2), 'checklist', 'Expected filter type 3'); +}); + +module('UI Filter elements'); +test('Filters are empty', function() { + deepEqual(flt1.options.length, 1, 'Number of options for filter 1'); + deepEqual(flt2.options.length, 1, 'Number of options for filter 2'); + deepEqual(flt1.options[0].text, 'Clear', 'Filter 1 text'); + deepEqual(flt2.options[0].text, 'Clear', 'Filter 2 text'); + deepEqual(flt3Cont.innerHTML, 'Click to load filter data', 'Filter 3 text'); +}); + +test('Filters are populated after activation', function() { + flt1.focus(); + flt2.focus(); + buildChecklist(tf, 2); + + flt3 = tf.getFilterElement(2); + + deepEqual(flt1.options.length, 3, 'Number of options for filter 1'); + deepEqual(flt2.options.length, 7, 'Number of options for filter 2'); + deepEqual(flt3.childNodes.length, 8, 'Number of options for filter 3'); +}); + +test('TableFilter re-initialised with grid layout', function() { + tf.destroy(); + deepEqual(tf.hasGrid(), false, 'Filters removed'); + tf = null; + tf = new TableFilter('demo', { + base_path: '../dist/tablefilter/', + col_0: 'multiple', + col_1: 'select', + col_2: 'checklist', + load_filters_on_demand: true, + grid_layout: true + }); + tf.init(); + + flt1 = tf.getFilterElement(0); + flt2 = tf.getFilterElement(1); + flt3 = null; + flt3ContId = tf.feature('checkList').prfxCheckListDiv+'2_'+tf.id; + flt3Cont = id(flt3ContId); +}); + +module('Behaviour with grid layout'); +test('Selet type filters exist', function() { + deepEqual(tf.loadFltOnDemand, true, 'loadFltOnDemand property'); + notEqual(flt1, null, 'Filter 1 element exists'); + notEqual(flt2, null, 'Filter 2 element exists'); + deepEqual(flt3, null, 'Filter 3 element exists'); + deepEqual(tf.getFilterType(0), 'multiple', 'Expected filter type 1'); + deepEqual(tf.getFilterType(1), 'select', 'Expected filter type 2'); + deepEqual(tf.getFilterType(2), 'checklist', 'Expected filter type 3'); +}); + +module('UI Filter elements'); +test('Filters are empty', function() { + deepEqual(flt1.options.length, 1, 'Number of options for filter 1'); + deepEqual(flt2.options.length, 1, 'Number of options for filter 2'); + deepEqual(flt1.options[0].text, 'Clear', 'Filter 1 text'); + deepEqual(flt2.options[0].text, 'Clear', 'Filter 2 text'); + deepEqual(flt3Cont.innerHTML, 'Click to load filter data', 'Filter 3 text'); +}); + +test('Filters are populated after activation', function() { + flt1.focus(); + flt2.focus(); + buildChecklist(tf, 2); + flt3 = tf.getFilterElement(2); + + deepEqual(flt1.options.length, 3, 'Number of options for filter 1'); + deepEqual(flt2.options.length, 7, 'Number of options for filter 2'); + deepEqual(flt3.childNodes.length, 8, 'Number of options for filter 3'); +}); + +test('Filters can filter table', function() { + tf.setFilterValue(0, 'Sydney'); + tf.setFilterValue(1, 'Canberra'); + tf.setFilterValue(2, '286'); + tf.filter(); + + deepEqual(tf.getValidRows().length, 1, 'Number of results'); +}); + +test('TableFilter removed', function() { + tf.destroy(); + deepEqual(tf.hasGrid(), false, 'Filters removed'); + tf = null; +});