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

move hotlistclear into connection

Browse source 
Also some clean up stray debug
This commit is contained in:
Tor Hveem 2015-03-23 12:58:56 +01:00
parent 399b3af9f4
commit feaf76f1ea
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
js/connection.js
View file

@ -258,6 +258,18 @@ weechat.factory('connection',
}));
};
var sendHotlistClear = function() {
if (parseInt(models.version.charAt(0)) >= 1) {
// WeeChat >= 1 supports clearing hotlist with this command
sendMessage('/buffer set hotlist -1');
} else {
// If user wants to sync hotlist with weechat
// we will send a /buffer bufferName command every time
// the user switches a buffer. This will ensure that notifications
// are cleared in the buffer the user switches to
sendCoreCommand('/buffer ' + models.getActiveBuffer().fullName);
}
};
var requestNicklist = function(bufferId, callback) {
bufferId = bufferId || null;
@ -334,6 +346,7 @@ weechat.factory('connection',
disconnect: disconnect,
sendMessage: sendMessage,
sendCoreCommand: sendCoreCommand,
sendHotlistClear: sendHotlistClear,
fetchMoreLines: fetchMoreLines,
requestNicklist: requestNicklist,
attemptReconnect: attemptReconnect

11
js/glowingbear.js
View file

@ -228,16 +228,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
// Do this part last since it's not important for the UI
if (settings.hotlistsync && ab.fullName) {
if (parseInt(models.version.charAt(0)) >= 1) {
// WeeChat >= 1 supports clearing hotlist with this command
connection.sendMessage('/buffer set hotlist -1');
} else {
// If user wants to sync hotlist with weechat
// we will send a /buffer bufferName command every time
// the user switches a buffer. This will ensure that notifications
// are cleared in the buffer the user switches to
connection.sendCoreCommand('/buffer ' + ab.fullName);
}
connection.sendHotlistClear();
}
});

1
js/handlers.js
View file

@ -6,7 +6,6 @@ var weechat = angular.module('weechat');
weechat.factory('handlers', ['$rootScope', '$log', 'models', 'plugins', 'notifications', function($rootScope, $log, models, plugins, notifications) {
var handleVersionInfo = function(message) {
console.log(message.objects[0]);
var content = message.objects[0].content;
var version = content.value;
// Store the WeeChat version in models