library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2024-11-15 23:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into gh-pages

Browse Source
This commit is contained in:
Rob Garrison 2016-09-28 21:15:42 -05:00
commit e7ec0b8691
18 changed files with 78 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.editorconfig Normal file
View File

@ -0,0 +1,11 @@
# https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties
root = true
[*]
indent_style = tab
indent_size = 2
trim_trailing_whitespace = true
end_of_line = lf
charset = utf-8
insert_final_newline = true
max_line_length = 80

16
README.md
View File

@ -51,6 +51,7 @@ tablesorter (FORK) is a jQuery plugin for turning a standard HTML table with THE
* [Plugin for Rails](https://github.com/themilkman/jquery-tablesorter-rails). Maintained by [themilkman](https://github.com/themilkman).
* [UserFrosting](https://github.com/alexweissman/UserFrosting) (A secure, modern user management system for PHP that uses tablesorter) by [alexweissman](https://github.com/alexweissman).
* [Grav CMS](https://getgrav.org/): `bin/gpm install tablesorter` ([ref](https://github.com/Perlkonig/grav-plugin-tablesorter)).
### Contributing
@ -101,6 +102,14 @@ If you would like to contribute, please...
View the [complete change log here](https://github.com/Mottie/tablesorter/wiki/Changes).
#### <a name="v2.27.8">Version 2.27.8</a> (9/28/2016)
* Core: minor code cleanup.
* Docs: remove code in duplicate example-widget-filter-custom. See [pull #1295](https://github.com/Mottie/tablesorter/pull/1295); thanks [@themilkman](https://github.com/themilkman)!
* ColumnSelector: `updateAll` properly updates the popup. See [Stack Overflow](http://stackoverflow.com/q/39669948/145346).
* Pager: Maintain filter focus on custom controls. Fixes [issue #1296](https://github.com/Mottie/tablesorter/issues/1296).
* Readme: Add link to Grav CMS. See [issue #1290](https://github.com/Mottie/tablesorter/issues/1290).
#### <a name="v2.27.7">Version 2.27.7</a> (9/23/2016)
* Core:
@ -139,10 +148,3 @@ View the [complete change log here](https://github.com/Mottie/tablesorter/wiki/C
* Keyboard keys now include left, right, up, down, pageUp, pageDown,
home, or end.
* `pageKeyStep` option added. Number of pages to skip with pageUp or pageDown.
#### <a name="v2.27.5">Version 2.27.5</a> (8/22/2016)
* Readme: Update IRC link to a free client.
* 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.

24
beta-testing/pager-custom-controls.js
View File

@ -1,5 +1,5 @@
/*!
* custom pager controls (beta) for Tablesorter - updated 9/1/2016 (v2.27.6)
* custom pager controls (beta) for Tablesorter - updated 9/28/2016 (v2.27.8)
initialize custom pager script BEFORE initializing tablesorter/tablesorter pager
custom pager looks like this:
1 | 2 … 5 | 6 | 7 … 99 | 100
@ -13,7 +13,7 @@
/*global jQuery: false */
;(function($) {
"use strict";
'use strict';
$.tablesorter = $.tablesorter || {};
@ -34,9 +34,13 @@ $.tablesorter.customPagerControls = function(settings) {
},
options = $.extend({}, defaults, settings),
$table = $(options.table),
$pager = $(options.pager);
$pager = $(options.pager),
focusOnPager = false;
$table
.on('filterStart', function() {
focusOnPager = false;
})
.on('pagerInitialized pagerComplete', function (e, c) {
var indx,
p = c.pager ? c.pager : c, // using widget
@ -83,11 +87,11 @@ $.tablesorter.customPagerControls = function(settings) {
});
}
}
$pager
.find('.pagecount')
.html(pages.html())
.find('.' + options.currentClass)
.focus();
$pager.find('.pagecount').html(pages.html());
if (focusOnPager) {
// don't focus on pager when using filter - fixes #1296
$pager.find('.' + options.currentClass).focus();
}
});
// set up pager controls
@ -103,6 +107,7 @@ $.tablesorter.customPagerControls = function(settings) {
})
.end()
.on('click', options.currentPage, function() {
focusOnPager = true;
var $el = $(this);
$el
.addClass(options.currentClass)
@ -118,11 +123,13 @@ $.tablesorter.customPagerControls = function(settings) {
// ignore arrows inside form elements
if (/input|select|textarea/i.test(events.target.nodeName) ||
!(events.which > 32 && events.which < 41)) {
focusOnPager = false;
return;
}
// only allow keyboard use if element inside of pager is focused
if ($(document.activeElement).closest(options.pager).is($pager)) {
events.preventDefault();
focusOnPager = true;
var key = events.which,
max = $table[0].config.totalRows,
$el = $pager.find(options.currentPage).filter('.' + options.currentClass),
@ -140,4 +147,5 @@ $.tablesorter.customPagerControls = function(settings) {
});
}
};
})(jQuery);

6
dist/js/jquery.tablesorter.combined.js vendored
View File

@ -1,4 +1,4 @@
/*! tablesorter (FORK) - updated 09-23-2016 (v2.27.7)*/
/*! tablesorter (FORK) - updated 09-28-2016 (v2.27.8)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {
@ -10,7 +10,7 @@
}
}(function(jQuery) {
/*! TableSorter (FORK) v2.27.7 *//*
/*! TableSorter (FORK) v2.27.8 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
@ -34,7 +34,7 @@
'use strict';
var ts = $.tablesorter = {
version : '2.27.7',
version : '2.27.8',
parsers : [],
widgets : [],

4
dist/js/jquery.tablesorter.combined.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/js/jquery.tablesorter.js vendored
View File

@ -8,7 +8,7 @@
}
}(function(jQuery) {
/*! TableSorter (FORK) v2.27.7 *//*
/*! TableSorter (FORK) v2.27.8 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
@ -32,7 +32,7 @@
'use strict';
var ts = $.tablesorter = {
version : '2.27.7',
version : '2.27.8',
parsers : [],
widgets : [],

2
dist/js/jquery.tablesorter.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/jquery.tablesorter.widgets.js vendored
View File

@ -1,4 +1,4 @@
/*! tablesorter (FORK) - updated 09-23-2016 (v2.27.7)*/
/*! tablesorter (FORK) - updated 09-28-2016 (v2.27.8)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {

2
dist/js/jquery.tablesorter.widgets.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/widgets/widget-columnSelector.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
docs/example-widget-filter-custom.html
View File

@ -110,10 +110,6 @@
// So typing in "a" will find "albert" but not "frank", both have a's; default is false
filter_startsWith : false,
// if false, filters are collapsed initially, but can be revealed by hovering over the grey bar immediately
// below the header row. Additionally, tabbing through the document will open the filter row when an input gets focus
filter_hideFilters : false,
// Add select box to 4th column (zero-based index)
// each option has an associated function that returns a boolean
// function variables:

4
docs/index.html
View File

@ -456,7 +456,7 @@
<li><span class="label label-info">Beta</span> <a href="example-widget-chart.html">Chart Widget</a> (<span class="version">v2.19.0</span>; <span class="version updated">v2.24.0</span>).</li>
<li><span class="results">&dagger;</span> <a href="example-widget-columns.html">Columns highlight widget</a> (v2.0.17).</li>
<li><a href="example-widget-column-selector.html">Column selector widget</a> (<span class="version">v2.15</span>; <span class="version updated">v2.27.1</span>).</li>
<li><a href="example-widget-column-selector.html">Column selector widget</a> (<span class="version">v2.15</span>; <span class="version updated">v2.27.8</span>).</li>
<li><a href="example-widget-editable.html">Content editable widget</a> (v2.9; <span class="version updated">v2.25.5</span>).</li>
<li><a href="example-widget-current-sort.html">Current Sort Widget</a> (<span class="version">v2.27.0</span>).</li>
<li><span class="label label-info">Beta</span> <a href="example-dragtable.html">Dragtable mod</a> - (jQuery UI widget for column reordering [<a class="external" href="http://stackoverflow.com/a/27770224/145346">ref</a>]; <span class="version">v2.24.0</span>).</li>
@ -543,7 +543,7 @@
<h4>Work-in-progress</h4>
<ul>
<li><span class="label label-info">Beta</span> <a href="../beta-testing/example-pager-custom-controls.html">Custom pager control script</a> (<span class="version updated">v2.17.1</span>).</li>
<li><span class="label label-info">Beta</span> <a href="../beta-testing/example-pager-custom-controls.html">Custom pager control script</a> (<span class="version updated">v2.27.8</span>).</li>
<li><span class="label label-info">Alpha</span> <a href="../beta-testing/example-widget-column-reorder.html">Column reorder widget</a> - not working 100% with sticky headers.</li>
<li><span class="label label-info">Alpha</span> Column reorder using the <a class="external" href="http://stackoverflow.com/a/27770224/145346">dragtable widget</a> (non-mod version).</li>
</ul>

6
js/jquery.tablesorter.combined.js
View File

@ -4,7 +4,7 @@
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀██
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
*/
/*! tablesorter (FORK) - updated 09-23-2016 (v2.27.7)*/
/*! tablesorter (FORK) - updated 09-28-2016 (v2.27.8)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {
@ -16,7 +16,7 @@
}
}(function(jQuery) {
/*! TableSorter (FORK) v2.27.7 *//*
/*! TableSorter (FORK) v2.27.8 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
@ -40,7 +40,7 @@
'use strict';
var ts = $.tablesorter = {
version : '2.27.7',
version : '2.27.8',
parsers : [],
widgets : [],

4
js/jquery.tablesorter.js
View File

@ -1,4 +1,4 @@
/*! TableSorter (FORK) v2.27.7 *//*
/*! TableSorter (FORK) v2.27.8 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
@ -22,7 +22,7 @@
'use strict';
var ts = $.tablesorter = {
version : '2.27.7',
version : '2.27.8',
parsers : [],
widgets : [],

2
js/jquery.tablesorter.widgets.js
View File

@ -4,7 +4,7 @@
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀██
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
*/
/*! tablesorter (FORK) - updated 09-23-2016 (v2.27.7)*/
/*! tablesorter (FORK) - updated 09-28-2016 (v2.27.8)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {

4
js/widgets/widget-columnSelector.js
View File

@ -1,4 +1,4 @@
/* Widget: columnSelector (responsive table widget) - updated 7/31/2016 (v2.27.1) *//*
/* Widget: columnSelector (responsive table widget) - updated 9/28/2016 (v2.27.8) *//*
* Requires tablesorter v2.8+ and jQuery 1.7+
* by Justin Hallett & Rob Garrison
*/
@ -209,6 +209,8 @@
c.$table
.off('updateAll' + namespace)
.on('updateAll' + namespace, function() {
tsColSel.setupSelector(c, wo);
tsColSel.setupBreakpoints(c, wo);
tsColSel.updateBreakpoints(c, wo);
tsColSel.updateCols(c, wo);
});

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "tablesorter",
"title": "tablesorter",
"version": "2.27.7",
"version": "2.27.8",
"description": "tablesorter (FORK) 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.",
"author": {
"name": "Christian Bach",

2
tablesorter.jquery.json
View File

@ -1,7 +1,7 @@
{
"name": "tablesorter",
"title": "tablesorter",
"version": "2.27.7",
"version": "2.27.8",
"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.",
"author": {
"name": "Christian Bach",