From 4c086934dc06692095415c632446f82b15ebe6d8 Mon Sep 17 00:00:00 2001 From: Paul Schuegraf Date: Sun, 25 May 2014 10:20:06 +0300 Subject: [PATCH] fix(pagination): fixes issue when init called after watch triggered --- src/pagination/pagination.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pagination/pagination.js b/src/pagination/pagination.js index f022dce540..e9c391e3d5 100644 --- a/src/pagination/pagination.js +++ b/src/pagination/pagination.js @@ -21,6 +21,20 @@ angular.module('ui.bootstrap.pagination', []) } else { this.itemsPerPage = config.itemsPerPage; } + + $scope.$watch('totalItems', function() { + $scope.totalPages = self.calculateTotalPages(); + }); + + $scope.$watch('totalPages', function(value) { + setNumPages($scope.$parent, value); // Readonly variable + + if ( $scope.page > value ) { + $scope.selectPage(value); + } else { + ngModelCtrl.$render(); + } + }); }; this.calculateTotalPages = function() { @@ -48,20 +62,6 @@ angular.module('ui.bootstrap.pagination', []) $scope.noNext = function() { return $scope.page === $scope.totalPages; }; - - $scope.$watch('totalItems', function() { - $scope.totalPages = self.calculateTotalPages(); - }); - - $scope.$watch('totalPages', function(value) { - setNumPages($scope.$parent, value); // Readonly variable - - if ( $scope.page > value ) { - $scope.selectPage(value); - } else { - ngModelCtrl.$render(); - } - }); }]) .constant('paginationConfig', {