rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: remove memory leak in click-outside

Browse Source
This commit is contained in:
Baptiste Grob
2020-06-29 18:19:28 +02:00
parent 7d313d2104
commit fc0a7d4c66
1 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/assets/javascripts/directives/functional/click-outside.ts
View File

@@ -3,38 +3,35 @@ export function clickOutside($document: ng.IDocumentService) {
return {
restrict: 'A',
replace: false,
link: function ($scope: ng.IScope, $element: JQLite, attrs: any) {
// Causes memory leak as-is:
// let didApplyClickOutside = false;
link($scope: ng.IScope, $element: JQLite, attrs: any) {
let didApplyClickOutside = false;
// $scope.$on('$destroy', () => {
// attrs.clickOutside = null;
// $element.unbind('click', $scope.onElementClick);
// $document.unbind('click', $scope.onDocumentClick);
// $scope.onElementClick = null;
// $scope.onDocumentClick = null;
// });
function onElementClick(event: JQueryEventObject) {
didApplyClickOutside = false;
if (attrs.isOpen) {
event.stopPropagation();
}
}
// $scope.onElementClick = (event) => {
// didApplyClickOutside = false;
// if (attrs.isOpen) {
// event.stopPropagation();
// }
// };
// $scope.onDocumentClick = (event) => {
// /* Ignore click if on SKAlert */
// if (event.target.closest('.sk-modal')) {
// return;
// }
// if (!didApplyClickOutside) {
// $scope.$apply(attrs.clickOutside);
// didApplyClickOutside = true;
// }
// };
function onDocumentClick(event: JQueryEventObject) {
/** Ignore click if on SKAlert */
if (event.target.closest('.sk-modal')) {
return;
}
if (!didApplyClickOutside) {
$scope.$apply(attrs.clickOutside);
didApplyClickOutside = true;
}
};
// $element.bind('click', $scope.onElementClick);
// $document.bind('click', $scope.onDocumentClick);
$scope.$on('$destroy', () => {
attrs.clickOutside = undefined;
$element.unbind('click', onElementClick);
$document.unbind('click', onDocumentClick);
});
$element.bind('click', onElementClick);
$document.bind('click', onDocumentClick);
}
};
}