From 03e1a14274813157d16ea23f2242fbf86249baa7 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Fri, 6 Feb 2015 09:37:47 +0000 Subject: [PATCH] Make sure expose view indicators always displays on as we need to calculate the active slide position -Fix miss calculation of accurate postion of active slide on thumbnail indicator -Fix slide navigation with keyboard always popups controls, no respect to fullscreen mode --- etemplate/js/expose.js | 9 +-------- etemplate/templates/default/etemplate2.css | 9 ++++++++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/etemplate/js/expose.js b/etemplate/js/expose.js index c9941c7185..28e9a33546 100644 --- a/etemplate/js/expose.js +++ b/etemplate/js/expose.js @@ -488,14 +488,7 @@ function expose (widget) // See if we need to move the indicator var indicator = gallery.container.find('.indicator'); var current = $j('.active',indicator).position(); - if (current.left == 0 && !gallery.container.hasClass(this.expose_options.playingClass)) - { - //As controlsClass activates indicators, - //we use it to make indicators available for the first time - //which helps to re-calculate the correct position of it, if it's not loaded yet - gallery.container.addClass(this.expose_options.controlsClass); - current = $j('.active',indicator).position(); - } + if(current) { indicator.animate({left: (gallery.container.width() / 2)-current.left}); diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css index 161ff7024a..80c5f726f7 100644 --- a/etemplate/templates/default/etemplate2.css +++ b/etemplate/templates/default/etemplate2.css @@ -1813,7 +1813,13 @@ span.et2_egw_action_ddHelper_itemsCnt { z-index: -1; position: relative; } - +/*Make indicator visible all the time to be able accuratley estimate + current active slide position in thubmnal bar*/ +.blueimp-gallery>.indicator { + opacity:0; /* Hide it through opacity*/ + white-space: nowrap; + display: inline-block; /* Very important to keep gallery indicator always with display inline-block*/ +} /*Thumbnail border on hover*/ .blueimp-gallery>.indicator>li:hover { -webkit-box-shadow: inset 0px 0px 0px 4px rgba(255, 255, 255, 1); @@ -1846,4 +1852,5 @@ span.et2_egw_action_ddHelper_itemsCnt { /*indicator bar with controls*/ .blueimp-gallery-controls>.indicator { white-space: nowrap; + opacity:1; /* When the controls panel is on then we need to show back the indicators*/ } \ No newline at end of file