Update of /cvsroot/dynapi/dynapi/src/lib/dynapi/gui
In directory usw-pr-cvs1:/tmp/cvs-serv3403
Modified Files:
dynimage.js
Log Message:
DynImage was setting DynImage.loadimages[i].origsrc and then looking for
DynImage.loadimages[i].img.origsrc in which case it wouldn't find the image, and would
create a new one. Now fixed.
Index: dynimage.js
===================================================================
RCS file: /cvsroot/dynapi/dynapi/src/lib/dynapi/gui/dynimage.js,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** dynimage.js 2001/03/31 20:12:59 1.21
--- dynimage.js 2001/04/23 17:23:07 1.22
***************
*** 12,17 ****
this.DynLayer = DynLayer;
this.DynLayer();
!
! if (typeof(arguments[0])=="string") this.setImageSrc(arguments[0]);
else if (typeof(arguments[0])=="object") this.setImage(arguments[0]);
else this.img = null;
--- 12,17 ----
this.DynLayer = DynLayer;
this.DynLayer();
!
! if (typeof(arguments[0])=="string") this.setImageSrc(arguments[0]);
else if (typeof(arguments[0])=="object") this.setImage(arguments[0]);
else this.img = null;
***************
*** 89,93 ****
DynImage.getImage=function(src,w,h) {
for (var i=0;i<DynImage.loadimages.length;i++) {
! if (DynImage.loadimages[i].img.origsrc==src ||
DynImage.loadimages[i].img.src==src)
return DynImage.loadimages[i].img;
}
--- 89,93 ----
DynImage.getImage=function(src,w,h) {
for (var i=0;i<DynImage.loadimages.length;i++) {
! if (DynImage.loadimages[i].img.origsrc==src ||
DynImage.loadimages[i].img.src==src)
return DynImage.loadimages[i].img;
}
***************
*** 95,105 ****
if (w&&h) DynImage.loadimages[i].img = new Image(w,h);
else DynImage.loadimages[i].img = new Image();
! DynImage.loadimages[i].complete = false;
! DynImage.loadimages[i].img.src=DynImage.loadimages[i].origsrc=src;
DynImage.loadimages[i].img.dynimages=[];
if (DynAPI.loaded && !DynImage.timerId) DynImage.loaderStart();
return DynImage.loadimages[i].img;
};
! DynImage.loaderStart=function() {
DynImage.timerId=setTimeout('DynImage.loadercheck()',50);
if (DynImage.onLoaderStart) DynImage.onLoaderStart();
--- 95,104 ----
if (w&&h) DynImage.loadimages[i].img = new Image(w,h);
else DynImage.loadimages[i].img = new Image();
! DynImage.loadimages[i].img.src=DynImage.loadimages[i].img.origsrc=src;
DynImage.loadimages[i].img.dynimages=[];
if (DynAPI.loaded && !DynImage.timerId) DynImage.loaderStart();
return DynImage.loadimages[i].img;
};
! DynImage.loaderStart=function() {
DynImage.timerId=setTimeout('DynImage.loadercheck()',50);
if (DynImage.onLoaderStart) DynImage.onLoaderStart();
***************
*** 113,117 ****
DynImage.timerId=setTimeout('DynImage.loadercheck()',25);
}
! else {
for (var i=0; i<DynImage.loadimages.length; i++) {
if (DynImage.loadimages[i].img.dynimages) {
--- 112,116 ----
DynImage.timerId=setTimeout('DynImage.loadercheck()',25);
}
! else {
for (var i=0; i<DynImage.loadimages.length; i++) {
if (DynImage.loadimages[i].img.dynimages) {
_______________________________________________
Dynapi-CVS mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/dynapi-cvs
