Skip to content

use $watch instead of setTimeout call every 250 ms in auto-resize directive #6079

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

Closed
wants to merge 2 commits into from
Closed

use $watch instead of setTimeout call every 250 ms in auto-resize directive #6079

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f7f162
auto-resize directive now uses $watch instead of setTimeout call ever…
asvishnyakov Mar 15, 2017
38e9c1c
Added semicolon to pass travis tests
asvishnyakov Mar 15, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 14 additions & 44 deletions src/features/auto-resize-grid/js/auto-resize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,54 +15,24 @@
var module = angular.module('ui.grid.autoResize', ['ui.grid']);


module.directive('uiGridAutoResize', ['$timeout', 'gridUtil', function ($timeout, gridUtil) {
module.directive('uiGridAutoResize', ['gridUtil', function (gridUtil) {
return {
require: 'uiGrid',
scope: false,
link: function ($scope, $elm, $attrs, uiGridCtrl) {
var prevGridWidth, prevGridHeight;

function getDimensions() {
prevGridHeight = gridUtil.elementHeight($elm);
prevGridWidth = gridUtil.elementWidth($elm);
}

// Initialize the dimensions
getDimensions();

var resizeTimeoutId;
function startTimeout() {
clearTimeout(resizeTimeoutId);

resizeTimeoutId = setTimeout(function () {
var newGridHeight = gridUtil.elementHeight($elm);
var newGridWidth = gridUtil.elementWidth($elm);

if (newGridHeight !== prevGridHeight || newGridWidth !== prevGridWidth) {
uiGridCtrl.grid.gridHeight = newGridHeight;
uiGridCtrl.grid.gridWidth = newGridWidth;
uiGridCtrl.grid.api.core.raise.gridDimensionChanged(prevGridHeight, prevGridWidth, newGridHeight, newGridWidth);

$scope.$apply(function () {
uiGridCtrl.grid.refresh()
.then(function () {
getDimensions();

startTimeout();
});
});
}
else {
startTimeout();
}
}, 250);
}

startTimeout();

$scope.$on('$destroy', function() {
clearTimeout(resizeTimeoutId);
});
$scope.$watch(function () {
return {
height: gridUtil.elementHeight($elm),
width: gridUtil.elementWidth($elm)
};
}, function (newDimensions, oldDimensions) {
if (newDimensions.height !== oldDimensions.height || newDimensions.width !== oldDimensions.width) {
uiGridCtrl.grid.gridHeight = newDimensions.height;
uiGridCtrl.grid.gridWidth = newDimensions.width;
uiGridCtrl.grid.api.core.raise.gridDimensionChanged(oldDimensions.height, oldDimensions.width, newDimensions.height, newDimensions.width);
uiGridCtrl.grid.refresh();
}
}, true);
}
};
}]);
Expand Down