ux/Lightbox.js

[roojs1] / ux / Lightbox.js

diff --git a/ux/Lightbox.js b/ux/Lightbox.js
index 407c867..b2c8e8b 100644 (file)
--- a/ux/Lightbox.js
+++ b/ux/Lightbox.js
@@ -163,7 +163,6 @@ Roo.apply(Roo.ux.Lightbox.prototype,
         Roo.each(ids.split(' '), 
             function(id){ 
                 var vid = id.replace(/\-/g,'');
-                Roo.log(id);
                 th[vid] = th.el.child('.'+id); 
                 if (!th[vid]) {
                     return;
@@ -395,10 +394,11 @@ Roo.apply(Roo.ux.Lightbox.prototype,
         }
         */
         var s = Roo.get(document).getScroll();
-        
-        // 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', 
@@ -409,7 +409,6 @@ Roo.apply(Roo.ux.Lightbox.prototype,
         this.lightbox.show();
         
         
-        
         this.changeImage(imageNum);
     },
 
@@ -444,13 +443,20 @@ 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);
             
-            this.lightboximage.dom.src = this.imageArray[this.activeImage].dom.href || this.imageArray[this.activeImage].dom.src;
+            Roo.log('this.imageArray[this.activeImage].dom.lheight');
+            Roo.log(this.imageArray[this.activeImage].dom.lheight);
             
-            this.resizeImageContainer(imgPreloader.getWidth(), imgPreloader.getHeight());
+            this.lightboximage.dom.src = this.imageArray[this.activeImage].href || 
+                this.imageArray[this.activeImage].dom.href || this.imageArray[this.activeImage].dom.src;
+            
+            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].dom.href || this.imageArray[this.activeImage].dom.src;
+        imgPreloader.dom.src = this.imageArray[this.activeImage].href || 
+            this.imageArray[this.activeImage].dom.href ||  this.imageArray[this.activeImage].dom.src;
     },
 
     
@@ -472,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;
         
@@ -485,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);
@@ -660,12 +669,14 @@ Roo.apply(Roo.ux.Lightbox.prototype,
         if (this.imageArray.length > this.activeImage + 1){
             preloadNextImage = Roo.DomHelper.append(document.body, { tag: 'img' } , true);
             preloadNextImage.on('load', function() { preloadNextImage.remove() });
-            preloadNextImage.dom.src = this.imageArray[this.activeImage + 1].dom.href || this.imageArray[this.activeImage + 1 ].dom.src;;
+            preloadNextImage.dom.src = this.imageArray[this.activeImage + 1].href ||
+                    this.imageArray[this.activeImage + 1].dom.href || this.imageArray[this.activeImage + 1 ].dom.src;;
         }
         if (this.activeImage > 0){
             preloadPrevImage = Roo.DomHelper.append(document.body, { tag: 'img' } , true);
             preloadPrevImage.on('load', function() { preloadPrevImage.remove() });
-            preloadPrevImage.dom.src = this.imageArray[this.activeImage - 1].dom.href || this.imageArray[this.activeImage - 1].dom.src;
+            preloadPrevImage.dom.src = this.imageArray[this.activeImage - 1].href || 
+                   this.imageArray[this.activeImage - 1].dom.href || this.imageArray[this.activeImage - 1].dom.src;
         }
     
     },