masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use separate form fields for host and port

This commit is contained in:
Tor Hveem 2013-10-11 23:15:08 +02:00
parent 0d7cfcf376
commit 5a8294b2cc
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
index.html
View File

@ -53,10 +53,15 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
<strong>Oh no!</strong> We cannot connect! <strong>Oh no!</strong> We cannot connect!
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label" for="hostport">Hostname and port</label> <label class="control-label" for="host">WeeChat hostname</label>
<input type="text" class="form-control" id="hostport" ng-model="hostport" placeholder="Hostport"> <input type="text" class="form-control" id="host" ng-model="host" placeholder="Address">
<p class="help-block">Enter the hostname and the port to the WeeChat relay, separated by a :</p> <p class="help-block">Enter the hostname to the WeeChat relay</p>
</div> </div>
<div class="form-group">
<label class="control-label" for="port">WeeChat port number</label>
<input type="text" class="form-control" id="port" ng-model="port" placeholder="9001">
<p class="help-block">Enter the the port to the WeeChat relay</p>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label" for="password">WeeChat relay password</label> <label class="control-label" for="password">WeeChat relay password</label>
<input type="password" class="form-control" id="password" ng-model="password" placeholder="Password"> <input type="password" class="form-control" id="password" ng-model="password" placeholder="Password">

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 // 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'; var proto = ssl ? 'wss':'ws';
websocket = new WebSocket(proto+"://" + hostport + "/weechat"); websocket = new WebSocket(proto+"://" + host + ':' + port + "/weechat");
websocket.binaryType = "arraybuffer" websocket.binaryType = "arraybuffer"
websocket.onopen = function (evt) { websocket.onopen = function (evt) {
@ -424,7 +424,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$rootScope.buffer = [] $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, "proto", "weechat");
$store.bind($scope, "password", ""); $store.bind($scope, "password", "");
$store.bind($scope, "ssl", false); $store.bind($scope, "ssl", false);
@ -462,7 +463,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
}; };
$scope.connect = function() { $scope.connect = function() {
connection.connect($scope.hostport, $scope.password, $scope.ssl); connection.connect($scope.host, $scope.port, $scope.password, $scope.ssl);
} }
$rootScope.getLines = function() { $rootScope.getLines = function() {
var count = 20; var count = 20;