fix dataview paging code (#43), fix grid paging errors to do with AllowAddNew and paging, add new updatePagingStatusFromView method to work around the hacky requirements for dataView.onPagingInfoChanged() (this breaks separation of concerns very slightly, but was a lesser evil. it will in any case default to existing behaviour)

Author: 6pac

README.md

@@ -2,20 +2,18 @@
 
 This is the acknowledged most active non-customised fork of SlickGrid.
 
-It aims to be a viable alternative master repo, building on the current state of the mleibman/SlickGrid master branch, keeping libraries up to date and applying small, safe core patches and enhancements without turning into a personalised build.
+It aims to be a viable alternative master repo, building on the legacy of the mleibman/SlickGrid master branch, keeping libraries up to date and applying small, safe core patches and enhancements without turning into a personalised build.
 
 Check out the [examples](https://github.com/6pac/SlickGrid/wiki/Examples) for examples demonstrating new features and use cases, such as dynamic grid creation and editors with third party controls.
 
 Also check out my [wiki](https://github.com/6pac/SlickGrid/wiki).
 
-The following are the changes made since forking from the main MLeibman branch, a significant number in response to issues or pull requests.
+The following are the changes (most recent first) made since forking from the main MLeibman branch, a significant number in response to issues or pull requests.
 
 **Maintenance:**
 
-most recent first
-
 * breaking change: updated jquery.event.drag-2.2.js and jquery.event.drop-2.2.js to be compatible with jQuery 3, bumped these to jquery.event.drag-2.3.0.js and jquery.event.drop-2.3.0.js
-* tested with jQuery 1.8.3, 1.11.2, 2.2.4, and 3.1.0
+* tested with jQuery 1.8.3, 1.11.2, 2.2.4, and 3.1.0  -- thanks to lfilho
 * updated repo to work with jQuery 3.x (without needing jQuery-Migrate) -- thanks to lfilho
 * fix bug with refresh last row of grid
 * fix bug in compound editor example 'isValueChanged' method

examples/example4-model.html

@@ -275,16 +275,9 @@ <h2>View Source:</h2>
   });
 
   dataView.onPagingInfoChanged.subscribe(function (e, pagingInfo) {
-    var isLastPage = pagingInfo.pageNum == pagingInfo.totalPages - 1;
-    var enableAddRow = isLastPage || pagingInfo.pageSize == 0;
-    var options = grid.getOptions();
-
-    if (options.enableAddRow != enableAddRow) {
-      grid.setOptions({enableAddRow: enableAddRow});
-    }
+    grid.updatePagingStatusFromView( pagingInfo );
   });
 
-
   var h_runfilters = null;
 
   // wire up the slider to apply the filter to the model

slick.dataview.js

@@ -762,14 +762,17 @@
       // get the current page
       var paged;
       if (pagesize) {
-        if (filteredItems.length < pagenum * pagesize) {
-          pagenum = Math.floor(filteredItems.length / pagesize);
+        if (filteredItems.length <= pagenum * pagesize) {
+		  if (filteredItems.length === 0) {
+			pagenum = 0;
+		  } else {
+			pagenum = Math.floor((filteredItems.length - 1) / pagesize);
+		  }
         }
         paged = filteredItems.slice(pagesize * pagenum, pagesize * pagenum + pagesize);
       } else {
         paged = filteredItems;
       }
-
       return {totalRows: filteredItems.length, rows: paged};
     }
 

slick.grid.js

@@ -170,7 +170,9 @@ if (typeof Slick === "undefined") {
     var columnPosLeft = [];
     var columnPosRight = [];
 
-
+	var pagingActive = false;
+	var pagingIsLastPage = false;
+	
     // async call handles
     var h_editorLoader = null;
     var h_render = null;
@@ -1397,7 +1399,9 @@ if (typeof Slick === "undefined") {
     }
 
     function getDataLengthIncludingAddNew() {
-      return getDataLength() + (options.enableAddRow ? 1 : 0);
+      return getDataLength() + (!options.enableAddRow ? 0
+		: (!pagingActive || pagingIsLastPage ? 1 : 0)
+	  );
     }
 
     function getDataItem(i) {
@@ -1705,7 +1709,8 @@ if (typeof Slick === "undefined") {
         return;
       }
       vScrollDir = 0;
-      for (i = 0, rl = rows.length; i < rl; i++) {
+	  rl = rows.length;
+      for (i = 0;  i < rl; i++) {
         if (currentEditor && activeRow === rows[i]) {
           makeActiveCellNormal();
         }
@@ -1802,9 +1807,15 @@ if (typeof Slick === "undefined") {
       render();
     }
 
+    function updatePagingStatusFromView( pagingInfo ) {
+		pagingActive = (pagingInfo.pageSize !== 0);
+		pagingIsLastPage = (pagingInfo.pageNum == pagingInfo.totalPages - 1);
+	}
+
     function updateRowCount() {
       if (!initialized) { return; }
 
+      var dataLength = getDataLength();
       var dataLengthIncludingAddNew = getDataLengthIncludingAddNew();
       var numberOfRows = dataLengthIncludingAddNew +
           (options.leaveSpaceForNewRows ? numVisibleRows - 1 : 0);
@@ -1818,15 +1829,15 @@ if (typeof Slick === "undefined") {
 
       // remove the rows that are now outside of the data range
       // this helps avoid redundant calls to .removeRow() when the size of the data decreased by thousands of rows
-      var l = dataLengthIncludingAddNew - 1;
+      var r1 = dataLength - 1;
       for (var i in rowsCache) {
-        if (i > l) {
+        if (i > r1) {
           removeRowFromCache(i);
         }
       }
       if (options.enableAsyncPostRenderCleanup) { startPostProcessingCleanup(); }
 
-      if (activeCellNode && activeRow > l) {
+      if (activeCellNode && activeRow > r1) {
         resetActiveCell();
       }
 
@@ -3621,6 +3632,7 @@ if (typeof Slick === "undefined") {
       "getSelectedRows": getSelectedRows,
       "setSelectedRows": setSelectedRows,
       "getContainerNode": getContainerNode,
+	  "updatePagingStatusFromView": updatePagingStatusFromView,
 
       "render": render,
       "invalidate": invalidate,