From e9bfb25e0edf60187099caa7fd05876880c59238 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Mon, 3 Nov 2014 06:05:31 +0300
Subject: [PATCH] several minor fixes and tweaks...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/index.html | 10 +++++++++-
 ui (gen4)/ribbons.js |  1 -
 ui (gen4)/viewer.js  | 39 +++++++++++++++++++++++++++++++++++++--
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/ui (gen4)/index.html b/ui (gen4)/index.html
index 7b6ec347..76c26678 100755
--- a/ui (gen4)/index.html	
+++ b/ui (gen4)/index.html	
@@ -78,6 +78,15 @@
 	transition: all 0.2s ease-out;
 }
 
+/* XXX not 100% sure about this... */
+.current-marker:not(.no-transitions) {
+	-webkit-transition: left 0.2s ease-out;
+	-moz-transition: left 0.2s ease-out;
+	-ms-transition: left 0.2s ease-out;
+	-o-transition: left 0.2s ease-out;
+	transition: left 0.2s ease-out;
+}
+
 .no-transitions {
 	-webkit-transition: none;
 	-moz-transition: none;
@@ -87,7 +96,6 @@
 }
 
 
-
 /* DEBUG stuff... */
 .container-center {
 	position: absolute;
diff --git a/ui (gen4)/ribbons.js b/ui (gen4)/ribbons.js
index c770ef9a..424ed63e 100755
--- a/ui (gen4)/ribbons.js	
+++ b/ui (gen4)/ribbons.js	
@@ -411,7 +411,6 @@ module.RibbonsPrototype = {
 				// NOTE: placing the shadow in the viewer is a compromise that
 				// 		lets us do simpler positioning 
 				.appendTo(this.viewer)
-				
 		}
 
 		img.addClass('moving')
diff --git a/ui (gen4)/viewer.js b/ui (gen4)/viewer.js
index db532c18..7d15ac8b 100755
--- a/ui (gen4)/viewer.js	
+++ b/ui (gen4)/viewer.js	
@@ -1258,6 +1258,11 @@ module.CurrentImageIndicator = Feature({
 	min_border: 2,
 
 	border_timeout: 200,
+	shift_timeout: 200,
+
+	fadein: 500,
+
+	animate: true,
 
 	updateMarker: function(actions, target, update_border){
 		var scale = actions.ribbons.getScale()
@@ -1275,7 +1280,7 @@ module.CurrentImageIndicator = Feature({
 			// create a marker...
 			if(marker.length == 0){
 				var marker = $('<div/>')
-					.addClass('current-marker ' + this.tag)
+					.addClass('current-marker '+ this.tag)
 					.css({
 						opacity: '0',
 						top: '0px',
@@ -1284,7 +1289,7 @@ module.CurrentImageIndicator = Feature({
 					.appendTo(ribbon)
 					.animate({
 						'opacity': 1
-					}, 500)
+					}, this.fadein)
 
 			// add marker to current ribbon...
 			} else {
@@ -1318,10 +1323,21 @@ module.CurrentImageIndicator = Feature({
 	},
 
 	setup: function(actions){
+		var timeout
 		var that = this
 		return actions
+			// move marker to current image...
 			.on( 'focusImage.post', this.tag, 
 					function(target){ that.updateMarker(this, target) })
+			// prevent animations when focusing ribbons...
+			.on('focusRibbon.pre', this.tag, 
+					function(){
+						var m = this.ribbons.viewer.find('.current-marker')
+						this.ribbons.preventTransitions(m)
+						return function(){
+							this.ribbons.restoreTransitions(m)
+						}
+					})
 			// Change border size in the appropriate spot in the animation:
 			// 	- before animation when scaling up
 			// 	- after when scaling down
@@ -1333,6 +1349,25 @@ module.CurrentImageIndicator = Feature({
 					that.updateMarker(this, null, w0 > w1 ? 'before' : 'after') 
 				}
 			})
+			// hide marker on shift left/right...
+			.on([
+					'shiftImageLeft.pre',
+					'shiftImageRight.pre',
+				], this.tag, function(){
+					this.ribbons.viewer.find('.current-marker').hide()
+					if(timeout != null){
+						clearTimeout(timeout)
+						timeout == null
+					}
+					return function(){
+						var ribbons = this.ribbons
+						var fadein = that.fadein
+						timeout = setTimeout(function(){ 
+							ribbons.viewer.find('.current-marker').fadeIn(fadein)
+						}, that.shift_timeout)
+					}
+				})
+			// turn the marker on...
 			// XXX not sure about this...
 			.focusImage()
 	},