Bump to v0.2.6

See release notes for changes
michaelbromley · Oct 13, 2014 · 471f966 · 471f966
1 parent 39cca44
commit 471f966
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angularUtils-pagination",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "homepage": "https://github.com/michaelbromley/angularUtils/tree/master/src/directives/pagination",
   "authors": [
     "Michael Bromley <michael@michaelbromley.co.uk>"

diff --git a/dirPagination.js b/dirPagination.js
@@ -36,7 +36,7 @@
     module.directive('dirPaginate', ['$compile', '$parse', '$timeout', 'paginationService', function($compile, $parse, $timeout, paginationService) {
         return  {
             terminal: true,
-            compile: function(element, attrs){
+            compile: function dirPaginationCompileFn(element, attrs){
                 attrs.$set('ngRepeat', attrs.dirPaginate); // Add ng-repeat to the dom element
                 element.removeAttr(attrs.$attr.dirPaginate); // Remove the dir-paginate attribute to prevent infinite recursion of compilation
 
@@ -51,7 +51,7 @@
                 var itemsPerPageFilterRemoved = match[2].replace(filterPattern, '');
                 var collectionGetter = $parse(itemsPerPageFilterRemoved);
 
-                return function(scope, element, attrs){
+                return function dirPaginationLinkFn(scope, element, attrs){
                     var paginationId;
                     var compiled =  $compile(element); // we manually compile the element again, as we have now swapped dir-paginate for an ng-repeat
 
@@ -92,7 +92,7 @@
                     compiled(scope);
                 };
             }
-        };
+        }; 
     }]);
 
     module.directive('dirPaginationControls', ['paginationService', function(paginationService) {
@@ -204,8 +204,10 @@
 
                 scope.$watch(function() {
                     return paginationService.getCurrentPage(paginationId);
-                }, function(currentPage) {
-                    goToPage(currentPage);
+                }, function(currentPage, previousPage) {
+                    if (currentPage != previousPage) {
+                        goToPage(currentPage);
+                    }
                 });
 
                 scope.setCurrent = function(num) {
@@ -272,7 +274,6 @@
     module.service('paginationService', function() {
         var instances = {};
         var lastRegisteredInstance;
-        this.paginationDirectiveInitialized = false;
 
         this.registerInstance = function(instanceId) {
             if (typeof instances[instanceId] === 'undefined') {

diff --git a/dirPagination.tpl.html b/dirPagination.tpl.html
@@ -2,15 +2,15 @@
     <li ng-if="boundaryLinks" ng-class="{ disabled : pagination.current == 1 }">
         <a href="" ng-click="setCurrent(1)">&laquo;</a>
     </li>
-    <li ng-if="directionLinks" ng-class="{ disabled : pagination.current == 1 }" class="ng-scope">
-        <a href="" ng-click="setCurrent(pagination.current - 1)" class="ng-binding">&lsaquo;</a>
+    <li ng-if="directionLinks" ng-class="{ disabled : pagination.current == 1 }">
+        <a href="" ng-click="setCurrent(pagination.current - 1)">&lsaquo;</a>
     </li>
     <li ng-repeat="pageNumber in pages track by $index" ng-class="{ active : pagination.current == pageNumber, disabled : pageNumber == '...' }">
         <a href="" ng-click="setCurrent(pageNumber)">{{ pageNumber }}</a>
     </li>
 
-    <li ng-if="directionLinks" ng-class="{ disabled : pagination.current == pagination.last }" class="ng-scope">
-        <a href="" ng-click="setCurrent(pagination.current + 1)" class="ng-binding">&rsaquo;</a>
+    <li ng-if="directionLinks" ng-class="{ disabled : pagination.current == pagination.last }">
+        <a href="" ng-click="setCurrent(pagination.current + 1)">&rsaquo;</a>
     </li>
     <li ng-if="boundaryLinks"  ng-class="{ disabled : pagination.current == pagination.last }">
         <a href="" ng-click="setCurrent(pagination.last)">&raquo;</a>