ux/Lightbox.js

[roojs1] / ux / Lightbox.js

diff --git a/ux/Lightbox.js b/ux/Lightbox.js
index 6c239d0..b2c8e8b 100644 (file)
--- 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);
@@ -444,11 +443,16 @@ Roo.apply(Roo.ux.Lightbox.prototype,
         // once image is preloaded, resize image container
 
         imgPreloader.on('load', function() {
+            Roo.log('this.imageArray[this.activeImage].dom.lwidth');
+            Roo.log(this.imageArray[this.activeImage].dom.lwidth);
+            
+            Roo.log('this.imageArray[this.activeImage].dom.lheight');
+            Roo.log(this.imageArray[this.activeImage].dom.lheight);
             
             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 || 
@@ -474,9 +478,11 @@ Roo.apply(Roo.ux.Lightbox.prototype,
         var w = window;
         var ww = w.innerWidth || (w.document.documentElement.clientWidth || w.document.body.clientWidth);
         var wh = w.innerHeight || (w.document.documentElement.clientHeight || w.document.body.clientHeight);
-        
+        Roo.log(ww);
+        Roo.log(wh);
         ww -= 150;
         wh -= 150;
+        
         // get new width and height
         var bs =  this.borderSize * 2;
         
@@ -487,6 +493,7 @@ Roo.apply(Roo.ux.Lightbox.prototype,
             // bigger than window.
             // scale here... - bit nasty..
             var rescale = 1.1 * Math.max( widthNew / ww , heightNew  / wh);
+            Roo.log(rescale);
              //console.log(rescale);
             imgWidth = Math.floor(imgWidth / rescale);
             imgHeight = Math.floor(imgHeight / rescale);