to stop leaking showwin's internals, make a trivial getter

[mkgallery.git] / include / show.js

diff --git a/include/show.js b/include/show.js
index 5016928d2c1cef6718a1298260954e8616a3e461..b9ee1a08d8ef154c1ff26971db1acb92f7744968 100644 (file)
--- a/include/show.js
+++ b/include/show.js
@@ -75,9 +75,9 @@ var Show = new Class({
                        set('class', 'mainformat').
                        setProperty('alt', 'Current Image').
                        setStyle('opacity', 0).
-                       injectInside(this.container.container);
+                       injectInside(this.container.domelement());
                this.ondisplay = this.prevdisplay.clone().
-                       injectInside(this.container.container);
+                       injectInside(this.container.domelement());
                this.loadingdiv = new Element('div').
                addClass('loading').setStyles({
                        position: 'absolute',
@@ -87,7 +87,7 @@ var Show = new Class({
                        display: 'none',
                        width: this.coords.width,
                        height: this.coords.height,
-               }).injectInside(this.container.container);
+               }).injectInside(this.container.domelement());
 
                window.addEvent('resize', this.resizer.bind(this))
        },
@@ -104,6 +104,8 @@ var Show = new Class({
        /* prev, play, stop, next, exit, comm are methods for button presses */
 
        prev: function(){
+               this.cleartimer();
+               this.stopfx();
                if (this.currentid > 0) {
                        this.show(this.currentid-1);
                } else {
@@ -112,9 +114,8 @@ var Show = new Class({
        },
 
        stop: function(){
-               if (this.isplaying) { $clear(this.timer); }
+               this.cleartimer()
                this.isplaying = false;
-               $clear(this.timer);
                this.controls.running(0);
        },
 
@@ -130,6 +131,8 @@ var Show = new Class({
        },
 
        next: function(){
+               this.cleartimer();
+               this.stopfx();
                if (this.currentid < this.vimgs.length-1) {
                        this.show(this.currentid+1);
                } else {
@@ -138,12 +141,12 @@ var Show = new Class({
        },
 
        exit: function(){
-               if (this.isplaying) { $clear(this.timer); }
+               this.cleartimer();
+               this.stopfx();
                this.prevdisplay.setStyle('display', 'none');
                this.ondisplay.setStyle('display', 'none');
-               this.stopfx();
-               this.options.cbExit();
                document.location.href = this.baseurl;
+               this.options.cbExit();
        },
 
        comm: function(){
@@ -248,7 +251,7 @@ var Show = new Class({
                });
                this.prevdisplay.dispose();
                this.prevdisplay = this.ondisplay.clone().
-               setStyle('zIndex', 2).injectInside(this.container.container);
+               setStyle('zIndex', 2).injectInside(this.container.domelement());
                newimg.replaces(this.ondisplay);
                this.ondisplay = newimg;
                this.effect();
@@ -312,6 +315,10 @@ var Show = new Class({
                this.loadingdiv.setStyle('display', 'none');
        },
 
+       cleartimer: function(){
+               if (this.isplaying) { $clear(this.timer); }
+       },
+
        stopfx: function(){
                if (this.fx) this.fx.cancel();
        },