From ec76aecf86da3aec0843f36aaab424f0ab48dc12 Mon Sep 17 00:00:00 2001 From: hiyao Date: Thu, 9 Aug 2018 18:58:25 +0800 Subject: [PATCH 1/2] Fix the pagination breaks when add the pagination-id --- src/directives/pagination/dirPagination.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/directives/pagination/dirPagination.js b/src/directives/pagination/dirPagination.js index a1a7265..b4e9014 100644 --- a/src/directives/pagination/dirPagination.js +++ b/src/directives/pagination/dirPagination.js @@ -132,7 +132,7 @@ idDefinedInFilter = !!expression.match(/(\|\s*itemsPerPage\s*:[^|]*:[^|]*)/); if (paginationId !== DEFAULT_ID && !idDefinedInFilter) { - repeatExpression = expression.replace(/(\|\s*itemsPerPage\s*:\s*[^|\s]*)/, "$1 : '" + paginationId + "'"); + repeatExpression = expression.replace(/(\|\s*itemsPerPage\s*:\s*[^|\s\)]*)(\)+)/, "$1 : '" + paginationId + "' $2"); } else { repeatExpression = expression; } From 71214880a3a6ab6dca734c96583df6f2ec49d0ff Mon Sep 17 00:00:00 2001 From: hiyao Date: Thu, 9 Aug 2018 19:05:50 +0800 Subject: [PATCH 2/2] fix regex --- src/directives/pagination/dirPagination.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/directives/pagination/dirPagination.js b/src/directives/pagination/dirPagination.js index b4e9014..5a035eb 100644 --- a/src/directives/pagination/dirPagination.js +++ b/src/directives/pagination/dirPagination.js @@ -132,7 +132,7 @@ idDefinedInFilter = !!expression.match(/(\|\s*itemsPerPage\s*:[^|]*:[^|]*)/); if (paginationId !== DEFAULT_ID && !idDefinedInFilter) { - repeatExpression = expression.replace(/(\|\s*itemsPerPage\s*:\s*[^|\s\)]*)(\)+)/, "$1 : '" + paginationId + "' $2"); + repeatExpression = expression.replace(/(\|\s*itemsPerPage\s*:\s*[^|\s\)]*)(\)*)/, "$1 : '" + paginationId + "' $2"); } else { repeatExpression = expression; }