X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=include%2Fgallery.js;h=25a2a5a285d876297cd6b36c6d3edf3bd4d8da99;hp=690ac57dfb24ddda6893bdd7518acfa49a30f98a;hb=af2f2275168124e103af685035fafdc0755d45be;hpb=fc80339e3c4b8d62c2138734f8b778bd714aa46b

diff --git a/include/gallery.js b/include/gallery.js
index 690ac57..25a2a5a 100644
--- a/include/gallery.js
+++ b/include/gallery.js
@@ -1,4 +1,6 @@
 /*
+	$Id$
+
         This is a part of mkgallery.pl suite
         http://www.average.org/mkgallery/
 
@@ -26,7 +28,11 @@ var showWindow = new Class({
 
 		this.options.container = $(this.options.container)
 
-		this.container = new Element('div').addClass(name).setStyles({
+		this.container = new Element('div').addClass(name).
+		setProperties({
+			id: name,
+			name: name,
+		}).setStyles({
 			position: 'absolute',
 			left: '0px',
 			top: '0px',
@@ -38,12 +44,14 @@ var showWindow = new Class({
 			this.options.onClick()
 		}.bind(this)).injectInside(this.options.container);
 
+		this.embedded = []
 		this.options.embed.each(function(el){
 			var sub = new Element('div')
 			sub.addClass(el).setProperties({
 				id: el,
 				name: el,
 			}).injectInside(this.container)
+			this.embedded.push(sub)
 		},this)
 
 		this.position()
@@ -54,18 +62,17 @@ var showWindow = new Class({
 
 	position: function(){
 		if(this.options.container == document.body){
-			var h = window.getHeight()+'px'
-			var s = window.getScrollTop()+'px'
-			this.container.setStyles({top: s, height: h})
+			this.h = window.getHeight()
+			this.s = window.getScrollTop()
 		}else{
 			var myCoords = this.options.container.getCoordinates()
-			this.container.setStyles({
-				top: myCoords.top+'px',
-				height: myCoords.height+'px',
-				left: myCoords.left+'px',
-				width: myCoords.width+'px'
-			})
+			this.h = myCoords.height
+			this.s = myCoords.top
 		}
+		this.container.setStyles({
+			top: this.s+'px',
+			height: this.h+'px'
+		})
 	},
 
 	show: function(){
@@ -98,14 +105,6 @@ var showControls = new Class({
 		var buttons = ['prev','stop','play','next','exit','comm']
 		buttons.each(function(el){
 			var sub = new Element('div')
-			if (el == 'comm') {
-				this.comm = sub
-				sub.set('text', 'this is a comment field')
-			/*
-			} else {
-				sub.set('text', el)
-			*/
-			}
 			if (this.options[el]) {
 				sub.addEvent('click', function() {
 					this.options[el]()
@@ -118,15 +117,12 @@ var showControls = new Class({
 		},this)
 	},
 
-	settext: function(text) {
-		this.comm.set(text)
-	}
 })
 showControls.implement(new Options)
 
 /* Make overlay window and start slideshow */
 function showImage(id,doplay) {
- var i=rimgs[id][0]
+ var i=rimgs[id]
  /* alert('show id='+id+' index='+i+' doplay='+doplay) */
  showwin.show()
  show.play(i)
@@ -195,13 +191,13 @@ function init_gallery() {
   el.addEvent('click', showImage.bind(el,[el.get('id'),0]))
  })
  $$('div.varimages').each(function(el,i){
-  rimgs[el.id] = [i, el.title]
+  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]
+   vimgs[i][j]=[w,h,ael.href,el.id,el.title]
   })
  })
    /* debugging output
@@ -231,9 +227,9 @@ function init_gallery() {
 
  var winparms = {
   /* onClick: showStop,  /* temporarily */
-  embed: ['slideshowContainer', 'slideshowControls'],
+  embed: ['slideshowControls'],
  }
- showwin = new showWindow('slideshowWindow',winparms)
+ showwin = new showWindow('slideshowContainer',winparms)
 
  var showparms = {
   wait: 3000,
@@ -241,7 +237,8 @@ function init_gallery() {
   duration: 1000,
   loop: false, 
   thumbnails: false,
-  onClick: function(i){alert(i)}
+  onClick: function(i){alert(i)},
+  comment: 'comm',
  }
  show = new slideShow('slideshowContainer',vimgs,showparms)