Changeset 2404

Timestamp:

04/01/10 15:38:01 (14 years ago)

Author:

nathalie.silva

Message:

Ticket #891 - Correção de problemas quando utiliza HTML - aceita todas as tags. Nathalie

File:

• sandbox/expressoMail1_2/corretor_ortografico/spell_checker/js/spell_checker.js (modified) (7 diffs)

sandbox/expressoMail1_2/corretor_ortografico/spell_checker/js/spell_checker.js

@@ -120 +120 @@
         var ifr = document.getElementsByTagName('iframe')[0];
         var numSpellCheckers = 0;
-        var tempSpellCheckers = Array();
-      //  alert("NOT OK");
-
-         //novo
-         //if (textareas){
+        //var tempSpellCheckers = Array();
+                
         if(ifr.contentWindow)
            ifr=ifr.contentWindow.document;
         else
            ifr=ifr.contentDocument;
-       //  alert(ifr.body.innerHTML);
-         var texto = ifr.body.innerHTML;
+        var texto = ifr.body.innerHTML;
 
        //  alert("valor textarea");
@@ -376 +372 @@
         
         
-        //Adicionado por Nathalie
+        // Obtain the HTML content from iframe (edit area)
          var ifr= currObj.objToCheck;
          if(ifr.contentWindow)
@@ -382 +378 @@
          else
             ifr=ifr.contentDocument;
-            alert(ifr.body.innerHTML);
-
          var texto = ifr.body.innerHTML;
         
@@ -695 +689 @@
 {
         with(currObj);
+        var parentElement = currObj.spellingResultsDiv;
+
+        // Obtain all span tags which have highlight className or corrected_word className
+        var nodeArray = parentElement.getElementsByTagName("span");
+        var totArray = nodeArray.length;
+        var nodeRemove = new Array(totArray);
+        var j = -1;
+        for (var i = 0 ; i < totArray ; i++) {
+            var node = nodeArray[i];
+            if (node.className == "highlight" || node.className == "corrected_word") {
+                j++;
+                nodeRemove[j] = node.id;
+                
+                
+            }
+        }
+
+        //Remove span tags which have highlight className or corrected_word className
+        for (var i = 0 ; i <= j ; i++) {
+            var valorNo = document.getElementById(nodeRemove[i]).innerHTML;
+            var fake = document.createTextNode(valorNo);
+            var parent =  document.getElementById(nodeRemove[i]).parentNode;
+            parent.replaceChild(fake, document.getElementById(nodeRemove[i]));            
+        }
         var text = currObj.spellingResultsDiv.innerHTML;
-        text = text.replace(/<br *\/?>/gi, "~~~");
-        // Work around a cpaint/safari bug by prefixing an asterisk to the text so that the text is never completely empty
-        text = '*' + text;
-        cp.call(currObj.config['spellUrl'], 'switchText', switchText_cb, text);
+
+        text = text.replace(/&nbsp;/gi, " %u2026 "); // Replace &nbsp; with the code %u2026
+        text = '*' + text;
+        cp.call(currObj.config['spellUrl'], 'switchText', switchText_cb, text);
+        
 }; // end switchText
 
@@ -717 +736 @@
 {
         with(currObj);
+        
+        new_string = new_string.replace(/ %u2026/gi, "&nbsp;"); // Replace the code %u2026 with &nbsp;
+             
         new_string = new_string.replace(/~~~/gi, "\n");
-
+       
         // Remove the prefixed asterisk that was added in switchText().
         new_string = new_string.substr(1);
+
+
         currObj.objToCheck.style.display = "none";
          var ifr= currObj.objToCheck;
@@ -727 +751 @@
          else
             ifr=ifr.contentDocument;
-            alert(ifr.body.innerHTML);
          var texto = ifr.body.innerHTML;
+     
          ifr.body.innerHTML = new_string;
         currObj.objToCheck.disabled = false;
@@ -769 +793 @@
                 currObj.statusSpan.innerHTML = "Working...";
         }
+       
         
         if(spellingSuggestionsDiv)
         {
-                spellingSuggestionsDiv.parentNode.removeChild(spellingSuggestionsDiv);
+                
+                spellingSuggestionsDiv.parentNode.removeChild(spellingSuggestionsDiv);
                 spellingSuggestionsDiv = null;
         }