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 working

Browse Source
This commit is contained in:
Mottie 2014-12-11 09:39:56 -06:00
commit 89af1163e5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -91,7 +91,7 @@ View the [complete listing here](//github.com/Mottie/tablesorter/wiki/Changes).
* Core * Core
* Add `cssAllowClicks` option; setting "tablesorter-allowClicks" on a header cell will allow clicks to bubble up. * Add `cssAllowClicks` option; setting "tablesorter-allowClicks" on a header cell will allow clicks to bubble up.
* A column can now be targetted using a class name within the header cell as well as the header cell itself; this only applies to previous options that could use a class name/id to target the header cell. * A column can now be targeted using a class name within the header cell as well as the header cell itself; this only applies to previous options that could use a class name/id to target the header cell.
* Docs * Docs
* Emphasize that this is a fork of tablesorter. Fixes [issue #758](https://github.com/Mottie/tablesorter/issues/758). * Emphasize that this is a fork of tablesorter. Fixes [issue #758](https://github.com/Mottie/tablesorter/issues/758).
@ -108,7 +108,7 @@ View the [complete listing here](//github.com/Mottie/tablesorter/wiki/Changes).
* Nested tables now work properly in IE. * Nested tables now work properly in IE.
* Pager addon & widget * Pager addon & widget
* Fix `selectorRemove` class name parseing. * Fix `selectorRemove` class name parsing.
* A `pagerComplete` event now fires off immediately after initialization & once again fires on non-ajax tables. * A `pagerComplete` event now fires off immediately after initialization & once again fires on non-ajax tables.
* Fix double `pagerComplete` events firing on init & initial filter settings. * Fix double `pagerComplete` events firing on init & initial filter settings.
* Fix pager initialization with filter widget & displaying page output. Fixes [issue #755](https://github.com/Mottie/tablesorter/issues/755) & [issue #757](https://github.com/Mottie/tablesorter/issues/757). * Fix pager initialization with filter widget & displaying page output. Fixes [issue #755](https://github.com/Mottie/tablesorter/issues/755) & [issue #757](https://github.com/Mottie/tablesorter/issues/757).
@ -161,7 +161,7 @@ View the [complete listing here](//github.com/Mottie/tablesorter/wiki/Changes).
* Add `maxOptionSize` option * Add `maxOptionSize` option
* Tweak code & fix problems introduces in [pull #711](https://github.com/Mottie/tablesorter/pull/711). * Tweak code & fix problems introduces in [pull #711](https://github.com/Mottie/tablesorter/pull/711).
* Thanks [camallen](https://github.com/camallen)! * Thanks [camallen](https://github.com/camallen)!
* Fix ouput display not updating on initialization. * Fix output display not updating on initialization.
* Add url check to allow ajax updating of table. Fixes [issue #730](https://github.com/Mottie/tablesorter/issues/730). * Add url check to allow ajax updating of table. Fixes [issue #730](https://github.com/Mottie/tablesorter/issues/730).
* Check for dynamically changing `ajaxUrl` option. * Check for dynamically changing `ajaxUrl` option.
* Add `ajaxObject` to the `table.config.pager` variable. * Add `ajaxObject` to the `table.config.pager` variable.

2
css/theme.bootstrap.css
View File

@ -25,7 +25,7 @@
} }
/* bootstrap uses <i> for icons */ /* bootstrap uses <i> for icons */
.tablesorter-bootstrap .tablesorter-header i { .tablesorter-bootstrap .tablesorter-header i.tablesorter-icon {
font-size: 11px; font-size: 11px;
position: absolute; position: absolute;
right: 2px; right: 2px;