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

Merge pull request #620 from glowing-bear/noswitch

Browse source 
Use -noswitch option to open buffers
This commit is contained in:
Tor Hveem 2015-09-17 09:05:35 +02:00
parent 9659fa2efc 1f37f848fc
commit cf771eb73f
5 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/connection.js
View file

@ -267,7 +267,7 @@ weechat.factory('connection',
};
var sendHotlistClear = function() {
if (parseInt(models.version.charAt(0)) >= 1) {
if (models.version[0] >= 1) {
// WeeChat >= 1 supports clearing hotlist with this command
sendMessage('/buffer set hotlist -1');
// Also move read marker

12
js/glowingbear.js
View file

@ -452,7 +452,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
// the messages in this buffer before you switched to the new one
// this is only needed with new type of clearing since in the old
// way WeeChat itself takes care of that part
if (parseInt(models.version.charAt(0)) >= 1) {
if (models.version[0] >= 1) {
connection.sendHotlistClear();
}
@ -464,9 +464,17 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
fullName = fullName.substring(0, fullName.lastIndexOf('.') + 1) + bufferName; // substitute the last part
if (!$scope.setActiveBuffer(fullName, 'fullName')) {
var command = 'join';
// WeeChat 0.4.0+ supports /join -noswitch
// As Glowing Bear requires 0.4.2+, we don't need to check the version
var command = 'join -noswitch';
// Check if it's a query and we need to use /query instead
if (['#', '&', '+', '!'].indexOf(bufferName.charAt(0)) < 0) { // these are the characters a channel name can start with (RFC 2813-2813)
command = 'query';
// WeeChat 1.2+ supports /query -noswitch. See also #577 (different context)
if ((models.version[0] == 1 && models.version[1] >= 2) || models.version[1] > 1) {
command += " -noswitch";
}
}
connection.sendMessage('/' + command + ' ' + bufferName);
}

3
js/handlers.js
View file

@ -9,7 +9,8 @@ weechat.factory('handlers', ['$rootScope', '$log', 'models', 'plugins', 'notific
var content = message.objects[0].content;
var version = content.value;
// Store the WeeChat version in models
models.version = version;
// this eats things like 1.3-dev -> [1,3]
models.version = version.split(".").map(function(c) { return parseInt(c); });
};
var handleBufferClosing = function(message) {

2
js/inputbar.js
View file

@ -118,7 +118,7 @@ weechat.directive('inputBar', function() {
}
// New style clearing requires this, old does not
if (parseInt(models.version.charAt(0)) >= 1) {
if (models.version[0] >= 1) {
connection.sendHotlistClear();
}

2
js/models.js
View file

@ -463,7 +463,7 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter)
* @return active buffer pointer (WeeChat 1.0+) or fullname (older versions)
*/
this.getActiveBufferReference = function() {
if (this.version !== null && parseInt(this.version.charAt(0)) >= 1) {
if (this.version !== null && this.version[0] >= 1) {
// pointers are being validated, they're more reliable than
// fullName (e.g. if fullName contains spaces)
return "0x"+activeBuffer.id;