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

Merge pull request #683 from glowing-bear/nicklist-fixes 

Request nicklist using ptr instead of fullname
This commit is contained in:
Lorenz Hübschle-Schneider 2015-11-28 12:30:49 +01:00
parent 8e43758c2e 4f686d512d
commit 870af58ed4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/connection.js
View File

@ -282,10 +282,13 @@ weechat.factory('connection',
}; };
var requestNicklist = function(bufferId, callback) { var requestNicklist = function(bufferId, callback) {
bufferId = bufferId || null; // Prevent requesting nicklist for all buffers if bufferId is invalid
if (!bufferId) {
return;
}
ngWebsockets.send( ngWebsockets.send(
weeChat.Protocol.formatNicklist({ weeChat.Protocol.formatNicklist({
buffer: bufferId buffer: "0x"+bufferId
}) })
).then(function(nicklist) { ).then(function(nicklist) {
handlers.handleNicklist(nicklist); handlers.handleNicklist(nicklist);

2
js/glowingbear.js
View File

@ -168,7 +168,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
// Send a request for the nicklist if it hasn't been loaded yet // Send a request for the nicklist if it hasn't been loaded yet
if (!ab.nicklistRequested()) { if (!ab.nicklistRequested()) {
connection.requestNicklist(ab.fullName, function() { connection.requestNicklist(ab.id, function() {
$scope.showNicklist = $scope.updateShowNicklist(); $scope.showNicklist = $scope.updateShowNicklist();
// Scroll after nicklist has been loaded, as it may break long lines // Scroll after nicklist has been loaded, as it may break long lines
$rootScope.scrollWithBuffer(true); $rootScope.scrollWithBuffer(true);