mirror of
https://github.com/Mottie/tablesorter.git
synced 2025-01-12 15:24:21 +00:00
uitheme wraps headers in a div for Firefox
This commit is contained in:
parent
b0fccd0ebb
commit
6186faa5bf
@ -14,7 +14,7 @@
|
||||
</style>
|
||||
|
||||
<!-- jQuery -->
|
||||
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8/jquery.js"></script>
|
||||
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.2/jquery.js"></script>
|
||||
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/cupertino/jquery-ui.css">
|
||||
|
||||
<!-- Tablesorter themes -->
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* TableSorter 2.4 - Client-side table sorting with ease!
|
||||
* TableSorter 2.4.1 - Client-side table sorting with ease!
|
||||
* @requires jQuery v1.2.6+
|
||||
*
|
||||
* Copyright (c) 2007 Christian Bach
|
||||
@ -1218,7 +1218,7 @@
|
||||
ts.addParser({
|
||||
id: "usLongDate",
|
||||
is: function(s) {
|
||||
return /^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4}|'?\d{2})\s+(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i.test(s);
|
||||
return (/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4}|'?\d{2})\s+(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i).test(s);
|
||||
},
|
||||
format: function(s, table) {
|
||||
return ts.formatFloat( (new Date(s.replace(/(\S)([AP]M)$/i, "$1 $2")).getTime() || ''), table);
|
||||
@ -1255,7 +1255,7 @@
|
||||
ts.addParser({
|
||||
id: "time",
|
||||
is: function(s) {
|
||||
return /^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i.test(s);
|
||||
return (/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i).test(s);
|
||||
},
|
||||
format: function(s, table) {
|
||||
return ts.formatFloat( (new Date("2000/01/01 " + s.replace(/(\S)([AP]M)$/i, "$1 $2")).getTime() || ""), table);
|
||||
|
4
js/jquery.tablesorter.min.js
vendored
4
js/jquery.tablesorter.min.js
vendored
File diff suppressed because one or more lines are too long
@ -1,4 +1,4 @@
|
||||
/*! tableSorter 2.4+ widgets - updated 9/27/2012
|
||||
/*! tableSorter 2.4+ widgets - updated 9/29/2012
|
||||
*
|
||||
* Column Styles
|
||||
* Column Filters
|
||||
@ -138,6 +138,10 @@ $.tablesorter.addWidget({
|
||||
}, function(){
|
||||
$(this).removeClass(o.hover);
|
||||
});
|
||||
if (!$h.find('.tablesorter-wrapper').length) {
|
||||
// Firefox needs this inner div to position the resizer correctly
|
||||
$h.wrapInner('<div class="tablesorter-wrapper" style="position:relative;height:100%;width:100%"></div>');
|
||||
}
|
||||
if (c.cssIcon){
|
||||
// if c.cssIcon is '', then no <i> is added to the header
|
||||
$h.find('.' + c.cssIcon).addClass(o.icons);
|
||||
@ -811,7 +815,7 @@ $.tablesorter.addWidget({
|
||||
$c = $(this).children();
|
||||
if (!$(this).find('.tablesorter-wrapper').length) {
|
||||
// Firefox needs this inner div to position the resizer correctly
|
||||
$c.wrapInner('<div class="tablesorter-wrapper" style="position:relative;height:100%;width:100%"></div>')
|
||||
$c.wrapInner('<div class="tablesorter-wrapper" style="position:relative;height:100%;width:100%"></div>');
|
||||
}
|
||||
$c = $c.slice(0,-1); // don't include the last column of the row
|
||||
$cols = $cols ? $cols.add($c) : $c;
|
||||
|
22
js/jquery.tablesorter.widgets.min.js
vendored
22
js/jquery.tablesorter.widgets.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user