publish new version

Author: lorenzofox3

bower.json

@@ -1,29 +1,29 @@
 {
-    "name": "angular-smart-table",
-    "version": "2.1.0",
-    "homepage": "https://github.com/lorenzofox3/Smart-Table",
-    "authors": [
-        "lorenzofox3 <[email protected]>"
-    ],
-    "description": "table module for angular",
-    "main": "dist/smart-table.js",
-    "keywords": [
-        "smart-table",
-        "angular",
-        "table"
-    ],
-    "license": "MIT",
-    "ignore": [
-        "node_modules",
-        "bower_components",
-        "test",
-        "tests"
-    ],
-    "dependencies": {
-        "angular": "^1.0.0"
-    },
-    "devDependencies": {
-        "angular-mocks": "^1.0.0",
-        "jquery": "^2.0.0"
-    }
+  "name": "angular-smart-table",
+  "version": "2.1.1",
+  "homepage": "https://github.com/lorenzofox3/Smart-Table",
+  "authors": [
+    "lorenzofox3 <[email protected]>"
+  ],
+  "description": "table module for angular",
+  "main": "dist/smart-table.js",
+  "keywords": [
+    "smart-table",
+    "angular",
+    "table"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "angular": "^1.0.0"
+  },
+  "devDependencies": {
+    "angular-mocks": "^1.0.0",
+    "jquery": "^2.0.0"
+  }
 }

changeLog.md

@@ -139,4 +139,10 @@ function(tableState, tableController){
 * support nested search (thanks to @jansabbe)
 * fix #254
 * fix wrong path to default config for stSkipNatural (@phuvo)
-* fix #406
+* fix #406
+
+## version 2.1.1
+
+* support commonjs 
+* add totalItemCount on tableState (@eirikbell)
+

dist/smart-table.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-smart-table",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "",
   "main": "index.js",
   "scripts": {

dist/smart-table.min.js

@@ -28,6 +28,7 @@ ng.module('smart-table')
           var end;
           var i;
           var prevPage = scope.currentPage;
+          scope.totalItemCount = paginationState.totalItemCount;
           scope.currentPage = Math.floor(paginationState.start / paginationState.number) + 1;
 
           start = Math.max(start, scope.currentPage - Math.abs(Math.floor(scope.stDisplayedPages / 2)));

package.json

@@ -11,7 +11,8 @@ ng.module('smart-table')
       sort: {},
       search: {},
       pagination: {
-        start: 0
+        start: 0,
+        totalItemCount: 0
       }
     };
     var filtered;
@@ -114,6 +115,7 @@ ng.module('smart-table')
       if (tableState.sort.predicate) {
         filtered = orderBy(filtered, tableState.sort.predicate, tableState.sort.reverse);
       }
+      pagination.totalItemCount = filtered.length;
       if (pagination.number !== undefined) {
         pagination.numberOfPages = filtered.length > 0 ? Math.ceil(filtered.length / pagination.number) : 1;
         pagination.start = pagination.start >= filtered.length ? (pagination.numberOfPages - 1) * pagination.number : pagination.start;

src/stPagination.js

@@ -19,7 +19,7 @@ describe('stPagination directive', function () {
   var tableState = {
     sort: {},
     search: {},
-    pagination: {start: 0}
+    pagination: {start: 0, totalItemCount: 0}
   };
   var compile;
 
@@ -380,6 +380,36 @@ describe('stPagination directive', function () {
       expect(pages.length).toBe(0);
     });
 
+    describe('with extended template', function () {
+      var templateCache;
+      beforeEach(inject(function ($templateCache) {
+        templateCache = $templateCache;
+      }));
+
+      it('should save totalItemCount from paginationState on scope', function () {
+        templateCache.put('custom_template.html', '<nav ng-if="pages.length >= 2"><ul class="pagination">' +
+        '<li ng-repeat="page in pages" ng-class="{active: page==currentPage}"><a ng-click="selectPage(page)">{{page}}</a></li>' +
+        '</ul>' +
+        '<span>Showing {{(currentPage-1)*stItemsByPage+1}}-{{(currentPage)*stItemsByPage > totalItemCount ? totalItemCount : (currentPage)*stItemsByPage}} of {{totalItemCount}}</span>' +
+        '</nav>');
+
+        var template = '<table st-table="rowCollection"><tfoot><tr><td id="pagination" st-pagination="" st-template="custom_template.html" st-items-by-page="2"></td></tr></tfoot></table>';
+        element = compile(template)(rootScope);
+
+        rootScope.$apply();
+
+        tableState.pagination = {
+          start: 3,
+          numberOfPages: 3,
+          number: 2,
+          totalItemCount: 5
+        };
+
+        rootScope.$apply();
+
+        expect(element.find('SPAN')[0].innerHTML).toBe('Showing 3-4 of 5');
+      });
+    });
   });
 
   describe('select page', function () {
@@ -485,7 +515,7 @@ describe('stPagination directive', function () {
       expect(rootScope.onPageChange).toHaveBeenCalledWith(3);
       expect(rootScope.onPageChange.calls.length).toBe(1);
 
-      tableState.pagination.numberOfPages=5;
+      tableState.pagination.numberOfPages = 5;
 
       rootScope.$apply();
       pages = getPages();

src/stTable.js

@@ -41,11 +41,11 @@ describe('stPipe directive', function () {
         $timeout.flush();
 
         expect(firstArg).toEqual({
-            sort: {predicate: 'name', reverse: false}, search: {}, pagination: {start: 0}
+            sort: {predicate: 'name', reverse: false}, search: {}, pagination: {start: 0, totalItemCount: 0}
         });
 
         expect(secondArg.tableState()).toEqual({
-            sort: {predicate: 'name', reverse: false}, search: {}, pagination: {start: 0}
+            sort: {predicate: 'name', reverse: false}, search: {}, pagination: {start: 0, totalItemCount: 0}
         });
     }));
 });

test/spec/stPagination.spec.js

@@ -28,6 +28,22 @@ describe('st table Controller', function () {
 
     }));
 
+    describe('init', function(){
+      it('should contain default tableState', function(){
+        var defaultTableState = {
+          sort: {},
+          search: {},
+          pagination: {
+            start: 0,
+            totalItemCount: 0
+          }
+        };
+
+        var tableState = ctrl.tableState();
+        expect(tableState).toEqual(defaultTableState);
+      });
+    });
+
     describe('sort', function () {
       it('should sort the data', function () {
         ctrl.sortBy('firstname');
@@ -191,6 +207,20 @@ describe('st table Controller', function () {
     });
 
     describe('pipe', function () {
+      it('should set totalItemCount on tableState pagination', function(){
+        var expectedLength = 5;
+        ctrl.pipe();
+        expect(scope.data.length).toBe(expectedLength);
+        expect(ctrl.tableState().pagination.totalItemCount).toBe(expectedLength);
+      });
+
+      it('should set totalItemCount as size of filtered array', function(){
+        var expectedLength = 3;
+        ctrl.search('re', 'name');
+        expect(scope.data.length).toBe(expectedLength);
+        expect(ctrl.tableState().pagination.totalItemCount).toBe(expectedLength);
+      });
+
       it('should remembered the last slice length but start back to zero when sorting', function () {
         ctrl.slice(1, 2);
         expect(scope.data.length).toBe(2);