safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-55: Clean up event handlers after guacClipboard directive is destroyed.

Browse Source
This commit is contained in:
Michael Jumper
2016-06-22 01:46:32 -07:00
parent 65897fdb64
commit 0a0933a23e
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
guacamole/src/main/webapp/app/client/directives/guacClipboard.js
View File

@@ -63,6 +63,7 @@ angular.module('client').directive('guacClipboard', [function guacClipboard() {
// Required services // Required services
var $rootScope = $injector.get('$rootScope'); var $rootScope = $injector.get('$rootScope');
var $window = $injector.get('$window');
var clipboardService = $injector.get('clipboardService'); var clipboardService = $injector.get('clipboardService');
/** /**
@@ -122,26 +123,38 @@ angular.module('client').directive('guacClipboard', [function guacClipboard() {
}); });
/** /**
* Checks whether the clipboard data has changed, firing a new * Checks whether the clipboard data has changed, updating the stored
* "guacClipboard" event if it has. * clipboard data if it has. If this function is being called due to a
* DOM event, that event should be passed to this function such that the
* context of the call can be taken into account. Focus events, in
* particular, need to be considered only in the context of the window.
*
* @param {Event} [e]
* The event currently being handled, if any.
*/ */
var checkClipboard = function checkClipboard() { var checkClipboard = function checkClipboard(e) {
// Ignore focus events for anything except the window
if (e && e.type === 'focus' && e.target !== $window)
return;
clipboardService.getLocalClipboard().then(function clipboardRead(data) { clipboardService.getLocalClipboard().then(function clipboardRead(data) {
$scope.data = data; $scope.data = data;
}); });
}; };
// Attempt to read the clipboard if it may have changed // Attempt to read the clipboard if it may have changed
window.addEventListener('load', checkClipboard, true); $window.addEventListener('copy', checkClipboard, true);
window.addEventListener('copy', checkClipboard, true); $window.addEventListener('cut', checkClipboard, true);
window.addEventListener('cut', checkClipboard, true); $window.addEventListener('focus', checkClipboard, true);
window.addEventListener('focus', function focusGained(e) {
// Only recheck clipboard if it's the window itself that gained focus // Clean up on destruction
if (e.target === window) $scope.$on('$destroy', function destroyClipboard() {
checkClipboard(); $window.removeEventListener('copy', checkClipboard);
$window.removeEventListener('cut', checkClipboard);
}, true); $window.removeEventListener('focus', checkClipboard);
});
// Perform initial clipboard check // Perform initial clipboard check
checkClipboard(); checkClipboard();