safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-11 07:27:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-526: Move handling of request error notification to guacNotification, resolving circular dependency.

Browse Source
This commit is contained in:
Michael Jumper
2018-04-26 22:28:18 -07:00
parent 266b445c21
commit ae6b5fc8bb
10 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
guacamole/src/main/webapp/app/rest/restModule.js
View File

@@ -22,6 +22,5 @@
* Guacamole web application.
*/
angular.module('rest', [
'auth',
'notification'
'auth'
]);

18
guacamole/src/main/webapp/app/rest/services/requestService.js
View File

@@ -25,9 +25,8 @@ angular.module('rest').factory('requestService', ['$injector',
function requestService($injector) {
// Required services
var $http = $injector.get('$http');
var $log = $injector.get('$log');
var guacNotification = $injector.get('guacNotification');
var $http = $injector.get('$http');
var $log = $injector.get('$log');
// Required types
var Error = $injector.get('Error');
@@ -116,19 +115,6 @@ angular.module('rest').factory('requestService', ['$injector',
$log.warn(error.type, error.message || error.translatableMessage);
});
/**
* Promise error callback which displays a modal notification for all
* rejections due to REST errors. The message displayed to the user within
* the notification is provided by the contents of the @link{Error} object
* within the REST response. All other rejections, such as those due to
* JavaScript errors, are logged to the browser console without displaying
* any notification.
*
* @constant
* @type Function
*/
service.SHOW_NOTIFICATION = service.createErrorCallback(guacNotification.showRequestError);
return service;
}]);