Merge branch 'optional-port' of https://github.com/bkylerussell/noVNC
This commit is contained in:
commit
8290d3f271
11
core/rfb.js
11
core/rfb.js
|
@ -270,9 +270,9 @@ RFB.prototype = {
|
|||
this._rfb_password = (password !== undefined) ? password : "";
|
||||
this._rfb_path = (path !== undefined) ? path : "";
|
||||
|
||||
if (!this._rfb_host || !this._rfb_port) {
|
||||
if (!this._rfb_host) {
|
||||
return this._fail(
|
||||
_("Must set host and port"));
|
||||
_("Must set host"));
|
||||
}
|
||||
|
||||
this._rfb_init_state = '';
|
||||
|
@ -393,7 +393,12 @@ RFB.prototype = {
|
|||
uri = this._encrypt ? 'wss' : 'ws';
|
||||
}
|
||||
|
||||
uri += '://' + this._rfb_host + ':' + this._rfb_port + '/' + this._rfb_path;
|
||||
uri += '://' + this._rfb_host;
|
||||
if(this._rfb_port) {
|
||||
uri += ':' + this._rfb_port;
|
||||
}
|
||||
uri += '/' + this._rfb_path;
|
||||
|
||||
Log.Info("connecting to " + uri);
|
||||
|
||||
try {
|
||||
|
|
|
@ -85,15 +85,6 @@ describe('Remote Frame Buffer Protocol Client', function() {
|
|||
expect(client._updateConnectionState).to.not.have.been.called;
|
||||
expect(client._rfb_connection_state).to.equal('');
|
||||
});
|
||||
|
||||
it('should not try to connect if we are missing a port', function () {
|
||||
client._fail = sinon.spy();
|
||||
client._rfb_connection_state = '';
|
||||
client.connect('abc');
|
||||
expect(client._fail).to.have.been.calledOnce;
|
||||
expect(client._updateConnectionState).to.not.have.been.called;
|
||||
expect(client._rfb_connection_state).to.equal('');
|
||||
});
|
||||
});
|
||||
|
||||
describe('#disconnect', function () {
|
||||
|
@ -507,6 +498,13 @@ describe('Remote Frame Buffer Protocol Client', function() {
|
|||
client._updateConnectionState('connecting');
|
||||
expect(client._sock.open).to.have.been.calledWith('ws://HOST:8675/PATH');
|
||||
});
|
||||
|
||||
it('should not include a port in the uri if not specified in connect', function () {
|
||||
sinon.spy(client._sock, 'open');
|
||||
client.set_encrypt(true);
|
||||
client.connect('HOST', undefined)
|
||||
expect(client._sock.open).to.have.been.calledWith('wss://HOST/');
|
||||
});
|
||||
});
|
||||
|
||||
describe('disconnecting', function () {
|
||||
|
|
Loading…
Reference in New Issue