jquery-tablesorter 1.0.3 → 1.0.4

data/README.markdown

@@ -3,7 +3,7 @@ jQuery Table Sorter plugin for Rails
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current version: 2.3.8(6/5/2012), [documentation]
+Current version: 2.3.10(6/21/2012), [documentation]
 
 Any issue associate 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.0.3"
+  VERSION = "1.0.4"
 end

data/lib/tasks/jquery-tablesorter_tasks.rake

@@ -32,7 +32,7 @@ namespace :jquery_tablesorter do
       'vendor/assets/javascripts/jquery-tablesorter/addons/',
       :verbose => true
     FileUtils.cp_r 'tablesorter/addons/pager/icons',
-      'vendor/assets/images/jquery-tablesorter/addons/icons',
+      'vendor/assets/images/jquery-tablesorter/addons',
       :verbose => true
 
   end

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

@@ -1,5 +1,5 @@
 /*!
-* TableSorter 2.3.8 - Client-side table sorting with ease!
+* TableSorter 2.3.10 - Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
 * Copyright (c) 2007 Christian Bach
@@ -18,7 +18,7 @@
 	$.extend({
 		tablesorter: new function() {
 
-			this.version = "2.3.8";
+			this.version = "2.3.10";
 
 			var parsers = [], widgets = [];
 			this.defaults = {
@@ -384,7 +384,7 @@
 					$t = $(this);
 					ch = c.headers[index];
 					this.innerHTML = '<div class="tablesorter-header-inner">' + this.innerHTML + '</div>'; // faster than wrapInner
-					if (c.onRenderHeader) { c.onRenderHeader.apply($th, [index]); }
+					if (c.onRenderHeader) { c.onRenderHeader.apply($t, [index]); }
 					this.column = header_index[this.parentNode.rowIndex + "-" + this.cellIndex];
 					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
@@ -464,7 +464,9 @@
 				for (i = 0; i < l; i++) {
 					s = sortList[i];
 					o = c.headerList[s[0]];
-					o.count = s[1] % (c.sortReset ? 3 : 2);
+					if (o) { // prevents error if sorton array is wrong
+						o.count = s[1] % (c.sortReset ? 3 : 2);
+					}
 				}
 			}
 
@@ -602,6 +604,23 @@
 				return b - a;
 			}
 
+			function checkResort($table, flag, callback) {
+				var t = $table[0];
+				if (flag !== false) {
+					$table.trigger("sorton", [t.config.sortList, function(){
+						$table.trigger('updateComplete');
+						if (typeof callback === "function") {
+							callback(t);
+						}
+					}]);
+				} else {
+					$table.trigger('updateComplete');
+					if (typeof callback === "function") {
+						callback(t);
+					}
+				}
+			}
+
 			/* public methods */
 			this.construct = function(settings) {
 				return this.each(function() {
@@ -609,12 +628,12 @@
 					if (!this.tHead || this.tBodies.length === 0) { return; }
 					// declare
 					var $headers, $cell, $this,
-						config, c, i, j, k, a, s, o, downTime,
+						c, i, j, k, a, s, o, downTime,
 						m = $.metadata;
 					// new blank config object
 					this.config = {};
 					// merge and extend.
-					c = config = $.extend(true, this.config, $.tablesorter.defaults, settings);
+					c = $.extend(true, this.config, $.tablesorter.defaults, settings);
 
 					if (c.debug) { $.data( this, 'startoveralltimer', new Date()); }
 					// store common expression for speed
@@ -744,16 +763,16 @@
 					}
 					// apply easy methods that trigger binded events
 					$this
-					.bind("update", function(e, resort) {
+					.bind("update", function(e, resort, callback) {
 						// remove rows/elements before update
 						$(c.selectorRemove, this).remove();
 						// rebuild parsers.
 						c.parsers = buildParserCache(this, $headers);
 						// rebuild the cache map
 						buildCache(this);
-						if (resort !== false) { $(this).trigger("sorton", [c.sortList]); }
+						checkResort($this, resort, callback);
 					})
-					.bind("updateCell", function(e, cell, resort) {
+					.bind("updateCell", function(e, cell, resort, callback) {
 						// get position from the dom.
 						var t = this, $tb = $(this).find('tbody'), row, pos,
 						// update cache - format: function(s, table, cell, cellIndex)
@@ -761,9 +780,9 @@
 						row = $tb.eq(tbdy).find('tr').index( $(cell).closest('tr') );
 						pos = [ row, cell.cellIndex];
 						t.config.cache[tbdy].normalized[pos[0]][pos[1]] = c.parsers[pos[1]].format( getElementText(t, cell, pos[1]), t, cell, pos[1] );
-						if (resort !== false) { $(this).trigger("sorton", [c.sortList]); }
+						checkResort($this, resort, callback);
 					})
-					.bind("addRows", function(e, $row, resort) {
+					.bind("addRows", function(e, $row, resort, callback) {
 						var i, rows = $row.filter('tr').length,
 						dat = [], l = $row[0].cells.length, t = this,
 						tbdy = $(this).find('tbody').index( $row.closest('tbody') );
@@ -781,12 +800,16 @@
 							dat = [];
 						}
 						// resort using current settings
-						if (resort !== false) { $(this).trigger("sorton", [c.sortList]); }
+						checkResort($this, resort, callback);
 					})
-					.bind("sorton", function(e, list, init) {
+					.bind("sorton", function(e, list, callback, init) {
 						$(this).trigger("sortStart", this);
-						// update and store the sortlist
-						c.sortList = list;
+						var l = c.headerList.length;
+						c.sortList = [];
+						$.each(list, function(i,v){
+							// make sure column exists
+							if (v[0] < l) { c.sortList.push(list[i]); }
+						});
 						// update header count index
 						updateHeaderSortCount(this, c.sortList);
 						// set css for headers
@@ -794,6 +817,9 @@
 						// sort the table and append it to the dom
 						multisort(this, c.sortList);
 						appendToTable(this, init);
+						if (typeof callback === "function") {
+							callback(this);
+						}
 					})
 					.bind("appendCache", function(e, init) {
 						appendToTable(this, init);
@@ -819,7 +845,7 @@
 					applyWidget(this, true);
 					// if user has supplied a sort list to constructor.
 					if (c.sortList.length > 0) {
-						$this.trigger("sorton", [c.sortList, !c.initWidgets]);
+						$this.trigger("sorton", [c.sortList, {}, !c.initWidgets]);
 					} else if (c.initWidgets) {
 						// apply widget format
 						applyWidget(this);
@@ -886,7 +912,7 @@
 			};
 			this.isDigit = function(s) {
 				// replace all unwanted chars and match.
-				return (/^[\-+(]?\d*[)]?$/).test(s.replace(/[,.'\s]/g, ''));
+				return (/^[\-+(]?\d+[)]?$/).test(s.replace(/[,.'\s]/g, ''));
 			};
 
 			// regex used in natural sort

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

@@ -1,4 +1,4 @@
-/*! tableSorter 2.3 widgets - updated 6/5/2012
+/*! tableSorter 2.3 widgets - updated 6/21/2012
  *
  * jQuery UI Theme
  * Column Styles
@@ -178,10 +178,11 @@ $.tablesorter.addWidget({
 $.tablesorter.addWidget({
 	id: "filter",
 	format: function(table) {
-		if (!$(table).hasClass('hasFilters')) {
+		if (table.config.parsers && !$(table).hasClass('hasFilters')) {
 			var i, j, k, l, cv, v, val, r, ff, t, x, xi, cr,
-			sel, $tb, $tr, $td, reg2,
+			sel, $tb, $th, $tr, $td, reg2,
 			c = table.config,
+			$ths = $(c.headerList),
 			wo = c.widgetOptions,
 			css = wo.filter_cssFilter || 'tablesorter-filter',
 			$t = $(table).addClass('hasFilters'),
@@ -203,11 +204,11 @@ $.tablesorter.addWidget({
 					l = $tr.length;
 					// loop through the rows
 					for (j = 0; j < l; j++) {
-						// skip child rows
-						if (reg1.test($tr[j].className)) { continue; }
 						if (cv === '') {
 							$tr[j].style.display = '';
 						} else {
+							// skip child rows
+							if (reg1.test($tr[j].className)) { continue; }
 							r = true;
 							cr = $tr.eq(j).nextUntil('tr:not(.' + c.cssChildRow + ')');
 							// so, if "table.config.widgetOptions.filter_childRows" is true and there is
@@ -215,6 +216,7 @@ $.tablesorter.addWidget({
 							// checked here so the option can be changed dynamically
 							t = (cr.length && (wo && wo.hasOwnProperty('filter_childRows') &&
 								typeof wo.filter_childRows !== 'undefined' ? wo.filter_childRows : true)) ? cr.text() : '';
+							t = wo.filter_ignoreCase ? t.toLocaleLowerCase() : t;
 							$td = $tr.eq(j).children('td');
 							for (i = 0; i < cols; i++) {
 								x = $.trim($td.eq(i).text());
@@ -245,18 +247,14 @@ $.tablesorter.addWidget({
 										}
 									// Look for quotes to get an exact match
 									} else if (/[\"|\']$/.test(val) && xi === val.replace(/(\"|\')/g,'')) {
-										r = (r) ? true : false;
+										ff = true;
 									// Look for wild card: ? = single, or * = multiple
 									} else if (/[\?|\*]/.test(val)) {
 										ff = new RegExp( val.replace(/\?/g, '\\S{1}').replace(/\*/g, '\\S*') ).test(xi);
 									// Look for match, and add child row data for matching
 									} else {
 										x = (xi + t).indexOf(val);
-										if ( (!wo.filter_startsWith && x >= 0) || (wo.filter_startsWith && x === 0) ) {
-											r = (r) ? true : false;
-										} else {
-											r = false;
-										}
+										ff  = ( (!wo.filter_startsWith && x >= 0) || (wo.filter_startsWith && x === 0) );
 									}
 									r = (ff) ? (r ? true : false) : false;
 								}
@@ -272,17 +270,19 @@ $.tablesorter.addWidget({
 				}
 				$t.trigger('applyWidgets'); // make sure zebra widget is applied
 			},
-			buildSelect = function(i){
+			buildSelect = function(i, updating){
 				var o, arry = [];
 				i = parseInt(i, 10);
-				o = '<option value="">' + ($(c.headerList[i]).attr('data-placeholder') || '') + '</option>';
+				o = '<option value="">' + ($ths.filter('[data-column="' + i + '"]:last').attr('data-placeholder') || '') + '</option>';
 				for (k = 0; k < b.length; k++ ) {
 					l = c.cache[k].row.length;
 					// loop through the rows
 					for (j = 0; j < l; j++) {
 						// get non-normalized cell content
 						t = c.cache[k].row[j][0].cells[i];
-						arry.push( c.supportsTextContent ? t.textContent : $(t).text() );
+						if (t) {
+							arry.push( c.supportsTextContent ? t.textContent : $(t).text() );
+						}
 					}
 				}
 				// get unique elements and sort the list
@@ -291,31 +291,44 @@ $.tablesorter.addWidget({
 				for (k = 0; k < arry.length; k++) {
 					o += '<option value="' + arry[k] + '">' + arry[k] + '</option>';
 				}
-				$t.find('thead').find('select.' + css + '[data-col="' + i + '"]').append(o);
+				$t.find('thead').find('select.' + css + '[data-column="' + i + '"]')[ updating ? 'html' : 'append' ](o);
+			},
+			buildDefault = function(updating){
+				// build default select dropdown
+				for (i = 0; i < cols; i++) {
+					t = $ths.filter('[data-column="' + i + '"]:last');
+					// look for the filter-select class, but don't build it twice.
+					if (t.hasClass('filter-select') && !t.hasClass('filter-false') && !(wo.filter_functions && wo.filter_functions[i] === true)){
+						buildSelect(i, updating);
+					}
+				}
 			};
 			if (c.debug) {
 				time = new Date();
 			}
+			wo.filter_ignoreCase = wo.filter_ignoreCase !== false; // set default filter_ignoreCase to true
 			for (i=0; i < cols; i++){
-				sel = (wo.filter_functions && wo.filter_functions[i] && typeof wo.filter_functions[i] !== 'function') || $(c.headerList[i]).hasClass('filter-select');
+				$th = $ths.filter('[data-column="' + i + '"]:last'); // assuming last cell of a column is the main column
+				sel = (wo.filter_functions && wo.filter_functions[i] && typeof wo.filter_functions[i] !== 'function') || $th.hasClass('filter-select');
 				fr += '<td>';
 				if (sel){
-					fr += '<select data-col="' + i + '" class="' + css;
+					fr += '<select data-column="' + i + '" class="' + css;
 				} else {
-					fr += '<input type="search" placeholder="' + ($(c.headerList[i]).attr('data-placeholder') || "") + '" data-col="' + i + '" class="' + css;
+					fr += '<input type="search" placeholder="' + ($th.attr('data-placeholder') || "") + '" data-column="' + i + '" class="' + css;
 				}
 				// use header option - headers: { 1: { filter: false } } OR add class="filter-false"
 				if ($.tablesorter.getData) {
 					// get data from jQuery data, metadata, headers option or header class name
-					fr += $.tablesorter.getData(c.headerList[i], c.headers[i], 'filter') === 'false' ? ' disabled" disabled' : '"';
+					fr += $.tablesorter.getData($th[0], c.headers[i], 'filter') === 'false' ? ' disabled" disabled' : '"';
 				} else {
 					// only class names and header options - keep this for compatibility with tablesorter v2.0.5
-					fr += ((c.headers[i] && c.headers[i].hasOwnProperty('filter') && c.headers[i].filter === false) || $(c.headerList[i]).hasClass('filter-false') ) ? ' disabled" disabled' : '"';
+					fr += ((c.headers[i] && c.headers[i].hasOwnProperty('filter') && c.headers[i].filter === false) || $th.hasClass('filter-false') ) ? ' disabled" disabled' : '"';
 				}
 				fr += (sel ? '></select>' : '>') + '</td>';
 			}
 			$t
 			.bind('addRows updateCell update appendCache', function(){
+				buildDefault(true);
 				findRows();
 			})
 			.find('thead').eq(0).append(fr += '</tr>')
@@ -336,7 +349,7 @@ $.tablesorter.addWidget({
 			if (wo.filter_functions) {
 				// i = column # (string)
 				for (i in wo.filter_functions) {
-					t = $(c.headerList[i]);
+					t = $ths.filter('[data-column="' + i + '"]:last');
 					fr = '';
 					if (typeof i === 'string' && wo.filter_functions[i] === true && !t.hasClass('filter-false')) {
 						buildSelect(i);
@@ -348,18 +361,11 @@ $.tablesorter.addWidget({
 								fr += '<option>' + j + '</option>';
 							}
 						}
-						$t.find('thead').find('select.' + css + '[data-col="' + i + '"]').append(fr);
+						$t.find('thead').find('select.' + css + '[data-column="' + i + '"]').append(fr);
 					}
 				}
 			}
-			// build default select dropdown
-			for (i = 0; i < c.headerList.length; i++) {
-				t = $(c.headerList[i]);
-				// look for the filter-select class, but don't build it twice.
-				if (t.hasClass('filter-select') && !t.hasClass('filter-false') && !(wo.filter_functions && wo.filter_functions[i] === true)){
-					buildSelect(i);
-				}
-			}
+			buildDefault();
 
 			$t.find('select.' + css).bind('change', function(){
 				findRows();

data/vendor/assets/stylesheets/jquery-tablesorter/blue/style.css

@@ -1,9 +1,8 @@
 /* Blue Theme */
 table.tablesorter {
-	font-family: arial;
+	font: 11px/18px Arial, Sans-serif;
 	background-color: #cdcdcd;
 	margin: 10px 0 15px;
-	font-size: 11px;
 	width: 100%;
 	text-align: left;
 	border-spacing: 0;
@@ -11,13 +10,14 @@ table.tablesorter {
 table.tablesorter,
 table.tablesorter th,
 table.tablesorter td {
-	background-color: #e6eeee;
 	border: #cdcdcd 1px solid;
 }
 
 table.tablesorter th {
+	background-color: #99bfe6;
+	color: #000;
 	border-collapse: collapse;
-	font-size: 12px;
+	font: 12px/18px Arial, Sans-serif;
 	padding: 4px;
 }
 table.tablesorter .header,
@@ -41,7 +41,7 @@ table.tablesorter tbody td {
 }
 table.tablesorter th.headerSortUp,
 table.tablesorter th.tablesorter-headerSortUp {
-	background-color: #8dbdd8;
+	background-color: #9fbfdf;
 	/* black asc arrow */
 	background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7);
 	/* white asc arrow */
@@ -51,7 +51,7 @@ table.tablesorter th.tablesorter-headerSortUp {
 }
 table.tablesorter th.headerSortDown,
 table.tablesorter th.tablesorter-headerSortDown {
-	background-color: #8dbdd8;
+	background-color: #8cb3d9;
 	/* black desc arrow */
 	background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7);
 	/* white desc arrow */
@@ -66,32 +66,44 @@ table.tablesorter .tablesorter-hidden {
 
 /* Zebra Widget - row alternating colors */
 table.tablesorter tr.odd td {
-	background-color: #f0f0ff;
+	background-color: #ebf2fa;
 }
 table.tablesorter tr.even td {
 	background-color: #fff;
 }
 
 /* Column Widget - column sort colors */
-table.tablesorter td.primary, table.tablesorter tr.odd td.primary {
-	background-color: #c0c0ff;
+.tablesorter td.primary,
+.tablesorter tr.odd td.primary {
+	background-color: #99b3e6;
 }
-table.tablesorter tr.even td.primary {
-	background-color: #e8e8ff;
+.tablesorter tr.even td.primary {
+	background-color: #c2d1f0;
 }
 
-table.tablesorter td.secondary, table.tablesorter tr.odd td.secondary {
-	background-color: #d6d6ff;
+.tablesorter td.secondary,
+.tablesorter tr.odd td.secondary {
+	background-color: #c2d1f0;
 }
-table.tablesorter tr.even td.secondary {
-	background-color: #e8e8ff;
+.tablesorter tr.even td.secondary {
+	background-color: #d6e0f5;
 }
 
-table.tablesorter td.tertiary, table.tablesorter tr.odd td.tertiary {
-	background-color: #e5e5ff;
+.tablesorter td.tertiary,
+.tablesorter tr.odd td.tertiary {
+	background-color: #d6e0f5;
 }
-table.tablesorter tr.even td.tertiary {
-	background-color: #f8f8ff;
+.tablesorter tr.even td.tertiary {
+	background-color: #ebf0fa;
+}
+
+/* hovered row colors */
+table.tablesorter tbody tr:hover td,
+table.tablesorter tbody tr.even:hover td {
+	background: #d9d9d9;
+}
+table.tablesorter tbody tr.odd:hover td {
+	background: #bfbfbf;
 }
 
 /* filter widget */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -68,18 +68,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1326086202805563987
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1326086202805563987
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23