Update of /cvsroot/dynapi/dynapi/src/lib/dynapi/api
In directory usw-pr-cvs1:/tmp/cvs-serv22867
Modified Files:
dynlayer.js
Log Message:
Moved the line this.elm.innerHTML=html; into the IE specific function for
setHTML. Two reasons for doing this: NS4 doesn't need to set innerHTML
(I've looked, it's not read anywhere else), and NS6 supports innerHTML as
well as the method being used, so the HTML was being set twice for NS6.
Index: dynlayer.js
===================================================================
RCS file: /cvsroot/dynapi/dynapi/src/lib/dynapi/api/dynlayer.js,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** dynlayer.js 2001/02/26 20:16:55 1.34
--- dynlayer.js 2001/03/08 18:39:09 1.35
***************
*** 40,44 ****
if (this.parent.isDocument) this.dyndoc=this.parent; else
this.dyndoc=this.parent.dyndoc;
! if (is.def) {
var
parentElement=(this.parent.isDynLayer)?this.parent.elm:this.parent.doc.body;
if (is.ie4) {
--- 40,44 ----
if (this.parent.isDocument) this.dyndoc=this.parent; else
this.dyndoc=this.parent.dyndoc;
! if (is.def) {
var
parentElement=(this.parent.isDynLayer)?this.parent.elm:this.parent.doc.body;
if (is.ie4) {
***************
*** 67,71 ****
this.doc=this.elm.document;
this.doc.lyrobj=this;
! }
this.elm.lyrobj=this;
this.flagPrecreate(this);
--- 67,71 ----
this.doc=this.elm.document;
this.doc.lyrobj=this;
! }
this.elm.lyrobj=this;
this.flagPrecreate(this);
***************
*** 86,90 ****
this.doc.write(this.getInnerHTML());
this.doc.close();
! for (var i in this.doc.images) this.doc.images[i].lyrobj=this;
for (i=0;i<this.doc.links.length;i++) this.doc.links[i].lyrobj=this;
}
--- 86,90 ----
this.doc.write(this.getInnerHTML());
this.doc.close();
! for (var i in this.doc.images) this.doc.images[i].lyrobj=this;
for (i=0;i<this.doc.links.length;i++) this.doc.links[i].lyrobj=this;
}
***************
*** 137,141 ****
this.doc=elm.document;
this.doc.lyrobj=this;
! for (var i in this.doc.images) this.doc.images[i].lyrobj=this;
for (i=0;i<this.doc.links.length;i++) this.doc.links[i].lyrobj=this;
}
--- 137,141 ----
this.doc=elm.document;
this.doc.lyrobj=this;
! for (var i in this.doc.images) this.doc.images[i].lyrobj=this;
for (i=0;i<this.doc.links.length;i++) this.doc.links[i].lyrobj=this;
}
***************
*** 148,152 ****
var child=this.children[i];
this.dyndoc.all[child.id]=child;
! child.dyndoc=this.dyndoc;
if (is.ns4) var elm=this.doc.layers[child.id];
else if (is.ie) var elm=this.elm.all[child.id];
--- 148,152 ----
var child=this.children[i];
this.dyndoc.all[child.id]=child;
! child.dyndoc=this.dyndoc;
if (is.ns4) var elm=this.doc.layers[child.id];
else if (is.ie) var elm=this.elm.all[child.id];
***************
*** 170,174 ****
this.invokeEvent('precreate');
}
! DynLayer.prototype.flagDeleteChildren=function() {
for (var i=0; i<this.children.length; i++) {
if (this.children[i].created) this.children[i].flagDeleteChildren();
--- 170,174 ----
this.invokeEvent('precreate');
}
! DynLayer.prototype.flagDeleteChildren=function() {
for (var i=0; i<this.children.length; i++) {
if (this.children[i].created) this.children[i].flagDeleteChildren();
***************
*** 255,261 ****
s+=' clip:rect(0px '+dlyr.w+'px '+dlyr.h+'px 0px);';
if (dlyr.z) s+=' zIndex='+dlyr.z;
! if (dlyr.bgImage!=null) s+=' background-image:url('+dlyr.bgImage+');'
if (dlyr.bgColor!=null) s+=' background-color:'+dlyr.bgColor+';'
! if (is.ie55 && dlyr.bgImage==null && dlyr.html==null) s+='
background-image:url(javascript:null);'
s+=' position:absolute;">';
if (dlyr.html!=null) s+=dlyr.html;
--- 255,261 ----
s+=' clip:rect(0px '+dlyr.w+'px '+dlyr.h+'px 0px);';
if (dlyr.z) s+=' zIndex='+dlyr.z;
! if (dlyr.bgImage!=null) s+=' background-image:url('+dlyr.bgImage+');'
if (dlyr.bgColor!=null) s+=' background-color:'+dlyr.bgColor+';'
! if (is.ie55 && dlyr.bgImage==null && dlyr.html==null) s+='
background-image:url(javascript:null);'
s+=' position:absolute;">';
if (dlyr.html!=null) s+=dlyr.html;
***************
*** 377,381 ****
DynLayer.prototype.setBgColor=function(color) {
if (color==null) {
! if (is.ns4) color=null
else color='transparent'
}
--- 377,381 ----
DynLayer.prototype.setBgColor=function(color) {
if (color==null) {
! if (is.ns4) color=null
else color='transparent'
}
***************
*** 394,404 ****
this.doc.write(sTmp)
this.doc.close()
! for (var i in this.doc.images) this.doc.images[i].lyrobj=this;
! for (i=0;i<this.doc.links.length;i++) this.doc.links[i].lyrobj=this;
}
} else if (is.ie) {
! DynLayer.prototype._setHTML=function(html) { for (i in
this.elm.all.tags("img")) this.elm.all.tags("img")[i].lyrobj=this }
! } else {
! DynLayer.prototype._setHTML=function(html) {;
sTmp=(this.w==null)?'<NOBR>'+this.html+'</NOBR>':this.html;
while (this.elm.hasChildNodes())
this.elm.removeChild(this.elm.firstChild);
--- 394,407 ----
this.doc.write(sTmp)
this.doc.close()
! for (var i in this.doc.images) this.doc.images[i].lyrobj=this;
! for (var i=0;i<this.doc.links.length;i++) this.doc.links[i].lyrobj=this;
}
} else if (is.ie) {
! DynLayer.prototype._setHTML=function(html) {
! this.elm.innerHTML=html;
! for (var i in this.elm.all.tags("img"))
this.elm.all.tags("img")[i].lyrobj=this;
! }
! } else {
! DynLayer.prototype._setHTML=function(html) {
sTmp=(this.w==null)?'<NOBR>'+this.html+'</NOBR>':this.html;
while (this.elm.hasChildNodes())
this.elm.removeChild(this.elm.firstChild);
***************
*** 408,412 ****
var df=r.createContextualFragment(sTmp);
this.elm.appendChild(df);
! for (i in this.doc.images) this.doc.images[i].lyrobj=this.elm;
}
}
--- 411,415 ----
var df=r.createContextualFragment(sTmp);
this.elm.appendChild(df);
! for (var i in this.doc.images) this.doc.images[i].lyrobj=this.elm;
}
}
***************
*** 416,420 ****
if (this.css==null) return;
if (noevt!=false) this.invokeEvent("beforeload");
- this.elm.innerHTML=html;
this._setHTML(html);
if (noevt!=false) this.invokeEvent("load");
--- 419,422 ----
***************
*** 492,496 ****
for (var i in c) c[i]=parseInt(c[i]);
return [c[0],c[1],c[2],c[3]];
! }
else return [0,this.w,this.h,0];
}
--- 494,498 ----
for (var i in c) c[i]=parseInt(c[i]);
return [c[0],c[1],c[2],c[3]];
! }
else return [0,this.w,this.h,0];
}
_______________________________________________
Dynapi-CVS mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/dynapi-cvs
