Changeset 8861

Timestamp:

03/05/07 10:41:46 (5 years ago)

Author:

sys

Message:

Debuggage implémentation ctrlC / ctrlX dans champs textes pour la gestion des espaces inséccables.

Location:

trunk

Files:

• Xul_Cms/chrome/content/scenaricms/widgets/sctab/texteditor.xbl.xml (modified) (2 diffs)
• Xul_XedLib/chrome/content/scenarixedlib/core/xed.js (modified) (1 diff)

trunk/Xul_Cms/chrome/content/scenaricms/widgets/sctab/texteditor.xbl.xml

@@ -83 +83 @@
                                 this.fDraftTextBox.style.color="#666666";
                                 
-                                //Controller copie de XEDInputController.
+                                //Controller copie de XEDInputController (nécessaire pour préservaion des espaces inséccables dans le copier/coller).
                                 var vController = {
                                         fInput : this.fEditorBox.inputField,
@@ -102 +102 @@
                 return;
         }
-        //ut.debug("XEDInputController!!!!!!!"+pCmd);
         //On copie
         var vSel = vEditor.selection;
+        if(vSel.isCollapsed) return;
         var vRange = vSel.getRangeAt(0);
-        var vCurrNode = vRange.startContainer;
-        var vStartOffs = vRange.startOffset;
-        if(vCurrNode.nodeType!=3) {
-                vCurrNode = vCurrNode.fisrtChild;
-                if(vCurrNode.nodeType!=3) return;
-                vStartOffs = 0;
-        }
+        var vStartNode = vRange.startContainer;
         var vEndNode = vRange.endContainer;
-        var vEndOffs = vRange.endOffset;
-        if(vEndNode.nodeType!=3) {
-                vEndNode = vEndNode.lastChild;
-                while(vEndNode && vEndNode.nodeType!=3) {
-                        vEndNode = vEndNode.previsouSibling;
+        
+        var vResult = "";
+        
+        if(vStartNode == vEndNode) {
+                vResult = vStartNode.substringData(vRange.startOffset, vRange.endOffset - vRange.startOffset);
+        } else {
+                var vTw = vStartNode.ownerDocument.createTreeWalker(vRange.commonAncestorContainer, NodeFilter.SHOW_ELEMENT|NodeFilter.SHOW_TEXT|NodeFilter.SHOW_CDATA_SECTION, null, true);
+                var vCurrNode = vTw.currentNode;
+                while(vCurrNode && vCurrNode != vStartNode) vCurrNode = vTw.nextNode();
+                
+                if(vCurrNode == vStartNode) {
+                        if(vStartNode.nodeType==3) {
+                                vResult += vStartNode.substringData(vRange.startOffset, vStartNode.length - vRange.startOffset);
+                                vCurrNode = vTw.nextNode();
+                        } else {
+                                vCurrNode = vTw.currentNode = vStartNode.childNodes.item(vRange.startOffset);
+                        }
                 }
-                if(!vEndNode) return;
-                vEndOffs = vEndNode.length;
-        }
-        
-        var vResult;
-        if(vCurrNode == vEndNode) {
-                vResult = vCurrNode.substringData(vStartOffs, vEndOffs - vStartOffs);
-        } else {
-                vResult = vCurrNode.substringData(vStartOffs, vCurrNode.length - vStartOffs);
-                vCurrNode = vCurrNode.nextSibling;
-                while(vCurr != vEndNode) {
-                        vResult += vCurrNode.data;
-                        vCurrNode = vCurrNode.nextSibling;
+                
+                var vStopNode = vEndNode;
+                if(vEndNode.nodeType==1) vStopNode = vEndNode.childNodes.item(vRange.endOffset);
+                
+                while(vCurrNode && vCurrNode != vStopNode) {
+                        if(vCurrNode.nodeType==3) {
+                                vResult += vCurrNode.data;
+                        } else {
+                                switch(vCurrNode.localName) {
+                                        case "br" :
+                                        case "div" :
+                                        case "p" :
+                                                vResult += ut.isWin ? "\r\n" : "\n";
+                                }
+                        }
+                        vCurrNode = vTw.nextNode();
                 }
-                vResult += vEndNode.data.substringData(0, vEndOffs);
+                if(vCurrNode == vEndNode) {
+                        if(vEndNode.nodeType==3) vResult += vEndNode.substringData(0, vRange.endOffset);
+                }
         }
         

trunk/Xul_XedLib/chrome/content/scenarixedlib/core/xed.js

@@ -2123 +2123 @@
         //xed.debug("XEDInputController!!!!!!!"+pCmd);
         //On copie
+        //On copie
         var vSel = vEditor.selection;
+        if(vSel.isCollapsed) return;
         var vRange = vSel.getRangeAt(0);
-        var vCurrNode = vRange.startContainer;
-        var vStartOffs = vRange.startOffset;
-        if(vCurrNode.nodeType!=3) {
-                vCurrNode = vCurrNode.fisrtChild;
-                if(vCurrNode.nodeType!=3) return;
-                vStartOffs = 0;
-        }
+        var vStartNode = vRange.startContainer;
         var vEndNode = vRange.endContainer;
-        var vEndOffs = vRange.endOffset;
-        if(vEndNode.nodeType!=3) {
-                vEndNode = vEndNode.lastChild;
-                while(vEndNode && vEndNode.nodeType!=3) {
-                        vEndNode = vEndNode.previsouSibling;
-                }
-                if(!vEndNode) return;
-                vEndOffs = vEndNode.length;
-        }
         
-        var vResult;
-        if(vCurrNode == vEndNode) {
-                vResult = vCurrNode.substringData(vStartOffs, vEndOffs - vStartOffs);
+        var vResult = "";
+        
+        if(vStartNode == vEndNode && vStartNode.nodeType==3) {
+                vResult = vStartNode.substringData(vRange.startOffset, vRange.endOffset - vRange.startOffset);
         } else {
-                vResult = vCurrNode.substringData(vStartOffs, vCurrNode.length - vStartOffs);
-                vCurrNode = vCurrNode.nextSibling;
-                while(vCurr != vEndNode) {
-                        vResult += vCurrNode.data;
-                        vCurrNode = vCurrNode.nextSibling;
-                }
-                vResult += vEndNode.data.substringData(0, vEndOffs);
+                var vTw = vStartNode.ownerDocument.createTreeWalker(vRange.commonAncestorContainer, NodeFilter.SHOW_ELEMENT|NodeFilter.SHOW_TEXT|NodeFilter.SHOW_CDATA_SECTION, null, true);
+                var vCurrNode = vTw.currentNode;
+                while(vCurrNode && vCurrNode != vStartNode) vCurrNode = vTw.nextNode();
+                
+                if(vCurrNode == vStartNode) {
+                        if(vStartNode.nodeType==3) {
+                                vResult += vStartNode.substringData(vRange.startOffset, vStartNode.length - vRange.startOffset);
+                                vCurrNode = vTw.nextNode();
+                        } else {
+                                vCurrNode = vTw.currentNode = vStartNode.childNodes.item(vRange.startOffset);
+                        }
+                }
+                
+                var vStopNode = vEndNode;
+                if(vEndNode.nodeType==1) vStopNode = vEndNode.childNodes.item(vRange.endOffset);
+                
+                while(vCurrNode && vCurrNode != vStopNode) {
+                        if(vCurrNode.nodeType==3) {
+                                vResult += vCurrNode.data;
+                        } else {
+                                switch(vCurrNode.localName) {
+                                        case "br" :
+                                        case "div" :
+                                        case "p" :
+                                                vResult += ut.isWin ? "\r\n" : "\n";
+                                }
+                        }
+                        vCurrNode = vTw.nextNode();
+                }
+                if(vCurrNode == vEndNode) {
+                        if(vEndNode.nodeType==3) vResult += vEndNode.substringData(0, vRange.endOffset);
+                }
         }