undo change that prevented position: 0 option for non-array galleries

make sure array galleries w/ specified position have correct caption
henrygd · Oct 5, 2019 · 59fd252 · 59fd252
1 parent a6c7e08
commit 59fd252
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/dist/BigPicture.js b/dist/BigPicture.js
@@ -351,7 +351,7 @@
 			// is array of images
 			galleryPosition = position || 0;
 			galleryEls = gallery;
-			captionContent = gallery[0].caption;
+			captionContent = gallery[galleryPosition].caption;
 		} else {
 			// is element selector or nodelist
 			galleryEls = [].slice.call(
@@ -361,7 +361,7 @@
 			);
 			// find initial gallery position
 			var elIndex = galleryEls.indexOf(el);
-			galleryPosition = position ? position : elIndex !== -1 ? elIndex : 0;
+			galleryPosition = (position === 0 || position) ? position : (elIndex !== -1 ? elIndex : 0);
 			// make gallery object w/ els / src / caption
 			galleryEls = galleryEls.map(function(el) {
 				return {

diff --git a/dist/BigPicture.min.js b/dist/BigPicture.min.js
diff --git a/example_page/js/BigPicture.js b/example_page/js/BigPicture.js
@@ -351,7 +351,7 @@
 			// is array of images
 			galleryPosition = position || 0;
 			galleryEls = gallery;
-			captionContent = gallery[0].caption;
+			captionContent = gallery[galleryPosition].caption;
 		} else {
 			// is element selector or nodelist
 			galleryEls = [].slice.call(
@@ -361,7 +361,7 @@
 			);
 			// find initial gallery position
 			var elIndex = galleryEls.indexOf(el);
-			galleryPosition = position ? position : elIndex !== -1 ? elIndex : 0;
+			galleryPosition = (position === 0 || position) ? position : (elIndex !== -1 ? elIndex : 0);
 			// make gallery object w/ els / src / caption
 			galleryEls = galleryEls.map(function(el) {
 				return {

diff --git a/index.js b/index.js
@@ -351,7 +351,7 @@
 			// is array of images
 			galleryPosition = position || 0;
 			galleryEls = gallery;
-			captionContent = gallery[0].caption;
+			captionContent = gallery[galleryPosition].caption;
 		} else {
 			// is element selector or nodelist
 			galleryEls = [].slice.call(
@@ -361,7 +361,7 @@
 			);
 			// find initial gallery position
 			var elIndex = galleryEls.indexOf(el);
-			galleryPosition = position ? position : elIndex !== -1 ? elIndex : 0;
+			galleryPosition = (position === 0 || position) ? position : (elIndex !== -1 ? elIndex : 0);
 			// make gallery object w/ els / src / caption
 			galleryEls = galleryEls.map(function(el) {
 				return {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "bigpicture",
-	"version": "2.2.0",
+	"version": "2.2.1",
 	"description": "Lightweight image and video viewer, supports youtube / vimeo",
 	"main": "index.js",
 	"scripts": {