Skip to content

Commit

Permalink
Merge pull request #5015 from yccteam/Fix-to-#4972
Browse files Browse the repository at this point in the history
fix(colMoving): Fix #4972 unpinned columns got pinned again after column moving
  • Loading branch information
swalters committed Jan 24, 2016
2 parents 1d0b22c + 9f14318 commit a70e390
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/features/pinning/js/pinning.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
return typeof(this.context.col.renderContainer) !== 'undefined' && this.context.col.renderContainer !== null && this.context.col.renderContainer !== 'body';
},
action: function () {
service.pinColumn(this.context.col.grid, this.context.col, uiGridPinningConstants.container.UNPIN);
service.pinColumn(this.context.col.grid, this.context.col, uiGridPinningConstants.container.NONE);
}
};

Expand All @@ -203,6 +203,7 @@
pinColumn: function(grid, col, container) {
if (container === uiGridPinningConstants.container.NONE) {
col.renderContainer = null;
col.colDef.pinnedLeft = col.colDef.pinnedRight = false;
}
else {
col.renderContainer = container;
Expand Down

0 comments on commit a70e390

Please sign in to comment.