From c79513f39aaf826daa2b8385b715b48f8e68668c Mon Sep 17 00:00:00 2001
From: "Greenberg, Dana" <dana.greenberg@kronos.com>
Date: Mon, 6 Mar 2017 15:35:43 -0500
Subject: [PATCH] Revert "delegate .ui-grid-cell-contents events (#5997)"

This reverts commit 7fc28dd0a1dd62787821c93b476698de6cc556ef.
---
 .../move-columns/js/column-movable.js         | 10 +++----
 src/js/core/directives/ui-grid-header-cell.js | 28 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/features/move-columns/js/column-movable.js b/src/features/move-columns/js/column-movable.js
index 13a35bc0ef..10aafcca5e 100644
--- a/src/features/move-columns/js/column-movable.js
+++ b/src/features/move-columns/js/column-movable.js
@@ -306,7 +306,7 @@
                  * and we instead get a mouseup or a touchend, then we just drop out again and do nothing.
                  *
                  */
-                var contentsSelector = '.ui-grid-cell-contents';
+                var $contentsElm = angular.element( $elm[0].querySelectorAll('.ui-grid-cell-contents') );
 
                 var gridLeft;
                 var previousMouseX;
@@ -471,13 +471,13 @@
                 };
 
                 var onDownEvents = function(){
-                  $elm.on('touchstart', contentsSelector, downFn);
-                  $elm.on('mousedown', contentsSelector, downFn);
+                  $contentsElm.on('touchstart', downFn);
+                  $contentsElm.on('mousedown', downFn);
                 };
 
                 var offAllEvents = function() {
-                  $elm.off('touchstart', contentsSelector, downFn);
-                  $elm.off('mousedown', contentsSelector, downFn);
+                  $contentsElm.off('touchstart', downFn);
+                  $contentsElm.off('mousedown', downFn);
 
                   $document.off('mousemove', moveFn);
                   $document.off('touchmove', moveFn);
diff --git a/src/js/core/directives/ui-grid-header-cell.js b/src/js/core/directives/ui-grid-header-cell.js
index 4a1f05ddc6..45b9694790 100644
--- a/src/js/core/directives/ui-grid-header-cell.js
+++ b/src/js/core/directives/ui-grid-header-cell.js
@@ -67,7 +67,7 @@
             // Store a reference to menu element
             var $colMenu = angular.element( $elm[0].querySelectorAll('.ui-grid-header-cell-menu') );
 
-            var contentsSelector = '.ui-grid-cell-contents';
+            var $contentsElm = angular.element( $elm[0].querySelectorAll('.ui-grid-cell-contents') );
 
 
             // apply any headerCellClass
@@ -166,13 +166,13 @@
 
             $scope.clickFn = function ( event ){
               event.stopPropagation();
-              $elm.off('click', contentsSelector, $scope.clickFn);
+              $contentsElm.off('click', $scope.clickFn);
             };
 
 
             $scope.offAllEvents = function(){
-              $elm.off('touchstart', contentsSelector, $scope.downFn);
-              $elm.off('mousedown', contentsSelector, $scope.downFn);
+              $contentsElm.off('touchstart', $scope.downFn);
+              $contentsElm.off('mousedown', $scope.downFn);
 
               $document.off('touchend', $scope.upFn);
               $document.off('mouseup', $scope.upFn);
@@ -180,7 +180,7 @@
               $document.off('touchmove', $scope.moveFn);
               $document.off('mousemove', $scope.moveFn);
 
-              $elm.off('click', contentsSelector, $scope.clickFn);
+              $contentsElm.off('click', $scope.clickFn);
             };
 
             $scope.onDownEvents = function( type ){
@@ -192,24 +192,24 @@
               switch (type){
                 case 'touchmove':
                 case 'touchend':
-                  $elm.on('click', contentsSelector, $scope.clickFn);
-                  $elm.on('touchstart', contentsSelector, $scope.downFn);
+                  $contentsElm.on('click', $scope.clickFn);
+                  $contentsElm.on('touchstart', $scope.downFn);
                   $timeout(function(){
-                    $elm.on('mousedown', contentsSelector, $scope.downFn);
+                    $contentsElm.on('mousedown', $scope.downFn);
                   }, changeModeTimeout);
                   break;
                 case 'mousemove':
                 case 'mouseup':
-                  $elm.on('click', contentsSelector, $scope.clickFn);
-                  $elm.on('mousedown', contentsSelector, $scope.downFn);
+                  $contentsElm.on('click', $scope.clickFn);
+                  $contentsElm.on('mousedown', $scope.downFn);
                   $timeout(function(){
-                    $elm.on('touchstart', contentsSelector, $scope.downFn);
+                    $contentsElm.on('touchstart', $scope.downFn);
                   }, changeModeTimeout);
                   break;
                 default:
-                  $elm.on('click', contentsSelector, $scope.clickFn);
-                  $elm.on('touchstart', contentsSelector, $scope.downFn);
-                  $elm.on('mousedown', contentsSelector, $scope.downFn);
+                  $contentsElm.on('click', $scope.clickFn);
+                  $contentsElm.on('touchstart', $scope.downFn);
+                  $contentsElm.on('mousedown', $scope.downFn);
               }
             };