Last page mismatch fix

README.md

@@ -42,6 +42,7 @@ http://www.google.com/design/spec/components/data-tables.html
  - virtual-repeat
  - delete-row-callback
  - selected-row-callback
+ - clicked-row-callback
  - animate-sort-icon
  - ripple-effect
  - ! title-overflow-handler
@@ -89,6 +90,7 @@ http://www.google.com/design/spec/components/data-tables.html
 |:white_check_mark:| virtual-repeat                                 | Boolean       | optional, when set, virtual scrolling will be applied to the table. You must set a fixed height to the `.md-virtual-repeat-container` class in order to make it work properly. Since virtual scrolling is working with fixed height. |
 |:white_check_mark:| delete-row-callback                            | Function      | optional, callback function when deleting rows. The callback will be called with the array of the deleted row ids. Don't forget to specify `table-row-id` for `mdt-row`. If you do, it will return the deleted rows data. |
 |:white_check_mark:| selected-row-callback                          | Function      | optional, callback function when selecting rows. The callback will be called with the array of the selected row ids. Don't forget to specify `table-row-id` for `mdt-row`. If you do, it will return the selected rows data. |
+|:white_check_mark:| clicked-row-callback                           | Function      | optional, callback function when clicked rows. The callback will be called when the row is clicked. Don't forget to specify `table-row-id` for `mdt-row`. |
 ![alt tag](http://material-design.storage.googleapis.com/publish/material_v_4/material_ext_publish/0B3mOPoJlxiFhcWNyQl9xYmRkQnc/components_datatables_interaction_selectedrow.png)
 
 | Available        | Params                                         | Type          | Details       |

app/modules/main/directives/mdtTableDirective.js

@@ -116,6 +116,7 @@
     function mdtTableDirective(TableDataStorageFactory,
                                EditCellFeature,
                                SelectableRowsFeature,
+                               ClickableRowsFeature,
                                PaginationFeature,
                                ColumnSelectorFeature,
                                _){
@@ -128,7 +129,7 @@
                 selectableRows: '=',
                 alternateHeaders: '=',
                 deleteRowCallback: '&',
-                selectedRowCallback: '&',
+                clickedRowCallback: '&',
                 saveRowCallback: '&',
                 animateSortIcon: '=',
                 rippleEffect: '=',
@@ -220,6 +221,7 @@
 
                 _initEditCellFeature();
                 _initSelectableRowsFeature();
+                _initClickableRowsFeature();
 
                 PaginationFeature.startFeature(ctrl);
                 ColumnSelectorFeature.initFeatureHeaderValues($scope.dataStorage.header, ctrl.columnSelectorFeature);
@@ -274,6 +276,12 @@
                         ctrl: ctrl
                     });
                 }
+                function _initClickableRowsFeature(){
+                    ClickableRowsFeature.getInstance({
+                        $scope: $scope,
+                        ctrl: ctrl
+                    });
+                }
             }
         };
     }

app/modules/main/factories/mdtAjaxPaginationHelperFactory.js

@@ -47,7 +47,7 @@
         mdtAjaxPaginationHelper.prototype.getEndRowIndex = function(){
             var lastItem = this.getStartRowIndex() + this.rowsPerPage - 1;
 
-            if(this.totalResultCount < lastItem){
+            if((this.totalResultCount - 1) < lastItem){
                 return this.totalResultCount - 1;
             }
 
@@ -66,7 +66,6 @@
             var that = this;
             if(this.hasPreviousPage()){
                 this.fetchPage(this.page-1).then(function(){
-                    that.page--;
                 });
             }
         };
@@ -75,15 +74,12 @@
             var that = this;
             if(this.hasNextPage()){
                 this.fetchPage(this.page+1).then(function(){
-                    that.page++;
                 });
             }
         };
 
         mdtAjaxPaginationHelper.prototype.getFirstPage = function(){
-            this.page = 1;
-
-            this.fetchPage(this.page);
+            this.fetchPage(1);
         };
 
         mdtAjaxPaginationHelper.prototype.hasNextPage = function(){
@@ -95,6 +91,11 @@
         };
 
         mdtAjaxPaginationHelper.prototype.fetchPage = function(page){
+            if (page) {
+                this.page = page;
+            } else {
+                page = this.page;
+            }
             this.isLoading = true;
 
             var that = this;

app/modules/main/factories/mdtPaginationHelperFactory.js

@@ -40,7 +40,7 @@
         mdtPaginationHelper.prototype.getEndRowIndex = function(){
             var lastItem = this.getStartRowIndex() + this.rowsPerPage-1;
 
-            if(this.dataStorage.storage.length < lastItem){
+            if((this.dataStorage.storage.length - 1) < lastItem){
                 return this.dataStorage.storage.length - 1;
             }
 

app/modules/main/features/ClickableRowsFeature.js

@@ -0,0 +1,32 @@
+(function () {
+    'use strict';
+
+    function ClickableRowsFeatureFactory($timeout) {
+
+        function ClickableRowsFeature(params) {
+            this.$scope = params.$scope;
+            this.ctrl = params.ctrl;
+
+            this.$scope.rowClickCallBackHandler = _.bind(this.rowClickCallBackHandler, this);
+        }
+
+        ClickableRowsFeature.prototype.rowClickCallBackHandler = function (event, row) {
+            var that = this;
+            // we need to push it to the event loop to make it happen last
+            // (e.g.: all the elements can be selected before we call the callback)
+            $timeout(function () {
+                that.$scope.clickedRowCallback({rowId: row.rowId});
+            }, 0);
+        };
+
+        return {
+            getInstance: function (params) {
+                return new ClickableRowsFeature(params);
+            }
+        };
+    }
+
+    angular
+        .module('mdDataTable')
+        .service('ClickableRowsFeature', ClickableRowsFeatureFactory);
+}());

app/modules/main/templates/rows/generateRows.html

@@ -1,7 +1,8 @@
 <tr class="tbodyTrRow"
     ng-repeat="rowData in mdtPaginationHelper.getRows() track by $index"
     ng-class="{'selectedRow': rowData.optionList.selected, '{{rowData.optionList.className}}': rowData.optionList.className }"
-    ng-show="(isPaginationEnabled() === false || rowData.optionList.visible === true) && rowData.optionList.deleted === false">
+    ng-show="(isPaginationEnabled() === false || rowData.optionList.visible === true) && rowData.optionList.deleted === false"
+    ng-click="rowClickCallBackHandler($event, rowData)">
 
     <td class="checkboxCell" ng-show="selectableRows"
         ng-include="'/main/templates/cells/generateCheckboxCell.html'"></td>