From 61d39ff1da2cf43bc694339a51de1c6eef494990 Mon Sep 17 00:00:00 2001 From: Ca Phun Ung Date: Sat, 5 Oct 2013 14:23:46 +0800 Subject: [PATCH] fixes #380: column reordering not working if pinning enabled --- src/classes/eventProvider.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/classes/eventProvider.js b/src/classes/eventProvider.js index 3292e3b21d..9f61ffed30 100644 --- a/src/classes/eventProvider.js +++ b/src/classes/eventProvider.js @@ -15,7 +15,7 @@ } else { grid.$groupPanel.on('mousedown', self.onGroupMouseDown).on('dragover', self.dragOver).on('drop', self.onGroupDrop); grid.$headerScroller.on('mousedown', self.onHeaderMouseDown).on('dragover', self.dragOver); - if (grid.config.enableColumnReordering && !grid.config.enablePinning) { + if (grid.config.enableColumnReordering) { grid.$headerScroller.on('drop', self.onHeaderDrop); } } @@ -158,8 +158,8 @@ // Get the scope from the header. var headerScope = angular.element(headerContainer).scope(); if (headerScope) { - // If we have the same column, do nothing. - if (self.colToMove.col === headerScope.col) { + // If we have the same column or the target column is pinned, do nothing. + if (self.colToMove.col === headerScope.col || headerScope.col.pinned) { return; } // Splice the columns