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

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

This commit is contained in:
Joel Martin 2011-06-28 16:23:57 -05:00
parent 0b7bc4e986 95ff836e45
commit 96513f5645
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/rfb.js
View File

@ -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() {
} 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) {
// 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");