jquery-tablesorter 1.12.8 → 1.13.0

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-date-extract.js

@@ -1,57 +1,80 @@
 /*!
  * Extract out date parsers
+ * 10/26/2014 (v2.18.0)
  */
 /*jshint jquery:true */
 ;(function($){
 "use strict";
 
+	var regex = {
+		usLong     : /[A-Z]{3,10}\.?\s+\d{1,2},?\s+(?:\d{4})(?:\s+\d{1,2}:\d{2}(?::\d{2})?(?:\s+[AP]M)?)?/i,
+		mdy        : /(\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4}(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?)/i,
+
+		dmy        : /(\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4}(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?)/i,
+		dmyreplace : /(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,
+
+		ymd        : /(\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2}(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?)/i,
+		ymdreplace : /(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/
+	};
+
 	/*! extract US Long Date (ignore any other text)
 	* e.g. "Sue's Birthday! Jun 26, 2004 7:22 AM (8# 2oz)"
-	* demo: http://jsfiddle.net/abkNM/2293/
+	* demo: http://jsfiddle.net/Mottie/abkNM/4165/
 	*/
 	$.tablesorter.addParser({
 		id: "extractUSLongDate",
-		is: function (s) {
+		is: function () {
 			// don't auto detect this parser
 			return false;
 		},
-		format: function (s, table) {
-			var date = s.match(/[A-Z]{3,10}\.?\s+\d{1,2},?\s+(?:\d{4})(?:\s+\d{1,2}:\d{2}(?::\d{2})?(?:\s+[AP]M)?)?/i);
-			return date ? $.tablesorter.formatFloat((new Date(date[0]).getTime() || ''), table) || s : s;
+		format: function (s) {
+			var date,
+				str = s ? s.match(regex.usLong) : s;
+			if (str) {
+				date = new Date( str[0] );
+				return date instanceof Date && isFinite(date) ? date.getTime() : s;
+			}
+			return s;
 		},
 		type: "numeric"
 	});
 
 	/*! extract MMDDYYYY (ignore any other text)
-	* demo: http://jsfiddle.net/Mottie/abkNM/2418/
+	* demo: http://jsfiddle.net/Mottie/abkNM/4166/
 	*/
 	$.tablesorter.addParser({
 		id: "extractMMDDYYYY",
-		is: function (s) {
+		is: function () {
 			// don't auto detect this parser
 			return false;
 		},
-		format: function (s, table) {
-			var date = s.replace(/\s+/g," ").replace(/[\-.,]/g, "/").match(/(\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4}(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?)/i);
-			return date ? $.tablesorter.formatFloat((new Date(date[0]).getTime() || ''), table) || s : s;
+		format: function (s) {
+			var date,
+				str = s ? s.replace(/\s+/g," ").replace(/[\-.,]/g, "/").match(regex.mdy) : s;
+			if (str) {
+				date = new Date( str[0] );
+				return date instanceof Date && isFinite(date) ? date.getTime() : s;
+			}
+			return s;
 		},
 		type: "numeric"
 	});
 
 	/*! extract DDMMYYYY (ignore any other text)
-	* demo: http://jsfiddle.net/Mottie/abkNM/2419/
+	* demo: http://jsfiddle.net/Mottie/abkNM/4167/
 	*/
 	$.tablesorter.addParser({
 		id: "extractDDMMYYYY",
-		is: function (s) {
+		is: function () {
 			// don't auto detect this parser
 			return false;
 		},
-		format: function (s, table) {
-			var date = s.replace(/\s+/g," ").replace(/[\-.,]/g, "/").match(/(\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4}(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?)/i);
-			if (date) {
-				date = date[0].replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/, "$2/$1/$3");
-				return $.tablesorter.formatFloat((new Date(date).getTime() || ''), table) || s;
+		format: function (s) {
+			var date,
+				str = s ? s.replace(/\s+/g," ").replace(/[\-.,]/g, "/").match(regex.dmy) : s;
+			if (str) {
+				date = new Date( str[0].replace(regex.dmyreplace, "$2/$1/$3") );
+				return date instanceof Date && isFinite(date) ? date.getTime() : s;
 			}
 			return s;
 		},
@@ -59,19 +82,20 @@
 	});
 
 	/*! extract YYYYMMDD (ignore any other text)
-	* demo: http://jsfiddle.net/Mottie/abkNM/2420/
+	* demo: http://jsfiddle.net/Mottie/abkNM/4168/
 	*/
 	$.tablesorter.addParser({
 		id: "extractYYYYMMDD",
-		is: function (s) {
+		is: function () {
 			// don't auto detect this parser
 			return false;
 		},
-		format: function (s, table) {
-			var date = s.replace(/\s+/g," ").replace(/[\-.,]/g, "/").match(/(\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2}(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?)/i);
-			if (date) {
-				date = date[0].replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/, "$2/$3/$1");
-				return $.tablesorter.formatFloat((new Date(date).getTime() || ''), table) || s;
+		format: function (s) {
+			var date,
+				str = s ? s.replace(/\s+/g," ").replace(/[\-.,]/g, "/").match(regex.ymd) : s;
+			if (str) {
+				date = new Date( str[0].replace(regex.ymdreplace, "$2/$3/$1") );
+				return date instanceof Date && isFinite(date) ? date.getTime() : s;
 			}
 			return s;
 		},

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-date-iso8601.js

@@ -1,4 +1,4 @@
-/*! ISO-8601 date parser
+/*! ISO-8601 date parser - 10/26/2014 (v2.18.0)
  * This parser will work with dates in ISO8601 format
  * 2013-02-18T18:18:44+00:00
  * Written by Sean Ellingham :https://github.com/seanellingham
@@ -9,13 +9,14 @@
 "use strict";
 
 	var iso8601date = /^([0-9]{4})(-([0-9]{2})(-([0-9]{2})(T([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2}):([0-9]{2})))?)?)?)?$/;
+
 	$.tablesorter.addParser({
 		id : 'iso8601date',
 		is : function(s) {
-			return s.match(iso8601date);
+			return s ? s.match(iso8601date) : false;
 		},
 		format : function(s) {
-			var result = s.match(iso8601date);
+			var result = s ? s.match(iso8601date) : s;
 			if (result) {
 				var date = new Date(result[1], 0, 1);
 				if (result[3]) { date.setMonth(result[3] - 1); }
@@ -24,7 +25,7 @@
 				if (result[8]) { date.setMinutes(result[8]); }
 				if (result[10]) { date.setSeconds(result[10]); }
 				if (result[12]) { date.setMilliseconds(Number('0.' + result[12]) * 1000); }
-				return date;
+				return date.getTime();
 			}
 			return s;
 		},

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-date-month.js

@@ -1,5 +1,5 @@
-/*! Month parser
- * Demo: http://jsfiddle.net/Mottie/abkNM/477/
+/*! Month parser - 10/26/2014 (v2.18.0)
+ * Demo: http://jsfiddle.net/Mottie/abkNM/4169/
  */
 /*jshint jquery:true */
 ;(function($){
@@ -18,14 +18,20 @@
 			return false;
 		},
 		format: function(s, table) {
-			var j = -1, c = table.config,
-			n = c.ignoreCase ? s.toLocaleLowerCase() : s;
-			$.each(ts.dates[ 'month' + (c.ignoreCase ? 'Lower' : 'Cased') ], function(i,v){
-				if (j < 0 && n.match(v)) { j = i; }
-			});
-			// return s (original string) if there isn't a match
-			// (non-weekdays will sort separately and empty cells will sort as expected)
-			return j < 0 ? s : j;
+			if (s) {
+				var j = -1, c = table.config,
+				n = c.ignoreCase ? s.toLocaleLowerCase() : s;
+				$.each(ts.dates[ 'month' + (c.ignoreCase ? 'Lower' : 'Cased') ], function(i,v){
+					if (j < 0 && n.match(v)) {
+						j = i;
+						return false;
+					}
+				});
+				// return s (original string) if there isn't a match
+				// (non-weekdays will sort separately and empty cells will sort as expected)
+				return j < 0 ? s : j;
+			}
+			return s;
 		},
 		type: "numeric"
 	});

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-date-two-digit-year.js

@@ -1,16 +1,18 @@
-/*! Two digit year parser
- * Demo: http://jsfiddle.net/Mottie/abkNM/427/
+/*! Two digit year parser - 10/26/2014 (v2.18.0)
+ * Demo: http://mottie.github.io/tablesorter/docs/example-parsers-dates.html
  */
 /*jshint jquery:true */
 ;(function($){
 "use strict";
 
-	var ts = $.tablesorter,
-
 	// Make the date be within +/- range of the 2 digit year
 	// so if the current year is 2020, and the 2 digit year is 80 (2080 - 2020 > 50), it becomes 1980
 	// if the 2 digit year is 50 (2050 - 2020 < 50), then it becomes 2050.
-	range = 50;
+	var range = 50,
+
+	// no need to change any of the code below
+	ts = $.tablesorter,
+	now = new Date().getFullYear();
 
 	ts.dates = $.extend({}, ts.dates, {
 		regxxxxyy: /(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{2})/,
@@ -18,21 +20,26 @@
 	});
 
 	ts.formatDate = function(s, regex, format, table){
-		var n = s
-				// replace separators
-				.replace(/\s+/g," ").replace(/[-.,]/g, "/")
-				// reformat xx/xx/xx to mm/dd/19yy;
-				.replace(regex, format),
-			d = new Date(n),
-			y = d.getFullYear(),
-			rng = table && table.config.dateRange || range,
-			now = new Date().getFullYear();
-		// if date > 50 years old (set range), add 100 years
-		// this will work when people start using "50" and mean "2050"
-		while (now - y > rng) {
-			y += 100;
+		if (s) {
+			var y, rng,
+				n = s
+					// replace separators
+					.replace(/\s+/g," ").replace(/[-.,]/g, "/")
+					// reformat xx/xx/xx to mm/dd/19yy;
+					.replace(regex, format),
+				d = new Date(n);
+			if ( d instanceof Date && isFinite(d) ) {
+				y = d.getFullYear();
+				rng = table && table.config.dateRange || range;
+				// if date > 50 years old (set range), add 100 years
+				// this will work when people start using "50" and mean "2050"
+				while (now - y > rng) {
+					y += 100;
+				}
+				return d.setFullYear(y);
+			}
 		}
-		return d.setFullYear(y) || s;
+		return s;
 	};
 
 	$.tablesorter.addParser({

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-date-weekday.js

@@ -1,5 +1,5 @@
-/*! Weekday parser
- * Demo: http://jsfiddle.net/Mottie/abkNM/477/
+/*! Weekday parser - 10/26/2014 (v2.18.0)
+ * Demo: http://jsfiddle.net/Mottie/abkNM/4169/
  */
 /*jshint jquery:true */
 ;(function($){
@@ -18,14 +18,20 @@
 			return false;
 		},
 		format: function(s, table) {
-			var j = -1, c = table.config;
-			s = c.ignoreCase ? s.toLocaleLowerCase() : s;
-			$.each(ts.dates[ 'weekday' + (c.ignoreCase ? 'Lower' : 'Cased') ], function(i,v){
-				if (j < 0 && s.match(v)) { j = i; }
-			});
-			// return s (original string) if there isn't a match
-			// (non-weekdays will sort separately and empty cells will sort as expected)
-			return j < 0 ? s : j;
+			if (s) {
+				var j = -1, c = table.config;
+				s = c.ignoreCase ? s.toLocaleLowerCase() : s;
+				$.each(ts.dates[ 'weekday' + (c.ignoreCase ? 'Lower' : 'Cased') ], function(i,v){
+					if (j < 0 && s.match(v)) {
+						j = i;
+						return false;
+					}
+				});
+				// return s (original string) if there isn't a match
+				// (non-weekdays will sort separately and empty cells will sort as expected)
+				return j < 0 ? s : j;
+			}
+			return s;
 		},
 		type: "numeric"
 	});

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-date.js

@@ -1,12 +1,13 @@
 /*!
  * Extract dates using popular natural language date parsers
+ * 10/26/2014 (v2.18.0)
  */
 /*jshint jquery:true */
 ;(function($){
 "use strict";
 
 	/*! Sugar (http://sugarjs.com/dates#comparing_dates)
-	* demo: http://jsfiddle.net/Mottie/abkNM/551/
+	* demo: http://jsfiddle.net/Mottie/abkNM/4163/
 	*/
 	$.tablesorter.addParser({
 		id: "sugar",
@@ -14,13 +15,14 @@
 			return false;
 		},
 		format: function(s) {
-			return Date.create ? Date.create(s).getTime() || s : new Date(s).getTime() || s;
+			var date = Date.create ? Date.create(s) : s ? new Date(s) : s;
+			return date instanceof Date && isFinite(date) ? date.getTime() : s;
 		},
 		type: "numeric"
 	});
 
 	/*! Datejs (http://www.datejs.com/)
-	* demo: http://jsfiddle.net/Mottie/abkNM/550/
+	* demo: http://jsfiddle.net/Mottie/abkNM/4164/
 	*/
 	$.tablesorter.addParser({
 		id: "datejs",
@@ -28,7 +30,8 @@
 			return false;
 		},
 		format: function(s) {
-			return Date.parse && Date.parse(s) || s;
+			var date = Date.parse ? Date.parse(s) : s ? new Date(s) : s;
+			return date instanceof Date && isFinite(date) ? date.getTime() : s;
 		},
 		type: "numeric"
 	});

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-named-numbers.js

@@ -0,0 +1,121 @@
+/*! Named Numbers Parser - 10/26/2014 (v2.18.0)
+ * code modified from http://stackoverflow.com/a/12014376/145346
+ */
+/*jshint jquery:true */
+;(function($){
+"use strict";
+
+	// Change language of the named numbers as needed
+	var named = {
+		negative: [ 'negative', 'minus' ],
+		numbers : {
+			'zero' : 0,
+			'one' : 1,
+			'two' : 2,
+			'three' : 3,
+			'four' : 4,
+			'five' : 5,
+			'six' : 6,
+			'seven' : 7,
+			'eight' : 8,
+			'nine' : 9,
+			'ten' : 10,
+			'eleven' : 11,
+			'twelve' : 12,
+			'thirteen' : 13,
+			'fourteen' : 14,
+			'fifteen' : 15,
+			'sixteen' : 16,
+			'seventeen' : 17,
+			'eighteen' : 18,
+			'nineteen' : 19,
+			'twenty' : 20,
+			'thirty' : 30,
+			'forty' : 40,
+			'fourty' : 40, // common misspelling
+			'fifty' : 50,
+			'sixty' : 60,
+			'seventy' : 70,
+			'eighty' : 80,
+			'ninety' : 90
+		},
+		// special case
+		hundred : 'hundred',
+		// multiples
+		powers : {
+			'thousand' : 1e3,
+			'million' : 1e6,
+			'billion' : 1e9,
+			'trillion' : 1e12,
+			'quadrillion' : 1e15,
+			'quintillion' : 1e18,
+			'sextillion' : 1e21,
+			'septillion' : 1e24,
+			'octillion' : 1e27,
+			'nonillion' : 1e30,
+			'decillion' : 1e33,
+			'undecillion' : 1e36,
+			'duodecillion' : 1e39,
+			'tredecillion' : 1e42,
+			'quattuordecillion' : 1e45,
+			'quindecillion' : 1e48,
+			'sexdecillion' : 1e51,
+			'septendecillion' : 1e54,
+			'octodecillion' : 1e57,
+			'novemdecillion' : 1e60,
+			'vigintillion' : 1e63,
+			'unvigintillion' : 1e66,
+			'duovigintillion' : 1e69,
+			'trevigintillion' : 1e72,
+			'quattuorvigintillion' : 1e75,
+			'quinvigintillion' : 1e78,
+			'sexvigintillion' : 1e81,
+			'septenvigintillion' : 1e84,
+			'octovigintillion' : 1e87,
+			'novemvigintillion' : 1e90,
+			'trigintillion' : 1e93,
+			'untrigintillion' : 1e96,
+			'duotrigintillion' : 1e99,
+			'googl' : 1e100
+		}
+	},
+	result, group,
+	negativeRegex = new RegExp('(' + named.negative.join('|') + ')'),
+	calc = function ( word, table ) {
+		var num = named.numbers.hasOwnProperty( word ) ? named.numbers[ word ] : null,
+			power = named.powers.hasOwnProperty( word ) ? named.powers[ word ] : null;
+		if ( !num && !isNaN( word ) ) {
+			num = $.tablesorter.formatFloat( word || '', table );
+		}
+		if ( num !== null ) {
+			group += num;
+		} else if ( word === named.hundred ) {
+			group *= 100;
+		} else if ( power !== null ) {
+			result += group * power;
+			group = 0;
+		}
+	};
+
+	$.tablesorter.addParser({
+		id: "namedNumbers",
+		is: function () {
+			return false;
+		},
+		format: function ( str, table ) {
+			result = 0;
+			group = 0;
+			var indx,
+				arry = ( str || '' ).split( /[\s-]+/ ),
+				len = arry.length;
+			for ( indx = 0; indx < len; indx++ ) {
+				calc( arry[ indx ].toLowerCase(), table );
+			}
+			result = ( result + group ) * ( str.match( negativeRegex ) ? -1 : 1 );
+			// make sure to let zero get parsed, so check hasOwnProperty
+			return result || named.numbers.hasOwnProperty( str ) ? result : $.tablesorter.formatFloat( str || '', table );
+		},
+		type: "numeric"
+	});
+
+})( jQuery );