tobast/glowingbear-mainbox
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use separate form fields for host and port

Browse source
This commit is contained in:
Tor Hveem 2013-10-11 23:15:08 +02:00
commit 5a8294b2cc
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/websockets.js
View file

@ -320,9 +320,9 @@ weechat.factory('connection', ['$rootScope', '$log', 'handlers', 'colors', 'mode
}
// Takes care of the connection and websocket hooks
var connect = function (hostport, passwd, ssl) {
var connect = function (host, port, passwd, ssl) {
var proto = ssl ? 'wss':'ws';
websocket = new WebSocket(proto+"://" + hostport + "/weechat");
websocket = new WebSocket(proto+"://" + host + ':' + port + "/weechat");
websocket.binaryType = "arraybuffer"
websocket.onopen = function (evt) {
@ -424,7 +424,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$rootScope.buffer = []
$store.bind($scope, "hostport", "localhost:9001");
$store.bind($scope, "host", "localhost");
$store.bind($scope, "port", "9001");
$store.bind($scope, "proto", "weechat");
$store.bind($scope, "password", "");
$store.bind($scope, "ssl", false);
@ -462,7 +463,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
};
$scope.connect = function() {
connection.connect($scope.hostport, $scope.password, $scope.ssl);
connection.connect($scope.host, $scope.port, $scope.password, $scope.ssl);
}
$rootScope.getLines = function() {
var count = 20;