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

Merge pull request #39 from glyptodon/no-relative-pinch

Browse Source 
GUAC-957: Do not handle pinch-to-zoom when relative mouse is in use.
This commit is contained in:
Mike Jumper
2014-12-28 15:18:21 -08:00
parent 9671303504 fd944b71a3
commit 9f6b7014e1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@
/** /**
* The controller for the page used to connect to a connection or balancing group. * The controller for the page used to connect to a connection or balancing group.
*/ */
angular.module('home').controller('clientController', ['$scope', '$routeParams', '$injector', angular.module('client').controller('clientController', ['$scope', '$routeParams', '$injector',
function clientController($scope, $routeParams, $injector) { function clientController($scope, $routeParams, $injector) {
// Required types // Required types
@@ -304,6 +304,10 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
// Zoom and pan client via pinch gestures // Zoom and pan client via pinch gestures
$scope.clientPinch = function clientPinch(inProgress, startLength, currentLength, centerX, centerY) { $scope.clientPinch = function clientPinch(inProgress, startLength, currentLength, centerX, centerY) {
// Do not handle pinch gestures while relative mouse is in use
if (!$scope.clientProperties.emulateAbsoluteMouse)
return false;
// Stop gesture if not in progress // Stop gesture if not in progress
if (!inProgress) { if (!inProgress) {
initialScale = null; initialScale = null;
@@ -318,7 +322,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
} }
// Determine new scale absolutely // Determine new scale absolutely
currentScale = initialScale * currentLength / startLength; var currentScale = initialScale * currentLength / startLength;
// Fix scale within limits - scroll will be miscalculated otherwise // Fix scale within limits - scroll will be miscalculated otherwise
currentScale = Math.max(currentScale, $scope.clientProperties.minScale); currentScale = Math.max(currentScale, $scope.clientProperties.minScale);