Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mottie
Mottie committed Jul 11, 2016
1 parent 4e5add0 commit 288a06e
Show file tree
Hide file tree
Showing 31 changed files with 294 additions and 193 deletions.
42 changes: 31 additions & 11 deletions README.md
View file
Expand Up @@ -101,6 +101,37 @@ If you would like to contribute, please...

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

#### <a name="v2.26.6">Version 2.26.6</a> (7/11/2016)

* Global: Fix "updated" date in various widgets & pager.
* Docs:
* Cleanup links & license. Fixes [issue #1244](https://github.com/Mottie/tablesorter/issues/1244).
* Add button type to all buttons.
* Update to jQuery v3.1.0.
* Core: Prevent undefined error in natural sort. See [issue #1151](https://github.com/Mottie/tablesorter/issues/1151).
* Column Selector: Check visibility of cells after colspan. See [issue #1238](https://github.com/Mottie/tablesorter/issues/1238).
* Filter
* Filter formatter for Select2 v3.4.6 (v4.0+ still not supported)
* Now adheres to case sensitivity setting. See [issue #1237](https://github.com/Mottie/tablesorter/issues/1237).
* Update after filter row rebuilt. See [issue #1237](https://github.com/Mottie/tablesorter/issues/1237).
* Properly remove case-insensitive flag in regex.
* Properly escaped characters in regex.
* Use uncached `widgetOptions` after inside events.
* `filter_hideFilters` option now accepts a function. See [issue #477](https://github.com/Mottie/tablesorter/issues/477).
* Grouping:
* Fix js error when storage isn't loaded.
* Fix `group_collapsed` behavior. See [issue #1247](https://github.com/Mottie/tablesorter/issues/1247).
* Pager:
* Prevent ajax call on init. See [issue #1196](https://github.com/Mottie/tablesorter/issues/1196).
* Prevent setting "all" value before initialization. See [issue #1196](https://github.com/Mottie/tablesorter/issues/1196).
* Scroller: Save scroll position of window. See [issue #1240](https://github.com/Mottie/tablesorter/issues/1240).
* UITheme: Modify filter row after filterInit.
* View:
* Update to get the raw text value of a column without the span wrap.
* Trigger "viewComplete" in the view builder, not in init, otherwise you get no trigger when switching views.
* Replace all instances, not just the first one.
* Bower: Add license identifiers. See [pull #1239](https://github.com/Mottie/tablesorter/pull/1239); thanks [@bckfnn](https://github.com/bckfnn)!

#### <a name="v2.26.5">Version 2.26.5</a> (6/28/2016)

* Docs:
Expand All @@ -122,14 +153,3 @@ View the [complete change log here](https://github.com/Mottie/tablesorter/wiki/C
#### <a name="v2.26.4">Version 2.26.4</a> (6/15/2016)

* Version bump due to merging issues.

#### <a name="v2.26.3">Version 2.26.3</a> (6/15/2016)

* Distribution: Provide source css & js files on CDNJS. Fixes [issue #1222](https://github.com/Mottie/tablesorter/issues/1222).
* Readme:
* Make changelog link clickable. See [pull #1221](https://github.com/Mottie/tablesorter/pull/1221); thanks [@aried3r](https://github.com/aried3r)!
* Update badge for ZenHub.
* Docs: Update main page to use jQuery 3.0.0-rc1 & add migrate.
* Filter: Fix select2 lint issue.
* Scroller: Hide `<col>` with hidden columns. Fixes [issue #1229](https://github.com/Mottie/tablesorter/issues/1229).
* Grunt: Update dependencies & fix pager indentation.
2 changes: 1 addition & 1 deletion addons/pager/jquery.tablesorter.pager.js
View file
@@ -1,6 +1,6 @@
/*!
* tablesorter (FORK) pager plugin
* updated 6/28/2016 (v2.26.5)
* updated 7/11/2016 (v2.26.6)
*/
/*jshint browser:true, jquery:true, unused:false */
;(function($) {
Expand Down
2 changes: 1 addition & 1 deletion dist/js/extras/jquery.tablesorter.pager.min.js
View file

Large diffs are not rendered by default.

78 changes: 48 additions & 30 deletions dist/js/jquery.tablesorter.combined.js
View file
@@ -1,4 +1,4 @@
/*! tablesorter (FORK) - updated 06-28-2016 (v2.26.5)*/
/*! tablesorter (FORK) - updated 07-11-2016 (v2.26.6)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {
Expand All @@ -10,7 +10,7 @@
}
}(function($) {

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

version : '2.26.5',
version : '2.26.6',

parsers : [],
widgets : [],
Expand Down Expand Up @@ -1771,14 +1771,14 @@
regex = ts.regex;
// first try and sort Hex codes
if ( regex.hex.test( b ) ) {
aNum = parseInt( a.match( regex.hex ), 16 );
bNum = parseInt( b.match( regex.hex ), 16 );
aNum = parseInt( ( a || '' ).match( regex.hex ), 16 );
bNum = parseInt( ( b || '' ).match( regex.hex ), 16 );
if ( aNum < bNum ) { return -1; }
if ( aNum > bNum ) { return 1; }
}
// chunk/tokenize
aNum = a.replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
bNum = b.replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
aNum = ( a || '' ).replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
bNum = ( b || '' ).replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
max = Math.max( aNum.length, bNum.length );
// natural sorting through split numeric strings and default strings
for ( indx = 0; indx < max; indx++ ) {
Expand Down Expand Up @@ -2833,7 +2833,7 @@

})(jQuery, window, document);

/*! Widget: uitheme - updated 3/26/2015 (v2.21.3) */
/*! Widget: uitheme - updated 7/11/2016 (v2.26.6) */
;(function ($) {
'use strict';
var ts = $.tablesorter || {};
Expand Down Expand Up @@ -2891,7 +2891,7 @@
id: 'uitheme',
priority: 10,
format: function(table, c, wo) {
var i, hdr, icon, time, $header, $icon, $tfoot, $h, oldtheme, oldremove, oldIconRmv, hasOldTheme,
var i, tmp, hdr, icon, time, $header, $icon, $tfoot, $h, oldtheme, oldremove, oldIconRmv, hasOldTheme,
themesAll = ts.themes,
$table = c.$table.add( $( c.namespace + '_extra_table' ) ),
$headers = c.$headers.add( $( c.namespace + '_extra_headers' ) ),
Expand Down Expand Up @@ -2958,10 +2958,20 @@
.removeClass(hasOldTheme ? [ oldtheme.icons, oldIconRmv ].join(' ') : '')
.addClass(themes.icons || '');
}
if ($table.hasClass('hasFilters')) {
$table.children('thead').children('.' + ts.css.filterRow)
.removeClass(hasOldTheme ? oldtheme.filterRow || '' : '')
.addClass(themes.filterRow || '');
// filter widget initializes after uitheme
if (c.widgets.indexOf('filter') > -1) {
tmp = function() {
$table.children('thead').children('.' + ts.css.filterRow)
.removeClass(hasOldTheme ? oldtheme.filterRow || '' : '')
.addClass(themes.filterRow || '');
};
if (wo.filter_initialized) {
tmp();
} else {
$table.one('filterInit', function() {
tmp();
});
}
}
}
for (i = 0; i < c.columns; i++) {
Expand Down Expand Up @@ -3098,7 +3108,7 @@

})(jQuery);

/*! Widget: filter - updated 6/28/2015 (v2.26.5) *//*
/*! Widget: filter - updated 7/11/2016 (v2.26.6) *//*
* Requires tablesorter v2.8+ and jQuery 1.7+
* by Rob Garrison
*/
Expand Down Expand Up @@ -3885,12 +3895,13 @@
.attr( 'data-lastSearchTime', new Date().getTime() )
.unbind( tmp.replace( ts.regex.spaces, ' ' ) )
.bind( 'keydown' + namespace, function( event ) {
if ( event.which === tskeyCodes.escape && !wo.filter_resetOnEsc ) {
if ( event.which === tskeyCodes.escape && !table.config.widgetOptions.filter_resetOnEsc ) {
// prevent keypress event
return false;
}
})
.bind( 'keyup' + namespace, function( event ) {
wo = table.config.widgetOptions; // make sure "wo" isn't cached
var column = parseInt( $( this ).attr( 'data-column' ), 10 );
$( this ).attr( 'data-lastSearchTime', new Date().getTime() );
// emulate what webkit does.... escape clears the filter
Expand All @@ -3917,7 +3928,8 @@
// don't get cached data, in case data-column changes dynamically
var column = parseInt( $( this ).attr( 'data-column' ), 10 );
// don't allow 'change' event to process if the input value is the same - fixes #685
if ( wo.filter_initialized && ( event.which === tskeyCodes.enter || event.type === 'search' ||
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 === '' ) ) {
Expand Down Expand Up @@ -3966,7 +3978,7 @@
// show/hide filter row as needed
c.$table
.find( '.' + tscss.filterRow )
.triggerHandler( combinedFilters === '' ? 'mouseleave' : 'mouseenter' );
.triggerHandler( tsf.hideFiltersCheck( c ) ? 'mouseleave' : 'mouseenter' );
}
// return if the last search is the same; but filter === false when updating the search
// see example-widget-filter.html filter toggle buttons
Expand Down Expand Up @@ -3999,26 +4011,34 @@
return false;
}
},
hideFiltersCheck: function( c ) {
if (typeof c.widgetOptions.filter_hideFilters === 'function') {
var val = c.widgetOptions.filter_hideFilters( c );
if (typeof val === 'boolean') {
return val;
}
}
return ts.getFilters( c.$table ).join( '' ) === '';
},
hideFilters: function( c, $table ) {
var timer,
$row = ( $table || c.$table ).find( '.' + tscss.filterRow ).addClass( tscss.filterRowHide );
$row
var timer;
( $table || c.$table )
.find( '.' + tscss.filterRow )
.addClass( tscss.filterRowHide )
.bind( 'mouseenter mouseleave', function( e ) {
// save event object - http://bugs.jquery.com/ticket/12140
var event = e,
$filterRow = $( this );
$row = $( this );
clearTimeout( timer );
timer = setTimeout( function() {
if ( /enter|over/.test( event.type ) ) {
$filterRow.removeClass( tscss.filterRowHide );
$row.removeClass( tscss.filterRowHide );
} else {
// don't hide if input has focus
// $( ':focus' ) needs jQuery 1.6+
if ( $( document.activeElement ).closest( 'tr' )[0] !== $filterRow[0] ) {
if ( $( document.activeElement ).closest( 'tr' )[0] !== $row[0] ) {
// don't hide row if any filter has a value
if ( c.lastCombinedFilter === '' ) {
$filterRow.addClass( tscss.filterRowHide );
}
$row.toggleClass( tscss.filterRowHide, tsf.hideFiltersCheck( c ) );
}
}
}, 200 );
Expand All @@ -4030,9 +4050,7 @@
timer = setTimeout( function() {
clearTimeout( timer );
// don't hide row if any filter has a value
if ( ts.getFilters( c.$table ).join( '' ) === '' ) {
$row.toggleClass( tscss.filterRowHide, event.type !== 'focus' );
}
$row.toggleClass( tscss.filterRowHide, tsf.hideFiltersCheck( c ) && event.type !== 'focus' );
}, 200 );
});
},
Expand Down Expand Up @@ -5226,7 +5244,7 @@

})(jQuery, window);

/*! Widget: resizable - updated 6/28/2015 (v2.26.5) */
/*! Widget: resizable - updated 6/28/2016 (v2.26.5) */
/*jshint browser:true, jquery:true, unused:false */
;(function ($, window) {
'use strict';
Expand Down
8 changes: 4 additions & 4 deletions dist/js/jquery.tablesorter.combined.min.js
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions dist/js/jquery.tablesorter.js
View file
Expand Up @@ -8,7 +8,7 @@
}
}(function($) {

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

version : '2.26.5',
version : '2.26.6',

parsers : [],
widgets : [],
Expand Down Expand Up @@ -1769,14 +1769,14 @@
regex = ts.regex;
// first try and sort Hex codes
if ( regex.hex.test( b ) ) {
aNum = parseInt( a.match( regex.hex ), 16 );
bNum = parseInt( b.match( regex.hex ), 16 );
aNum = parseInt( ( a || '' ).match( regex.hex ), 16 );
bNum = parseInt( ( b || '' ).match( regex.hex ), 16 );
if ( aNum < bNum ) { return -1; }
if ( aNum > bNum ) { return 1; }
}
// chunk/tokenize
aNum = a.replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
bNum = b.replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
aNum = ( a || '' ).replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
bNum = ( b || '' ).replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
max = Math.max( aNum.length, bNum.length );
// natural sorting through split numeric strings and default strings
for ( indx = 0; indx < max; indx++ ) {
Expand Down
4 changes: 2 additions & 2 deletions dist/js/jquery.tablesorter.min.js
View file

Large diffs are not rendered by default.

0 comments on commit 288a06e

Please sign in to comment.