safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-347: Merge fix for IE lack of window.location.origin.

Browse Source
This commit is contained in:
Michael Jumper
2018-01-13 18:50:11 -08:00
parent 00d464b511 6f7517028e
commit 6563281496
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
guacamole/src/main/webapp/app/rest/services/tunnelService.js
View File

@@ -189,8 +189,14 @@ angular.module('rest').factory('tunnelService', ['$injector',
*/
service.downloadStream = function downloadStream(tunnel, stream, mimetype, filename) {
// Work-around for IE missing window.location.origin
if (!$window.location.origin)
var streamOrigin = $window.location.protocol + '//' + $window.location.hostname + ($window.location.port ? (':' + $window.location.port) : '');
else
var streamOrigin = $window.location.origin;
// Build download URL
var url = $window.location.origin
var url = streamOrigin
+ $window.location.pathname
+ 'api/session/tunnels/' + encodeURIComponent(tunnel)
+ '/streams/' + encodeURIComponent(stream.index)
@@ -267,8 +273,14 @@ angular.module('rest').factory('tunnelService', ['$injector',
var deferred = $q.defer();
// Work-around for IE missing window.location.origin
if (!$window.location.origin)
var streamOrigin = $window.location.protocol + '//' + $window.location.hostname + ($window.location.port ? (':' + $window.location.port) : '');
else
var streamOrigin = $window.location.origin;
// Build upload URL
var url = $window.location.origin
var url = streamOrigin
+ $window.location.pathname
+ 'api/session/tunnels/' + encodeURIComponent(tunnel)
+ '/streams/' + encodeURIComponent(stream.index)

8
guacamole/src/main/webapp/app/rest/types/UserCredentials.js
View File

@@ -114,8 +114,14 @@ angular.module('rest').factory('UserCredentials', ['$injector', function defineU
*/
UserCredentials.getLink = function getLink(userCredentials) {
// Work-around for IE missing window.location.origin
if (!$window.location.origin)
var linkOrigin = $window.location.protocol + '//' + $window.location.hostname + ($window.location.port ? (':' + $window.location.port) : '');
else
var linkOrigin = $window.location.origin;
// Build base link
var link = $window.location.origin
var link = linkOrigin
+ $window.location.pathname
+ '#/';