Group widget + pager now works properly. See #437

docs/index.html

@@ -377,7 +377,7 @@
 			</ul>
 		</li>
 		<li><a href="example-widget-build-table.html">Build Table Widget</a> (<span class="version">v2.11</span>).</li>
-		<li><a href="example-widget-grouping.html">Grouping rows Widget</a> (v2.8; <span class="version updated">v2.14</span>).</li>
+		<li><a href="example-widget-grouping.html">Grouping rows Widget</a> (v2.8; <span class="version updated">v2.14.6</span>).</li>
 		<li><a href="example-widget-grouping-filter-childrows.html">Grouping rows Widget + filter + child rows</a></li>
 		<li><a href="example-widgets.html">Repeat Headers widget</a> (v2.0.5; <span class="version updated">v2.9</span>)</li>
 		<li><a href="example-widget-resizable.html">Resizable Columns widget</a> (v2.0.23.1; <span class="version updated">v2.8.3</span>)</li>

js/widgets/widget-grouping.js

@@ -1,4 +1,4 @@
-/*! tablesorter Grouping widget - updated 11/25/2013 (core v2.14.2)
+/*! tablesorter Grouping widget - updated 12/18/2013 (core v2.14.6)
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -10,84 +10,48 @@ var ts = $.tablesorter;
 
 ts.grouping = {
 
-	number : function(c, $column, txt, num, group){
+	types : {
-		var value, word;
+		number : function(c, $column, txt, num, group){
-		if (num > 1 && txt !== '') {
+			var value, word;
-			if ($column.hasClass(ts.css.sortAsc)) {
+			if (num > 1 && txt !== '') {
-				value = Math.floor(parseFloat(txt)/num) * num;
+				if ($column.hasClass(ts.css.sortAsc)) {
-				return value > parseFloat(group || 0) ? value : parseFloat(group || 0);
+					value = Math.floor(parseFloat(txt)/num) * num;
-			} else {
+					return value > parseFloat(group || 0) ? value : parseFloat(group || 0);
-				value = Math.ceil(parseFloat(txt)/num) * num;
+				} else {
-				return value < parseFloat(group || num) - value ? parseFloat(group || num) - value : value;
+					value = Math.ceil(parseFloat(txt)/num) * num;
-			}
+					return value < parseFloat(group || num) - value ? parseFloat(group || num) - value : value;
-		} else {
-			word = (txt + '').match(/\d+/g);
-			return word && word.length >= num ? word[num - 1] : txt || '';
-		}
-	},
-	separator : function(c, $column, txt, num){
-		var word = (txt + '').split(c.widgetOptions.group_separator);
-		return $.trim(word && num > 0 && word.length >= num ? word[(num || 1) - 1] : '');
-	},
-	word : function(c, $column, txt, num){
-		var word = (txt + ' ').match(/\w+/g);
-		return word && word.length >= num ? word[num - 1] : txt || '';
-	},
-	letter : function(c, $column, txt, num){
-		return txt ? (txt + ' ').substring(0, num) : '';
-	},
-	date : function(c, $column, txt, part, group){
-		var wo = c.widgetOptions,
-			time = new Date(txt || ''),
-			hours = time.getHours();
-		return part === 'year' ? time.getFullYear() :
-			part === 'month' ? wo.group_months[time.getMonth()] :
-			part === 'day' ? wo.group_months[time.getMonth()] + ' ' + time.getDate() :
-			part === 'week' ? wo.group_week[time.getDay()] :
-			part === 'time' ? ('00' + (hours > 12 ? hours - 12 : hours === 0 ? hours + 12 : hours)).slice(-2) + ':' +
-				('00' + time.getMinutes()).slice(-2) + ' ' + ('00' + wo.group_time[hours >= 12 ? 1 : 0]).slice(-2) :
-			wo.group_dateString(time);
-	}
-};
-
-ts.addWidget({
-	id: 'group',
-	priority: 100,
-	options: {
-		group_collapsible : true, // make the group header clickable and collapse the rows below it.
-		group_collapsed   : false, // start with all groups collapsed
-		group_count       : ' ({num})', // if not false, the "{num}" string is replaced with the number of rows in the group
-		group_separator   : '-',  // group name separator; used when group-separator-# class is used.
-		group_formatter   : null, // function(txt, column, table, c, wo) { return txt; }
-		group_callback    : null, // function($cell, $rows, column, table){}, callback allowing modification of the group header labels
-		group_complete    : 'groupingComplete', // event triggered on the table when the grouping widget has finished work
-
-		// change these default date names based on your language preferences
-		group_months      : [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ],
-		group_week        : [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ],
-		group_time        : [ 'AM', 'PM' ],
-		// this function is used when "group-date" is set to create the date string
-		// you can just return date, date.toLocaleString(), date.toLocaleDateString() or d.toLocaleTimeString()
-		// reference: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#Conversion_getter
-		group_dateString  : function(date) { return date.toLocaleString(); }
-	},
-	init: function(table, thisWidget, c, wo){
-		if (wo.group_collapsible) {
-			// .on() requires jQuery 1.7+
-			c.$table.on('click toggleGroup', 'tr.group-header', function(event){
-				event.stopPropagation();
-				var $this = $(this);
-				// use shift-click to toggle ALL groups
-				if (event.type === 'click' && event.shiftKey) {
-					$this.siblings('.group-header').trigger('toggleGroup');
 				}
-				$this.toggleClass('collapsed');
+			} else {
-				// nextUntil requires jQuery 1.4+
+				word = (txt + '').match(/\d+/g);
-				$this.nextUntil('tr.group-header').toggleClass('group-hidden', $this.hasClass('collapsed') );
+				return word && word.length >= num ? word[num - 1] : txt || '';
-			});
+			}
+		},
+		separator : function(c, $column, txt, num){
+			var word = (txt + '').split(c.widgetOptions.group_separator);
+			return $.trim(word && num > 0 && word.length >= num ? word[(num || 1) - 1] : '');
+		},
+		word : function(c, $column, txt, num){
+			var word = (txt + ' ').match(/\w+/g);
+			return word && word.length >= num ? word[num - 1] : txt || '';
+		},
+		letter : function(c, $column, txt, num){
+			return txt ? (txt + ' ').substring(0, num) : '';
+		},
+		date : function(c, $column, txt, part, group){
+			var wo = c.widgetOptions,
+				time = new Date(txt || ''),
+				hours = time.getHours();
+			return part === 'year' ? time.getFullYear() :
+				part === 'month' ? wo.group_months[time.getMonth()] :
+				part === 'day' ? wo.group_months[time.getMonth()] + ' ' + time.getDate() :
+				part === 'week' ? wo.group_week[time.getDay()] :
+				part === 'time' ? ('00' + (hours > 12 ? hours - 12 : hours === 0 ? hours + 12 : hours)).slice(-2) + ':' +
+					('00' + time.getMinutes()).slice(-2) + ' ' + ('00' + wo.group_time[hours >= 12 ? 1 : 0]).slice(-2) :
+				wo.group_dateString(time);
 		}
 	},
-	format: function(table, c, wo) {
+
+	update : function(table, c, wo){
 		if ($.isEmptyObject(c.cache)) { return; }
 		var rowIndex, tbodyIndex, currentGroup, $rows, groupClass, grouping, time, cache,
 			lang = wo.grouping_language,
@@ -116,9 +80,9 @@ ts.addWidget({
 						// grouping = [ 'group', '{word/separator/letter/number/date/false}', '{#/year/month/day/week/time}' ]
 						grouping = groupClass ? groupClass[0].split('-') : ['','letter',1]; // default to letter 1
 						// fixes #438
-						if (ts.grouping[grouping[1]]) {
+						if (ts.grouping.types[grouping[1]]) {
 							currentGroup = cache[rowIndex] ? 
-								ts.grouping[grouping[1]]( c, c.$headers.eq(column), cache[rowIndex][column], /date/.test(groupClass) ?
+								ts.grouping.types[grouping[1]]( c, c.$headers.eq(column), cache[rowIndex][column], /date/.test(groupClass) ?
 								grouping[2] : parseInt(grouping[2] || 1, 10) || 1, group, lang ) : currentGroup;
 							if (group !== currentGroup) {
 								group = currentGroup;
@@ -161,6 +125,52 @@ ts.addWidget({
 				$.tablesorter.benchmark("Applying groups widget: ", time);
 			}
 		}
+	}
+
+};
+
+ts.addWidget({
+	id: 'group',
+	priority: 100,
+	options: {
+		group_collapsible : true, // make the group header clickable and collapse the rows below it.
+		group_collapsed   : false, // start with all groups collapsed
+		group_count       : ' ({num})', // if not false, the "{num}" string is replaced with the number of rows in the group
+		group_separator   : '-',  // group name separator; used when group-separator-# class is used.
+		group_formatter   : null, // function(txt, column, table, c, wo) { return txt; }
+		group_callback    : null, // function($cell, $rows, column, table){}, callback allowing modification of the group header labels
+		group_complete    : 'groupingComplete', // event triggered on the table when the grouping widget has finished work
+
+		// change these default date names based on your language preferences
+		group_months      : [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ],
+		group_week        : [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ],
+		group_time        : [ 'AM', 'PM' ],
+		// this function is used when "group-date" is set to create the date string
+		// you can just return date, date.toLocaleString(), date.toLocaleDateString() or d.toLocaleTimeString()
+		// reference: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#Conversion_getter
+		group_dateString  : function(date) { return date.toLocaleString(); }
+	},
+	init: function(table, thisWidget, c, wo){
+		if (wo.group_collapsible) {
+			// .on() requires jQuery 1.7+
+			c.$table.on('click toggleGroup', 'tr.group-header', function(event){
+				event.stopPropagation();
+				var $this = $(this);
+				// use shift-click to toggle ALL groups
+				if (event.type === 'click' && event.shiftKey) {
+					$this.siblings('.group-header').trigger('toggleGroup');
+				}
+				$this.toggleClass('collapsed');
+				// nextUntil requires jQuery 1.4+
+				$this.nextUntil('tr.group-header').toggleClass('group-hidden', $this.hasClass('collapsed') );
+			});
+		}
+		c.$table.on('pagerChange', function(){
+			ts.grouping.update(table, c, wo);
+		});
+	},
+	format: function(table, c, wo) {
+		ts.grouping.update(table, c, wo);
 	},
 	remove : function(table, c, wo){
 		c.$table