Changeset 12925

Timestamp:

03/01/09 19:56:52 (3 years ago)

Author:

sys

Message:

textPrim editor : suppr appel HTMLEditor.insertNode -> perf catastrophiques sur insertions volumineuses (coller imposants)

File:

• trunk/Xul_XedLib/chrome/content/scenarixedlib/libUiExtra/scRichText/textBase.xbl.xml (modified) (15 diffs)

trunk/Xul_XedLib/chrome/content/scenarixedlib/libUiExtra/scRichText/textBase.xbl.xml

@@ -165 +165 @@
                                                                                 if(pInTransaction) {
                                                                                         this.insertElt(vPara, vNode, null);
-                                                                                        //this.fHTMLEditor.insertNode(vPara, vNode, 0);
                                                                                 } else {
                                                                                         vNode.appendChild(this.createPara());
@@ -178 +177 @@
                                                                                         if(pInTransaction) {
                                                                                                 this.insertElt(vCaption, vNode, vNode.firstChild);
-                                                                                                //this.fHTMLEditor.insertNode(vCaption, vNode, 0);
                                                                                         } else {
                                                                                                 vNode.insertBefore(vCaption, vNode.firstChild);
@@ -190 +188 @@
                                                                                         if(pInTransaction) {
                                                                                                 this.insertElt(vCol, vNode, vCaption ? vCaption.nextSibling : vNode.firstChild);
-                                                                                                //this.fHTMLEditor.insertNode(vCol, vNode, vCaption ? 1 : 0);
                                                                                         } else {
                                                                                                 vNode.insertBefore(vCol, vCaption ? vCaption.nextSibling : vNode.firstChild);
@@ -202 +199 @@
                                                                                         if(pInTransaction) {
                                                                                                 this.insertElt(vTR, vNode, null);
-                                                                                                //this.fHTMLEditor.insertNode(vTR, vNode, vNode.childNodes.length);
                                                                                         } else {
                                                                                                 vNode.appendChild(vTR);
@@ -220 +216 @@
                                                                                                 if(pInTransaction) {
                                                                                                         this.insertElt(vNewTD, vNode, null);
-                                                                                                        //this.fHTMLEditor.insertNode(vNewTD, vNode, vNode.childNodes.length);
                                                                                                 } else {
                                                                                                         vNode.appendChild(vNewTD);
@@ -244 +239 @@
                                                                 if( ! vNode.hasChildNodes() || vNode.lastChild.nodeName!="BR") {
                                                                         if(pInTransaction) {
-                                                                                this.fHTMLEditor.insertNode(vDoc.createElement("BR"), vNode, vNode.childNodes.length);
+                                                                                this.insertElt(vDoc.createElement("BR"), vNode, null);
                                                                         } else {
                                                                                 vNode.appendChild(vDoc.createElement("BR"));
@@ -2453 +2448 @@
                                                 if(pRole) vTR.setAttribute("role", pRole);
                                                 this.insertElt(vTR, pTable, pBefore);
-                                                //this.fHTMLEditor.insertNode(vTR, pTable, pBefore ? this.getOffsetInParent(pBefore) : pTable.childNodes.length);
                                                 this.checkForEdit(vTR, true);
                                         }
@@ -3750 +3744 @@
                                                                                                 if(vCh.nodeName != "BR") {
                                                                                                         this.deleteElt(vCh);
-                                                                                                        this.fHTMLEditor.insertNode(vCh, vReceiver, vReceiver.childNodes.length - 1);
+                                                                                                        this.insertElt(vCh, vReceiver, vReceiver.lastChild);
                                                                                                 }
                                                                                                 vCh = vNext;
@@ -4047 +4041 @@
                                 ]]></body>
                         </method>
+                        <!-- Transaction pour l'insertion d'un tableau de noeuds. -->
+                        <method name="insertElts">
+                                <parameter name="pNodes"/>
+                                <parameter name="pParent"/>
+                                <parameter name="pBefore"/>
+                                <body><![CDATA[
+                                        var vTrans = {  fNodes : pNodes, 
+                                                                        fParent : pParent, 
+                                                                        fNext : pBefore,
+                                                                        merge : function(pTrans){return false;},
+                                                                        isTransient : false
+                                                                };
+                                        
+                                        vTrans.doTransaction = function(){
+                                                for(var i = 0; i < this.fNodes.length; i++) {
+                                                        this.fParent.insertBefore(this.fNodes[i], this.fNext);
+                                                }
+                                        }
+                                        vTrans.undoTransaction = function(){
+                                                for(var i = this.fNodes.length - 1; i >=0 ; i--) {
+                                                        this.fParent.removeChild(this.fNodes[i]);
+                                                }
+                                        }
+                                        vTrans.redoTransaction = function(){
+                                                this.doTransaction();
+                                        }
+                                        this.fHTMLEditor.doTransaction(vTrans);
+                                ]]></body>
+                        </method>
                         <!-- Transaction pour replacer la sélection sur un undo -->
                         <method name="addTransSelForUndo">
@@ -4183 +4206 @@
                                         //On insert le texte
                                         if(pParent.nodeType == 1) {
-                                                //On est pas dans un text, on cherche un frère de type text
+                                                //On n'est pas dans un text, on cherche un frère de type text
                                                 var vNode = pParent.childNodes[pOffset];
                                                 if(vNode && vNode.nodeType == 3) {
@@ -4195 +4218 @@
                                                         } else {
                                                                 //Pas de noeud text autour, on crée un nouveau noeud.
-                                                                this.fHTMLEditor.insertNode(this.fHTMLEditor.document.createTextNode(pCdata), pParent, pOffset);
+                                                                this.insertElt(this.fHTMLEditor.document.createTextNode(pCdata), pParent, pParent.childNodes[pOffset]);
                                                                 return;
                                                         }
@@ -4699 +4722 @@
                                                                 //On transforme tous les parablocks/textblock pour les insérer en member de la liste
                                                                 var vThis = this;
-                                                                var vInserted = 0;
+                                                                var vNodeToInsert = [];
                                                                 function insertBlock(pXmlParent) {
-                                                                        var vCh = pXmlParent.lastChild;
+                                                                        var vCh = pXmlParent.firstChild;
                                                                         while(vCh) {
                                                                                 var vClass = vThis.fClasses._xml[vCh.localName];
@@ -4712 +4735 @@
                                                                                                 vThis.xml2html(vCh, vNewPara, pEraseId, vElParent);
                                                                                                 vThis.checkForEdit(vNewPara, false);
-                                                                                                vThis.fHTMLEditor.insertNode(vNewPara, vElParent, pOffset);
-                                                                                                vInserted++;
+                                                                                                vNodeToInsert.push(vNewPara);
                                                                                                 //xed.debug("result::\n"+xed.getXml(vNewPara));
                                                                                         } else if(vClass.type==6) {
@@ -4720 +4742 @@
                                                                                         }
                                                                                 }
-                                                                                vCh = vCh.previousSibling;
+                                                                                vCh = vCh.nextSibling;
                                                                         }
                                                                 }
                                                                 insertBlock(pNodeRoot);
-                                                                if(vInserted>0) {
+                                                                if(vNodeToInsert.length>0) {
+                                                                        this.insertElts(vNodeToInsert, vElParent, vElParent.childNodes.item(pOffset));
                                                                         var vRange = this.fHTMLEditor.document.createRange();
                                                                         vRange.setStart(pParent, pOffset);
-                                                                        vRange.setEnd(pParent, pOffset+vInserted);
+                                                                        vRange.setEnd(pParent, pOffset + vNodeToInsert.length);
                                                                         return vRange;
                                                                 } else return null;
@@ -4750 +4773 @@
                                                                         var vRange = this.fHTMLEditor.document.createRange();
                                                                         vRange.setStart(vElParent, pOffset);
-                                                                        var vInserted = 0;
-                                                                        while(vFrag.hasChildNodes()) {
-                                                                                this.fHTMLEditor.insertNode(vFrag.lastChild, vElParent, pOffset);
-                                                                                vInserted++;
-                                                                        }
-                                                                        vRange.setEnd(vElParent, pOffset+vInserted);
+                                                                        var vNodeToInsert = [];
+                                                                        while(vFrag.hasChildNodes()) vNodeToInsert.push(vFrag.removeChild(vFrag.firstChild));
+                                                                        this.insertElts(vNodeToInsert, vElParent, vElParent.childNodes.item(pOffset));
+                                                                        vRange.setEnd(vElParent, pOffset + vNodeToInsert.length);
                                                                         return vRange;
                                                                 }