Skip to content

Tweak the processing logic when setting up for TOTAL_COUNT #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TimIgoe wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Tweak the processing logic when setting up for TOTAL_COUNT #111

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
437381a
Merge remote-tracking branch 'refs/remotes/mattiash/master'
TimIgoe Mar 27, 2018
3303237
Tweak to setup of the TOTAL_COUNT value
TimIgoe Mar 27, 2018
3fc1f3f
When calculating the total pages length, throw away static binding, c…
TimIgoe Apr 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions js/angular-tablesort.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,10 +516,10 @@ tableSortModule.directive( 'tsRepeat', ['$compile', '$interpolate', function($co

var tsExpr = 'tablesortOrderBy:sortFun | tablesortLimit:filterLimitFun | tablesortLimit:pageLimitFun';
var repeatExpr = element.attr(ngRepeatDirective);
var repeatExprRegex = /^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(\s+track\s+by\s+[\s\S]+?)?\s*$/;
repeatExpr = repeatExpr.replace('::', '');
var repeatExprRegex = /^\s*([\s\S]+?)\s+in\s+([\S]+?)\s+([\s\S]+?)(\s+track\s+by\s+[\s\S]+?)?\s*$/;
var trackByMatch = repeatExpr.match(/\s+track\s+by\s+(\$index|\S+?\.(\S+))/);
var repeatInMatch = repeatExpr.match(repeatExprRegex);
if (trackByMatch) {
if (trackByMatch) {
tsWrapperCtrl.setTrackBy(trackByMatch[2] || trackByMatch[1]);
}

Expand All @@ -534,6 +534,8 @@ tableSortModule.directive( 'tsRepeat', ['$compile', '$interpolate', function($co
repeatExpr = repeatExpr.replace(repeatExprRegex, '$1 in $2 | ' + tsExpr + '$3');
}

var repeatInMatch = repeatExpr.match(repeatExprRegex);

if (angular.isUndefined(attrs.tsHideNoData)) {
var startSym = $interpolate.startSymbol();
var endSym = $interpolate.endSymbol();
Expand Down