Changeset 2557

Timestamp:

04/16/10 10:55:43 (14 years ago)

Author:

nathalie.silva

Message:

Ticket #891 - alterada a função spell_checker no php - Nathalie

Location:

sandbox/expressoMail1_2/corretor_ortografico/spell_checker

Files:

• js/spell_checker.js (modified) (5 diffs)
• spell_checker.php (modified) (3 diffs)

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

@@ -412 +412 @@
 function spellCheck_cb(new_data)
 {
-         
-        var ifr= currObj.objToCheck;
+        var ifr= currObj.objToCheck;
         if(ifr.contentWindow)
             ifr=ifr.contentWindow.document;
@@ -419 +418 @@
             ifr=ifr.contentDocument;
 
-
         with(currObj);
 
@@ -426 +424 @@
         new_data = new_data.substring(1);
 
-       
-
-        if(currObj.spellingResultsDiv)
-        {
-            
-                ifr.removeChild(currObj.spellingResultsDiv.id);
-                
-        }
-
-
-         var ifr= currObj.objToCheck;
-         if(ifr.contentWindow)
-            ifr=ifr.contentWindow.document;
-         else
-            ifr=ifr.contentDocument;
-         ifr.body.innerHTML =  "";
-         var cssLink = ifr.createElement("link");
-         cssLink.href = "spell_checker/css/spell_checker.css";
-         cssLink .rel = "stylesheet";
-         cssLink .type = "text/css";            
-              //Testes nathalie - substituido
+        if(currObj.spellingResultsDiv)
+        {
+            ifr.removeChild(currObj.spellingResultsDiv.id);
+        }
+
+        var ifr= currObj.objToCheck;
+        if(ifr.contentWindow)
+           ifr=ifr.contentWindow.document;
+        else
+           ifr=ifr.contentDocument;
+        ifr.body.innerHTML =  "";
+        var cssLink = ifr.createElement("link");
+        cssLink.href = "spell_checker/css/spell_checker.css";
+        cssLink .rel = "stylesheet";
+        cssLink .type = "text/css";
+        
+        // this is not being used
         currObj.spellingResultsDiv =  ifr.createElement('span');
         currObj.spellingResultsDiv.className = 'edit_box';
@@ -457 +451 @@
         //currObj.objToCheck.style.display = "none";
         currObj.statusSpan.innerHTML = "";  
-       
-          //ifr.body.appendChild(currObj.spellingResultsDiv);
-         //alert(new_data);
-         ifr.body.innerHTML = "";
-         //alert(new_data);
-         //new_data = new_data.replace(/ </g ,"&nbsp;<");
-         //alert(new_data);
-         
-         ifr.body.innerHTML = new_data;
-         //alert(ifr.body.innerHTML);
-         ifr.body.appendChild(cssLink);
+
+        //add the new_data to iframe and the css style
+        ifr.body.innerHTML = "";
+        ifr.body.innerHTML = new_data;
+        ifr.body.appendChild(cssLink);
 
 
@@ -623 +611 @@
             query = query.replace(/\r?\n/gi, " ");  // replace \n with " " - By Nathalie
 
-            cp.call(currObj.config['spellUrl'], 'spellCheck', spellCheck_cb, query, currObj.config['varName'], languageId);
+            var browser = trim(checkBrowser());
+            
+            cp.call(currObj.config['spellUrl'], 'spellCheck', spellCheck_cb, query, currObj.config['varName'], languageId, browser);
 
 }; // end spellcheck

sandbox/expressoMail1_2/corretor_ortografico/spell_checker/spell_checker.php

@@ -162 +162 @@
  *
  *************************************************************/
-function spellCheck($string, $varName, $language)
+function spellCheck($string, $varName, $language, $browser)
 {
         //global $pspell_link; //the global link to the pspell module
@@ -181 +181 @@
         $numResults = count($words); //the number of elements in the array.
 
-        $misspelledCount = 0;   
+        $misspelledCount = 0;
+
+
+        /* There is a problem with innerHTML of IE browsers - It removes the spaces.
+         * If there are two misspelled words side by side, it makes then together (no space
+         * between then). This will be checked using this variable.
+         * */
+        $difference = 0; 
    
         //this loop looks through the words array and splits any lines of text that aren't html tags on space, preserving the spaces.
@@ -207 +214 @@
                                 {                                        
                                         $onClick = "onclick=\"setCurrentObject(" . $varName . "); showSuggestions('" . addslashes($tmpWord) . "', '" . $varName . "_" . $misspelledCount . "_" . addslashes($tmpWord) . "'); return false;\"";
-                                        $words[$i][$j] = str_replace($tmpWord, " <span " . $onClick . " id=\"" . $varName . "_" . $misspelledCount . "_" . $tmpWord . "\" class=\"highlight\">" . stripslashes($tmpWord) . " </span> ", $words[$i][$j]);
+
+                                        $difference =  $misspelledCount + 1;
+                                        if (($difference - $misspelledCount) == 1 and $browser == "ie") //if IE, adds a html space before Span tag
+                                            $words[$i][$j] = str_replace($tmpWord, "<span " . $onClick . " id=\"" . $varName . "_" . $misspelledCount . "_" . $tmpWord . "\" class=\"highlight\">" . stripslashes($tmpWord) . " </span>&nbsp;", $words[$i][$j]);
+                                        else
+                                            $words[$i][$j] = str_replace($tmpWord, "<span " . $onClick . " id=\"" . $varName . "_" . $misspelledCount . "_" . $tmpWord . "\" class=\"highlight\">" . stripslashes($tmpWord) . " </span>", $words[$i][$j]);
+
                                         $misspelledCount++;
-                                } 
+                                        
+                                }                                
                                 
                                 $words[$i][$j] = str_replace("\n", "<br />", $words[$i][$j]); //replace any breaks with <br />'s, for html display