extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 17:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure expose view indicators always displays on as we need to calculate the active slide position

Browse Source 
-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
This commit is contained in:
Hadi Nategh 2015-02-06 09:37:47 +00:00
parent e258df70a2
commit 03e1a14274
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etemplate/js/expose.js
View File

@ -488,14 +488,7 @@ function expose (widget)
// See if we need to move the indicator // See if we need to move the indicator
var indicator = gallery.container.find('.indicator'); var indicator = gallery.container.find('.indicator');
var current = $j('.active',indicator).position(); 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) if(current)
{ {
indicator.animate({left: (gallery.container.width() / 2)-current.left}); indicator.animate({left: (gallery.container.width() / 2)-current.left});

9
etemplate/templates/default/etemplate2.css
View File

@ -1813,7 +1813,13 @@ span.et2_egw_action_ddHelper_itemsCnt {
z-index: -1; z-index: -1;
position: relative; 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*/ /*Thumbnail border on hover*/
.blueimp-gallery>.indicator>li:hover { .blueimp-gallery>.indicator>li:hover {
-webkit-box-shadow: inset 0px 0px 0px 4px rgba(255, 255, 255, 1); -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*/ /*indicator bar with controls*/
.blueimp-gallery-controls>.indicator { .blueimp-gallery-controls>.indicator {
white-space: nowrap; white-space: nowrap;
opacity:1; /* When the controls panel is on then we need to show back the indicators*/
} }