Skip to content

N
noVNC
Commit 96513f56 authored by Joel Martin's avatar Joel Martin
Browse files
Options

Merge branch 'master' of git@github.com:kanaka/noVNC

parents 0b7bc4e9 95ff836e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
include/rfb.js
View file @ 96513f56
...@@ -35,6 +35,7 @@ var that = {}, // Public API methods ...@@ -35,6 +35,7 @@ var that = {}, // Public API methods
rfb_host = '', rfb_host = '',
rfb_port = 5900, rfb_port = 5900,
rfb_password = '', rfb_password = '',
rfb_uri = '',
rfb_state = 'disconnected', rfb_state = 'disconnected',
rfb_version = 0, rfb_version = 0,
...@@ -272,7 +273,7 @@ function connect() { ...@@ -272,7 +273,7 @@ function connect() {
} else { } else {
uri = "ws://"; uri = "ws://";
} }
uri += rfb_host + ":" + rfb_port + "/"; uri += rfb_host + ":" + rfb_port + "/" + rfb_uri;
Util.Info("connecting to " + uri); Util.Info("connecting to " + uri);
ws.open(uri); ws.open(uri);
...@@ -1446,12 +1447,13 @@ clientCutText = function(text) { ...@@ -1446,12 +1447,13 @@ clientCutText = function(text) {
// Public API interface functions // Public API interface functions
// //
that.connect = function(host, port, password) { that.connect = function(host, port, password, uri) {
//Util.Debug(">> connect"); //Util.Debug(">> connect");
rfb_host = host; rfb_host = host;
rfb_port = port; rfb_port = port;
rfb_password = (password !== undefined) ? password : ""; rfb_password = (password !== undefined) ? password : "";
rfb_uri = (uri !== undefined) ? uri : "";
if ((!rfb_host) || (!rfb_port)) { if ((!rfb_host) || (!rfb_port)) {
return fail("Must set host and port"); return fail("Must set host and port");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment