From ee953d8de2892b1ac7dc2390458c95f207903d95 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Wed, 4 Dec 2013 23:33:35 +0400
Subject: [PATCH] reworked and fixed screen-oriented navigation via keyboard...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui/keybindings.js | 44 ++++++++++++++++++++++++--------------------
 ui/setup.js       |  1 +
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/ui/keybindings.js b/ui/keybindings.js
index 15e9e10d..806f89fa 100755
--- a/ui/keybindings.js
+++ b/ui/keybindings.js
@@ -313,6 +313,7 @@ var KEYBOARD_CONFIG = {
 
 						return false
 					}),
+				ctrl: 'prev-screen',
 			},
 		Right: {
 				alt: doc('Shift image right', 
@@ -337,6 +338,29 @@ var KEYBOARD_CONFIG = {
 
 						return false
 					}),
+				ctrl: 'next-screen',
+			},
+		'prev-screen': doc('Previous screen',
+				function(){ 
+					event.preventDefault()
+					prevScreenImages()
+					centerRibbons()
+				}),
+		'next-screen': doc('Next screen',
+				function(){ 
+					event.preventDefault()
+					nextScreenImages()
+					centerRibbons()
+				}),
+		Space: {
+				// screen-oriented movement...
+				ctrl: 'Right',
+				'ctrl+shift': 'prev-screen',
+			},
+		Backspace: {
+				// screen-oriented movement...
+				ctrl: 'Left',
+				'ctrl+shift': 'next-screen',
 			},
 
 		// zooming...
@@ -403,7 +427,6 @@ var KEYBOARD_CONFIG = {
 						prevImage() 
 						centerRibbons()
 					}),
-				ctrl: 'prev-screen',
 
 				// XXX button not final...
 				'ctrl+shift': doc('Previous URL in history', loadURLHistoryPrev ),
@@ -417,36 +440,17 @@ var KEYBOARD_CONFIG = {
 						nextImage() 
 						centerRibbons()
 					}),
-				ctrl: 'next-screen',
 
 				// XXX button not final...
 				'ctrl+shift': doc('Next URL in history', loadURLHistoryNext ),
 			},
-		'prev-screen': doc('Previous screen',
-				function(){ 
-					event.preventDefault()
-					prevScreenImages()
-					centerRibbons()
-				}),
-		'next-screen': doc('Next screen',
-				function(){ 
-					event.preventDefault()
-					nextScreenImages()
-					centerRibbons()
-				}),
 		Space: {
 				default: 'Right',
 				shift: 'Left',
-				// screen-oriented movement...
-				ctrl: 'Right',
-				'ctrl+shift': 'prev-screen',
 			},
 		Backspace: {
 				default: 'Left',
 				shift: 'Right',
-				// screen-oriented movement...
-				ctrl: 'Left',
-				'ctrl+shift': 'next-screen',
 			},
 		Home: doc('First image', 
 			function(){
diff --git a/ui/setup.js b/ui/setup.js
index 4057adc3..813c5373 100755
--- a/ui/setup.js
+++ b/ui/setup.js
@@ -94,6 +94,7 @@ function setupDataBindings(viewer){
 
 			// skip all but the curent ribbon in single image view...
 			if(toggleSingleImageMode('?') == 'on' && r != getRibbonIndex()){
+				console.log('>>>> skipping ribbon:', r)
 				return 
 			}