From 7df0f6184698de3dcb313f49e62a5220a43cafa2 Mon Sep 17 00:00:00 2001
From: Zuo Haocheng <HZuo@slb.com>
Date: Wed, 23 Sep 2015 13:35:08 +0800
Subject: [PATCH] Fix(edit) #4422 Disable end-edit on scroll in deepedit mode
 to prevent jump out of edit mode by scroll, which triggered by disable
 scroller added in 91077e828f450bbb7cb0c76404686110f700e396

---
 src/features/edit/js/gridEdit.js             | 3 +++
 src/js/core/factories/GridRenderContainer.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/features/edit/js/gridEdit.js b/src/features/edit/js/gridEdit.js
index ca9879d51c..28fb7d403f 100644
--- a/src/features/edit/js/gridEdit.js
+++ b/src/features/edit/js/gridEdit.js
@@ -760,6 +760,9 @@
 
               //stop editing when grid is scrolled
               var deregOnGridScroll = $scope.col.grid.api.core.on.scrollBegin($scope, function () {
+                if ($scope.grid.disableScrolling) {
+                  return;
+                }
                 endEdit();
                 $scope.grid.api.edit.raise.afterCellEdit($scope.row.entity, $scope.col.colDef, cellModel($scope), origCellValue);
                 deregOnGridScroll();
diff --git a/src/js/core/factories/GridRenderContainer.js b/src/js/core/factories/GridRenderContainer.js
index a607cb9d5b..4b6e44d4c6 100644
--- a/src/js/core/factories/GridRenderContainer.js
+++ b/src/js/core/factories/GridRenderContainer.js
@@ -739,7 +739,7 @@ angular.module('ui.grid')
   };
 
   GridRenderContainer.prototype.needsHScrollbarPlaceholder = function () {
-    return this.grid.options.enableHorizontalScrollbar && !this.hasHScrollbar;
+    return this.grid.options.enableHorizontalScrollbar && !this.hasHScrollbar && !this.grid.disableScrolling;
   };
 
   GridRenderContainer.prototype.getViewportStyle = function () {