projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6604cd6
)
ux/Lightbox.js
author
Edward
<edward@roojs.com>
Mon, 16 Jun 2014 06:15:40 +0000
(14:15 +0800)
committer
Edward
<edward@roojs.com>
Mon, 16 Jun 2014 06:15:40 +0000
(14:15 +0800)
ux/Lightbox.js
patch
|
blob
|
history
diff --git
a/ux/Lightbox.js
b/ux/Lightbox.js
index
5fd0a65
..
1091755
100644
(file)
--- 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() {
// 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.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);
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;
ww -= 150;
wh -= 150;
@@
-488,15
+482,11
@@
Roo.apply(Roo.ux.Lightbox.prototype,
var widthNew = imgWidth + bs;
var heightNew = imgHeight + bs;
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..
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);
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);
//console.log(rescale);
imgWidth = Math.floor(imgWidth / rescale);
imgHeight = Math.floor(imgHeight / rescale);