From 063b91d5c230b1c5881416b0ed2ae49b251caa6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Tue, 3 Apr 2018 14:32:28 +0200 Subject: [PATCH] Don't switch to hidden buffers with Alt-Up/Down either --- js/glowingbear.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/js/glowingbear.js b/js/glowingbear.js index f87b139..0bc3ca7 100644 --- a/js/glowingbear.js +++ b/js/glowingbear.js @@ -819,12 +819,18 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', // direction is +1 for next buffer, -1 for previous buffer var sortedBuffers = _.sortBy($scope.getBuffers(), $rootScope.predicate); var activeBuffer = models.getActiveBuffer(); - var index = sortedBuffers.indexOf(activeBuffer); - if (index >= 0) { - var newBuffer = sortedBuffers[index + direction]; - if (newBuffer) { - $scope.setActiveBuffer(newBuffer.id); - } + var index = sortedBuffers.indexOf(activeBuffer) + direction; + var newBuffer; + + // look for next non-hidden buffer + while (index >= 0 && index < sortedBuffers.length && + (!newBuffer || newBuffer.hidden)) { + newBuffer = sortedBuffers[index]; + index += direction; + } + + if (!!newBuffer) { + $scope.setActiveBuffer(newBuffer.id); } };