From 2523d0f984304d8ea6880e487d436d1ad8a02538 Mon Sep 17 00:00:00 2001 From: Edward Date: Mon, 16 Jun 2014 14:15:40 +0800 Subject: [PATCH] ux/Lightbox.js --- ux/Lightbox.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/ux/Lightbox.js b/ux/Lightbox.js index 5fd0a65ca4..1091755dfb 100644 --- a/ux/Lightbox.js +++ b/ux/Lightbox.js @@ -443,11 +443,6 @@ 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; @@ -478,8 +473,7 @@ 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; @@ -488,15 +482,11 @@ Roo.apply(Roo.ux.Lightbox.prototype, var widthNew = imgWidth + bs; var heightNew = imgHeight + bs; - Roo.log(widthNew); - Roo.log(heightNew); + if (widthNew > ww || heightNew > wh) { // bigger than window. // scale here... - bit nasty.. - Roo.log(widthNew / ww ); - Roo.log(heightNew / wh); 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); -- 2.39.2