fix(example): updated code due to documentation

total should be a number
esvit · Apr 16, 2015 · ce15e94 · ce15e94
1 parent 228a3a1
commit ce15e94
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 24 deletions.
diff --git a/examples/demo14.html b/examples/demo14.html
@@ -40,7 +40,7 @@ <h2>Dataset: <select ng-model="dataset" ng-options="ds for ds in datasets"></sel
         var app = angular.module('main', ['ngTable']).
 
         controller('DemoCtrl', function($interval, $http, $scope, $filter, NgTableParams) {
-			$scope.datasets = ["1","2", "3"];
+			$scope.datasets = ["1","2"];
 			$scope.dataset = "1";
             var self = this;
             self.data1 = [{name: "One", age: 50},
@@ -78,20 +78,6 @@ <h2>Dataset: <select ng-model="dataset" ng-options="ds for ds in datasets"></sel
                         {name: "Nephi", age: 29},
                         {name: "Enos", age: 34}];
 
-            self.data3 = [];
-
-            $interval(function() {
-                $http.jsonp("http://www.filltext.com/?callback=JSON_CALLBACK&rows=5&name={firstName}&age={number|80}")
-                .success(function (data) {
-                    self.data3 = data;
-                    // $scope.tableParams.reload();
-                });
-            }, 5000);
-
-			var getData = function() {
-				return self['data' + $scope.dataset]; 
-			};
-
 			$scope.$watch("dataset", function () {
 				$scope.tableParams.reload();
 			});
@@ -103,16 +89,18 @@ <h2>Dataset: <select ng-model="dataset" ng-options="ds for ds in datasets"></sel
                     name: 'asc'     // initial sorting
                 }
             }, {
-                total: function () { return getData().length; }, // length of data
+                total: 0, // we should calc it inside getData because data length is dynamic
                 getData: function($defer, params) {
-                    var filteredData = getData();
+
+                    var data = self["data" + $scope.dataset];
+
+                    var filteredData = data;
                     var orderedData = params.sorting() ?
                                         $filter('orderBy')(filteredData, params.orderBy()) :
                                         filteredData;
-
+                    params.total(self["data" + $scope.dataset].length);
                     $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count()));
-                },
-				$scope: { $data: {} }
+                }
             });
         })
         </script>

diff --git a/src/scripts/03-params.js b/src/scripts/03-params.js
@@ -403,8 +403,10 @@ app.factory('NgTableParams', ['$q', '$log', 'ngTableDefaults', function($q, $log
                     self.data = data;
                     if (settings.$scope) settings.$scope.$data = data;
                 }
-                if (settings.$scope) settings.$scope.pages = self.generatePagesArray(self.page(), self.total(), self.count());
-                settings.$scope.$emit('ngTableAfterReloadData');
+                if (settings.$scope) {
+                    settings.$scope.pages = self.generatePagesArray(self.page(), self.total(), self.count());
+                    settings.$scope.$emit('ngTableAfterReloadData');
+                }
                 return data;
             });
         };

diff --git a/src/scripts/06-pagination.js b/src/scripts/06-pagination.js
@@ -25,7 +25,10 @@ app.directive('ngTablePagination', ['$compile',
             link: function(scope, element, attrs) {
 
                 scope.params.settings().$scope.$on('ngTableAfterReloadData', function() {
-                    scope.pages = scope.params.generatePagesArray(scope.params.page(), scope.params.total(), scope.params.count());
+                    var page = scope.params.page(),
+                        total = scope.params.total(),
+                        count = scope.params.count();
+                    scope.pages = scope.params.generatePagesArray(page, total, count);
                 }, true);
 
                 scope.$watch('templateUrl', function(templateUrl) {
@@ -42,4 +45,4 @@ app.directive('ngTablePagination', ['$compile',
             }
         };
     }
-]);
+]);