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-1044: Auto-fit property missing from menu object.

Browse Source
This commit is contained in:
Michael Jumper
2015-01-30 17:21:31 -08:00
parent 7134347d4c
commit 5ac129661d
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
guacamole/src/main/webapp/app/client/controllers/clientController.js
View File

@@ -167,6 +167,14 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
*/ */
shown : false, shown : false,
/**
* Whether the Guacamole display should be scaled to fit the browser
* window.
*
* @type Boolean
*/
autoFit : true,
/** /**
* The currently selected input method. This may be either "none", * The currently selected input method. This may be either "none",
* "osk", or "text". * "osk", or "text".
@@ -310,7 +318,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
currentScale = Math.min(currentScale, $scope.client.clientProperties.maxScale); currentScale = Math.min(currentScale, $scope.client.clientProperties.maxScale);
// Update scale based on pinch distance // Update scale based on pinch distance
$scope.autoFit = false; $scope.menu.autoFit = false;
$scope.client.clientProperties.autoFit = false; $scope.client.clientProperties.autoFit = false;
$scope.client.clientProperties.scale = currentScale; $scope.client.clientProperties.scale = currentScale;
@@ -476,7 +484,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
}; };
$scope.zoomIn = function zoomIn() { $scope.zoomIn = function zoomIn() {
$scope.autoFit = false; $scope.menu.autoFit = false;
$scope.client.clientProperties.autoFit = false; $scope.client.clientProperties.autoFit = false;
$scope.client.clientProperties.scale += 0.1; $scope.client.clientProperties.scale += 0.1;
}; };
@@ -486,12 +494,11 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
$scope.client.clientProperties.scale -= 0.1; $scope.client.clientProperties.scale -= 0.1;
}; };
$scope.autoFit = true;
$scope.changeAutoFit = function changeAutoFit() { $scope.changeAutoFit = function changeAutoFit() {
if ($scope.autoFit && $scope.client.clientProperties.minScale) { if ($scope.menu.autoFit && $scope.client.clientProperties.minScale) {
$scope.client.clientProperties.autoFit = true; $scope.client.clientProperties.autoFit = true;
} else { }
else {
$scope.client.clientProperties.autoFit = false; $scope.client.clientProperties.autoFit = false;
$scope.client.clientProperties.scale = 1; $scope.client.clientProperties.scale = 1;
} }