From 25a103fe6ab19844448cb8e551358481a86d242d Mon Sep 17 00:00:00 2001
From: Fredrik Erlandsson <fredrik.e@gmail.com>
Date: Thu, 10 Nov 2011 15:38:26 +0100
Subject: [PATCH] Squashed '3.0/themes/pear4gallery3/' changes from
 ce0987a..b24d37b

b24d37b Fix with click on skimming img & carousel slides to correct image.

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: b24d37b1a05ee2016f3276b22bd022c1361c2b91
---
 js/pear.js           | 2 +-
 views/album.html.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/pear.js b/js/pear.js
index 7f898de0..54d7db70 100644
--- a/js/pear.js
+++ b/js/pear.js
@@ -410,7 +410,7 @@ function startImageFlow(userSet)
 			$('#pearImageFlow').append(img); 
 		}
 		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');
 	mosaicResize();
diff --git a/views/album.html.php b/views/album.html.php
index ecd4af1e..455dba8f 100644
--- a/views/album.html.php
+++ b/views/album.html.php
@@ -50,10 +50,10 @@ if($child->is_album()):
 	$offset = 0;
 	$step = round(200/min(count($granchildren),50));
 	foreach ($granchildren as $i => $granchild):?>
-      <? if($i++ > 50) break; ?>
+      <? if(++$i > 50) break; ?>
       <? if ($granchild->has_thumb()): ?>
       <?= $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 ?>
 <?		$offset+=$step;
 endforeach;