Refactored, to increase coverage, and remove duplicate code paths.

@@ -27,11 +27,18 @@ define(function(require) {
                 var currentPage = parseInt(this.get('currentPage'));
                 var currentPage = parseInt(this.get('currentPage'));
                 var pageSize = parseInt(this.get('pageSize'));
                 var pageSize = parseInt(this.get('pageSize'));
                 var totalCount = parseInt(this.get('totalCount'));
                 var totalCount = parseInt(this.get('totalCount'));
-                if (!currentPage || !pageSize || !totalCount) {
+                if (!totalCount) {
                     return;
                     return;
                 }
                 }
                 var pages = [];
                 var pages = [];
                 var totalPages = Math.floor((totalCount + pageSize - 1) / pageSize);
                 var totalPages = Math.floor((totalCount + pageSize - 1) / pageSize);
+                if (currentPage < 0) {
+                    this.set('currentPage', 1);
+                    return;
+                } else if (currentPage > totalPages) {
+                    this.set('currentPage', totalPages);
+                    return;
+                }
                 function addPage(self, i) {
                 function addPage(self, i) {
                     pages.push({
                     pages.push({
                         current: i === currentPage,
                         current: i === currentPage,
@@ -59,10 +66,8 @@ define(function(require) {
                 }
                 }
 
 
                 for (var i = startAt; i < endAt; i++) {
                 for (var i = startAt; i < endAt; i++) {
-                    if (i > 0 && i <= totalPages) {
                     addPage(this, i);
                     addPage(this, i);
                 }
                 }
-                }
                 var hasPrevious = currentPage > 1;
                 var hasPrevious = currentPage > 1;
                 var hasNext = currentPage < totalPages;
                 var hasNext = currentPage < totalPages;
                 var pageJump = this.get('pageJump');
                 var pageJump = this.get('pageJump');
@@ -89,21 +94,6 @@ define(function(require) {
                     totalPages: totalPages,
                     totalPages: totalPages,
                 });
                 });
             };
             };
-            this.on('change:pageSize change:currentPage change:totalCount', function() {
-                var currentPage = parseInt(this.get('currentPage'));
-                var pageSize = parseInt(this.get('pageSize'));
-                var totalCount = parseInt(this.get('totalCount'));
-                if (!currentPage || !pageSize || !totalCount) {
-                    return;
-                }
-                var pages = [];
-                var totalPages = Math.floor((totalCount + pageSize - 1) / pageSize);
-                if (currentPage < 0) {
-                    this.set('currentPage', 1);
-                } else if (currentPage > totalPages) {
-                    this.set('currentPage', totalPages);
-                }
-            }, this);
             this.on('change:pageSize change:currentPage change:totalCount', buildPages, this);
             this.on('change:pageSize change:currentPage change:totalCount', buildPages, this);
             var installActions = _.bind(function installActions(eventName, nextName, hasNextName, previousName, hasPreviousName, pageCount) {
             var installActions = _.bind(function installActions(eventName, nextName, hasNextName, previousName, hasPreviousName, pageCount) {
                 this.on(eventName, function() {
                 this.on(eventName, function() {