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

diff --git a/ux/Lightbox.js b/ux/Lightbox.js
index 1abfe1eb1c..1091755dfb 100644
--- a/ux/Lightbox.js
+++ b/ux/Lightbox.js
@@ -53,20 +53,13 @@ Roo.ux.Lightbox = function(cfg) {
 Roo.apply(Roo.ux.Lightbox.prototype,  
 {
     // optiosn..
-    /**
-     * @cfg fileLoadingImage {string} loading image
-     */
-    fileLoadingImage:        '/lightbox/images/loading.gif',     
-    /**
-     * @cfg fileBottomNavCloseImage {string} close image
-     */
-    fileBottomNavCloseImage: '/lightbox/images/closelabel.gif',
+     
     /**
      * @cfg overlayOpacity {number} controls transparency of shadow overlay
      */
     overlayOpacity: 0.8,   
     /**
-     * @cfg fileLoadingImage {boolean} toggles resizing animations
+     * @cfg animate {boolean} toggles resizing animations
      */
     animate: true,          
     /**
@@ -170,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;
@@ -236,7 +228,7 @@ Roo.apply(Roo.ux.Lightbox.prototype,
                 left: 0,
                 width: '100%',
                 'text-align': 'center',
-                'line-height': 0,
+                'line-height': 0
             },
             '.roo-lightbox a img' : { border: 'none'  },
             '.roo-lightbox .outer-image-container' : {
@@ -259,20 +251,20 @@ Roo.apply(Roo.ux.Lightbox.prototype,
                 'line-height':'0'
             
             },
-            '.roo-lightbox loading a' : { 
+            '.roo-lightbox .loading a' : { 
                 background:'url('+ rootURL  + '/ux/lightbox/loading.gif) 0 0 no-repeat', 
                 display:'block',
                 width:'32px',
                 height:'32px',
                 cursor:'pointer'
             },
-            '.roo-lightbox bottom-nav-close' : {
+            '.roo-lightbox .bottom-nav-close' : {
                 background:'url('+ rootURL  + '/ux/lightbox/close.gif) 0 0 no-repeat', 
                 height:'26px',
                 width:'26px',
                 cursor:'pointer'
             },
-            '.roo-lightbox .hoverNav' :{ 
+            '.roo-lightbox .hover-nav' :{ 
                 position:'absolute', 
                 top:'0', 
                 left:'0', 
@@ -310,8 +302,8 @@ Roo.apply(Roo.ux.Lightbox.prototype,
             '.roo-lightbox .image-data' : { padding:'0 10px', color: '#666' },
             '.roo-lightbox .image-data .image-details ' : { width: '70%', 'float': 'left', 'text-align': 'left'}  ,
             '.roo-lightbox .image-data .caption' : { 'font-weight': 'bold' },
-            '.roo-lightbox .image-data .numberDisplay' : { 'display': 'block', clear: 'left', 'padding-bottom': '1.0em'  } ,   
-            '.roo-lightbox .image-data .bottomNavClose' : {  'float': 'right',  'padding-bottom': '0.7em','outline': 'none'} ,
+            '.roo-lightbox .image-data .number-display' : { 'display': 'block', clear: 'left', 'padding-bottom': '1.0em'  } ,   
+            '.roo-lightbox .image-data .bottom-nav-close' : {  'float': 'right',  'padding-bottom': '0.7em','outline': 'none'} ,
             '.roo-lightbox-overlay' : {
                 'background-color': 'black',
                 height: '500px',
@@ -402,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', 
@@ -416,7 +409,6 @@ Roo.apply(Roo.ux.Lightbox.prototype,
         this.lightbox.show();
         
         
-        
         this.changeImage(imageNum);
     },
 
@@ -452,12 +444,14 @@ Roo.apply(Roo.ux.Lightbox.prototype,
 
         imgPreloader.on('load', function() {
             
-            this.lightboximage.dom.src = this.imageArray[this.activeImage].dom.href;
+            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].dom.href;
+        imgPreloader.dom.src = this.imageArray[this.activeImage].href || 
+            this.imageArray[this.activeImage].dom.href ||  this.imageArray[this.activeImage].dom.src;
     },
 
     
@@ -482,6 +476,7 @@ Roo.apply(Roo.ux.Lightbox.prototype,
         
         ww -= 150;
         wh -= 150;
+        
         // get new width and height
         var bs =  this.borderSize * 2;
         
@@ -532,8 +527,8 @@ Roo.apply(Roo.ux.Lightbox.prototype,
         }
 
         (function(){
-            this.prevlink.setStyle({ top: imgHeight + 'px' });
-            this.nextlink.setStyle({ top: imgHeight + 'px' });
+            this.prevlink.setStyle({ height: imgHeight + 'px' });
+            this.nextlink.setStyle({ height: imgHeight + 'px' });
             this.imagedatacontainer.setStyle({ width: widthNew + 'px'}); // the text area..
             this.showImage();
         }).defer(timeout / 1000, this);
@@ -667,12 +662,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;
+            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;
+            preloadPrevImage.dom.src = this.imageArray[this.activeImage - 1].href || 
+                   this.imageArray[this.activeImage - 1].dom.href || this.imageArray[this.activeImage - 1].dom.src;
         }
     
     },