Fix botched merge
This commit is contained in:
parent
703128ab28
commit
f018876987
2 changed files with 1 additions and 5 deletions
|
@ -66,9 +66,6 @@
|
|||
Error: wrong password
|
||||
</div>
|
||||
|
||||
<label class="control-label" for="password">WeeChat relay password</label>
|
||||
<input type="password" class="form-control monospace" id="password" ng-model="password" placeholder="Password">
|
||||
|
||||
<div class="checkbox">
|
||||
<label class="control-label" for="savepassword">
|
||||
<input type="checkbox" id="savepassword" ng-model="savepassword">
|
||||
|
|
|
@ -361,8 +361,7 @@ function($rootScope,
|
|||
};
|
||||
|
||||
var disconnect = function() {
|
||||
/* TODO: Send protocol disconnect */
|
||||
ngWebsockets.disconnect();
|
||||
ngWebsockets.send(weeChat.Protocol.formatQuit());
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue