Skip to content

Commit

Permalink
version bump & misc cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Mottie committed Sep 23, 2016
1 parent 29fc272 commit 570d3c0
Show file tree
Hide file tree
Showing 28 changed files with 95 additions and 78 deletions.
12 changes: 6 additions & 6 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.md diss=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.md diss=astextplain
23 changes: 18 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,24 @@ If you would like to contribute, please...

View the [complete change log here](https://github.com/Mottie/tablesorter/wiki/Changes).

#### <a name="v2.27.7">Version 2.27.7</a> (9/23/2016)

* Core:
* Include version in log.
* Remove space from debug message.
* Docs: update jQuery.
* Filter:
* Include "input" event for searches. See [issue #1280](https://github.com/Mottie/tablesorter/issues/1280).
* Add support for descending sort on selectSources values.
* Mark: Remove internal case matching.
* Pager:
* Allow for optional output callback in favour of parsable string. See [pull #1283](https://github.com/Mottie/tablesorter/pull/1283); thanks [@joelperry93](https://github.com/joelperry93)!
* Add output function support to pager widget. See [pull #1283](https://github.com/Mottie/tablesorter/pull/1283).
* Maintain `pageDisplay` ID, if one exists. Fixes [issue #1288](https://github.com/Mottie/tablesorter/issues/1288).
* RepeatHeaders:
* Repeat HTML content instead of only text. See [pull #1282](https://github.com/Mottie/tablesorter/pull/1282); thanks [@Milania1](https://github.com/Milania1)!
* Testing: update jQuery usage.

#### <a name="v2.27.6">Version 2.27.6</a> (9/1/2016)

* Core: `textSorter` option now accepts class names. See [Stackoverflow](http://stackoverflow.com/q/39259954/145346).
Expand Down Expand Up @@ -128,8 +146,3 @@ View the [complete change log here](https://github.com/Mottie/tablesorter/wiki/C
* Docs: Correct usage of Sugar v2.0+ `sortCollage`.
* Filter: Add any match search by column text - see [updated demo](https://mottie.github.io/tablesorter/docs/example-widget-filter-any-match.html#anymatch_searches).
* Parser: Fix JSHint issue.

#### <a name="v2.27.4">Version 2.27.4</a> (8/18/2016)

* Docs & parser: Update Sugar library v2.0+. Fixes [issue #1275](https://github.com/Mottie/tablesorter/issues/1275).
* Docs: Add `sortStable` example.
2 changes: 1 addition & 1 deletion addons/pager/jquery.tablesorter.pager.css
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ td.tablesorter-pager {
opacity: 0.5;
filter: alpha(opacity=50);
cursor: default;
}
}
2 changes: 1 addition & 1 deletion addons/pager/jquery.tablesorter.pager.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* tablesorter (FORK) pager plugin
* updated 8/17/2016 (v2.27.3)
* updated 9/23/2016 (v2.27.7)
*/
/*jshint browser:true, jquery:true, unused:false */
;(function($) {
Expand Down
2 changes: 1 addition & 1 deletion dist/js/extras/jquery.tablesorter.pager.min.js

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions dist/js/jquery.tablesorter.combined.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! tablesorter (FORK) - updated 09-01-2016 (v2.27.6)*/
/*! tablesorter (FORK) - updated 09-23-2016 (v2.27.7)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {
Expand All @@ -10,7 +10,7 @@
}
}(function(jQuery) {

/*! TableSorter (FORK) v2.27.6 *//*
/*! TableSorter (FORK) v2.27.7 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
Expand All @@ -34,7 +34,7 @@
'use strict';
var ts = $.tablesorter = {

version : '2.27.6',
version : '2.27.7',

parsers : [],
widgets : [],
Expand Down Expand Up @@ -245,7 +245,7 @@
// save the settings where they read
$.data( table, 'tablesorter', c );
if ( c.debug ) {
console[ console.group ? 'group' : 'log' ]( 'Initializing tablesorter' );
console[ console.group ? 'group' : 'log' ]( 'Initializing tablesorter v' + ts.version );
$.data( table, 'startoveralltimer', new Date() );
}

Expand Down Expand Up @@ -347,7 +347,7 @@
table.hasInitialized = true;
table.isProcessing = false;
if ( c.debug ) {
console.log( 'Overall initialization time: ' + ts.benchmark( $.data( table, 'startoveralltimer' ) ) );
console.log( 'Overall initialization time:' + ts.benchmark( $.data( table, 'startoveralltimer' ) ) );
if ( c.debug && console.groupEnd ) { console.groupEnd(); }
}
$table.triggerHandler( 'tablesorter-initialized', table );
Expand Down Expand Up @@ -3131,7 +3131,7 @@

})(jQuery);

/*! Widget: filter - updated 8/22/2016 (v2.27.5) *//*
/*! Widget: filter - updated 9/23/2016 (v2.27.7) *//*
* Requires tablesorter v2.8+ and jQuery 1.7+
* by Rob Garrison
*/
Expand Down Expand Up @@ -3964,9 +3964,9 @@
// don't allow 'change' event to process if the input value is the same - fixes #685
if ( table.config.widgetOptions.filter_initialized &&
( event.which === tskeyCodes.enter || event.type === 'search' ||
( event.type === 'change' ) && this.value !== c.lastSearch[column] ) ||
// only "input" event fires in MS Edge when clicking the "x" to clear the search
( event.type === 'input' && this.value === '' ) ) {
( event.type === 'change' || event.type === 'input' ) &&
this.value !== c.lastSearch[column] )
) {
event.preventDefault();
// init search with no delay
$( this ).attr( 'data-lastSearchTime', new Date().getTime() );
Expand Down Expand Up @@ -4681,6 +4681,7 @@
var cts, txt, indx, len, parsedTxt, str,
c = table.config,
validColumn = typeof column !== 'undefined' && column !== null && column >= 0 && column < c.columns,
direction = validColumn ? c.$headerIndexed[ column ].hasClass( 'filter-select-sort-desc' ) : false,
parsed = [];
// get unique elements and sort the list
// if $.tablesorter.sortText exists ( not in the original tablesorter ),
Expand Down Expand Up @@ -4721,8 +4722,8 @@
// sort parsed select options
cts = c.textSorter || '';
parsed.sort( function( a, b ) {
var x = a.parsed,
y = b.parsed;
var x = direction ? b.parsed : a.parsed,
y = direction ? a.parsed : b.parsed;
if ( validColumn && typeof cts === 'function' ) {
// custom OVERALL text sorter
return cts( x, y, true, column, table );
Expand Down
8 changes: 4 additions & 4 deletions dist/js/jquery.tablesorter.combined.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dist/js/jquery.tablesorter.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
}(function(jQuery) {

/*! TableSorter (FORK) v2.27.6 *//*
/*! TableSorter (FORK) v2.27.7 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
Expand All @@ -32,7 +32,7 @@
'use strict';
var ts = $.tablesorter = {

version : '2.27.6',
version : '2.27.7',

parsers : [],
widgets : [],
Expand Down Expand Up @@ -243,7 +243,7 @@
// save the settings where they read
$.data( table, 'tablesorter', c );
if ( c.debug ) {
console[ console.group ? 'group' : 'log' ]( 'Initializing tablesorter' );
console[ console.group ? 'group' : 'log' ]( 'Initializing tablesorter v' + ts.version );
$.data( table, 'startoveralltimer', new Date() );
}

Expand Down Expand Up @@ -345,7 +345,7 @@
table.hasInitialized = true;
table.isProcessing = false;
if ( c.debug ) {
console.log( 'Overall initialization time: ' + ts.benchmark( $.data( table, 'startoveralltimer' ) ) );
console.log( 'Overall initialization time:' + ts.benchmark( $.data( table, 'startoveralltimer' ) ) );
if ( c.debug && console.groupEnd ) { console.groupEnd(); }
}
$table.triggerHandler( 'tablesorter-initialized', table );
Expand Down
2 changes: 1 addition & 1 deletion dist/js/jquery.tablesorter.min.js

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions dist/js/jquery.tablesorter.widgets.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! tablesorter (FORK) - updated 09-01-2016 (v2.27.6)*/
/*! tablesorter (FORK) - updated 09-23-2016 (v2.27.7)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {
Expand Down Expand Up @@ -376,7 +376,7 @@

})(jQuery);

/*! Widget: filter - updated 8/22/2016 (v2.27.5) *//*
/*! Widget: filter - updated 9/23/2016 (v2.27.7) *//*
* Requires tablesorter v2.8+ and jQuery 1.7+
* by Rob Garrison
*/
Expand Down Expand Up @@ -1209,9 +1209,9 @@
// don't allow 'change' event to process if the input value is the same - fixes #685
if ( table.config.widgetOptions.filter_initialized &&
( event.which === tskeyCodes.enter || event.type === 'search' ||
( event.type === 'change' ) && this.value !== c.lastSearch[column] ) ||
// only "input" event fires in MS Edge when clicking the "x" to clear the search
( event.type === 'input' && this.value === '' ) ) {
( event.type === 'change' || event.type === 'input' ) &&
this.value !== c.lastSearch[column] )
) {
event.preventDefault();
// init search with no delay
$( this ).attr( 'data-lastSearchTime', new Date().getTime() );
Expand Down Expand Up @@ -1926,6 +1926,7 @@
var cts, txt, indx, len, parsedTxt, str,
c = table.config,
validColumn = typeof column !== 'undefined' && column !== null && column >= 0 && column < c.columns,
direction = validColumn ? c.$headerIndexed[ column ].hasClass( 'filter-select-sort-desc' ) : false,
parsed = [];
// get unique elements and sort the list
// if $.tablesorter.sortText exists ( not in the original tablesorter ),
Expand Down Expand Up @@ -1966,8 +1967,8 @@
// sort parsed select options
cts = c.textSorter || '';
parsed.sort( function( a, b ) {
var x = a.parsed,
y = b.parsed;
var x = direction ? b.parsed : a.parsed,
y = direction ? a.parsed : b.parsed;
if ( validColumn && typeof cts === 'function' ) {
// custom OVERALL text sorter
return cts( x, y, true, column, table );
Expand Down
6 changes: 3 additions & 3 deletions dist/js/jquery.tablesorter.widgets.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/widgets/widget-filter.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/widgets/widget-mark.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/widgets/widget-pager.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/widgets/widget-repeatheaders.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/assets/City0.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,4 @@
"District": "Noord-Holland",
"Population": 110722
}]
}
}
2 changes: 1 addition & 1 deletion docs/assets/ajax-content.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@
<td>$13.19</td>
<td>11%</td>
<td>Jan 18, 2007 9:12 AM</td>
</tr>
</tr>
2 changes: 1 addition & 1 deletion docs/assets/build.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
"data-info": "This row likes turtles"
}
]
}
}
2 changes: 1 addition & 1 deletion docs/assets/build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Down In It,Nine Inch Nails,$3.00
Broken,Nine Inch Nails,$6.00
Muse,Black Holes and Revelations,$7.00
Anon,"fake album, with comma", $1.00
Album,Artist,Price ($)
Album,Artist,Price ($)
23 changes: 12 additions & 11 deletions js/jquery.tablesorter.combined.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀██
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
*/
/*! tablesorter (FORK) - updated 09-01-2016 (v2.27.6)*/
/*! tablesorter (FORK) - updated 09-23-2016 (v2.27.7)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {
Expand All @@ -16,7 +16,7 @@
}
}(function(jQuery) {

/*! TableSorter (FORK) v2.27.6 *//*
/*! TableSorter (FORK) v2.27.7 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
Expand All @@ -40,7 +40,7 @@
'use strict';
var ts = $.tablesorter = {

version : '2.27.6',
version : '2.27.7',

parsers : [],
widgets : [],
Expand Down Expand Up @@ -251,7 +251,7 @@
// save the settings where they read
$.data( table, 'tablesorter', c );
if ( c.debug ) {
console[ console.group ? 'group' : 'log' ]( 'Initializing tablesorter' );
console[ console.group ? 'group' : 'log' ]( 'Initializing tablesorter v' + ts.version );
$.data( table, 'startoveralltimer', new Date() );
}

Expand Down Expand Up @@ -353,7 +353,7 @@
table.hasInitialized = true;
table.isProcessing = false;
if ( c.debug ) {
console.log( 'Overall initialization time: ' + ts.benchmark( $.data( table, 'startoveralltimer' ) ) );
console.log( 'Overall initialization time:' + ts.benchmark( $.data( table, 'startoveralltimer' ) ) );
if ( c.debug && console.groupEnd ) { console.groupEnd(); }
}
$table.triggerHandler( 'tablesorter-initialized', table );
Expand Down Expand Up @@ -3137,7 +3137,7 @@

})(jQuery);

/*! Widget: filter - updated 8/22/2016 (v2.27.5) *//*
/*! Widget: filter - updated 9/23/2016 (v2.27.7) *//*
* Requires tablesorter v2.8+ and jQuery 1.7+
* by Rob Garrison
*/
Expand Down Expand Up @@ -3970,9 +3970,9 @@
// don't allow 'change' event to process if the input value is the same - fixes #685
if ( table.config.widgetOptions.filter_initialized &&
( event.which === tskeyCodes.enter || event.type === 'search' ||
( event.type === 'change' ) && this.value !== c.lastSearch[column] ) ||
// only "input" event fires in MS Edge when clicking the "x" to clear the search
( event.type === 'input' && this.value === '' ) ) {
( event.type === 'change' || event.type === 'input' ) &&
this.value !== c.lastSearch[column] )
) {
event.preventDefault();
// init search with no delay
$( this ).attr( 'data-lastSearchTime', new Date().getTime() );
Expand Down Expand Up @@ -4687,6 +4687,7 @@
var cts, txt, indx, len, parsedTxt, str,
c = table.config,
validColumn = typeof column !== 'undefined' && column !== null && column >= 0 && column < c.columns,
direction = validColumn ? c.$headerIndexed[ column ].hasClass( 'filter-select-sort-desc' ) : false,
parsed = [];
// get unique elements and sort the list
// if $.tablesorter.sortText exists ( not in the original tablesorter ),
Expand Down Expand Up @@ -4727,8 +4728,8 @@
// sort parsed select options
cts = c.textSorter || '';
parsed.sort( function( a, b ) {
var x = a.parsed,
y = b.parsed;
var x = direction ? b.parsed : a.parsed,
y = direction ? a.parsed : b.parsed;
if ( validColumn && typeof cts === 'function' ) {
// custom OVERALL text sorter
return cts( x, y, true, column, table );
Expand Down
4 changes: 2 additions & 2 deletions js/jquery.tablesorter.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! TableSorter (FORK) v2.27.6 *//*
/*! TableSorter (FORK) v2.27.7 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
Expand All @@ -22,7 +22,7 @@
'use strict';
var ts = $.tablesorter = {

version : '2.27.6',
version : '2.27.7',

parsers : [],
widgets : [],
Expand Down
Loading

0 comments on commit 570d3c0

Please sign in to comment.