library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2024-11-15 23:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

grouping widget name now saves after callback. Fixes #514

Browse Source
This commit is contained in:
Mottie 2014-03-12 16:48:52 -05:00
parent 1266bdadd9
commit 502130d4a3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/widgets/widget-grouping.js
View File

@ -110,7 +110,6 @@ ts.grouping = {
currentGroup = wo.group_formatter((currentGroup || '').toString(), column, table, c, wo) || currentGroup; currentGroup = wo.group_formatter((currentGroup || '').toString(), column, table, c, wo) || currentGroup;
} }
$rows.eq(rowIndex).before('<tr class="group-header ' + c.selectorRemove.slice(1) + $rows.eq(rowIndex).before('<tr class="group-header ' + c.selectorRemove.slice(1) +
// (wo.group_collapsed && wo.group_collapsible ? ' collapsed' : '') +
'" unselectable="on"><td colspan="' + '" unselectable="on"><td colspan="' +
c.columns + '">' + (wo.group_collapsible ? '<i/>' : '') + '<span class="group-name">' + c.columns + '">' + (wo.group_collapsible ? '<i/>' : '') + '<span class="group-name">' +
currentGroup + '</span><span class="group-count"></span></td></tr>'); currentGroup + '</span><span class="group-count"></span></td></tr>');
@ -126,9 +125,8 @@ ts.grouping = {
c.$table.find('tr.group-header') c.$table.find('tr.group-header')
.bind('selectstart', false) .bind('selectstart', false)
.each(function(){ .each(function(){
var isHidden, $label, var isHidden, $label, name,
$row = $(this), $row = $(this),
name = $row.find('.group-name').text().toLowerCase(),
$rows = $row.nextUntil('tr.group-header').filter(':visible'); $rows = $row.nextUntil('tr.group-header').filter(':visible');
if (wo.group_count || $.isFunction(wo.group_callback)) { if (wo.group_count || $.isFunction(wo.group_callback)) {
$label = $row.find('.group-count'); $label = $row.find('.group-count');
@ -142,6 +140,7 @@ ts.grouping = {
} }
} }
if (wo.group_saveGroups && wo.group_currentGroups[wo.group_currentGroup].length) { if (wo.group_saveGroups && wo.group_currentGroups[wo.group_currentGroup].length) {
name = $row.find('.group-name').text().toLowerCase();
isHidden = $.inArray( name, wo.group_currentGroups[wo.group_currentGroup] ) > -1; isHidden = $.inArray( name, wo.group_currentGroups[wo.group_currentGroup] ) > -1;
$row.toggleClass('collapsed', isHidden); $row.toggleClass('collapsed', isHidden);
$rows.toggleClass('group-hidden', isHidden); $rows.toggleClass('group-hidden', isHidden);
@ -165,7 +164,7 @@ ts.grouping = {
event.stopPropagation(); event.stopPropagation();
var isCollapsed, $groups, indx, var isCollapsed, $groups, indx,
$this = $(this), $this = $(this),
name = $this.find('.group-name').text(); name = $this.find('.group-name').text().toLowerCase();
// use shift-click to toggle ALL groups // use shift-click to toggle ALL groups
if (event.type === 'click' && event.shiftKey) { if (event.type === 'click' && event.shiftKey) {
$this.siblings('.group-header').trigger('toggleGroup'); $this.siblings('.group-header').trigger('toggleGroup');