X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=include%2Fgallery.js;h=e4eeef39ebd4ba18b2b8acc47b0fe105013091fc;hp=08097589d49f25d9a5647556e9a46c9ae6d89e15;hb=8885ed7401ea77ca4c4ae1927c78df7891d61f63;hpb=b55242bcbdfa5ab5bea3b3391cee28b79ce59762

diff --git a/include/gallery.js b/include/gallery.js
index 0809758..e4eeef3 100644
--- a/include/gallery.js
+++ b/include/gallery.js
@@ -16,8 +16,9 @@
 /* Initialize everything, to be called on domready */
 function init_gallery() {
 
-	/* List of lists of img variations. Each image variation is a three-element
-	 * array: [width, height, url]. Index of the outer array is the global ID.
+	/* List of lists of img variations. Each image variation is
+	 * a three-element array: [width, height, url]. Index of the
+	 * outer array is the global ID.
 	 *
 	 * [
 	 *  [ id, title, [
@@ -38,21 +39,21 @@ function init_gallery() {
 
 	$$('div.varimages').each(function(el,i){
 		rimgs[el.id] = i;
-		vimgs[i] = [];
+		vimgs[i] = [el.id, el.title, []];
 		el.getElements('a').each(function(ael,j){
 			dim = /(\d+)[^\d](\d+)/.exec(ael.text);
 			w = dim[1];
 			h = dim[2];
-			vimgs[i][j]=[w,h,ael.href,el.id,el.title];
+			vimgs[i][2][j]=[w,h,ael.href];
 		});
 	});
 
 			/* debugging output
 	var msg='loaded '+vimgs.length+' image descriptions:';
 	vimgs.each(function(vimg,i){
-		msg+='\nid='+i;
-		vimg.each(function(vimg,i){
-			msg+='\n     w='+vimg[0]+' h='+vimg[1]+' url='+vimg[2];
+		msg+='\nid='+i+' ('+vimg[0]+') title='+vimg[1];
+		vimg[2].each(function(vv,i){
+			msg+='\n     w='+vv[0]+' h='+vv[1]+' url='+vv[2];
 		});
 	});
 	alert(msg);