GUAC-807 Moved usage of safeApply to a more sane place.

This commit is contained in:
James Muehlner
2014-11-05 23:59:12 -08:00
parent e33fff4730
commit c2521b1b15

View File

@@ -136,7 +136,7 @@ angular.module('client').directive('guacClient', [function guacClient() {
* size and "auto-fit" setting. * size and "auto-fit" setting.
*/ */
$scope.updateDisplayScale = function() { $scope.updateDisplayScale = function() {
$scope.safeApply(function() {
var guac = $scope.attachedClient; var guac = $scope.attachedClient;
if (!guac) if (!guac)
return; return;
@@ -156,7 +156,7 @@ angular.module('client').directive('guacClient', [function guacClient() {
else if (guac.getDisplay().getScale() > $scope.clientProperties.maxScale) else if (guac.getDisplay().getScale() > $scope.clientProperties.maxScale)
$scope.clientProperties.scale = $scope.clientProperties.maxScale; $scope.clientProperties.scale = $scope.clientProperties.maxScale;
});
}; };
/** /**
@@ -599,7 +599,7 @@ angular.module('client').directive('guacClient', [function guacClient() {
// If the window is resized, attempt to resize client // If the window is resized, attempt to resize client
$window.addEventListener('resize', function onResizeWindow() { $window.addEventListener('resize', function onResizeWindow() {
$scope.updateDisplayScale(); $scope.safeApply($scope.updateDisplayScale());
}); });
var show_keyboard_gesture_possible = true; var show_keyboard_gesture_possible = true;