Skip to content

Commit 7f5acb1

Browse files
committed
update submodule
1 parent d35b6c0 commit 7f5acb1

13 files changed

Lines changed: 39 additions & 58 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ required [node.js](http://nodejs.org/) & [bower](http://bower.io/) & [grunt](htt
2020
$ git submodule init
2121
$ git submodule update
2222
$ npm install
23-
$ bower install (./node_modulesode_modules/bower/bin/bower install)
23+
$ bower install (./node_modules/bower/bin/bower install)
2424
$ grunt (./node_modules/grunt-cli/bin/grunt)
2525
$ cd dist/
2626
$ open index.html

dist/assets/lib/tablesorter/README.md

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ tablesorter can successfully parse and sort many types of data including linked
4444

4545
View the [complete listing here](https://github.com/Mottie/tablesorter/wiki/Change).
4646

47+
#### <a name="v2.13.1">Version 2.13.1</a> (10/31/2013)
48+
49+
* Fixed filter widget issues
50+
* filter indexing will now be correct, even if a "tablesorter-filter" input/select doesn't exist in the filter row
51+
* Already parsed filters (filter-formatter) will not attempt to reparse the value; problem was caused by parsed dates.
52+
4753
#### <a name="v2.13">Version 2.13</a> (10/30/2013)
4854

4955
* Added a "Development" branch to the repository.
@@ -223,26 +229,3 @@ View the [complete listing here](https://github.com/Mottie/tablesorter/wiki/Chan
223229
**Thanks**
224230
* Thanks to @thezoggy and @TheSin- for help maintaining and supporting the tablesorter github project while I was away!
225231
* Also thanks to everyone else that contributed and even more thanks to those that helped troubleshoot and solve problems!
226-
227-
#### <a name="v2.10.8">Version 2.10.8</a> (6/3/2013)
228-
229-
* Updated the percent parser to only detect if the content is shorter than 15 characters. This prevents columns with a lot of content and one percent sign (%) from being set to be parsed as a percent numeric column. Fixes [issue #320](https://github.com/Mottie/tablesorter/issues/320).
230-
* Updated filter widget &amp; filter_formatter:
231-
* Added a new `filter_defaultAttrib` which points to the default `'data-value'` attribute in the table header which will contain the filter's default (starting) value and *will override* any set values within the filter_formatter functions. Updated the [custom filter widget function demo age column](http://mottie.github.io/tablesorter/docs/example-widget-filter-custom.html) to show this in action.
232-
* The `$.tablesorter.setFilter()` method now properly updates the filter formatter elements when set.
233-
* The `uiDateCompare` and `uiDatepicker` functions now adds a time of 11:59:59 to the "to" date or when a "less than" comparison is made so as to include all times within that selected day.
234-
* The `defaultDate` option (not `date` option, sorry) of the `uiDateCompare` now properly sets the value upon initialization.
235-
* The `from` and `to` options of the `uiDatepicker` now properly sets those values properly upon initialization.
236-
* Fixes [issue #321](https://github.com/Mottie/tablesorter/issues/321).
237-
* Fixed stickyHeaders widget:
238-
* When removing a sticky headers widget, it no longer unbinds scrolling when other sticky headers are still active.
239-
* Added `stickyHeaders_includeCaption` option (set as `true` by default). When this option is `false` and a caption exists, it will not be included in teh sticky header. Fixes [issue #322](https://github.com/Mottie/tablesorter/issues/322).
240-
241-
#### <a name="v2.10.7">Version 2.10.7</a> (5/31/2013)
242-
243-
* Now using correct `closest()` function equivalent. Thanks to [isuTony](https://github.com/isuTony); Fixes [issue #319](https://github.com/Mottie/tablesorter/issues/319).
244-
* Anticipating my sabbitical, I've added a few "beta-testing" scripts into a new folder for feedback, code fixes and help:
245-
* [Custom pager control script](http://mottie.github.io/tablesorter/beta-testing/example-pager-custom-controls.html) - should be working properly.
246-
* [External filters using Select2 plugin](http://mottie.github.io/tablesorter/beta-testing/example-external-filters-using-select2.html) - should be working properly.
247-
* [Column reorder widget](http://mottie.github.io/tablesorter/beta-testing/example-widget-column-reorder.html) - not working 100% with sticky headers.
248-
* [Column sum widget](http://mottie.github.io/tablesorter/beta-testing/example-widget-sum-columns.html) - still needs LOTS of work!

dist/assets/lib/tablesorter/component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tablesorter",
3-
"version": "2.13.0",
3+
"version": "2.13.1",
44
"dependencies": {
55
"jquery": ">=1.2.6"
66
}

dist/assets/lib/tablesorter/js/jquery.tablesorter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**!
2-
* TableSorter 2.13.0 - Client-side table sorting with ease!
2+
* TableSorter 2.13.1 - Client-side table sorting with ease!
33
* @requires jQuery v1.2.6+
44
*
55
* Copyright (c) 2007 Christian Bach
@@ -24,7 +24,7 @@
2424

2525
var ts = this;
2626

27-
ts.version = "2.13.0";
27+
ts.version = "2.13.1";
2828

2929
ts.parsers = [];
3030
ts.widgets = [];

dist/assets/lib/tablesorter/js/jquery.tablesorter.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/lib/tablesorter/js/jquery.tablesorter.widgets.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! tableSorter 2.8+ widgets - updated 10/30/2013
1+
/*! tableSorter 2.8+ widgets - updated 10/31/2013
22
*
33
* Column Styles
44
* Column Filters
@@ -399,7 +399,7 @@ ts.addWidget({
399399
}
400400
},
401401
findRows = function(filter, v, cv){
402-
var $tb, $tr, $td, cr, r, l, ff, time, r1, r2, searchFiltered;
402+
var $tb, $tr, $td, cr, r, l, ff, fr, time, r1, r2, searchFiltered;
403403
if (c.debug) { time = new Date(); }
404404
for (k = 0; k < b.length; k++ ){
405405
if (b.eq(k).hasClass(ts.css.info)) { continue; } // ignore info blocks, issue #264
@@ -477,19 +477,19 @@ ts.addWidget({
477477
ff = val === '' ? true : !(wo.filter_startsWith ? s === 0 : s >= 0);
478478
// Look for operators >, >=, < or <=
479479
} else if (/^[<>]=?/.test(val)){
480-
s = fmt(val.replace(wo.filter_regex.nondigit, '').replace(wo.filter_regex.operators,''), table);
480+
s = fr = fmt(val.replace(wo.filter_regex.nondigit, '').replace(wo.filter_regex.operators,''), table);
481481
// parse filter value in case we're comparing numbers (dates)
482482
if (parsed[i] || c.parsers[i].type === 'numeric') {
483483
rg = c.parsers[i].format('' + val.replace(wo.filter_regex.operators,''), table, $ths.eq(i), i);
484-
s = (rg !== '' && !isNaN(rg)) ? rg : s;
484+
s = (isNaN(s) && rg !== '' && !isNaN(rg)) ? rg : s;
485485
}
486486
// xi may be numeric - see issue #149;
487487
// check if c.cache[k].normalized[j] is defined, because sometimes j goes out of range? (numeric columns)
488488
rg = ( parsed[i] || c.parsers[i].type === 'numeric' ) && !isNaN(s) && c.cache[k].normalized[j] ? c.cache[k].normalized[j][i] :
489489
isNaN(xi) ? fmt(xi.replace(wo.filter_regex.nondigit, ''), table) : fmt(xi, table);
490490
if (/>/.test(val)) { ff = />=/.test(val) ? rg >= s : rg > s; }
491491
if (/</.test(val)) { ff = /<=/.test(val) ? rg <= s : rg < s; }
492-
if (s === '') { ff = true; } // keep showing all rows if nothing follows the operator
492+
if (!ff && fr === '') { ff = true; } // keep showing all rows if nothing follows the operator
493493
// Look for an AND or && operator (logical and)
494494
} else if (/\s+(AND|&&)\s+/g.test(v[i])) {
495495
s = val.split(/(?:\s+(?:and|&&)\s+)/g);
@@ -754,9 +754,7 @@ ts.addWidget({
754754
// $(':focus') needs jQuery 1.6+
755755
if ($(document.activeElement).closest('tr')[0] !== ft[0]){
756756
// get all filter values
757-
all = $t.find('.tablesorter-filter').map(function(){
758-
return $(this).val() || '';
759-
}).get().join('');
757+
all = ts.getFilters(table).join('');
760758
// don't hide row if any filter has a value
761759
if (all === ''){
762760
ft.addClass('hideme');
@@ -770,7 +768,7 @@ ts.addWidget({
770768
clearTimeout(st);
771769
st = setTimeout(function(){
772770
// don't hide row if any filter has a value
773-
if ($t.find('.tablesorter-filter').map(function(){ return $(this).val() || ''; }).get().join('') === ''){
771+
if (ts.getFilters(table).join('') === ''){
774772
ft2[ e.type === 'focus' ? 'removeClass' : 'addClass']('hideme');
775773
}
776774
}, 200);
@@ -826,15 +824,15 @@ ts.addWidget({
826824
ts.getFilters = function(table) {
827825
var c = table ? $(table)[0].config : {};
828826
if (c && c.widgetOptions && !c.widgetOptions.filter_columnFilters) { return $(table).data('lastSearch'); }
829-
return c && c.$filters ? c.$filters.find('.tablesorter-filter').map(function(i, el) {
830-
return $(el).val();
827+
return c && c.$filters ? c.$filters.map(function(i, el) {
828+
return $(el).find('.tablesorter-filter').val() || '';
831829
}).get() || [] : false;
832830
};
833831
ts.setFilters = function(table, filter, apply) {
834832
var $t = $(table),
835833
c = $t.length ? $t[0].config : {},
836-
valid = c && c.$filters ? c.$filters.find('.tablesorter-filter').each(function(i, el) {
837-
$(el).val(filter[i] || '');
834+
valid = c && c.$filters ? c.$filters.each(function(i, el) {
835+
$(el).find('.tablesorter-filter').val(filter[i] || '');
838836
}) || false : false;
839837
if (apply) { $t.trigger('search', [filter, false]); }
840838
return !!valid;

dist/assets/lib/tablesorter/js/jquery.tablesorter.widgets.min.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/lib/tablesorter/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tablesorter",
33
"title": "tablesorter",
4-
"version": "2.13.0",
4+
"version": "2.13.1",
55
"description": "tablesorter is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.\n\nThis forked version adds lots of new enhancements including: alphanumeric sorting, pager callback functons, multiple widgets providing column styling, ui theme application, sticky headers, column filters and resizer, as well as extended documentation with a lot more demos.",
66
"author": {
77
"name": "Christian Bach",

dist/assets/lib/tablesorter/tablesorter.jquery.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tablesorter",
33
"title": "tablesorter",
4-
"version": "2.13.0",
4+
"version": "2.13.1",
55
"description": "tablesorter is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.\n\nThis forked version adds lots of new enhancements including: alphanumeric sorting, pager callback functons, multiple widgets providing column styling, ui theme application, sticky headers, column filters and resizer, as well as extended documentation with a lot more demos.",
66
"author": {
77
"name": "Christian Bach",

dist/assets/lib/uniform/themes/_base/css/uniform._base.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ div#{$class-wrapper}#{$class-radio} {
398398

399399
@include whenActive {
400400
span {
401-
background-position: (-1 * $radio-width)-18px $radio-voffset;
401+
background-position: (-1 * $radio-width) $radio-voffset;
402402

403403
@include whenChecked {
404404
background-position: (-5 * $radio-width) $radio-voffset;
@@ -408,7 +408,7 @@ div#{$class-wrapper}#{$class-radio} {
408408

409409
@include whenHover {
410410
span {
411-
background-position: (-2 * $radio-width)-36px $radio-voffset;
411+
background-position: (-2 * $radio-width) $radio-voffset;
412412

413413
@include whenChecked {
414414
background-position: (-6 * $radio-width) $radio-voffset;

0 commit comments

Comments
 (0)