Skip to content

Commit 5f3b6ec

Browse files
Update to v0.3.2
See release notes for details
1 parent fcf93b4 commit 5f3b6ec

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angularUtils-pagination",
3-
"version": "0.3.1",
3+
"version": "0.3.2",
44
"homepage": "https://github.com/michaelbromley/angularUtils/tree/master/src/directives/pagination",
55
"authors": [
66
"Michael Bromley <[email protected]>"

dirPagination.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,12 @@
6060
var itemsPerPageFilterRemoved = match[2].replace(filterPattern, '');
6161
var collectionGetter = $parse(itemsPerPageFilterRemoved);
6262

63+
var paginationId = tAttrs.paginationId || '__default';
64+
paginationService.registerInstance(paginationId);
65+
6366
return function dirPaginationLinkFn(scope, element, attrs){
64-
var paginationId;
6567
var compiled = $compile(element, false, 5000); // we manually compile the element again, as we have now added ng-repeat. Priority less than 5000 prevents infinite recursion of compiling dirPaginate
6668

67-
paginationId = attrs.paginationId || '__default';
68-
paginationService.registerInstance(paginationId);
69-
7069
var currentPageGetter;
7170
if (attrs.currentPage) {
7271
currentPageGetter = $parse(attrs.currentPage);
@@ -238,8 +237,10 @@
238237
}
239238

240239
function generatePagination() {
241-
scope.pages = generatePagesArray(1, paginationService.getCollectionLength(paginationId), paginationService.getItemsPerPage(paginationId), paginationRange);
242-
scope.pagination.current = parseInt(paginationService.getCurrentPage(paginationId));
240+
var page = parseInt(paginationService.getCurrentPage(paginationId)) || 1;
241+
242+
scope.pages = generatePagesArray(page, paginationService.getCollectionLength(paginationId), paginationService.getItemsPerPage(paginationId), paginationRange);
243+
scope.pagination.current = page;
243244
scope.pagination.last = scope.pages[scope.pages.length - 1];
244245
if (scope.pagination.last < scope.pagination.current) {
245246
scope.setCurrent(scope.pagination.last);
@@ -309,7 +310,8 @@
309310
instances[instanceId].currentPageParser.assign(instances[instanceId].context, val);
310311
};
311312
this.getCurrentPage = function(instanceId) {
312-
return instances[instanceId].currentPageParser(instances[instanceId].context);
313+
var parser = instances[instanceId].currentPageParser;
314+
return parser ? parser(instances[instanceId].context) : 1;
313315
};
314316

315317
this.setItemsPerPage = function(instanceId, val) {

0 commit comments

Comments
 (0)