Update of /cvsroot/dynapi/dynapi/src/lib/dynapi/api
In directory usw-pr-cvs1:/tmp/cvs-serv25829

Modified Files:
        dynlayer.js 
Log Message:
Since now event methods properly look for the layer refernce, the is no need to 
manually assign a lyrobj reference to all images when setting content in IE.

Index: dynlayer.js
===================================================================
RCS file: /cvsroot/dynapi/dynapi/src/lib/dynapi/api/dynlayer.js,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** dynlayer.js 2001/01/11 05:57:25     1.11
--- dynlayer.js 2001/01/11 10:22:05     1.12
***************
*** 39,49 ****
  DynLayer.createElement=function(dlyr) {
        if (dlyr.created||!dlyr.parent||dlyr.elm!=null) return;
!       if (dlyr.parent.isDocument) dlyr.dyndoc=dlyr.parent;
!     else dlyr.dyndoc=dlyr.parent.dyndoc;
        var lyr;
        if (is.ns4) {
                var recycled=dlyr.parent.doc.recycled;
                if (recycled && recycled.length>0) {
!               lyr=recycled[0];
                        DynAPI.removeFromArray(recycled,recycled[0]);
                } else {
--- 39,48 ----
  DynLayer.createElement=function(dlyr) {
        if (dlyr.created||!dlyr.parent||dlyr.elm!=null) return;
!       if (dlyr.parent.isDocument) dlyr.dyndoc=dlyr.parent; else 
dlyr.dyndoc=dlyr.parent.dyndoc;
        var lyr;
        if (is.ns4) {
                var recycled=dlyr.parent.doc.recycled;
                if (recycled && recycled.length>0) {
!                       lyr=recycled[0];
                        DynAPI.removeFromArray(recycled,recycled[0]);
                } else {
***************
*** 135,139 ****
        if (is.ns4) for (i in dlyr.doc.images) dlyr.doc.images[i].lyrobj=dlyr;
        if (is.ns5) for (i in dlyr.doc.images) dlyr.doc.images[i].lyrobj=dlyr.elm;
!       if (is.ie) for (i in dlyr.elm.all.tags("img")) 
dlyr.elm.all.tags("img")[i].lyrobj=dlyr;
  };
  DynLayer.assignChildren=function(dlyr) {
--- 134,140 ----
        if (is.ns4) for (i in dlyr.doc.images) dlyr.doc.images[i].lyrobj=dlyr;
        if (is.ns5) for (i in dlyr.doc.images) dlyr.doc.images[i].lyrobj=dlyr.elm;
! 
!       /* ilmaestro: not neded anymore
!          if (is.ie) for (i in dlyr.elm.all.tags("img")) 
dlyr.elm.all.tags("img")[i].lyrobj=dlyr; */
  };
  DynLayer.assignChildren=function(dlyr) {
***************
*** 259,263 ****
        var s="";
        if (this.html!=null) s+=this.html;
!       for (var i=0; i<this.children.length;  i++) 
s+=this.getOuterHTML(this.children[i]);
        return s;
  };
--- 260,264 ----
        var s="";
        if (this.html!=null) s+=this.html;
!       for (var i=0;i<this.children.length;i++) 
s+=this.getOuterHTML(this.children[i]);
        return s;
  };
***************
*** 405,410 ****
        this.bgColor=color;
        if (this.css==null) return;
!     if (is.ns4) this.doc.bgColor=color;
!     else this.css.backgroundColor=color;
  };
  DynLayer.prototype.getBgColor=function() {
--- 406,411 ----
        this.bgColor=color;
        if (this.css==null) return;
!       if (is.ns4) this.doc.bgColor=color;
!       else this.css.backgroundColor=color;
  };
  DynLayer.prototype.getBgColor=function() {
***************
*** 415,424 ****
        if (this.css==null) return;
        this.invokeEvent("beforeload");
!     this.elm.innerHTML=html;
!     if (is.ns4) {
                this.doc.open();
                this.doc.write(html);
                this.doc.close();
!         for (var i in this.doc.images) this.doc.images[i].lyrobj=this;
        }
        else if (is.ns5) {
--- 416,425 ----
        if (this.css==null) return;
        this.invokeEvent("beforeload");
!       this.elm.innerHTML=html;
!       if (is.ns4) {
                this.doc.open();
                this.doc.write(html);
                this.doc.close();
!               for (var i in this.doc.images) this.doc.images[i].lyrobj=this;
        }
        else if (is.ns5) {
***************
*** 429,440 ****
                var df=r.createContextualFragment(html);
                this.elm.appendChild(df);
!         for (var i in this.doc.images) this.doc.images[i].lyrobj=this.elm;
        }
!       else {
!               for (var i in this.elm.all.tags("img")) {
                        this.elm.all.tags("img")[i].lyrobj=this;
!               }
!       }
!     if (noevt!=false) this.invokeEvent("load");
  };
  DynLayer.prototype.getHTML=function() {
--- 430,440 ----
                var df=r.createContextualFragment(html);
                this.elm.appendChild(df);
!               for (var i in this.doc.images) this.doc.images[i].lyrobj=this.elm;
        }
!       /* else {       // ilMaestro: not needed anymore
!               for (var i in this.elm.all.tags("img")) 
                        this.elm.all.tags("img")[i].lyrobj=this;
!       } */
!       if (noevt!=false) this.invokeEvent("load");
  };
  DynLayer.prototype.getHTML=function() {


_______________________________________________
Dynapi-CVS mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/dynapi-cvs

Reply via email to