bugfix-release version 1.0.5

dulanja33 · May 23, 2017 · c3c76da · c3c76da
1 parent 6c6dfab
commit c3c76da
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 24 deletions.
diff --git a/Kendo-Grid-VirtualScroll.js b/Kendo-Grid-VirtualScroll.js
@@ -31,10 +31,13 @@ var InfiniteScroll = (function () {
     this.innerWrap = $(".infinite_scroll_inner_wrap", this.target);
     this.delayFire = function (value) {
       _this.fired = value;
-      $(_this.target).scrollTop(_this.lastScrollTop);
+
     };
+    this.adjustScrollTop = function () {
+      $(_this.target).scrollTop(0);
+    }
 
-    $(scope).scroll(function () {
+    $(scope).off("scroll").on("scroll", function () {
       _this.detectTarget(scope);
       return _this.detectScrollDirection();
     });
@@ -127,6 +130,7 @@ var InfiniteScroll = (function () {
 
 })();
 
+var infiniteScrollObjcet = null;
 
 var kendoGridVS = function (kendoOptions) {
   var _data = null;
@@ -135,11 +139,11 @@ var kendoGridVS = function (kendoOptions) {
   var _gridContent = kendoOptions.gridElement.children(".k-grid-content");
 
   var _totalRows = _dataSource.total();
-  var _pageSize  = _dataSource.pageSize();
-  var _group     = _dataSource.group();
+  var _pageSize = _dataSource.pageSize();
+  var _group = _dataSource.group();
   var _isGrouped = false;
 
-  if(typeof _group !== 'undefined' && _group.length > 0){
+  if (typeof _group !== 'undefined' && _group.length > 0) {
     _isGrouped = true;
   }
 
@@ -178,29 +182,36 @@ var kendoGridVS = function (kendoOptions) {
     _dataSource.data(_data);
   };
 
-  _dataSource.page(1);
-  return new InfiniteScroll(_gridContent, {
+  if (infiniteScrollObjcet !== null) {
+    infiniteScrollObjcet.adjustScrollTop();
+  }
+
+  infiniteScrollObjcet = new InfiniteScroll(_gridContent, {
     callback: function (fireSequence, scrollDirection, delayFire) {
       _data = _dataSource.data();
       if ((Math.ceil(_totalRows / _pageSize) >= _dataSource.page() + 1) && scrollDirection === 'next') {
         if (!_isGrouped) {
           _dataSourceQuery({
             page: _dataSource.page() + 1,
-            pageSize: _pageSize
+            pageSize: _pageSize,
+            sort: _dataSource.sort()
           }, _normalDataAppend, delayFire);
         } else {
           _dataSourceQuery({
             page: _dataSource.page() + 1,
             pageSize: _pageSize,
-            group: _group
+            group: _group,
+            sort: _dataSource.sort()
           }, _groupedDataAppend, delayFire)
         }
       }
     }
-  }).run();
+  });
+
+  _dataSource.page(1);
+  return infiniteScrollObjcet.run();
 };
 
 
 module.exports = kendoGridVS;
 
-
diff --git a/README.md b/README.md
@@ -22,7 +22,20 @@ Can be use inside dataBound event in Kendo-Grid.
 
 ```javascript
 //set this as global variable and set true if grid is reload/change grouping etc..
-initDataBound = true; 
+initDataBound = true;
+```
+```javascript
+//when support sort, set initDataBound=true in sort event(Kendo grid event)
+ sort: function(e) {
+     initDataBound = true; 
+ }
+ ```
+
+ ```javascript
+ //when support group, set initDataBound=true in group event(Kendo grid event)
+  group: function(e) {
+      initDataBound = true; 
+  }
 ```
 <br/>
 

diff --git a/dist/Kendo-Grid-VirtualScroll.js b/dist/Kendo-Grid-VirtualScroll.js
@@ -119,10 +119,13 @@ var InfiniteScroll = (function () {
     this.innerWrap = $(".infinite_scroll_inner_wrap", this.target);
     this.delayFire = function (value) {
       _this.fired = value;
-      $(_this.target).scrollTop(_this.lastScrollTop);
+
     };
+    this.adjustScrollTop = function () {
+      $(_this.target).scrollTop(0);
+    }
 
-    $(scope).scroll(function () {
+    $(scope).off("scroll").on("scroll", function () {
       _this.detectTarget(scope);
       return _this.detectScrollDirection();
     });
@@ -215,6 +218,7 @@ var InfiniteScroll = (function () {
 
 })();
 
+var infiniteScrollObjcet = null;
 
 var kendoGridVS = function (kendoOptions) {
   var _data = null;
@@ -223,11 +227,11 @@ var kendoGridVS = function (kendoOptions) {
   var _gridContent = kendoOptions.gridElement.children(".k-grid-content");
 
   var _totalRows = _dataSource.total();
-  var _pageSize  = _dataSource.pageSize();
-  var _group     = _dataSource.group();
+  var _pageSize = _dataSource.pageSize();
+  var _group = _dataSource.group();
   var _isGrouped = false;
 
-  if(typeof _group !== 'undefined' && _group.length > 0){
+  if (typeof _group !== 'undefined' && _group.length > 0) {
     _isGrouped = true;
   }
 
@@ -266,34 +270,41 @@ var kendoGridVS = function (kendoOptions) {
     _dataSource.data(_data);
   };
 
-  _dataSource.page(1);
-  return new InfiniteScroll(_gridContent, {
+  if (infiniteScrollObjcet !== null) {
+    infiniteScrollObjcet.adjustScrollTop();
+  }
+
+  infiniteScrollObjcet = new InfiniteScroll(_gridContent, {
     callback: function (fireSequence, scrollDirection, delayFire) {
       _data = _dataSource.data();
       if ((Math.ceil(_totalRows / _pageSize) >= _dataSource.page() + 1) && scrollDirection === 'next') {
         if (!_isGrouped) {
           _dataSourceQuery({
             page: _dataSource.page() + 1,
-            pageSize: _pageSize
+            pageSize: _pageSize,
+            sort: _dataSource.sort()
           }, _normalDataAppend, delayFire);
         } else {
           _dataSourceQuery({
             page: _dataSource.page() + 1,
             pageSize: _pageSize,
-            group: _group
+            group: _group,
+            sort: _dataSource.sort()
           }, _groupedDataAppend, delayFire)
         }
       }
     }
-  }).run();
+  });
+
+  _dataSource.page(1);
+  return infiniteScrollObjcet.run();
 };
 
 
 module.exports = kendoGridVS;
 
 
 
-
 /***/ })
 /******/ ]);
 });
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kendo-grid-virtual-scrolling",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Custom implementation of virtual scrolling in Kendo-grid to support grouping and editing",
   "main": "Kendo-Grid-VirtualScroll.js",
   "scripts": {