From 3e1f59ebf03dbe8fa3a92dbee729674a89f3d964 Mon Sep 17 00:00:00 2001
From: Ramiro Saenz <saenzramiro@gmail.com>
Date: Tue, 18 Apr 2017 12:57:59 -0300
Subject: [PATCH] Fixed Ctrl + PG_DOWN bug

Fixes #705
---
 app/Application.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Application.js b/app/Application.js
index fe6974a2..0d68ab05 100644
--- a/app/Application.js
+++ b/app/Application.js
@@ -82,9 +82,14 @@ Ext.define('Rambox.Application', {
 						var tabPanel = Ext.cq1('app-main');
 						var activeIndex = tabPanel.items.indexOf(tabPanel.getActiveTab());
 						var i = activeIndex + 1;
-						if ( i >= tabPanel.items.items.length - 1 ) i = 0;
-						while ( tabPanel.items.items[i].id === 'tbfill' ) i++;
-						tabPanel.setActiveTab( i );
+
+						// "cycle" (go to the start) when the end is reached or the end is the spacer "tbfill"
+						if (i === tabPanel.items.items.length || i === tabPanel.items.items.length - 1 && tabPanel.items.items[i].id === 'tbfill') i = 0;
+
+						// skip spacer
+						while (tabPanel.items.items[i].id === 'tbfill') i++;
+
+						tabPanel.setActiveTab(i);
 					}
 				}
 				,{
@@ -97,7 +102,7 @@ Ext.define('Rambox.Application', {
 						var activeIndex = tabPanel.items.indexOf(tabPanel.getActiveTab());
 						var i = activeIndex - 1;
 						if ( i < 0 ) i = tabPanel.items.items.length - 1;
-						while ( tabPanel.items.items[i].id === 'tbfill' ) i--;
+						while ( tabPanel.items.items[i].id === 'tbfill' || i < 0 ) i--;
 						tabPanel.setActiveTab( i );
 					}
 				}