jquery-tablesorter 1.12.8 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f537540ad9cb3ae7519f0ede00b10a967df49b5
-  data.tar.gz: 4e043ff89f30abfa0bb964799a352dbe63d61b81
+  metadata.gz: 352f918783831cc401eb8b3c9a8ed8d0b1dbf1aa
+  data.tar.gz: 8d49de1c504051729de9cb5a9434542c479a9f0c
 SHA512:
-  metadata.gz: a1ee4421ddd5364f2f8471cdfa0ca6c1a9ef3794f53721092a859236b7492e756c3a925a7e9d4e6c5bc2725d2d8ba29be917ff82c9bb85972c218090ad54bf1a
-  data.tar.gz: c71c7fd64e88115f2a3fb66a3205c050001c4da2cfed4cf0a1178a4a18932d2ede7d40cc0b43b2ae25cfa3d1ad9e21bc32880acf0ceb5f001d2887817d54a4f3
+  metadata.gz: 4e11a4e7722b7eb97301d93caa25eefcade3a83750f68cb0a9608947e0d728537db07e408af70ec553269994569b6b66819467fec67aa0e96da1d5ef27cb32de
+  data.tar.gz: 9e1d3646f6ce66a39135020b2a94359018c96f824834046fb21e302879b336d98a7b50e18252fa52f518824db5a184969cf981232a273cfc14adbf6725deb125

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.17.8 (9/15/2014), [documentation]
+Current tablesorter version: 2.18.0 (10/26/2014), [documentation]
 
 Any issue associated with the js/css files, please report to [Mottie's fork].
 

data/lib/jquery-tablesorter/version.rb

@@ -1,3 +1,3 @@
 module JqueryTablesorter
-  VERSION = '1.12.8'
+  VERSION = '1.13.0'
 end

data/vendor/assets/javascripts/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js

@@ -1,6 +1,6 @@
 /*!
  * tablesorter pager plugin
- * updated 9/15/2014 (v2.17.8)
+ * updated 10/26/2014 (v2.18.0)
  */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {
@@ -131,16 +131,10 @@
 			}
 		},
 
-		updatePageDisplay = function(table, p, completed) {
-			var i, pg, s, $out, regex,
-				c = table.config,
-				f = c.$table.hasClass('hasFilters'),
-				t = [],
-				sz = p.size || 10; // don't allow dividing by zero
-			t = [ (c.widgetOptions && c.widgetOptions.filter_filteredRow || 'filtered'), c.selectorRemove.replace(/^(\w+\.)/g,'') ];
-			if (p.countChildRows) { t.push(c.cssChildRow); }
-			regex = new RegExp( '(' + t.join('|') + ')' );
-			if (f && !p.ajaxUrl) {
+		calcFilters = function(table, p) {
+			var c = table.config,
+				hasFilters = c.$table.hasClass('hasFilters');
+			if (hasFilters && !p.ajaxUrl) {
 				if ($.isEmptyObject(c.cache)) {
 					// delayInit: true so nothing is in the cache
 					p.filteredRows = p.totalRows = c.$tbodies.eq(0).children('tr').not( p.countChildRows ? '' : '.' + c.cssChildRow ).length;
@@ -150,11 +144,20 @@
 						p.filteredRows += p.regexRows.test(el[c.columns].$row[0].className) ? 0 : 1;
 					});
 				}
-			} else if (!f) {
+			} else if (!hasFilters) {
 				p.filteredRows = p.totalRows;
 			}
+		},
+
+		updatePageDisplay = function(table, p, completed) {
+			if ( !p.initialized ) { return; }
+			var s, t, $out,
+				c = table.config,
+				sz = p.size || 10; // don't allow dividing by zero
+			if (p.countChildRows) { t.push(c.cssChildRow); }
 			p.totalPages = Math.ceil( p.totalRows / sz ); // needed for "pageSize" method
 			c.totalRows = p.totalRows;
+			calcFilters(table, p);
 			c.filteredRows = p.filteredRows;
 			p.filteredPages = Math.ceil( p.filteredRows / sz ) || 0;
 			if ( Math.min( p.totalPages, p.filteredPages ) >= 0 ) {
@@ -188,38 +191,11 @@
 					$out[ ($out[0].tagName === 'INPUT') ? 'val' : 'html' ](s);
 					if ( p.$goto.length ) {
 						t = '';
-						pg = Math.min( p.totalPages, p.filteredPages );
-						// Filter the options page number link array if it's larger than 'maxOptionSize'
-						// as large page set links will slow the browser on large dom inserts
-						var skip_set_size = Math.floor(pg / p.maxOptionSize),
-						large_collection = pg > p.maxOptionSize,
-						current_page = p.page + 1,
-						start_page = 1,
-						end_page = pg,
-						option_pages = [];
-						//construct default options pages array
-						var option_pages_start_page = (large_collection && current_page == 1) ? skip_set_size : 1;
-						for (i = option_pages_start_page; i <= pg;) {
- 							option_pages.push(i);
-							i = large_collection ? i + skip_set_size : i++;
- 						}
-						if (large_collection) {
-							var central_focus_size = Math.floor(p.maxOptionSize / 2) - 1,
-							lower_focus_window = Math.abs(Math.floor(current_page - central_focus_size/2)),
-							focus_option_pages = [];
-							start_page = Math.min(current_page, lower_focus_window);
-							end_page = start_page + central_focus_size;
-							//construct an array to get a focus set around the current page
-							for (i = start_page; i <= end_page ; i++) focus_option_pages.push(i);
-							var insert_index = Math.floor(option_pages.length / 2) - Math.floor(focus_option_pages.length / 2);
-							Array.prototype.splice.apply(option_pages, [ insert_index, focus_option_pages.length ].concat(focus_option_pages));
-							option_pages.sort(function sortNumber(a,b) { return a - b; });
-						}
-						for ( i = 0; i < option_pages.length; i++) {
-							t += '<option>' + option_pages[i] + '</option>';
-						}
-						p.$goto[0].innerHTML = t;
-						p.$goto[0].value = current_page;
+						$.each(buildPageSelect(p), function(i, opt){
+							t += '<option value="' + opt + '">' + opt + '</option>';
+						});
+						// innerHTML doesn't work in IE9 - http://support2.microsoft.com/kb/276228
+						p.$goto.html(t).val( p.page + 1 );
 					}
 					// rebind startRow/page inputs
 					$out.find('.ts-startRow, .ts-page').unbind('change').bind('change', function(){
@@ -230,6 +206,7 @@
 				}
 			}
 			pagerArrows(p);
+			fixHeight(table, p);
 			if (p.initialized && completed !== false) {
 				c.$table.trigger('pagerComplete', p);
 				// save pager info to storage
@@ -242,26 +219,92 @@
 			}
 		},
 
+		buildPageSelect = function(p) {
+			// Filter the options page number link array if it's larger than 'maxOptionSize'
+			// as large page set links will slow the browser on large dom inserts
+			var i, central_focus_size, focus_option_pages, insert_index, option_length, focus_length,
+				pg = Math.min( p.totalPages, p.filteredPages ) || 1,
+				// make skip set size multiples of 5
+				skip_set_size = Math.ceil( ( pg / p.maxOptionSize ) / 5 ) * 5,
+				large_collection = pg > p.maxOptionSize,
+				current_page = p.page + 1,
+				start_page = skip_set_size,
+				end_page = pg - skip_set_size,
+				option_pages = [1],
+				// construct default options pages array
+				option_pages_start_page = (large_collection) ? skip_set_size : 1;
+
+			for ( i = option_pages_start_page; i <= pg; ) {
+				option_pages.push(i);
+				i = i + ( large_collection ? skip_set_size : 1 );
+			}
+			option_pages.push(pg);
+			if (large_collection) {
+				focus_option_pages = [];
+				// don't allow central focus size to be > 5 on either side of current page
+				central_focus_size = Math.max( Math.floor( p.maxOptionSize / skip_set_size ) - 1, 5 );
+
+				start_page = current_page - central_focus_size;
+				if (start_page < 1) { start_page = 1; }
+				end_page = current_page + central_focus_size;
+				if (end_page > pg) { end_page = pg; }
+				// construct an array to get a focus set around the current page
+				for (i = start_page; i <= end_page ; i++) {
+					focus_option_pages.push(i);
+				}
+
+				// keep unique values
+				option_pages = $.grep(option_pages, function(value, indx) {
+					return $.inArray(value, option_pages) === indx;
+				});
+
+				option_length = option_pages.length;
+				focus_length = focus_option_pages.length;
+
+				// make sure at all option_pages aren't replaced
+				if (option_length - focus_length > skip_set_size / 2 && option_length + focus_length > p.maxOptionSize ) {
+					insert_index = Math.floor(option_length / 2) - Math.floor(focus_length / 2);
+					Array.prototype.splice.apply(option_pages, [ insert_index, focus_length ]);
+				}
+				option_pages = option_pages.concat(focus_option_pages);
+
+			}
+
+			// keep unique values again
+			option_pages = $.grep(option_pages, function(value, indx) {
+				return $.inArray(value, option_pages) === indx;
+			})
+			.sort(function(a,b) { return a - b; });
+
+			return option_pages;
+		},
+
 		fixHeight = function(table, p) {
 			var d, h,
 				c = table.config,
 				$b = c.$tbodies.eq(0);
-			if (p.fixedHeight) {
-				$b.find('tr.pagerSavedHeightSpacer').remove();
+			$b.find('tr.pagerSavedHeightSpacer').remove();
+			if (p.fixedHeight && !p.isDisabled) { 
 				h = $.data(table, 'pagerSavedHeight');
 				if (h) {
 					d = h - $b.height();
 					if ( d > 5 && $.data(table, 'pagerLastSize') === p.size && $b.children('tr:visible').length < p.size ) {
-						$b.append('<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.replace(/^(\w+\.)/g,'') + '" style="height:' + d + 'px;"></tr>');
+						$b.append('<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.slice(1) + '" style="height:' + d + 'px;"></tr>');
 					}
 				}
 			}
 		},
 
 		changeHeight = function(table, p) {
-			var $b = table.config.$tbodies.eq(0);
+			var h,
+				c = table.config,
+				$b = c.$tbodies.eq(0);
 			$b.find('tr.pagerSavedHeightSpacer').remove();
-			$.data(table, 'pagerSavedHeight', $b.height());
+			if (!$b.children('tr:visible').length) {
+				$b.append('<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.slice(1) + '"><td>&nbsp</td></tr>');
+			}
+			h = $b.children('tr').eq(0).height() * p.size;
+			$.data(table, 'pagerSavedHeight', h);
 			fixHeight(table, p);
 			$.data(table, 'pagerLastSize', p.size);
 		},
@@ -418,8 +461,7 @@
 				p.last.totalRows = p.totalRows;
 				p.last.currentFilters = p.currentFilters;
 				p.last.sortList = (c.sortList || []).join(',');
-				updatePageDisplay(table, p);
-				fixHeight(table, p);
+				updatePageDisplay(table, p, true);
 				$t.trigger('updateCache', [function(){
 					if (p.initialized) {
 						// apply widgets after table has rendered & after a delay to prevent
@@ -560,8 +602,7 @@
 				}
 				ts.processTbody(table, $tb, false);
 			}
-			updatePageDisplay(table, p);
-			if ( !p.isDisabled ) { fixHeight(table, p); }
+			updatePageDisplay(table, p, true);
 			if (table.isUpdating) {
 				$t.trigger('updateComplete', [ table, true ]);
 			}
@@ -612,13 +653,14 @@
 
 		moveToPage = function(table, p, pageMoved) {
 			if ( p.isDisabled ) { return; }
-			var c = table.config,
+			var pg, c = table.config,
 				$t = $(table),
-				l = p.last,
-				pg = Math.min( p.totalPages, p.filteredPages );
-			if ( pageMoved !== false && p.initialized && $.isEmptyObject(table.config.cache)) {
+				l = p.last;
+			if ( pageMoved !== false && p.initialized && $.isEmptyObject(c.cache)) {
 				return updateCache(table);
 			}
+			calcFilters(table, p);
+			pg = Math.min( p.totalPages, p.filteredPages );
 			if ( p.page < 0 ) { p.page = 0; }
 			if ( p.page > ( pg - 1 ) && pg !== 0 ) { p.page = pg - 1; }
 			// fixes issue where one currentFilter is [] and the other is ['','',''],
@@ -628,6 +670,10 @@
 			// don't allow rendering multiple times on the same page/size/totalRows/filters/sorts
 			if ( l.page === p.page && l.size === p.size && l.totalRows === p.totalRows &&
 				(l.currentFilters || []).join(',') === (p.currentFilters || []).join(',') &&
+				// check for ajax url changes see #730
+				(l.ajaxUrl || '') === (p.ajaxObject.url || '') &&
+				// & ajax url option changes (dynamically add/remove/rename sort & filter parameters)
+				(l.optAjaxUrl || '') === (p.ajaxUrl || '') &&
 				l.sortList === (c.sortList || []).join(',') ) { return; }
 			if (c.debug) {
 				ts.log('Pager changing to page ' + p.page);
@@ -638,7 +684,9 @@
 				// fixes #408; modify sortList otherwise it auto-updates
 				sortList : (c.sortList || []).join(','),
 				totalRows : p.totalRows,
-				currentFilters : p.currentFilters || []
+				currentFilters : p.currentFilters || [],
+				ajaxUrl : p.ajaxObject.url || '',
+				optAjaxUrl : p.ajaxUrl || ''
 			};
 			if (p.ajax) {
 				getAjax(table, p);
@@ -722,11 +770,11 @@
 				p.$container.find(p.cssPageDisplay).attr('id', info);
 				c.$table.attr('aria-describedby', info);
 			}
+			changeHeight(table, p);
 			if ( triggered ) {
 				c.$table.trigger('updateRows');
 				setPageSize(table, p.size, p);
 				hideRowsSetup(table, p);
-				fixHeight(table, p);
 				if (c.debug) {
 					ts.log('pager enabled');
 				}
@@ -781,7 +829,7 @@
 				p.regexRows = new RegExp('(' + (wo.filter_filteredRow || 'filtered') + '|' + c.selectorRemove.replace(/^(\w+\.)/g,'') + '|' + c.cssChildRow + ')');
 
 				$t
-					.unbind('filterStart filterEnd sortEnd disable enable destroy updateComplete pageSize '.split(' ').join('.pager '))
+					.unbind('filterStart filterEnd sortEnd disable enable destroy updateComplete pageSize pageSet '.split(' ').join('.pager '))
 					.bind('filterStart.pager', function(e, filters) {
 						p.currentFilters = filters;
 						// don't change page is filters are the same (pager updating, etc)
@@ -796,11 +844,9 @@
 								// make sure we have a copy of all table rows once the cache has been built
 								updateCache(table);
 							}
-							// update page display first, so we update p.filteredPages
-							updatePageDisplay(table, p, false);
 							moveToPage(table, p, false);
 							c.$table.trigger('applyWidgets');
-							fixHeight(table, p);
+							updatePageDisplay(table, p, false);
 						}
 					})
 					.bind('disable.pager', function(e){
@@ -819,7 +865,6 @@
 						e.stopPropagation();
 						// table can be unintentionally undefined in tablesorter v2.17.7 and earlier
 						if ( !table || triggered ) { return; }
-						fixHeight(table, p);
 						var $rows = c.$tbodies.eq(0).children('tr').not(c.selectorRemove);
 						p.totalRows = $rows.length - ( p.countChildRows ? 0 : $rows.filter('.' + c.cssChildRow).length );
 						p.totalPages = Math.ceil( p.totalRows / p.size );
@@ -827,8 +872,12 @@
 							// make a copy of all table rows once the cache has been built
 							updateCache(table);
 						}
-						updatePageDisplay(table, p);
+						if ( p.page >= p.totalPages ) {
+							moveToLastPage(table, p);
+						}
 						hideRows(table, p);
+						changeHeight(table, p);
+						updatePageDisplay(table, p, true);
 					})
 					.bind('pageSize.pager', function(e,v){
 						e.stopPropagation();
@@ -912,11 +961,10 @@
 					hideRowsSetup(table, p);
 				}
 
-				changeHeight(table, p);
-
 				// pager initialized
 				if (!p.ajax) {
 					p.initialized = true;
+					updatePageDisplay(table, p, true);
 					$(table).trigger('pagerInitialized', p);
 				}
 			});

data/vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.js

@@ -1,5 +1,5 @@
 /**!
-* TableSorter 2.17.8 - Client-side table sorting with ease!
+* TableSorter 2.18.0 - Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
 * Copyright (c) 2007 Christian Bach
@@ -24,7 +24,7 @@
 
 			var ts = this;
 
-			ts.version = "2.17.8";
+			ts.version = "2.18.0";
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -75,6 +75,7 @@
 					zebra : [ 'even', 'odd' ]    // zebra widget alternating row class names
 				},
 				initWidgets      : true,       // apply widgets on tablesorter initialization
+				widgetClass     : 'widget-{name}', // table class name template to match to include a widget
 
 				// *** callbacks
 				initialized      : null,       // function(table){},
@@ -187,7 +188,7 @@
 			}
 
 			function detectParserForColumn(table, rows, rowIndex, cellIndex) {
-				var cur,
+				var cur, $node,
 				i = ts.parsers.length,
 				node = false,
 				nodeValue = '',
@@ -197,6 +198,7 @@
 					if (rows[rowIndex]) {
 						node = rows[rowIndex].cells[cellIndex];
 						nodeValue = getElementText(table, node, cellIndex);
+						$node = $(node);
 						if (table.config.debug) {
 							log('Checking if value was empty on row ' + rowIndex + ', column: ' + cellIndex + ': "' + nodeValue + '"');
 						}
@@ -207,7 +209,7 @@
 				while (--i >= 0) {
 					cur = ts.parsers[i];
 					// ignore the default text parser because it will always be true
-					if (cur && cur.id !== 'text' && cur.is && cur.is(nodeValue, table, node)) {
+					if (cur && cur.id !== 'text' && cur.is && cur.is(nodeValue, table, node, $node)) {
 						return cur;
 					}
 				}
@@ -457,7 +459,8 @@
 						}
 						$(this).html('<div class="' + ts.css.headerIn + '">' + t + '</div>'); // faster than wrapInner
 					}
-					if (c.onRenderHeader) { c.onRenderHeader.apply($t, [index]); }
+					if (c.onRenderHeader) { c.onRenderHeader.apply($t, [index, c, c.$table]); }
+					// *** remove this.column value if no conflicts found
 					this.column = parseInt( $(this).attr('data-column'), 10);
 					this.order = formatSortingOrder( ts.getData($t, ch, 'sortInitialOrder') || c.sortInitialOrder ) ? [1,0,2] : [0,1,2];
 					this.count = -1; // set to -1 because clicking on the header automatically adds one
@@ -648,7 +651,7 @@
 					});
 				}
 				// get current column index
-				indx = cell.column;
+				indx = parseInt( $(cell).attr('data-column'), 10 );
 				// user only wants to sort on one column
 				if (key) {
 					// flush the sort list
@@ -1078,8 +1081,10 @@
 					'aria-live' : 'polite',
 					'aria-relevant' : 'all'
 				});
-				if (c.$table.find('caption').length) {
-					c.$table.attr('aria-labelledby', 'theCaption');
+				if (c.$table.children('caption').length) {
+					k = c.$table.children('caption')[0];
+					if (!k.id) { k.id = c.namespace.slice(1) + 'caption'; }
+					c.$table.attr('aria-labelledby', k.id);
 				}
 				c.widgetInit = {}; // keep a list of initialized widgets
 				// change textExtraction via data-attribute
@@ -1556,11 +1561,24 @@
 				table = $(table)[0]; // in case this is called externally
 				var c = table.config,
 					wo = c.widgetOptions,
+					tableClass = ' ' + c.table.className + ' ',
 					widgets = [],
-					time, w, wd;
+					time, time2, w, wd;
 				// prevent numerous consecutive widget applications
 				if (init !== false && table.hasInitialized && (table.isApplyingWidgets || table.isUpdating)) { return; }
 				if (c.debug) { time = new Date(); }
+				// look for widgets to apply from in table class
+				// stop using \b otherwise this matches "ui-widget-content" & adds "content" widget
+				wd = new RegExp( '\\s' + c.widgetClass.replace( /\{name\}/i, '([\\w-]+)' )+ '\\s', 'g' );
+				if ( tableClass.match( wd ) ) {
+					// extract out the widget id from the table class (widget id's can include dashes)
+					w = tableClass.match( wd );
+					if ( w ) {
+						$.each( w, function( i,n ){
+							c.widgets.push( n.replace( wd, '$1' ) );
+						});
+					}
+				}
 				if (c.widgets.length) {
 					table.isApplyingWidgets = true;
 					// ensure unique widget ids
@@ -1590,17 +1608,22 @@
 									wo = table.config.widgetOptions = $.extend( true, {}, w.options, wo );
 								}
 								if (w.hasOwnProperty('init')) {
+									if (c.debug) { time2 = new Date(); }
 									w.init(table, w, c, wo);
+									if (c.debug) { ts.benchmark('Initializing ' + w.id + ' widget', time2); }
 								}
 							}
 							if (!init && w.hasOwnProperty('format')) {
+								if (c.debug) { time2 = new Date(); }
 								w.format(table, c, wo, false);
+								if (c.debug) { ts.benchmark( ( init ? 'Initializing ' : 'Applying ' ) + w.id + ' widget', time2); }
 							}
 						}
 					});
 				}
 				setTimeout(function(){
 					table.isApplyingWidgets = false;
+					$.data(table, 'lastWidgetApplication', new Date());
 				}, 0);
 				if (c.debug) {
 					w = c.widgets.length;
@@ -1743,23 +1766,6 @@
 		type: "numeric"
 	});
 
-	ts.addParser({
-		id: "ipAddress",
-		is: function(s) {
-			return (/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/).test(s);
-		},
-		format: function(s, table) {
-			var i, a = s ? s.split(".") : '',
-			r = "",
-			l = a.length;
-			for (i = 0; i < l; i++) {
-				r += ("00" + a[i]).slice(-3);
-			}
-			return s ? ts.formatFloat(r, table) : s;
-		},
-		type: "numeric"
-	});
-
 	ts.addParser({
 		id: "url",
 		is: function(s) {
@@ -1778,7 +1784,8 @@
 			return (/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/).test(s);
 		},
 		format: function(s, table) {
-			return s ? ts.formatFloat((s !== "") ? (new Date(s.replace(/-/g, "/")).getTime() || s) : "", table) : s;
+			var date = s ? new Date( s.replace(/-/g, "/") ) : s;
+			return date instanceof Date && isFinite(date) ? date.getTime() : s;
 		},
 		type: "numeric"
 	});
@@ -1794,6 +1801,19 @@
 		type: "numeric"
 	});
 
+	// added image parser to core v2.17.9
+	ts.addParser({
+		id: "image",
+		is: function(s, table, node, $node){
+			return $node.find('img').length > 0;
+		},
+		format: function(s, table, cell) {
+			return $(cell).find('img').attr(table.config.imgAttr || 'alt') || s;
+		},
+		parsed : true, // filter widget flag
+		type: "text"
+	});
+
 	ts.addParser({
 		id: "usLongDate",
 		is: function(s) {
@@ -1802,7 +1822,8 @@
 			return (/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i).test(s) || (/^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i).test(s);
 		},
 		format: function(s, table) {
-			return s ? ts.formatFloat( (new Date(s.replace(/(\S)([AP]M)$/i, "$1 $2")).getTime() || s), table) : s;
+			var date = s ? new Date( s.replace(/(\S)([AP]M)$/i, "$1 $2") ) : s;
+			return date instanceof Date && isFinite(date) ? date.getTime() : s;
 		},
 		type: "numeric"
 	});
@@ -1815,19 +1836,22 @@
 		},
 		format: function(s, table, cell, cellIndex) {
 			if (s) {
-				var c = table.config,
+				var date, d,
+					c = table.config,
 					ci = c.$headers.filter('[data-column=' + cellIndex + ']:last'),
 					format = ci.length && ci[0].dateFormat || ts.getData( ci, ts.getColumnData( table, c.headers, cellIndex ), 'dateFormat') || c.dateFormat;
-				s = s.replace(/\s+/g," ").replace(/[\-.,]/g, "/"); // escaped - because JSHint in Firefox was showing it as an error
+				d = s.replace(/\s+/g," ").replace(/[\-.,]/g, "/"); // escaped - because JSHint in Firefox was showing it as an error
 				if (format === "mmddyyyy") {
-					s = s.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/, "$3/$1/$2");
+					d = d.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/, "$3/$1/$2");
 				} else if (format === "ddmmyyyy") {
-					s = s.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/, "$3/$2/$1");
+					d = d.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/, "$3/$2/$1");
 				} else if (format === "yyyymmdd") {
-					s = s.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/, "$1/$2/$3");
+					d = d.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/, "$1/$2/$3");
 				}
+				date = new Date(d);
+				return date instanceof Date && isFinite(date) ? date.getTime() : s;
 			}
-			return s ? ts.formatFloat( (new Date(s).getTime() || s), table) : s;
+			return s;
 		},
 		type: "numeric"
 	});
@@ -1838,7 +1862,8 @@
 			return (/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i).test(s);
 		},
 		format: function(s, table) {
-			return s ? ts.formatFloat( (new Date("2000/01/01 " + s.replace(/(\S)([AP]M)$/i, "$1 $2")).getTime() || s), table) : s;
+			var date = s ? new Date( "2000/01/01 " + s.replace(/(\S)([AP]M)$/i, "$1 $2") ) : s;
+			return date instanceof Date && isFinite(date) ? date.getTime() : s;
 		},
 		type: "numeric"
 	});
@@ -1882,18 +1907,15 @@
 					$tr.removeClass(wo.zebra[even ? 1 : 0]).addClass(wo.zebra[even ? 0 : 1]);
 				});
 			}
-			if (c.debug) {
-				ts.benchmark("Applying Zebra widget", time);
-			}
 		},
 		remove: function(table, c, wo){
 			var k, $tb,
 				b = c.$tbodies,
 				rmv = (wo.zebra || [ "even", "odd" ]).join(' ');
 			for (k = 0; k < b.length; k++ ){
-				$tb = $.tablesorter.processTbody(table, b.eq(k), true); // remove tbody
+				$tb = ts.processTbody(table, b.eq(k), true); // remove tbody
 				$tb.children().removeClass(rmv);
-				$.tablesorter.processTbody(table, $tb, false); // restore tbody
+				ts.processTbody(table, $tb, false); // restore tbody
 			}
 		}
 	});