From 1ee518a6d782c65d9eecdb2f5af18b8825d109ca Mon Sep 17 00:00:00 2001
From: "Kenneth G. Franqueiro" <kfranqueiro@sitepen.com>
Date: Thu, 1 Oct 2015 12:32:58 -0400
Subject: [PATCH] Fix #1147: ColumnResizer: Protect header cells from clicks on
 resize

---
 css/dgrid.css                     |  9 +++++++++
 css/extensions/ColumnResizer.styl | 11 +++++++++++
 extensions/ColumnResizer.js       |  8 +++++++-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/css/dgrid.css b/css/dgrid.css
index 583619f77..e991dd2ed 100644
--- a/css/dgrid.css
+++ b/css/dgrid.css
@@ -243,6 +243,7 @@ html.has-mozilla .dgrid-focus {
   border-right: 2px dotted #000 !important;
 }
 .dgrid-column-resizer {
+  cursor: col-resize;
   position: absolute;
   width: 2px;
   background-color: #666;
@@ -262,6 +263,14 @@ html.has-mozilla .dgrid-focus {
 .dgrid-resize-header-container {
   height: 100%;
 }
+.dgrid-resize-guard {
+  cursor: col-resize;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  top: 0;
+}
 html.has-touch .dgrid-resize-handle {
   border-left: 20px solid transparent;
 }
diff --git a/css/extensions/ColumnResizer.styl b/css/extensions/ColumnResizer.styl
index bff7157d4..3aac1e219 100644
--- a/css/extensions/ColumnResizer.styl
+++ b/css/extensions/ColumnResizer.styl
@@ -1,4 +1,5 @@
 .dgrid-column-resizer {
+	cursor: col-resize;
 	position: absolute;
 	width: 2px;
 	background-color: #666;
@@ -21,6 +22,16 @@
 	height:100%;
 }
 
+.dgrid-resize-guard {
+	// Used to prevent click events trickling down to the underlying header cell
+	cursor: col-resize;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	top: 0;
+}
+
 // make the resize handles larger on touch-capable devices
 html.has-touch .dgrid-resize-handle {
 	border-left: 20px solid transparent;
diff --git a/extensions/ColumnResizer.js b/extensions/ColumnResizer.js
index e96bd02ab..87ac1c40f 100644
--- a/extensions/ColumnResizer.js
+++ b/extensions/ColumnResizer.js
@@ -138,27 +138,32 @@ define([
 	// Functions for shared resizer node
 
 	var resizerNode, // DOM node for resize indicator, reused between instances
+		resizerGuardNode, // DOM node to guard against clicks registering on header cells (and inducing sort)
 		resizableCount = 0; // Number of ColumnResizer-enabled grid instances
 	var resizer = {
 		// This object contains functions for manipulating the shared resizerNode
 		create: function () {
 			resizerNode = domConstruct.create('div', { className: 'dgrid-column-resizer' });
+			resizerGuardNode = domConstruct.create('div', { className: 'dgrid-resize-guard' });
 		},
 		destroy: function () {
 			domConstruct.destroy(resizerNode);
-			resizerNode = null;
+			domConstruct.destroy(resizerGuardNode);
+			resizerNode = resizerGuardNode = null;
 		},
 		show: function (grid) {
 			var pos = geom.position(grid.domNode, true);
 			resizerNode.style.top = pos.y + 'px';
 			resizerNode.style.height = pos.h + 'px';
 			document.body.appendChild(resizerNode);
+			grid.domNode.appendChild(resizerGuardNode);
 		},
 		move: function (x) {
 			resizerNode.style.left = x + 'px';
 		},
 		hide: function () {
 			resizerNode.parentNode.removeChild(resizerNode);
+			resizerGuardNode.parentNode.removeChild(resizerGuardNode);
 		}
 	};
 
@@ -337,6 +342,7 @@ define([
 			// in all but IE < 9.  setSelectable works for those.
 			e.preventDefault();
 			dom.setSelectable(this.domNode, false);
+
 			this._startX = this._getResizeMouseLocation(e); //position of the target
 
 			this._targetCell = query('.dgrid-column-' + miscUtil.escapeCssIdentifier(target.columnId, '-'),