Fix non-#channels and single-symbol channels (#)

This commit is contained in:
Lorenz Hübschle-Schneider 2014-11-20 12:57:19 +01:00
commit 9b7a778186
4 changed files with 20 additions and 4 deletions

View file

@ -74,7 +74,8 @@ weechat.factory('handlers', ['$rootScope', '$log', 'models', 'plugins', 'notific
var old = models.getBuffer(buffer);
old.fullName = obj.full_name;
old.shortName = obj.short_name;
old.trimmedName = obj.short_name.replace(/^[#&+]/, '');
old.trimmedName = obj.short_name.replace(/^[#&+]/, '') || ' ';
old.prefix = ['#', '&', '+'].indexOf(obj.short_name.charAt(0)) >= 0 ? obj.short_name.charAt(0) : '';
};
var handleBufferLocalvarChanged = function(message) {

View file

@ -15,7 +15,10 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter)
// weechat properties
var fullName = message.full_name;
var shortName = message.short_name;
var trimmedName = shortName.replace(/^[#&+]/, '');
// just use a space if the rest of the channel name is empty ('#')
var trimmedName = shortName.replace(/^[#&+]/, '') || ' ';
// get channel identifier
var prefix = ['#', '&', '+'].indexOf(shortName.charAt(0)) >= 0 ? shortName.charAt(0) : '';
var title = message.title;
var number = message.number;
var pointer = message.pointers[0];
@ -226,6 +229,7 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter)
fullName: fullName,
shortName: shortName,
trimmedName: trimmedName,
prefix: prefix,
number: number,
title: title,
lines: lines,