From 3fb7be145899fc6c569c7e8980b9e6c629f37936 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Thu, 2 Jan 2014 10:07:04 +0400
Subject: [PATCH] minor tweaks...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui/keybindings.js | 46 ++++++++++++++++++++++++++--------------------
 ui/tags.js        |  2 +-
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/ui/keybindings.js b/ui/keybindings.js
index 7276a201..8c7e7afc 100755
--- a/ui/keybindings.js
+++ b/ui/keybindings.js
@@ -469,6 +469,32 @@ var KEYBOARD_CONFIG = {
 				centerRibbons()
 			}),
 
+		// bookmark navigation...
+		'[': doc('Previous bookmarked image', 
+				function(){ prevBookmark() }),
+		']': doc('Next bookmarked image', 
+				function(){ nextBookmark() }),
+
+		// marked/unmarked navigation...
+		',': {
+				default: doc('Previous marked image', 
+					function(){ prevMark() }),
+				shift: doc('Previous unmarked image',
+					function(){ prevUnmarked() }),
+			},
+		'.': {
+				default: doc('Next marked image', 
+					function(){ nextMark() }),
+				shift: doc('Next unmarked image',
+					function(){ nextUnmarked() }),
+			},
+
+		// sorted section navigation...
+		'{': doc('Previous unsorted section edge', 
+				function(){ prevUnsortedSection() }),
+		'}': doc('Next unsorted section edge', 
+				function(){ nextUnsortedSection() }),
+
 
 		// combined navigation and editor actions...
 		Up: {
@@ -586,26 +612,6 @@ var KEYBOARD_CONFIG = {
 				ctrl: doc('Toggle bookmark', 
 					function(){ toggleBookmark() }),
 			},
-		'[': doc('Previous bookmarked image', 
-				function(){ prevBookmark() }),
-		']': doc('Next bookmarked image', 
-				function(){ nextBookmark() }),
-		',': {
-				default: doc('Previous marked image', 
-					function(){ prevMark() }),
-				shift: doc('Previous unmarked image',
-					function(){ prevUnmarked() }),
-			},
-		'.': {
-				default: doc('Next marked image', 
-					function(){ nextMark() }),
-				shift: doc('Next unmarked image',
-					function(){ nextUnmarked() }),
-			},
-		'{': doc('Previous unsorted section edge', 
-				function(){ prevUnsortedSection() }),
-		'}': doc('Next unsorted section edge', 
-				function(){ nextUnsortedSection() }),
 
 		S: {
 				default: doc('Start slideshow', 
diff --git a/ui/tags.js b/ui/tags.js
index b2cfa320..0ce9ba8b 100755
--- a/ui/tags.js
+++ b/ui/tags.js
@@ -400,7 +400,7 @@ function getGapEdge(direction, tag, gids){
 	var get = direction == 'next' ? getGIDAfter : getGIDBefore
 
 	gids = gids == null ? getRibbonGIDs() : gids
-	var tagged = TAGS[tag]
+	var tagged = TAGS[tag].filter(function(e){ return gids.indexOf(e) >= 0 })
 	var cur = getImageGID()
 	var step = direction == 'next' ? 1 : -1