Merge pull request #150 from lorenzhs/patch-2

switchToActivityBuffer: Prioritise notifications
This commit is contained in:
David Cormier 2014-02-17 08:46:58 -05:00
commit 6f972261da

View file

@ -733,12 +733,17 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$rootScope.switchToActivityBuffer = function() { $rootScope.switchToActivityBuffer = function() {
// Find next buffer with activity and switch to it // Find next buffer with activity and switch to it
var sortedBuffers = _.sortBy($scope.buffers, 'number'); var sortedBuffers = _.sortBy($scope.buffers, 'number');
for (var i in sortedBuffers) { var i, buffer;
var buffer = sortedBuffers[i]; for (i in sortedBuffers) {
buffer = sortedBuffers[i];
if (buffer.notification > 0) { if (buffer.notification > 0) {
$scope.setActiveBuffer(buffer.id); $scope.setActiveBuffer(buffer.id);
break; break;
} else if(buffer.unread > 0) { }
}
for (i in sortedBuffers) {
buffer = sortedBuffers[i];
if(buffer.unread > 0) {
$scope.setActiveBuffer(buffer.id); $scope.setActiveBuffer(buffer.id);
break; break;
} }