moonq/qalbum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed animation from manual browsing

Browse Source
This commit is contained in:
ville rantanen
2014-02-24 12:27:56 +02:00
parent 5d4dd60a77
commit 222170e54c
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
galleryscript.js
View File

@@ -964,11 +964,18 @@ function showimage(i) {
thumblist(i,i); thumblist(i,i);
var dirStr=$('#imagecontainer').data('ID')<i ? '-' : '+'; var dirStr=$('#imagecontainer').data('ID')<i ? '-' : '+';
var revDirStr=dirStr=='-' ? '+' : '-'; var revDirStr=dirStr=='-' ? '+' : '-';
var animateOut=(slideshowinterval!=0 && Math.abs(slideshowinterval)<2) ? 0 : 100;
var animateIn=animateOut/2;
$('#desccontainer').html(getProgressEl()+currentlink(i)+imagelist[i].desc); $('#desccontainer').html(getProgressEl()+currentlink(i)+imagelist[i].desc);
$('#desccontainer').css('display','block'); $('#desccontainer').css('display','block');
setProgress(i); setProgress(i);
if (slideshowinterval==0) { // Manual image change, no animation
showbigimage(i);
preload(i);
subfoldersmalllist();
currentimage=i;
return
}
var animateOut=(slideshowinterval!=0 && Math.abs(slideshowinterval)<2) ? 0 : 200;
var animateIn=animateOut/2;
$('#imagecontainer').clearQueue(); $('#imagecontainer').clearQueue();
$('#imagecontainer').stop(); $('#imagecontainer').stop();
$('#imagecontainer').css('margin-left', '0px'); $('#imagecontainer').css('margin-left', '0px');
@@ -994,6 +1001,7 @@ function showimage(i) {
function showbigimage(i) { function showbigimage(i) {
// The medium version of image in the big image container // The medium version of image in the big image container
if (i==-1) { return; } if (i==-1) { return; }
var dirRight=$('#imagecontainer').data('ID')<i;
var width=document.body.clientWidth-30; var width=document.body.clientWidth-30;
var height=document.body.clientHeight-225; var height=document.body.clientHeight-225;
if (fullscreen) { height=height+200; } if (fullscreen) { height=height+200; }
@@ -1031,6 +1039,11 @@ function showbigimage(i) {
if (currentimage>(imagelist.length-1)) { currentimage=0; } if (currentimage>(imagelist.length-1)) { currentimage=0; }
showimage(currentimage); showimage(currentimage);
}); });
if (dirRight) { var $dirEl=$('#nextTouch'); } else { var $dirEl=$('#prevTouch'); }
$dirEl.css("background-color","rgba(238,238,238,0.5)");
setTimeout(function(){
$dirEl.css("background", "");
}, 100);
if (fullscreen) { if (fullscreen) {
$('#imagecontainer')[0].scrollIntoView(true); $('#imagecontainer')[0].scrollIntoView(true);