From 8c4a0e78544be13a89a893c97e027d12b2154895 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 2 Jan 2015 02:13:04 -0800 Subject: [PATCH] GUAC-963: Open menu when file transfers are started. --- .../webapp/app/client/controllers/clientController.js | 8 ++++++++ guacamole/src/main/webapp/translations/en_US.json | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js index eb0dc795b..a763e4510 100644 --- a/guacamole/src/main/webapp/app/client/controllers/clientController.js +++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js @@ -385,6 +385,14 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams $scope.page.title = name; }); + // Show menu if new file transfers have started + $scope.$watch('client.uploads.length + client.downloads.length', function transfersChanged(count, oldCount) { + + if (count > oldCount) + $scope.menuShown = true; + + }); + // Show status dialog when connection status changes $scope.$watch('client.clientState.connectionState', function clientStateChanged(connectionState) { diff --git a/guacamole/src/main/webapp/translations/en_US.json b/guacamole/src/main/webapp/translations/en_US.json index 8d0998ee1..71ec4fe63 100644 --- a/guacamole/src/main/webapp/translations/en_US.json +++ b/guacamole/src/main/webapp/translations/en_US.json @@ -28,7 +28,6 @@ "DIALOG_HEADER_CONNECTING" : "Connecting", "DIALOG_HEADER_CONNECTION_ERROR" : "Connection Error", "DIALOG_HEADER_DISCONNECTED" : "Disconnected", - "DIALOG_HEADER_FILE_TRANSFER" : "File Transfer", "ERROR_CLIENT_201" : "This connection has been closed because the server is busy. Please wait a few minutes and try again.", "ERROR_CLIENT_202" : "The Guacamole server has closed the connection because the remote desktop is taking too long to respond. Please try again or contact your system administrator.",