X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=ux%2FLightbox.js;h=1091755dfb5fcba916cee82a076bcdeb14737d7a;hb=0b69a11b1055a6d3a3fd0719bdd58b5a235de0e4;hp=6c239d0ed015148fa13734fffb6a74f17eed0d8c;hpb=68fbb6ed08197f943532a378e62fc7406e08e2d8;p=roojs1

diff --git a/ux/Lightbox.js b/ux/Lightbox.js
index 6c239d0ed0..1091755dfb 100644
--- a/ux/Lightbox.js
+++ b/ux/Lightbox.js
@@ -394,10 +394,11 @@ Roo.apply(Roo.ux.Lightbox.prototype,
         }
         */
         var s = Roo.get(document).getScroll();
-        var pt = document.body.scrollTop;
-        // calculate top and left offset for the lightbox 
+         // calculate top and left offset for the lightbox 
         // weird.. why / 10?
-        var lightboxTop = s.top + (Roo.lib.Dom.getViewHeight() / 10);
+        
+        //var lightboxTop = s.top + (Roo.lib.Dom.getViewHeight() / 10);
+        var lightboxTop = (Roo.lib.Dom.getViewHeight() / 10);
         var lightboxLeft = s.left
         this.lightbox.setStyle({ 
             top: lightboxTop + 'px', 
@@ -406,8 +407,6 @@ Roo.apply(Roo.ux.Lightbox.prototype,
         })
         //console.log("show lightbox");
         this.lightbox.show();
-        // reset it... as we add crap, which messes up scolling..
-        var document.body.scrollTop = pt;
         
         
         this.changeImage(imageNum);
@@ -448,7 +447,7 @@ Roo.apply(Roo.ux.Lightbox.prototype,
             this.lightboximage.dom.src = this.imageArray[this.activeImage].href || 
                 this.imageArray[this.activeImage].dom.href || this.imageArray[this.activeImage].dom.src;
             
-            this.resizeImageContainer(imgPreloader.getWidth(), imgPreloader.getHeight());
+            this.resizeImageContainer(this.imageArray[this.activeImage].dom.lwidth || imgPreloader.getWidth(), this.imageArray[this.activeImage].dom.lheight || imgPreloader.getHeight());
             imgPreloader.remove();
         }, this);
         imgPreloader.dom.src = this.imageArray[this.activeImage].href || 
@@ -477,6 +476,7 @@ Roo.apply(Roo.ux.Lightbox.prototype,
         
         ww -= 150;
         wh -= 150;
+        
         // get new width and height
         var bs =  this.borderSize * 2;