crabapples
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 01692ec3a5 into f90c2a6d4b

This commit is contained in:
zvs001 2018-06-17 17:19:44 +00:00 committed by GitHub
parent f90c2a6d4b 01692ec3a5
commit 5edc213fd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ recordings
*.swp
*~
noVNC-*.tgz
.idea/

6
app/ui.js
View File

@ -161,7 +161,9 @@ const UI = {
UI.initSetting('resize', 'off');
UI.initSetting('shared', true);
UI.initSetting('view_only', false);
UI.initSetting('path', 'websockify');
let socketUrl = (window.location.pathname || '/').replace(/\/([^/]+)?$/, '/websockify');
UI.initSetting('path', socketUrl || '/websockify');
UI.initSetting('repeaterID', '');
UI.initSetting('reconnect', false);
UI.initSetting('reconnect_delay', 5000);
@ -1019,7 +1021,7 @@ const UI = {
if(port) {
url += ':' + port;
}
url += '/' + path;
url += path;
UI.rfb = new RFB(document.getElementById('noVNC_container'), url,
{ shared: UI.getSetting('shared'),