X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=include%2Fgallery.js;h=5cd2b5d9261718c67b0c160bbabda9739e336ca2;hp=d0f9760a84fe87b460852c3325e4592c5fd5e4db;hb=f8281d2d6eaaa20f2c65d9753a2870df1310fd1a;hpb=481af6c9567c2f71575e7e3464103937d6025ce4

diff --git a/include/gallery.js b/include/gallery.js
index d0f9760..5cd2b5d 100644
--- a/include/gallery.js
+++ b/include/gallery.js
@@ -1,94 +1,69 @@
 /*
+	$Id$
+
         This is a part of mkgallery.pl suite
         http://www.average.org/mkgallery/
 
-	Uses mootools (1.1) http://www.mootools.net/
+	Uses mootools (1.2) http://www.mootools.net/
 	Uses slideshow http://www.phatfusion.net/slideshow/
 */
 
 /*
-	Slideshow
+	Use slideshow classes with the index generated by mkgallery.pl
 */
 
-var showWindow = new Class({
+var showControls = new Class({
 
 	getOptions: function(){
 		return {
-			zIndex: 2,
-			container: document.body,
-			onClick: $empty,
-		};
-	},
-
-	initialize: function(div,options){
-		this.setOptions(this.getOptions(), options);
-
-		this.options.container = $(this.options.container);
-
-		this.div = $(div);
-		this.div.setStyles({
-			position: 'absolute',
-			left: '0px',
-			top: '0px',
-			width: '100%',
-			zIndex: this.options.zIndex,
-			overflow: 'hidden',
-			display: 'none'
-		});
-		this.div.addEvent('click', function(){
-			this.options.onClick();
-		}.bind(this));
-
-		this.position();
-
-		window.addEvent('resize', this.position.bind(this));
-		window.addEvent('scroll', this.position.bind(this));
-	},
-
-	position: function(){
-		if(this.options.container == document.body){
-			var h = window.getHeight()+'px';
-			var s = window.getScrollTop()+'px';
-			this.div.setStyles({top: s, height: h});
-		}else{
-			var myCoords = this.options.container.getCoordinates();
-			this.div.setStyles({
-				top: myCoords.top+'px',
-				height: myCoords.height+'px',
-				left: myCoords.left+'px',
-				width: myCoords.width+'px'
-			});
+			next: $empty,
+			prev: $empty,
+			stop: $empty,
+			play: $empty,
+			exit: $empty,
 		}
 	},
 
-	show: function(){
-		this.div.setStyles({display: 'block'});
+	initialize: function(name,options){
+		this.setOptions(this.getOptions(), options)
+
+		this.container = $(name)
+
+		var buttons = ['prev','stop','play','next','exit','comm']
+		buttons.each(function(el){
+			var sub = new Element('div')
+			if (this.options[el]) {
+				sub.addEvent('click', function() {
+					this.options[el]()
+				}.bind(this))
+			}
+			sub.addClass('controlButton').setProperties({
+				id: el,
+				name: el,
+			}).injectInside(this.container)
+		},this)
 	},
 
-	hide: function(){
-		this.div.setStyles({display: 'none'});
-	}
-});
-showWindow.implement(new Options);
+})
+showControls.implement(new Options)
 
 /* Make overlay window and start slideshow */
-function run_slideshow(startid) {
- showwin.show();
- show.stop();
- if (startid < 0) {
-  show.play(0);
- } else {
-  show.play(startid);
-  show.stop();
- }
- return false;
+function showImage(id,doplay) {
+	var i=rimgs[id]
+	/* alert('show id='+id+' index='+i+' doplay='+doplay) */
+	showwin.show()
+	show.play(i)
+	if (!doplay) {
+		show.stop()
+	}
+	return false
 }
 
 /* Stop slideshow and return to index page */
-function stop_slideshow() {
- show.stop();
- showwin.hide();
- return false;
+function showStop() {
+	show.quit()
+	showwin.hide()
+	return false
 }
 
 /* List of lists of img variations. Each image variation is a three-element  */
@@ -96,62 +71,100 @@ function stop_slideshow() {
 var vimgs=[]
 /*
  * [
- *  [
- *   [width, height, url]
+ *  [ id, title, [
+ *                [ width, height, url ]
+ *                ...
+ *               ]
  *   ...
  *  ]
  *  ...
  * ]
 */
+/* resolve string ID to index No which is the index in vimgs[] array */
+var rimgs=[]
+
 /* Initialize everything, to be called on domready */
 function init_gallery() {
- $$('div.varimages').each(function(el){
-  var id=el.id
-  vimgs[id]=[]
-  el.getElements('a').each(function(ael,i){
-   dim = /(\d+)[^\d](\d+)/.exec(ael.text)
-   w = dim[1]
-   h = dim[2]
-   vimgs[id][i]=[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]
-  })
- })
- alert(msg)
-   /* end debugging output */
-
- var iboxparams = {
-  useOverlay: true,
-  showNumbers: false,
-  openFromLink: false,
-  descClassName: 'infoboxdesc',
- }
- ibox = new multiBox('infobox', iboxparams)
-
- var winparms = {}
- showwin = new showWindow('slideshowWindow',winparms)
-
- var showparms = {
-  wait: 3000,
-  effect: 'fade',
-  duration: 1000,
-  loop: true, 
-  thumbnails: true,
-  onClick: function(i){alert(i)}
- }
- show = new slideShow('slideshowContainer','slideshowThumbnail',showparms)
-
- parsedurl = parseUrl(document.URL)
- // alert('Anchor: '+parsedurl['anchor']+'\nURL: '+document.URL)
- if ($chk(parsedurl['anchor'])){
-  run_slideshow(parsedurl['anchor'])
- }
+	$$('.conceal').each(function(el){
+		el.setStyle('display', 'none')
+	})
+	$$('a.infoBox').each(function(el){
+		var url=el.get('href')
+		el.set('href',url+'?conceal')
+	})
+	$$('a.showStart').each(function(el){
+		el.addEvent('click', showImage.bind(el,[el.get('id'),1]))
+	})
+	$$('a.showImage').each(function(el){
+		el.addEvent('click', showImage.bind(el,[el.get('id'),0]))
+	})
+	$$('div.varimages').each(function(el,i){
+		rimgs[el.id] = i
+		vimgs[i] = []
+		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]
+		})
+	})
+
+			/* 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]
+		})
+	})
+	alert(msg)
+			/* end debugging output */
+
+	var ovlparams = {}
+	ovl = new overlay(ovlparams)
+
+	var iboxparams = {
+		overlay: ovl,
+		showNumbers: false,
+		showControls: true,
+		openFromLink: false,
+		movieWidth: 640,
+		movieHeight: 480,
+		descClassName: 'infoBoxDesc',
+	}
+	ibox = new multiBox('infoBox', iboxparams)
+
+	var winparms = {
+		/* onClick: showStop,  /* temporarily */
+		embed: ['slideshowControls'],
+	}
+	showwin = new showWindow('slideshowContainer',winparms)
+
+	var showparms = {
+		wait: 3000,
+		effect: 'fade',
+		duration: 1000,
+		loop: false, 
+		thumbnails: false,
+		onClick: function(i){alert(i)},
+		comment: 'comm',
+	}
+	show = new slideShow('slideshowContainer',vimgs,showparms)
+
+	var ctlparams = {
+		next: function(){show.next()},
+		prev: function(){show.previous()},
+		stop: function(){show.stop()},
+		play: function(){show.play()},
+		exit: function(){showStop()},
+	}
+	ctl = new showControls('slideshowControls',ctlparams)
+
+	parsedurl = parseUrl(document.URL)
+	/* alert('Anchor: '+parsedurl['anchor']+'\nURL: '+document.URL) */
+	if ($chk(parsedurl['anchor'])){
+		showImage(parsedurl['anchor'],0)
+	}
 }
 
 /* Initialization */