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

simplify buffer jumping logic

Browse source
This commit is contained in:
Lorenz Hübschle-Schneider 2017-03-18 16:31:05 +01:00
parent cdd88baa62
commit d9346f5f3e
1 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
js/inputbar.js
View file

@ -261,29 +261,9 @@ weechat.directive('inputBar', function() {
$event.preventDefault(); $event.preventDefault();
// second digit // second digit
} else { } else {
bufferNumber = ($scope.jumpDecimal * 10) + (code - 48) - 1; bufferNumber = ($rootScope.jumpDecimal * 10) + (code - 48);
// quick select filtered entries $scope.$parent.setActiveBuffer(bufferNumber, '$jumpKey');
if (($scope.$parent.search.length || $scope.$parent.onlyUnread) && $scope.$parent.filteredBuffers.length) {
filteredBufferNum = $scope.$parent.filteredBuffers[bufferNumber];
if (filteredBufferNum !== undefined) {
activeBufferId = [filteredBufferNum.number, filteredBufferNum.id];
}
} else {
// Map the buffers to only their numbers and IDs so we don't have to
// copy the entire (possibly very large) buffer object, and then sort
// the buffers according to their WeeChat number
sortedBuffers = _.map(models.getBuffers(), function (buffer) {
return [buffer.number, buffer.id];
}).sort(function (left, right) {
// By default, Array.prototype.sort() sorts alphabetically.
// Pass an ordering function to sort by first element.
return left[0] - right[0];
});
activeBufferId = sortedBuffers[bufferNumber];
}
if (activeBufferId) {
$scope.$parent.setActiveBuffer(activeBufferId[1]);
}
$event.preventDefault(); $event.preventDefault();
$rootScope.showJumpKeys = false; $rootScope.showJumpKeys = false;
$scope.jumpDecimal = undefined; $scope.jumpDecimal = undefined;