Bug 366682 - spellCheckRange : scan only the first word of a text node and stop; r+sr=roc

2008-12-06 19:39:47 +01:00 · 2008-12-06 19:39:47 +01:00 · 8abd186fde
--- a/editor/libeditor/html/tests/Makefile.in
+++ b/editor/libeditor/html/tests/Makefile.in
@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk

 _TEST_FILES = \
+		test_bug366682.html \
 		test_bug432225.html \
 		test_bug456244.html \
 		$(NULL)
--- a/editor/libeditor/html/tests/test_bug366682.html
+++ b/editor/libeditor/html/tests/test_bug366682.html
@ -0,0 +1,86 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=366682
+-->
+<head>
+  <title>Test for Bug 366682</title>
+  <script type="application/javascript" src="/MochiKit/MochiKit.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>  
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=366682">Mozilla Bug 366682</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 366682 **/
+
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(runTest);
+
+var gMisspeltWords;
+
+function getEdit() {
+  return document.getElementById('edit');
+}
+
+function editDoc() {
+  return getEdit().contentDocument;
+}
+
+function getSpellCheckSelection() {
+  var Ci = Components.interfaces;
+  var win = editDoc().defaultView;
+  var editingSession = win.QueryInterface(Ci.nsIInterfaceRequestor)
+                          .getInterface(Ci.nsIWebNavigation)
+                          .QueryInterface(Ci.nsIInterfaceRequestor)
+                          .getInterface(Ci.nsIEditingSession);
+  var editor = editingSession.getEditorForWindow(win);
+  var selcon = editor.selectionController;
+  return selcon.getSelection(selcon.SELECTION_SPELLCHECK);  
+}
+
+function runTest() {
+  editDoc().body.innerHTML = "<div>errror and an other errror</div>";
+  gMisspeltWords = ["errror", "errror"];
+  editDoc().designMode = "on";
+  setTimeout(function() { evalTest(); }, 0);
+}  
+ 
+function evalTest() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  is(isSpellingCheckOk(), true, "All misspellings accounted for.");
+  SimpleTest.finish();
+}
+
+function isSpellingCheckOk() {
+  var sel = getSpellCheckSelection();
+  var numWords = sel.rangeCount;
+  
+  is(numWords, gMisspeltWords.length, "Correct number of misspellings and words.");
+  
+  if (numWords != gMisspeltWords.length) 
+    return false;
+  
+  for (var i=0; i<numWords; i++) {
+    var word = sel.getRangeAt(i);
+    is (word, gMisspeltWords[i], "Misspelling is what we think it is.");
+    if (word != gMisspeltWords[i])
+      return false;
+  }
+  return true;
+}
+
+</script>
+</pre>
+
+<iframe id="edit" width="200" height="100" src="about:blank"></iframe>
+
+</body>
+</html>
--- a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
@ -190,14 +190,20 @@ FindNextTextNode(nsIDOMNode* aNode, PRInt32 aOffset, nsIDOMNode* aRoot)
  if (child) {
    checkNode = child;
  } else {
-    // aOffset was beyond the end of the child list. Start checking at the next
-    // node after the last child, or aNode if there are no children.
-    aNode->GetLastChild(getter_AddRefs(child));
-    if (child) {
-      checkNode = FindNextNode(child, aRoot);
-    } else {
-      checkNode = FindNextNode(aNode, aRoot);
+    // aOffset was beyond the end of the child list. 
+    // goto next node in a preorder DOM traversal.
+    nsCOMPtr<nsIDOMNode> next;
+    aNode->GetNextSibling(getter_AddRefs(next));
+    while (!next) {
+      // Go up
+      aNode->GetParentNode(getter_AddRefs(next));
+      if (next == aRoot || !next) {
+        return nsnull;
+      }
+      aNode = next;
+      aNode->GetNextSibling(getter_AddRefs(next));
    }
+    checkNode = next;
  }
  
  while (checkNode && !IsTextNode(checkNode)) {