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

Merge pull request #261 from lorenzhs/nickclickfix

Browse source 
Improve nick clicking in buffer
This commit is contained in:
David Cormier 2014-04-24 10:17:36 -04:00
commit d95e85b017
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
js/glowingbear.js
View file

@ -860,15 +860,16 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
var addColon = newValue.length === 0; var addColon = newValue.length === 0;
if (newValue.length > 0) { if (newValue.length > 0) {
// Try to determine if it's a sequence of nicks // Try to determine if it's a sequence of nicks
if (newValue.charAt(newValue.length - 1) === ':') { var trimmedValue = newValue.trim();
if (trimmedValue.charAt(trimmedValue.length - 1) === ':') {
// get last word // get last word
var lastSpace = newValue.lastIndexOf(' ') + 1; var lastSpace = trimmedValue.lastIndexOf(' ') + 1;
var lastWord = newValue.slice(lastSpace, newValue.length - 1).trim(); var lastWord = trimmedValue.slice(lastSpace, trimmedValue.length - 1);
var nicklist = models.getActiveBuffer().flatNicklist(); var nicklist = models.getActiveBuffer().flatNicklist();
// check against nicklist to see if it's a list of highlights // check against nicklist to see if it's a list of highlights
if (nicklist.indexOf(lastWord) !== -1) { if (nicklist.indexOf(lastWord) !== -1) {
// It's another highlight! // It's another highlight!
newValue = newValue.slice(0, newValue.length - 1) + ' '; newValue = newValue.slice(0, newValue.lastIndexOf(':')) + ' ';
addColon = true; addColon = true;
} }
} }
@ -882,9 +883,10 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
// Add highlight to nicklist // Add highlight to nicklist
newValue += nick; newValue += nick;
if (addColon) { if (addColon) {
newValue += ':'; newValue += ': ';
} }
input.value = newValue; input.value = newValue;
input.focus();
}; };
// Calculate number of lines to fetch // Calculate number of lines to fetch