Update of /cvsroot/dynapi/dynapi/src/lib/dynapi/gui
In directory usw-pr-cvs1:/tmp/cvs-serv19033
Modified Files:
loadpanel.js
Log Message:
Merged IE4 and IE5 code. I did this ages ago, just forgot to commit it :-)
Index: loadpanel.js
===================================================================
RCS file: /cvsroot/dynapi/dynapi/src/lib/dynapi/gui/loadpanel.js,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** loadpanel.js 2001/04/18 14:06:03 1.17
--- loadpanel.js 2001/05/04 10:13:40 1.18
***************
*** 53,57 ****
};
LoadPanel.prototype.insertInlineElements=function() {
! if (is.ie5) {
if (this.isIFrame) this.setHTML('<IFRAME ID="'+this.id+'loadElement"
STYLE="visibility: hidden; display: none;"></IFRAME>',false);
else this.setHTML('<DIV ID="'+this.id+'loadElement"
STYLE="behavior:url(#default#download)" style="display: none;"></DIV>',false);
--- 53,57 ----
};
LoadPanel.prototype.insertInlineElements=function() {
! if (is.ie) {
if (this.isIFrame) this.setHTML('<IFRAME ID="'+this.id+'loadElement"
STYLE="visibility: hidden; display: none;"></IFRAME>',false);
else this.setHTML('<DIV ID="'+this.id+'loadElement"
STYLE="behavior:url(#default#download)" style="display: none;"></DIV>',false);
***************
*** 59,69 ****
else if (is.ns4 && this.isILayer) this.setHTML('<ilayer></ilayer>',false);
else if (is.ns6) this.setHTML('<IFRAME ID="'+this.id+'loadElement"
STYLE="visibility: hidden;"></IFRAME>',false);
- else if (is.ie4) {
- if (this.useBuffer) this.setHTML('<IFRAME ID="'+this.id+'loadElement"
STYLE="visibility: hidden; display: none;"
onLoad="LoadQueue.loadHandler()"></IFRAME>',false);
- else this.setHTML('<IFRAME ID="'+this.id+'loadElement"
WIDTH="'+this.getWidth()+'" HEIGHT="'+this.getHeight()+'" STYLE="visibility: hidden;
display: none;" onLoad="LoadQueue.loadHandler()"></IFRAME>',false);
- }
};
LoadPanel.prototype.findInlineElements=function() {
! if (is.ie5) {
if (this.isIFrame)
this.loadElement=document.frames(this.id+'loadElement');
else this.loadElement=document.all(this.id+'loadElement');
--- 59,65 ----
else if (is.ns4 && this.isILayer) this.setHTML('<ilayer></ilayer>',false);
else if (is.ns6) this.setHTML('<IFRAME ID="'+this.id+'loadElement"
STYLE="visibility: hidden;"></IFRAME>',false);
};
LoadPanel.prototype.findInlineElements=function() {
! if (is.ie) {
if (this.isIFrame)
this.loadElement=document.frames(this.id+'loadElement');
else this.loadElement=document.all(this.id+'loadElement');
***************
*** 74,81 ****
}
else if (is.ns6)
this.loadElement=document.getElementById(this.id+'loadElement');
- else if (is.ie4) {
- if (this.isIFrame)
this.loadElement=document.all[this.id+'loadElement'];
- else this.loadElement=this.elm;
- }
};
LoadPanel.prototype.getFileScope=function() {
--- 70,73 ----
***************
*** 104,116 ****
var p=this.parent;
this.removeFromParent();
- // CH: Had to add this code, so NS4 does not recycle the old loadElement.
- if(is.ns4 && p.doc.recycled && p.doc.recycled.length>0) {
- delete p.doc.recycled[p.doc.recycled.length-1];
- p.doc.recycled.length--;
- }
this.html = '';
p.addChild(this);
this.isReloading=false;
! }
LoadPanel.prototype.loadHandler=function(url) {
this.url=url;
--- 96,103 ----
var p=this.parent;
this.removeFromParent();
this.html = '';
p.addChild(this);
this.isReloading=false;
! };
LoadPanel.prototype.loadHandler=function(url) {
this.url=url;
***************
*** 165,169 ****
lpanel.findInlineElements();
}
! if (is.ie5) {
if (lpanel.isIFrame) {
lpanel.loadElement.document.isLoading=true;
--- 152,156 ----
lpanel.findInlineElements();
}
! if (is.ie) {
if (lpanel.isIFrame) {
lpanel.loadElement.document.isLoading=true;
***************
*** 173,180 ****
else
lpanel.loadElement.startDownload(url,LoadQueue.loadHandler);
}
- else if (is.ie4) {
- lpanel.timerID=setInterval("if
(document.frames['"+lpanel.id+"loadElement'].document.readyState=='interactive')
{clearInterval("+lpanel.toString()+".timerID);LoadQueue.loadHandler(document.frames['"+lpanel.id+"loadElement'].document.body.innerHTML)}",250);
-
document.frames[lpanel.id+"loadElement"].document.location=url;
- }
else if (is.ns6) {
lpanel.timerID=setInterval(this.toString() +
'.loadTimer()',250);
--- 160,163 ----
***************
*** 197,201 ****
}
}
! } else if (is.ie5) {
LoadQueue.prototype.loadTimer=function() {
var lpanel=this.currentLoadPanel;
--- 180,184 ----
}
}
! } else if (is.ie) {
LoadQueue.prototype.loadTimer=function() {
var lpanel=this.currentLoadPanel;
***************
*** 239,241 ****
else DynAPI.document.captureMouseEvents();
};
! LoadPanel.queue=new LoadQueue();
--- 222,224 ----
else DynAPI.document.captureMouseEvents();
};
! LoadPanel.queue=new LoadQueue();
\ No newline at end of file
_______________________________________________
Dynapi-CVS mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/dynapi-cvs
