Merge commit '25a103fe6ab19844448cb8e551358481a86d242d'
This commit is contained in:
commit
911de8e96b
@ -411,7 +411,7 @@ function startImageFlow(userSet)
|
|||||||
$('#pearImageFlow').append(img);
|
$('#pearImageFlow').append(img);
|
||||||
}
|
}
|
||||||
pearCarousel = new ImageFlow();
|
pearCarousel = new ImageFlow();
|
||||||
pearCarousel.init({ImageFlowID: 'pearImageFlow', aspectRatio: 2.4, imagesHeight: 0.6, opacity: true, reflections: false, startID: currentImg, onClick: function() {focusImage($(this).attr('longdesc'));}, startAnimation: true, xStep: 200, imageFocusM: 1.7, imageFocusMax: 4, opacityArray: [10, 9, 6, 2], percentOther: 130, captions: false, slider: false});
|
pearCarousel.init({ImageFlowID: 'pearImageFlow', aspectRatio: 2.4, imagesHeight: 0.6, opacity: true, reflections: false, startID: currentImg+1, onClick: function() {focusImage($(this).attr('longdesc'));}, startAnimation: true, xStep: 200, imageFocusM: 1.7, imageFocusMax: 4, opacityArray: [10, 9, 6, 2], percentOther: 130, captions: false, slider: false});
|
||||||
}
|
}
|
||||||
switchMode('carousel');
|
switchMode('carousel');
|
||||||
mosaicResize();
|
mosaicResize();
|
||||||
|
@ -50,10 +50,10 @@ if($child->is_album()):
|
|||||||
$offset = 0;
|
$offset = 0;
|
||||||
$step = round(200/min(count($granchildren),50));
|
$step = round(200/min(count($granchildren),50));
|
||||||
foreach ($granchildren as $i => $granchild):?>
|
foreach ($granchildren as $i => $granchild):?>
|
||||||
<? if($i++ > 50) break; ?>
|
<? if(++$i > 50) break; ?>
|
||||||
<? if ($granchild->has_thumb()): ?>
|
<? if ($granchild->has_thumb()): ?>
|
||||||
<?= $granchild->thumb_img(array("style" => "display: none;")) ?>
|
<?= $granchild->thumb_img(array("style" => "display: none;")) ?>
|
||||||
<div class="skimm_div" style="height: 200px; width: <?=$step?>px; left: <?=$offset?>px; top: 0px;" onmouseover="$('#thumb_<?=$child->id?>').attr('src', '<?=$granchild->thumb_url()?>');skimimg=<?=$i?>;" id="area_<?=$granchild->id?>"></div>
|
<div class="skimm_div" style="height: 200px; width: <?=$step?>px; left: <?=$offset?>px; top: 0px;" onmouseover="$('#thumb_<?=$child->id?>').attr('src', '<?=$granchild->thumb_url()?>');skimimg=<?=$i-1?>;" id="area_<?=$granchild->id?>"></div>
|
||||||
<? endif ?>
|
<? endif ?>
|
||||||
<? $offset+=$step;
|
<? $offset+=$step;
|
||||||
endforeach;
|
endforeach;
|
||||||
|
Reference in New Issue
Block a user