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

GUAC-605: Use consistent event naming.

Browse Source
This commit is contained in:
Michael Jumper
2014-11-16 16:47:55 -08:00
parent 452ec41fbd
commit 0f159d73ad
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,7 +244,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
}); });
// Handle reconnect action // Handle reconnect action
$scope.$on('guacStatusAction', function actionListener(event, action) { $scope.$on('guacAction', function actionListener(event, action) {
if (action === "client.action.reconnect") if (action === "client.action.reconnect")
$scope.id = uniqueId; $scope.id = uniqueId;

6
guacamole/src/main/webapp/app/client/services/guacClientFactory.js
View File

@@ -140,20 +140,20 @@ angular.module('client').factory('guacClientFactory', ['$rootScope',
$scope.safeApply(function() { $scope.safeApply(function() {
// Begin file download // Begin file download
var guacFileStartEvent = $scope.$emit('guacFileStart', guacClient, stream.index, mimetype, filename); var guacFileStartEvent = $scope.$emit('guacClientFileStart', guacClient, stream.index, mimetype, filename);
if (!guacFileStartEvent.defaultPrevented) { if (!guacFileStartEvent.defaultPrevented) {
var blob_reader = new Guacamole.BlobReader(stream, mimetype); var blob_reader = new Guacamole.BlobReader(stream, mimetype);
// Update progress as data is received // Update progress as data is received
blob_reader.onprogress = function onprogress() { blob_reader.onprogress = function onprogress() {
$scope.$emit('guacFileProgress', guacClient, stream.index, mimetype, filename); $scope.$emit('guacClientFileProgress', guacClient, stream.index, mimetype, filename);
stream.sendAck("Received", Guacamole.Status.Code.SUCCESS); stream.sendAck("Received", Guacamole.Status.Code.SUCCESS);
}; };
// When complete, prompt for download // When complete, prompt for download
blob_reader.onend = function onend() { blob_reader.onend = function onend() {
$scope.$emit('guacFileEnd', guacClient, stream.index, mimetype, filename); $scope.$emit('guacClientFileEnd', guacClient, stream.index, mimetype, filename);
}; };
stream.sendAck("Ready", Guacamole.Status.Code.SUCCESS); stream.sendAck("Ready", Guacamole.Status.Code.SUCCESS);

2
guacamole/src/main/webapp/app/index/controllers/statusController.js
View File

@@ -40,7 +40,7 @@ angular.module('manage').controller('statusController', ['$scope', '$rootScope',
statusModal.showStatus(false); statusModal.showStatus(false);
// Fire action event // Fire action event
$rootScope.$broadcast('guacStatusAction', action); $rootScope.$broadcast('guacAction', action);
}; };