jquery-tablesorter 1.12.7 → 1.12.8

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

@@ -0,0 +1,40 @@
+/*! Duration parser
+ */
+/*jshint jquery:true, unused:false */
+;(function($){
+"use strict";
+
+	// If any number > 9999, then set table.config.durationLength = 5
+	// The below regex matches this duration example: 1y 23d 12h 44m 9s
+	$.tablesorter.addParser({
+		id: "duration",
+		is: function() {
+			return false;
+		},
+		format: function(s, table) {
+			var i, time,
+				c = table.config,
+				t = '',
+				duration = '',
+				len = c.durationLength || 4,
+				str = new Array(len + 1).join('0'),
+				labels = (c.durationLabels || '(?:years|year|y),(?:days|day|d),(?:hours|hour|h),(?:minutes|minute|min|m),(?:seconds|second|sec|s)').split(/\s*,\s*/),
+				llen = labels.length;
+			// build regex
+			if (!c.durationRegex) {
+				for (i = 0; i < llen; i++) {
+					t += '(?:(\\d+)\\s*' + labels[i] + '\\s*)?';
+				}
+				c.durationRegex = new RegExp(t, 'i');
+			}
+			// remove commas from value
+			time = ( c.usNumberFormat ? s.replace(/,/g, '') : s.replace( /(\d)(?:\.|\s*)(\d)/g, '$1$2') ).match(c.durationRegex);
+			for (i = 1; i < llen + 1; i++) {
+				duration += ( str + ( time[i] || 0 ) ).slice(-len);
+			}
+			return duration;
+		},
+		type: "text"
+	});
+
+})(jQuery);

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

@@ -1,14 +1,16 @@
-/*! Title parser
+/*! Title parser - updated 9/15/2014 (v2.17.8)
  * This parser will remove "The", "A" and "An" from the beginning of a book
  * or movie title, so it sorts by the second word or number
  * Demo: http://jsfiddle.net/Mottie/abkNM/5/
  */
-/*global jQuery: false */
+/*jshint browser: true, jquery:true, unused:false */
 ;(function($){
 "use strict";
 
+var ts = $.tablesorter;
+
 	// basic list from http://en.wikipedia.org/wiki/Article_%28grammar%29
-	$.tablesorter.ignoreArticles = {
+	ts.ignoreArticles = {
 		"en" : "the, a, an",
 		"de" : "der, die, das, des, dem, den, ein, eine, einer, eines, einem, einen",
 		"nl" : "de, het, de, een",
@@ -24,22 +26,34 @@
 	// and then set the language id 'xx' in the headers option
 	// ignoreArticles : 'xx'
 
-	$.tablesorter.addParser({
+	ts.addParser({
 		id: 'ignoreArticles',
 		is: function() {
 			return false;
 		},
 		format: function(s, table, cell, cellIndex) {
-			var c = table.config, art, lang;
+			var art, ignore, lang,
+				c = table.config,
+				str = s || '';
 			if ( !(c.headers && c.headers[cellIndex] && c.headers[cellIndex].ignoreArticlesRegex) ) {
-				// initialize - save regex in c.headers[cellIndex].ignoreArticles
+				// initialize - save regex in c.headers[cellIndex].ignoreArticlesRegex
 				if (!c.headers) { c.headers = {}; }
 				if (!c.headers[cellIndex]) { c.headers[cellIndex] = {}; }
-				lang = $.tablesorter.getData(c.$headers.eq(cellIndex), c.headers[cellIndex], 'ignoreArticles');
-				art = ($.tablesorter.ignoreArticles[lang] || "the, a, an" ) + "";
+				lang = ts.getData( c.$headers.eq(cellIndex), ts.getColumnData( table, c.headers, cellIndex ), 'ignoreArticles' );
+				art = (ts.ignoreArticles[lang] || "the, a, an" ) + "";
 				c.headers[cellIndex].ignoreArticlesRegex = new RegExp('^(' + $.trim( art.split(/\s*\,\s*/).join('\\s|') + "\\s" ).replace("_\\s","") + ')', 'i');
+				// exception regex stored in c.headers[cellIndex].ignoreArticlesRegex2
+				ignore = ts.getData( c.$headers.eq(cellIndex), ts.getColumnData( table, c.headers, cellIndex ), 'ignoreArticlesExcept' );
+				c.headers[cellIndex].ignoreArticlesRegex2 = ignore !== '' ? new RegExp('^(' + ignore.replace(/\s/g, "\\s") + ')', 'i') : '';
+			}
+			art = c.headers[cellIndex].ignoreArticlesRegex;
+			if (art.test(str)) {
+				ignore = c.headers[cellIndex].ignoreArticlesRegex2;
+				if ( !(ignore && ignore.test(str)) ) {
+					return str.replace(art, '');
+				}
 			}
-			return (s || '').replace(c.headers[cellIndex].ignoreArticlesRegex, '');
+			return str;
 		},
 		type: 'text'
 	});

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

@@ -1,5 +1,5 @@
 /*! input & select parsers for jQuery 1.7+ & tablesorter 2.7.11+
- * Updated 8/1/2014 (v2.17.6)
+ * Updated 9/15/2014 (v2.17.8)
  * Demo: http://mottie.github.com/tablesorter/docs/example-widget-grouping.html
  */
 /*jshint browser: true, jquery:true, unused:false */
@@ -101,16 +101,20 @@
 			// this flag prevents the updateCell event from being spammed
 			// it happens when you modify input text and hit enter
 			var focused = false,
-				restoreValue = function(){
+				restoreValue = function(isTbody){
 					// focused = false; // uncomment this line to prevent auto-accepting changes
 					// make sure we restore original values
-					$(':focus').blur();
+					// isTbody is needed to prevent the select from closing in IE
+					// see https://connect.microsoft.com/IE/feedbackdetail/view/962618/
+					if (isTbody) {
+						$(':focus').blur();
+					}
 					return;
 				};
 			// bind to .tablesorter (default class name)
 			$(this).children('tbody')
-			.on('mouseleave', function(){
-				restoreValue();
+			.on('mouseleave', function(e){
+				restoreValue(e.target.tagName === 'TBODY');
 			})
 			.on('focus', 'select, input, textarea', function(){
 				focused = true;

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-editable.js

@@ -1,4 +1,4 @@
-/*! tablesorter Editable Content widget - updated 8/1/2014 (core v2.17.6)
+/*! tablesorter Editable Content widget - updated 9/15/2014 (core v2.17.8)
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -14,14 +14,42 @@
 			editable_enterToAccept : true,
 			editable_autoAccept    : true,
 			editable_autoResort    : false,
-			editable_validate      : null, // function(text, originalText){ return text; }
+			editable_wrapContent   : '<div>', // wrap the cell content... makes this widget work in IE, and with autocomplete
+			editable_trimContent   : true,    // trim content inside of contenteditable (remove tabs & carriage returns)
+			editable_validate      : null,    // function(text, originalText){ return text; }
+			editable_focused       : null,    // function(text, columnIndex, $element) {}
+			editable_blur          : null,    // function(text, columnIndex, $element) { }
+			editable_selectAll     : false,   // true/false or function(text, columnIndex, $element) { return true; }
 			editable_noEdit        : 'no-edit',
 			editable_editComplete  : 'editComplete'
 		},
 		init: function(table, thisWidget, c, wo){
 			if ( !wo.editable_columns.length ) { return; }
 			var indx, tmp, $t,
-				cols = [];
+				cols = [],
+				editComplete = function($cell, refocus){
+					$cell
+						.removeClass('tseditable-last-edited-cell')
+						.trigger( wo.editable_editComplete, [c] );
+					// restore focus last cell after updating
+					if (refocus) {
+						setTimeout(function(){
+							$cell.focus();
+						}, 50);
+					}
+				},
+				selectAll = function(cell){
+					setTimeout(function(){
+						// select all text in contenteditable
+						// see http://stackoverflow.com/a/6150060/145346
+						var range = document.createRange();
+						range.selectNodeContents(cell);
+						var sel = window.getSelection();
+						sel.removeAllRanges();
+						sel.addRange(range);
+					}, 100);
+				};
+
 			if ( $.type(wo.editable_columns) === "string" && wo.editable_columns.indexOf('-') >= 0 ) {
 				// editable_columns can contain a range string (i.e. "2-4" )
 				tmp = wo.editable_columns.split('-');
@@ -38,25 +66,51 @@
 					}
 				});
 			}
+			tmp = $('<div>').wrapInner(wo.editable_wrapContent).children().length || $.isFunction(wo.editable_wrapContent);
 			// IE does not allow making TR/TH/TD cells directly editable (issue #404)
 			// so add a div or span inside ( it's faster than using wrapInner() )
 			c.$tbodies.find( cols.join(',') ).not( '.' + wo.editable_noEdit ).each(function(){
 				// test for children, if they exist, then make the children editable
 				$t = $(this);
-				( $t.children().length ? $t.children() : $t ).prop( 'contenteditable', true );
+
+				if (tmp && $t.children().length === 0) {
+					$t.wrapInner( wo.editable_wrapContent );
+				}
+				if ($t.children().length) {
+					// make all children content editable
+					$t.children().not('.' + wo.editable_noEdit).each(function(){
+						var $this = $(this);
+						if (wo.editable_trimContent) {
+							$this.text(function(i, txt){
+								return $.trim(txt);
+							});
+						}
+						$this.prop( 'contenteditable', true );
+					});
+				} else {
+					if (wo.editable_trimContent) {
+						$t.text(function(i, txt){
+							return $.trim(txt);
+						});
+					}
+					$t.prop( 'contenteditable', true );
+				}
 			});
 			c.$tbodies
 				.on('mouseleave.tseditable', function(){
 					if ( c.$table.data('contentFocused') ) {
 						// change to "true" instead of element to allow focusout to process
 						c.$table.data( 'contentFocused', true );
-						$(':focus').trigger('blur');
+						$(':focus').trigger('focusout');
 					}
 				})
 				.on('focus.tseditable', '[contenteditable]', function(e){
+					clearTimeout( $(this).data('timer') );
 					c.$table.data( 'contentFocused', e.target );
 					var $this = $(this),
-						v = $this.html();
+						selAll = wo.editable_selectAll,
+						column = $this.closest('td').index(),
+						txt = $.trim( $this.text() );
 					if (wo.editable_enterToAccept) {
 						// prevent enter from adding into the content
 						$this.on('keydown.tseditable', function(e){
@@ -65,46 +119,79 @@
 							}
 						});
 					}
-					$this.data({ before : v, original: v });
+					$this.data({ before : txt, original: txt });
+
+					if (typeof wo.editable_focused === 'function') {
+						wo.editable_focused( txt, column, $this );
+					}
+
+					if (selAll) {
+						if (typeof selAll === 'function') {
+							if ( selAll( txt, column, $this ) ) {
+								selectAll($this[0]);
+							}
+						} else {
+							selectAll($this[0]);
+						}
+					}
 				})
 				.on('blur focusout keydown '.split(' ').join('.tseditable '), '[contenteditable]', function(e){
 					if ( !c.$table.data('contentFocused') ) { return; }
-					var t,
+					var t, validate,
 						valid = false,
-						$this = $(e.target);
+						$this = $(e.target),
+						txt = $.trim( $this.text() ),
+						column = $this.closest('td').index();
 					if ( e.which === 27 ) {
 						// user cancelled
-						$this.html( $this.data('original') ).trigger('blur.tseditable');
+						$this.html( $.trim( $this.data('original') ) ).trigger('blur.tseditable');
 						c.$table.data( 'contentFocused', false );
 						return false;
 					}
+					// accept on enter (if set), alt-enter (always) or if autoAccept is set and element is blurred or unfocused
 					t = e.which === 13 && ( wo.editable_enterToAccept || e.altKey ) || wo.editable_autoAccept && e.type !== 'keydown';
 					// change if new or user hits enter (if option set)
-					if ( t && $this.data('before') !== $this.html() ) {
-						valid = $.isFunction(wo.editable_validate) ? wo.editable_validate( $this.html(), $this.data('original') ) : $this.html();
+					if ( t && $this.data('before') !== txt ) {
+
+						validate = wo.editable_validate;
+						valid = txt;
+
+						if (typeof(validate) === "function") {
+							valid = validate( txt, $this.data('original'), column, $this );
+						} else if (typeof (validate = $.tablesorter.getColumnData( table, validate, column )) === 'function') {
+							valid = validate( txt, $this.data('original'), column, $this );
+						}
+
 						if ( t && valid !== false ) {
+							c.$table.find('.tseditable-last-edited-cell').removeClass('tseditable-last-edited-cell');
 							$this
-								.html( valid )
+								.addClass('tseditable-last-edited-cell')
+								.html( $.trim( valid ) )
 								.data('before', valid)
+								.data('original', valid)
 								.trigger('change');
-							c.$table.trigger('updateCell', [ $this.closest('td'), wo.editable_autoResort, function(table){
-								$this.trigger( wo.editable_editComplete, [c] );
-								$this.data( 'original', $this.html() );
-								if ( wo.editable_autoResort && c.sortList.length ) {
-									c.$table.trigger('applyWidgets');
+							c.$table.trigger('updateCell', [ $this.closest('td'), false, function(){
+								if (wo.editable_autoResort) {
+									setTimeout(function(){
+										c.$table.trigger("sorton", [ c.sortList, function(){
+											editComplete(c.$table.find('.tseditable-last-edited-cell'), true);
+										}, true ]);
+									}, 10);
+								} else {
+									editComplete(c.$table.find('.tseditable-last-edited-cell'));
 								}
-								// restore focus last cell after updating
-								setTimeout(function(){
-									var t = c.$table.data('contentFocused');
-									if ( t instanceof HTMLElement ) { t.focus(); }
-								}, 50);
 							} ]);
 							return false;
 						}
-					}
-					if ( !valid && e.type !== 'keydown' ) {
+					} else if ( !valid && e.type !== 'keydown' ) {
+						clearTimeout( $this.data('timer') );
+						$this.data('timer', setTimeout(function(){
+							if ($.isFunction(wo.editable_blur)) {
+								wo.editable_blur( $.trim( $this.text() ), column, $this );
+							}
+						}, 100));
 						// restore original content on blur
-						$this.html( $this.data('original') );
+						$this.html( $.trim( $this.data('original') ) );
 					}
 				});
 		}

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-pager.js

@@ -1,4 +1,4 @@
-/* Pager widget for TableSorter 8/1/2014 (v2.17.6) */
+/* Pager widget for TableSorter 9/15/2014 (v2.17.8) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($){
 "use strict";
@@ -215,7 +215,7 @@ tsp = ts.pager = {
 			s = wo.pager_selectors;
 
 		c.$table
-			.unbind('filterStart filterEnd sortEnd disable enable destroy update updateRows updateAll addRows pageSize '.split(' ').join('.pager '))
+			.unbind('filterStart filterEnd sortEnd disable enable destroy updateComplete pageSize '.split(' ').join('.pager '))
 			.bind('filterStart.pager', function(e, filters) {
 				p.currentFilters = filters;
 				// don't change page is filters are the same (pager updating, etc)
@@ -232,7 +232,9 @@ tsp = ts.pager = {
 					}
 					// update page display first, so we update p.filteredPages
 					tsp.updatePageDisplay(table, c, false);
-					tsp.moveToPage(table, p, false);
+					// tsp.moveToPage(table, p, false); <-- called when applyWidgets is triggered
+					c.pager.last.page = -1;
+					c.$table.trigger('applyWidgets');
 					tsp.fixHeight(table, c);
 				}
 			})
@@ -248,12 +250,18 @@ tsp = ts.pager = {
 				e.stopPropagation();
 				tsp.destroyPager(table, c);
 			})
-			.on('update updateRows updateAll addRows '.split(' ').join('.pager '), function(e){
+			.on('updateComplete.pager', function(e, table, triggered){
 				e.stopPropagation();
+				// table can be unintentionally undefined in tablesorter v2.17.7 and earlier
+				if (!table || triggered) { return; }
 				tsp.fixHeight(table, c);
-				var $rows = c.$tbodies.eq(0).children('tr');
+				var $rows = c.$tbodies.eq(0).children('tr').not(c.selectorRemove);
 				p.totalRows = $rows.length - ( c.widgetOptions.pager_countChildRows ? 0 : $rows.filter('.' + c.cssChildRow).length );
 				p.totalPages = Math.ceil( p.totalRows / p.size );
+				if ($rows.length && c.rowsCopy && c.rowsCopy.length === 0) {
+					// make a copy of all table rows once the cache has been built
+					tsp.updateCache(table);
+				}
 				tsp.updatePageDisplay(table, c);
 				tsp.hideRows(table, c);
 				// make sure widgets are applied - fixes #450
@@ -400,7 +408,8 @@ tsp = ts.pager = {
 					for ( i = 1; i <= pg; i++ ) {
 						t += '<option>' + i + '</option>';
 					}
-					p.$goto.html(t).val( p.page + 1 );
+					p.$goto[0].innerHTML = t;
+					p.$goto[0].value = p.page + 1;
 				}
 				// rebind startRow/page inputs
 				$out.find('.ts-startRow, .ts-page').unbind('change').bind('change', function(){
@@ -740,9 +749,8 @@ tsp = ts.pager = {
 
 		wo.pager_startPage = p.page;
 		wo.pager_size = p.size;
-		c.$table.trigger('applyWidgets');
 		if (table.isUpdating) {
-			c.$table.trigger('updateComplete');
+			c.$table.trigger('updateComplete', [ table, true ]);
 		}
 
 	},
@@ -764,6 +772,7 @@ tsp = ts.pager = {
 				.removeAttr('aria-describedby')
 				.find('tr.pagerSavedHeightSpacer').remove();
 			tsp.renderTable(table, c.rowsCopy);
+			c.$table.trigger('applyWidgets');
 			if (c.debug) {
 				ts.log('pager disabled');
 			}
@@ -834,9 +843,11 @@ tsp = ts.pager = {
 		}
 		$.data(table, 'pagerLastPage', p.page);
 		if (p.initialized && pageMoved !== false) {
-			c.$table.trigger('pageMoved', c);
+			c.$table
+				.trigger('pageMoved', c)
+				.trigger('applyWidgets');
 			if (!p.ajax && table.isUpdating) {
-				c.$table.trigger('updateComplete');
+				c.$table.trigger('updateComplete', [ table, true ]);
 			}
 		}
 	},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.12.7
+  version: 1.12.8
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -31,7 +31,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
-description: Simple integration of jquery-tablesorter into the asset pipeline.
+description: Simple integration of jquery-tablesorter (Mottie's fork) into the Rails
+  asset pipeline.
 email:
 - github@black-milk.de
 executables: []
@@ -90,6 +91,7 @@ files:
 - vendor/assets/javascripts/jquery-tablesorter/parsers/parser-date-two-digit-year.js
 - vendor/assets/javascripts/jquery-tablesorter/parsers/parser-date-weekday.js
 - vendor/assets/javascripts/jquery-tablesorter/parsers/parser-date.js
+- vendor/assets/javascripts/jquery-tablesorter/parsers/parser-duration.js
 - vendor/assets/javascripts/jquery-tablesorter/parsers/parser-feet-inch-fraction.js
 - vendor/assets/javascripts/jquery-tablesorter/parsers/parser-file-type.js
 - vendor/assets/javascripts/jquery-tablesorter/parsers/parser-ignore-articles.js
@@ -139,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -150,5 +152,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Simple integration of jquery-tablesorter into the asset pipeline.
+summary: Simple integration of jquery-tablesorter (Mottie's fork) into the Rails asset
+  pipeline.
 test_files: []