safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-963: Use $evalAsync() for changes to $scope that may occur synchronously.

Browse Source
This commit is contained in:
Michael Jumper
2014-12-28 22:19:50 -08:00
parent 1758085032
commit 3b81525eff
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/webapp/app/client/types/ManagedClient.js
View File

@@ -243,7 +243,7 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector',
// Update connection state as tunnel state changes // Update connection state as tunnel state changes
tunnel.onstatechange = function tunnelStateChanged(state) { tunnel.onstatechange = function tunnelStateChanged(state) {
$rootScope.$apply(function updateTunnelState() { $rootScope.$evalAsync(function updateTunnelState() {
switch (state) { switch (state) {
@@ -269,7 +269,7 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector',
// Update connection state as client state changes // Update connection state as client state changes
client.onstatechange = function clientStateChanged(clientState) { client.onstatechange = function clientStateChanged(clientState) {
$rootScope.$apply(function updateClientState() { $rootScope.$evalAsync(function updateClientState() {
switch (clientState) { switch (clientState) {

8
guacamole/src/main/webapp/app/element/directives/guacFocus.js
View File

@@ -23,7 +23,7 @@
/** /**
* A directive which allows elements to be manually focused / blurred. * A directive which allows elements to be manually focused / blurred.
*/ */
angular.module('element').directive('guacFocus', ['$timeout', '$parse', function guacFocus($timeout, $parse) { angular.module('element').directive('guacFocus', ['$parse', function guacFocus($parse) {
return { return {
restrict: 'A', restrict: 'A',
@@ -47,7 +47,7 @@ angular.module('element').directive('guacFocus', ['$timeout', '$parse', function
// Set/unset focus depending on value of guacFocus // Set/unset focus depending on value of guacFocus
$scope.$watch(guacFocus, function updateFocus(value) { $scope.$watch(guacFocus, function updateFocus(value) {
$timeout(function updateFocusAsync() { $scope.$evalAsync(function updateFocusAsync() {
if (value) if (value)
element.focus(); element.focus();
else else
@@ -57,14 +57,14 @@ angular.module('element').directive('guacFocus', ['$timeout', '$parse', function
// Set focus flag when focus is received // Set focus flag when focus is received
element.addEventListener('focus', function focusReceived() { element.addEventListener('focus', function focusReceived() {
$scope.$apply(function setGuacFocus() { $scope.$evalAsync(function setGuacFocusAsync() {
guacFocus.assign($scope, true); guacFocus.assign($scope, true);
}); });
}); });
// Unset focus flag when focus is lost // Unset focus flag when focus is lost
element.addEventListener('blur', function focusLost() { element.addEventListener('blur', function focusLost() {
$scope.$apply(function unsetGuacFocus() { $scope.$evalAsync(function unsetGuacFocusAsync() {
guacFocus.assign($scope, false); guacFocus.assign($scope, false);
}); });
}); });