From 014dcc80a0b2722c5508271a3cc49b75779eb9e8 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Mon, 2 Nov 2015 15:01:51 +0300
Subject: [PATCH] squashed several bugs...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/data.js   | 22 +++++++++++++++-------
 ui (gen4)/viewer.js | 18 ++++++++++++++++++
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/ui (gen4)/data.js b/ui (gen4)/data.js
index 5465a4bf..cf36d187 100755
--- a/ui (gen4)/data.js	
+++ b/ui (gen4)/data.js	
@@ -591,6 +591,13 @@ var DataPrototype = {
 			target = this.current
 		}
 
+		var offset = list == 'before' ? -1
+			: list == 'after' ? 1 
+			: 0
+		if(list == 'before' || list == 'after'){
+			list = null
+		}
+
 		// normalize mode...
 		if(mode != null 
 				&& mode.constructor === Array
@@ -600,7 +607,7 @@ var DataPrototype = {
 		}
 		// relative mode and offset...
 		if(typeof(mode) == typeof(123)){
-			var offset = mode
+			offset += mode
 			mode = offset < 0 ? 'before'
 				: offset > 0 ? 'after'
 				: mode
@@ -622,6 +629,7 @@ var DataPrototype = {
 			return -1
 		}
 
+
 		// normalize the list to a sparse list of gids...
 		list = list == null ? 
 				this.ribbons[this.getRibbon(target)]
@@ -636,14 +644,12 @@ var DataPrototype = {
 		}
 
 		// prepare for the search...
-		if(mode == 'before' || mode == 'prev'){
-			var step = -1
-
-		} else if(mode == 'after' || mode == 'next'){
-			var step = 1
+		var step = (mode == 'before' || mode == 'prev') ? -1
+			: (mode == 'after' || mode == 'next') ? 1
+			: null
 
 		// strict -- no hit means there is no point in searching...
-		} else {
+		if(step == null){
 			return null
 		}
 
@@ -652,6 +658,8 @@ var DataPrototype = {
 		// get the first non-null, also accounting for offset...
 		// NOTE: we are using this.order.length here as ribbons might 
 		// 		be truncated...
+		// XXX currently this works correctly ONLY when step and offset
+		// 		are in the same direction...
 		for(; i >= 0 && i < this.order.length; i+=step){
 			var cur = list[i]
 			// skip undefined or unloaded images...
diff --git a/ui (gen4)/viewer.js b/ui (gen4)/viewer.js
index 17c712ae..17378531 100755
--- a/ui (gen4)/viewer.js	
+++ b/ui (gen4)/viewer.js	
@@ -274,10 +274,28 @@ actions.Actions({
 	// basic navigation...
 	//
 	focusImage: ['Navigate/Focus image',
+		/* XXX same structure as action but instead of a function uses 
+		 		a list of args...
+		// aliases...
+		{
+			'firstImage': ['Navigate/First image in current ribbon', [ 'first' ]],
+			'lastImage': ['Navigate/Last image in current ribbon', [ 'last' ]],
+			'firstGlobalImage': ['Navigate/First globally image', [ 0 ]],
+			'lastGlobalImage': ['Navigate/Last globally image', [ -1 ]],
+		},
+		*/
 		function(img, list){
 			this.data.focusImage(img, list)
 		}],
 	focusRibbon: ['Navigate/Focus Ribbon',
+		/*
+		{
+			firstRibbon: ['Navigate/First ribbon', [ 'first' ]],
+			lastRibbon: ['Navigate/Last ribbon', [ 'last' ]],
+			prevRibbon: ['Navigate/Previous ribbon', [ 'before' ]],
+			nextRibbon: ['Navigate/Next ribbon', [ 'after' ]],
+		},
+		*/
 		function(target){
 			var data = this.data
 			var r = data.getRibbon(target)