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

Fix botched merge

This commit is contained in:
Lorenz Hübschle-Schneider 2014-02-14 16:40:44 +00:00
parent 703128ab28
commit f018876987
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.html
View File

@ -66,9 +66,6 @@
Error: wrong password Error: wrong password
</div> </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"> <div class="checkbox">
<label class="control-label" for="savepassword"> <label class="control-label" for="savepassword">
<input type="checkbox" id="savepassword" ng-model="savepassword"> <input type="checkbox" id="savepassword" ng-model="savepassword">

3
js/glowingbear.js
View File

@ -361,8 +361,7 @@ function($rootScope,
}; };
var disconnect = function() { var disconnect = function() {
/* TODO: Send protocol disconnect */ ngWebsockets.send(weeChat.Protocol.formatQuit());
ngWebsockets.disconnect();
}; };
/* /*