deblan-mirror/TableFilter
1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-05-22 08:16:43 +02:00
Code Issues Releases Wiki Activity

Fixed issue #70, paging sort when column is filtered

Browse source
This commit is contained in:
Max Guglielmi 2015-12-20 16:58:39 +11:00
parent dbe7aab8f9
commit f399dc85ec
33 changed files with 83 additions and 592 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
demos/advanced-grid-editable.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Editable Grid Demo</title>
<title>tablefilter v0.0.17 - Editable Grid Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Editable grid demo</h2>
<p>

4
demos/advanced-grid-selection.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Selection Grid Demo</title>
<title>tablefilter v0.0.17 - Selection Grid Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Selection grid demo</h2>
<p>

4
demos/auto-filter.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Auto-filter Demo</title>
<title>tablefilter v0.0.17 - Auto-filter Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Auto-filter demo</h2>
<p>
This demo features the auto-filter behaviour, the table is filtered as soon

4
demos/columns-visibility.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Columns Visibility Extension Demo</title>
<title>tablefilter v0.0.17 - Columns Visibility Extension Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -28,7 +28,7 @@
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/colsVisibility.css">
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Columns visibility extension demo</h2>
<p>
This demo features the columns visibility extension.

4
demos/data-types.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Data types Demo</title>
<title>tablefilter v0.0.17 - Data types Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Data types demo</h2>
<p>This example features 3 date types and 2 numeric formatting for the currency

4
demos/demo.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Demo</title>
<title>tablefilter v0.0.17 - Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<pre></pre>

4
demos/external-filters-visibility-commad.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Filters Visibility Extension Demo</title>
<title>tablefilter v0.0.17 - Filters Visibility Extension Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Filters visibility extension demo</h2>
<p>
This demo features the filters visibility extension.

4
demos/external-filters.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - External Filters Demo</title>
<title>tablefilter v0.0.17 - External Filters Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>External filters demo</h2>
<p>
This demo shows how generate the column filters in an external container.

4
demos/filter-images.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Filter and Sort Images Demo</title>
<title>tablefilter v0.0.17 - Filter and Sort Images Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Filter and sort images demo</h2>
<p>
This demo shows how to filter and sort a column containing images by using

4
demos/filters-visibility.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Filters Visibility Extension Demo</title>
<title>tablefilter v0.0.17 - Filters Visibility Extension Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Filters visibility extension demo</h2>
<p>
This demo features the filters visibility extension.

4
demos/grid-layout.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Grid Layout Demo</title>
<title>tablefilter v0.0.17 - Grid Layout Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Grid layout demo</h2>
<pre></pre>

4
demos/grouped-headers.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Grouped Headers Demo</title>
<title>tablefilter v0.0.17 - Grouped Headers Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Grouped headers demo</h2>
<p>
With grouped and/or multi-line headers, to place the filters row at desired

4
demos/linked-filters-disabled.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Linked filters Demo</title>
<title>tablefilter v0.0.17 - Linked filters Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Linked filters with disabled options demo</h2>
<p>
This demo features the refresh filters behaviour. In this mode, the

4
demos/linked-filters.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Linked filters Demo</title>
<title>tablefilter v0.0.17 - Linked filters Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Linked filters demo</h2>
<p>
This demo features the linked filters behaviour. In this mode, the drop-down

4
demos/load-filters-on-demand.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Load filters on demand Demo</title>
<title>tablefilter v0.0.17 - Load filters on demand Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Load filters on demand demo</h2>
<p>
The filter options are loaded only when used for the first time.

4
demos/pagination.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Pagination Demo</title>
<title>tablefilter v0.0.17 - Pagination Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -42,7 +42,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Pagination demo</h2>
<pre></pre>

4
demos/requirejs-dev.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Development workflow with RequireJs</title>
<title>tablefilter v0.0.17 - Development workflow with RequireJs</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Development workflow with RequireJs</h2>
<p>
To take advantage of the RequireJs development workflow use the

4
demos/requirejs.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - RequireJs demo</title>
<title>tablefilter v0.0.17 - RequireJs demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>RequireJs Demo</h2>
<pre></pre>

4
demos/theme-roller.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Theme Roller Demo</title>
<title>tablefilter v0.0.17 - Theme Roller Demo</title>
<link rel="stylesheet" type="text/css" href="../dist/tablefilter/style/tablefilter.css">
<style type="text/css">
body{
@ -27,7 +27,7 @@
</style>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<h1>tablefilter v0.0.17</h1>
<h2>Theme roller demo</h2>
<p>
This demo shows how to implement a theme roller.

514
dist/starter.html vendored
View file

@ -1,514 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.0.16 - Starter</title>
</head>
<body>
<h1>tablefilter v0.0.16</h1>
<table id="demo">
<thead>
<tr>
<th>country</th>
<th>iso</th>
<th>year</th>
<th>POP</th>
<th>XRAT</th>
<th>PPP</th>
<th>cgdp</th>
<th>cc</th>
<th>ci</th>
</tr>
</thead>
<tbody>
<tr>
<td>Benin</td>
<td>BEN</td>
<td>1998</td>
<td>5950.33</td>
<td>589.9517822</td>
<td>190.95</td>
<td>1178.46</td>
<td>90.98</td>
<td>7.55</td>
</tr>
<tr>
<td>Benin</td>
<td>BEN</td>
<td>1999</td>
<td>6109.53</td>
<td>615.6990967</td>
<td>200.19</td>
<td>1174.90</td>
<td>92.61</td>
<td>7.86</td>
</tr>
<tr>
<td>Benin</td>
<td>BEN</td>
<td>2000</td>
<td>6272.00</td>
<td>711.9763184</td>
<td>200.61</td>
<td>1224.74</td>
<td>92.27</td>
<td>8.25</td>
</tr>
<tr>
<td>Burkina Faso</td>
<td>BFA</td>
<td>1994</td>
<td>9755.03</td>
<td>555.2047119</td>
<td>125.76</td>
<td>838.76</td>
<td>79.81</td>
<td>6.57</td>
</tr>
<tr>
<td>Burkina Faso</td>
<td>BFA</td>
<td>1995</td>
<td>9988.00</td>
<td>499.148407</td>
<td>136.65</td>
<td>860.89</td>
<td>80.41</td>
<td>9.29</td>
</tr>
<tr>
<td>Burkina Faso</td>
<td>BFA</td>
<td>1996</td>
<td>10225.00</td>
<td>511.5523987</td>
<td>144.18</td>
<td>881.11</td>
<td>80.40</td>
<td>12.12</td>
</tr>
<tr>
<td>Burkina Faso</td>
<td>BFA</td>
<td>1997</td>
<td>10473.53</td>
<td>583.6693726</td>
<td>141.78</td>
<td>899.01</td>
<td>76.94</td>
<td>14.94</td>
</tr>
<tr>
<td>Russia</td>
<td>RUS</td>
<td>1998</td>
<td>146899.01</td>
<td>9.705082893</td>
<td>2.64</td>
<td>7086.39</td>
<td>67.73</td>
<td>9.20</td>
</tr>
<tr>
<td>Russia</td>
<td>RUS</td>
<td>1999</td>
<td>146308.99</td>
<td>24.6199398</td>
<td>4.03</td>
<td>8074.70</td>
<td>57.35</td>
<td>8.81</td>
</tr>
<tr>
<td>Russia</td>
<td>RUS</td>
<td>2000</td>
<td>145555.01</td>
<td>28.12916946</td>
<td>4.85</td>
<td>9995.91</td>
<td>54.74</td>
<td>8.79</td>
</tr>
<tr>
<td>Rwanda</td>
<td>RWA</td>
<td>1994</td>
<td>6230.00</td>
<td>194.517</td>
<td>50.39</td>
<td>529.48</td>
<td>132.16</td>
<td>4.48</td>
</tr>
<tr>
<td>Rwanda</td>
<td>RWA</td>
<td>1995</td>
<td>6400.00</td>
<td>262.1975098</td>
<td>70.67</td>
<td>746.34</td>
<td>92.77</td>
<td>3.08</td>
</tr>
<tr>
<td>Rwanda</td>
<td>RWA</td>
<td>1996</td>
<td>6727.00</td>
<td>306.8200073</td>
<td>77.90</td>
<td>823.25</td>
<td>89.71</td>
<td>3.21</td>
</tr>
<tr>
<td>Rwanda</td>
<td>RWA</td>
<td>1997</td>
<td>7895.18</td>
<td>301.5297852</td>
<td>84.13</td>
<td>847.79</td>
<td>91.44</td>
<td>3.72</td>
</tr>
<tr>
<td>Rwanda</td>
<td>RWA</td>
<td>1998</td>
<td>8105.00</td>
<td>312.3140869</td>
<td>85.32</td>
<td>914.22</td>
<td>89.34</td>
<td>4.22</td>
</tr>
<tr>
<td>El Salvador</td>
<td>SLV</td>
<td>1995</td>
<td>5669.00</td>
<td>8.754583359</td>
<td>3.54</td>
<td>4143.59</td>
<td>89.31</td>
<td>10.35</td>
</tr>
<tr>
<td>El Salvador</td>
<td>SLV</td>
<td>1996</td>
<td>5798.00</td>
<td>8.755000114</td>
<td>3.69</td>
<td>4235.79</td>
<td>88.77</td>
<td>7.79</td>
</tr>
<tr>
<td>El Salvador</td>
<td>SLV</td>
<td>1997</td>
<td>5911.00</td>
<td>8.756250381</td>
<td>3.74</td>
<td>4408.41</td>
<td>87.05</td>
<td>7.90</td>
</tr>
<tr>
<td>Slovak Republic</td>
<td>SVK</td>
<td>2000</td>
<td>5401.00</td>
<td>46.0352</td>
<td>13.02</td>
<td>12618.53</td>
<td>52.22</td>
<td>24.78</td>
</tr>
<tr>
<td>Slovenia</td>
<td>SVN</td>
<td>1994</td>
<td>1988.90</td>
<td>128.8085938</td>
<td>79.97</td>
<td>11662.12</td>
<td>53.21</td>
<td>19.87</td>
</tr>
<tr>
<td>Slovenia</td>
<td>SVN</td>
<td>1995</td>
<td>1990.00</td>
<td>118.5185013</td>
<td>89.03</td>
<td>12574.96</td>
<td>54.46</td>
<td>23.11</td>
</tr>
<tr>
<td>Slovenia</td>
<td>SVN</td>
<td>1996</td>
<td>1991.00</td>
<td>135.3643036</td>
<td>97.27</td>
<td>13151.51</td>
<td>54.32</td>
<td>23.23</td>
</tr>
<tr>
<td>Slovenia</td>
<td>SVN</td>
<td>1997</td>
<td>1985.96</td>
<td>159.6882935</td>
<td>103.96</td>
<td>14143.02</td>
<td>53.24</td>
<td>24.14</td>
</tr>
<tr>
<td>Slovenia</td>
<td>SVN</td>
<td>1998</td>
<td>1982.60</td>
<td>166.134201</td>
<td>108.93</td>
<td>15067.34</td>
<td>52.82</td>
<td>25.35</td>
</tr>
<tr>
<td>Zambia</td>
<td>ZMB</td>
<td>1994</td>
<td>8740.72</td>
<td>669.3706055</td>
<td>307.48</td>
<td>834.19</td>
<td>75.43</td>
<td>9.86</td>
</tr>
<tr>
<td>Zambia</td>
<td>ZMB</td>
<td>1995</td>
<td>8980.00</td>
<td>864.1192017</td>
<td>402.40</td>
<td>829.37</td>
<td>76.55</td>
<td>10.31</td>
</tr>
<tr>
<td>Zambia</td>
<td>ZMB</td>
<td>1996</td>
<td>9214.40</td>
<td>1207.900024</td>
<td>515.01</td>
<td>838.05</td>
<td>78.74</td>
<td>10.99</td>
</tr>
<tr>
<td>Zambia</td>
<td>ZMB</td>
<td>1997</td>
<td>9443.21</td>
<td>1314.498047</td>
<td>596.97</td>
<td>851.47</td>
<td>77.59</td>
<td>12.15</td>
</tr>
<tr>
<td>Zambia</td>
<td>ZMB</td>
<td>1998</td>
<td>9665.71</td>
<td>1862.06897</td>
<td>744.91</td>
<td>800.69</td>
<td>85.12</td>
<td>13.75</td>
</tr>
<tr>
<td>Zambia</td>
<td>ZMB</td>
<td>1999</td>
<td>9881.21</td>
<td>2388.019043</td>
<td>941.87</td>
<td>765.24</td>
<td>91.82</td>
<td>15.30</td>
</tr>
<tr>
<td>Zambia</td>
<td>ZMB</td>
<td>2000</td>
<td>10089.00</td>
<td>3110.843994</td>
<td>1157.63</td>
<td>840.97</td>
<td>86.33</td>
<td>15.38</td>
</tr>
<tr>
<td>Zimbabwe</td>
<td>ZWE</td>
<td>1994</td>
<td>10775.35</td>
<td>8.151538849</td>
<td>2.01</td>
<td>2586.84</td>
<td>60.10</td>
<td>18.53</td>
</tr>
<tr>
<td>Zimbabwe</td>
<td>ZWE</td>
<td>1995</td>
<td>11011.00</td>
<td>8.66537571</td>
<td>2.15</td>
<td>2603.37</td>
<td>66.89</td>
<td>15.03</td>
</tr>
<tr>
<td>Zimbabwe</td>
<td>ZWE</td>
<td>1996</td>
<td>11242.16</td>
<td>10.00234985</td>
<td>2.64</td>
<td>2860.23</td>
<td>72.06</td>
<td>11.32</td>
</tr>
<tr>
<td>Zimbabwe</td>
<td>ZWE</td>
<td>1997</td>
<td>11923.52</td>
<td>12.11128998</td>
<td>3.17</td>
<td>2727.06</td>
<td>82.82</td>
<td>11.01</td>
</tr>
<tr>
<td>Zimbabwe</td>
<td>ZWE</td>
<td>1998</td>
<td>12153.85</td>
<td>23.67910957</td>
<td>4.06</td>
<td>2799.85</td>
<td>77.66</td>
<td>10.75</td>
</tr>
<tr>
<td>Zimbabwe</td>
<td>ZWE</td>
<td>1999</td>
<td>12388.32</td>
<td>38.30120087</td>
<td>6.12</td>
<td>2770.48</td>
<td>76.89</td>
<td>10.73</td>
</tr>
<tr>
<td>Zimbabwe</td>
<td>ZWE</td>
<td>2000</td>
<td>12627.00</td>
<td>44.41791916</td>
<td>9.48</td>
<td>2607.03</td>
<td>69.23</td>
<td>8.62</td>
</tr>
</tbody>
</table>
<script src="tablefilter/tablefilter.js"></script>
<script data-config>
var filtersConfig = {
base_path: 'tablefilter/',
col_1: 'select',
col_2: 'select',
col_3: 'select',
alternate_rows: true,
rows_counter: true,
btn_reset: true,
loader: true,
status_bar: true,
mark_active_columns: true,
highlight_keywords: true,
col_number_format: [
null, null, 'US',
'US', 'US', 'US',
'US', 'US', 'US'
],
custom_options: {
cols:[3],
texts: [[
'0 - 25 000',
'100 000 - 1 500 000'
]],
values: [[
'>0 && <=25000',
'>100000 && <=1500000'
]],
sorts: [false]
},
col_widths: [
'150px', '100px', '100px',
'70px', '70px', '70px',
'70px', '60px', '60px'
],
extensions:[{ name: 'sort' }]
};
var tf = new TableFilter('demo', filtersConfig);
tf.init();
</script>
<pre></pre>
<!--
DO NOT COPY: NOT PART OF TABLEFILTER
-->
<script>
var configs = document.querySelectorAll('script[data-config]');
var pre = document.body.getElementsByTagName('pre')[0];
[].forEach.call(configs, function(config) {
if(pre){
pre.innerHTML +=
config.innerHTML.replace('<', '&lt;').replace('>', '&gt;');
}
});
</script>
<!-- -->
</body>
</html>

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.0.16 by Max Guglielmi
* build date: 2015-12-11T07:30:32.345Z
* tablefilter v0.0.17 by Max Guglielmi
* build date: 2015-12-20T05:40:05.603Z
* 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.0.16 by Max Guglielmi
* build date: 2015-12-11T07:30:32.345Z
* tablefilter v0.0.17 by Max Guglielmi
* build date: 2015-12-20T05:40:05.603Z
* 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.0.16 by Max Guglielmi
* build date: 2015-12-11T07:30:32.345Z
* tablefilter v0.0.17 by Max Guglielmi
* build date: 2015-12-20T05:40:05.603Z
* 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.0.16 by Max Guglielmi
* build date: 2015-12-11T07:30:32.345Z
* tablefilter v0.0.17 by Max Guglielmi
* build date: 2015-12-20T05:40:05.603Z
* 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;color:#333 !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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.0.16 by Max Guglielmi
* build date: 2015-12-11T07:30:32.345Z
* tablefilter v0.0.17 by Max Guglielmi
* build date: 2015-12-20T05:40:05.603Z
* 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;color:#fff !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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.0.16 by Max Guglielmi
* build date: 2015-12-11T07:30:32.345Z
* tablefilter v0.0.17 by Max Guglielmi
* build date: 2015-12-20T05:40:05.603Z
* 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

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

File diff suppressed because one or more lines are too long

2
package.json
View file

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

12
src/extensions/sort/adapterSortabletable.js
View file

@ -35,16 +35,6 @@ export default class AdapterSortableTable{
//cell attribute storing custom key
this.customKey = opts.custom_key || 'data-tf-sortKey';
/*** TF additional events ***/
//additional paging events for alternating background
// o.Evt._Paging.nextEvt = function(){
// if(o.sorted && o.alternateRows) o.Filter();
// }
// o.Evt._Paging.prevEvt = o.Evt._Paging.nextEvt;
// o.Evt._Paging.firstEvt = o.Evt._Paging.nextEvt;
// o.Evt._Paging.lastEvt = o.Evt._Paging.nextEvt;
// o.Evt._OnSlcPagesChangeEvt = o.Evt._Paging.nextEvt;
// callback invoked after sort is loaded and instanciated
this.onSortLoaded = Types.isFn(opts.on_sort_loaded) ?
opts.on_sort_loaded : null;
@ -134,6 +124,8 @@ export default class AdapterSortableTable{
//sort behaviour for paging
if(tf.paging){
let paginator = tf.feature('paging');
// recalculate valid rows index as sorting may have change it
tf.getValidRows(true);
paginator.enable();
paginator.setPage(paginator.getPage());
}

12
src/modules/paging.js
View file

@ -417,10 +417,10 @@ export class Paging extends Feature{
*/
groupByPage(validRows){
var tf = this.tf;
var alternateRows = tf.feature('alternateRows');
var alternateRows = tf.feature('alternateRows');
var rows = tf.tbl.rows;
var endPagingRow = parseInt(this.startPagingRow, 10) +
parseInt(this.pagingLength, 10);
var startPagingRow = parseInt(this.startPagingRow, 10);
var endPagingRow = startPagingRow + parseInt(this.pagingLength, 10);
//store valid rows indexes
if(validRows){
@ -433,7 +433,7 @@ export class Paging extends Feature{
var r = rows[validRowIdx];
var isRowValid = r.getAttribute('validRow');
if(h>=this.startPagingRow && h<endPagingRow){
if(h>=startPagingRow && h<endPagingRow){
if(Types.isNull(isRowValid) || Boolean(isRowValid==='true')){
r.style.display = '';
}
@ -473,7 +473,7 @@ export class Paging extends Feature{
}
var btnEvt = this.evt,
cmdtype = typeof cmd;
if(cmdtype==='string'){
if(cmdtype === 'string'){
switch(Str.lower(cmd)){
case 'next':
btnEvt.next();
@ -492,7 +492,7 @@ export class Paging extends Feature{
break;
}
}
else if(cmdtype==='number'){
else if(cmdtype === 'number'){
this.changePage(cmd-1);
}
}

1
src/tablefilter.js
View file

@ -1857,7 +1857,6 @@ export class TableFilter{
// TODO: provide a method in paging module
Mod.paging.startPagingRow = 0;
Mod.paging.currentPageNb = 1;
//
Mod.paging.setPagingInfo(this.validRowsIndex);
}
//invokes onafter callback

16
test/test-integration-paging-sort.js
View file

@ -9,7 +9,10 @@ var tf = new TableFilter('demo', {
remember_page_number: true,
remember_page_length: true,
results_per_page: ['Results per page ', [2,4,6]],
extensions: [{ name: 'sort' }]
extensions: [{
name: 'sort',
types: ['string', 'string', 'number', 'number', 'number']
}]
});
tf.init();
@ -44,6 +47,17 @@ test('Can select a page', function() {
deepEqual(paging.pagingSlc.selectedIndex, 2, 'Expected selected option');
});
module('Changing pages when column is sorted (issue #70)');
test('It can change page', function() {
var sort = tf.extension('sort');
tf.setFilterValue(2, '>400');
sort.sortByColumnIndex(1);
sort.sortByColumnIndex(1);
paging.setPage(3);
deepEqual(paging.getPage(), 3, 'Expected page number');
});
module('Tear-down');
test('can destroy TableFilter DOM elements', function() {
tf.destroy();