burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed index.xhtml to work on be compatible with uds 1.5 (needs a minor change to client-ui.js to get paramaters from "query.ui" instead of from document.location.search

Browse Source
This commit is contained in:
Adolfo Gómez 2014-07-28 12:02:34 +00:00
parent 0643e44125
commit 04135b14c9
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guacamole-tunnel/src/main/webapp/index.xhtml
View File

@ -177,13 +177,15 @@
var params = {}, re=/[^?]*\?([^&]*)&(.*)/; var params = {}, re=/[^?]*\?([^&]*)&(.*)/;
params.data = res[1] var res = re.exec(qs);
params.data = res[2]
params.data = res[1];
params.exit = res[2];
return params; return params;
} }
window.query = getQueryParams(document.location); window.query = getQueryParams(document.location.href);
// Sanity check Guacamole JavaScript API version // Sanity check Guacamole JavaScript API version
// if (Guacamole.API_VERSION !== "0.9.1") // if (Guacamole.API_VERSION !== "0.9.1")

8
guacamole-tunnel/src/main/webapp/scripts/client-ui.js
View File

@ -998,8 +998,13 @@ GuacUI.Client.connect = function() {
// all parameters should be preserved and passed on for // all parameters should be preserved and passed on for
// the sake of authentication. // the sake of authentication.
var queryArr = [];
for( k in window.query ) {
queryArr.push(k+"="+window.query[k])
}
var connect_string = var connect_string =
window.location.search.substring(1) queryArr.join('&')
+ "&width=" + Math.floor(optimal_width) + "&width=" + Math.floor(optimal_width)
+ "&height=" + Math.floor(optimal_height) + "&height=" + Math.floor(optimal_height)
+ "&dpi=" + Math.floor(optimal_dpi); + "&dpi=" + Math.floor(optimal_dpi);
@ -1028,6 +1033,7 @@ GuacUI.Client.connect = function() {
window.location = window.query.exit; window.location = window.query.exit;
}; };
console.log(connect_string);
// Connect // Connect
guac.connect(connect_string); guac.connect(connect_string);