projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove debugging code
[roojs1]
/
ux
/
Lightbox.js
diff --git
a/ux/Lightbox.js
b/ux/Lightbox.js
index
cbd5c6d
..
1091755
100644
(file)
--- a/
ux/Lightbox.js
+++ b/
ux/Lightbox.js
@@
-443,11
+443,11
@@
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.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;
- 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 ||
imgPreloader.remove();
}, this);
imgPreloader.dom.src = this.imageArray[this.activeImage].href ||
@@
-476,6
+476,7
@@
Roo.apply(Roo.ux.Lightbox.prototype,
ww -= 150;
wh -= 150;
ww -= 150;
wh -= 150;
+
// get new width and height
var bs = this.borderSize * 2;
// get new width and height
var bs = this.borderSize * 2;