Skip to content

Revert "fix(enableColumnResizing): enableColumnResizing accumulates w… #6058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2017
Merged

Revert "fix(enableColumnResizing): enableColumnResizing accumulates w… #6058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 12 additions & 24 deletions src/features/resize-columns/js/ui-grid-column-resizer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,7 @@
compile: function() {
return {
post: function ($scope, $elm, $attrs, uiGridCtrl) {
var grid = uiGridCtrl.grid,
resizerScopes = [],
resizers = [];
var grid = uiGridCtrl.grid;

if (grid.options.enableColumnResizing) {
var columnResizerElm = $templateCache.get('ui-grid/columnResizer');
Expand All @@ -213,9 +211,13 @@
rtlMultiplier = -1;
}

var displayResizers = function () {
var displayResizers = function(){

removeResizers();
// remove any existing resizers.
var resizers = $elm[0].getElementsByClassName('ui-grid-column-resizer');
for ( var i = 0; i < resizers.length; i++ ){
angular.element(resizers[i]).remove();
}

// get the target column for the left resizer
var otherCol = uiGridResizeColumnsService.findTargetCol($scope.col, 'left', rtlMultiplier);
Expand All @@ -225,29 +227,18 @@
if (otherCol && renderContainer.visibleColumnCache.indexOf($scope.col) !== 0 && otherCol.colDef.enableColumnResizing !== false) {
var resizerLeft = angular.element(columnResizerElm).clone();
resizerLeft.attr('position', 'left');

$elm.prepend(resizerLeft);
$compile(resizerLeft)(resizerScopes[resizerScopes.push($scope.$new()) - 1]);
$compile(resizerLeft)($scope);
}

// Don't append the right resizer if this column has resizing disabled
if ($scope.col.colDef.enableColumnResizing !== false) {
var resizerRight = angular.element(columnResizerElm).clone();
resizerRight.attr('position', 'right');
$elm.append(resizerRight);
$compile(resizerRight)(resizerScopes[resizerScopes.push($scope.$new()) - 1]);
}
};

var removeResizers = function() {
// remove any existing resizer scopes.
for (var x = resizerScopes.length - 1; x >= 0; x--) {
resizerScopes[x].$destroy();
resizerScopes.splice(x);
}
// remove any existing resizer elements.
resizers = $elm[0].getElementsByClassName('ui-grid-column-resizer');
for (var i = resizers.length - 1; i >= 0; i--) {
angular.element(resizers[i]).remove();
$elm.append(resizerRight);
$compile(resizerRight)($scope);
}
};

Expand All @@ -259,10 +250,7 @@

var dataChangeDereg = grid.registerDataChangeCallback( waitDisplay, [uiGridConstants.dataChange.COLUMN] );

$scope.$on( '$destroy',function() {
dataChangeDereg();
removeResizers();
});
$scope.$on( '$destroy', dataChangeDereg );
}
}
};
Expand Down
10 changes: 0 additions & 10 deletions src/features/resize-columns/test/resizeColumns.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,6 @@ describe('ui.grid.resizeColumns', function () {
});
});

describe('destroying header cell',function(){
it('should have 0 watchers after destroy',function(){
var secondCol = $(grid).find('[ui-grid-header-cell]:nth-child(1)');
secondCol.parent().scope().$destroy();
var numWatchers = secondCol.scope().$$watchers.length;

expect(numWatchers).toEqual(0);
});
});

describe('setting enableColumnResizing to false', function () {
it('should result in no resizer elements being attached to the column', function () {
$scope.gridOpts.enableColumnResizing = false;
Expand Down