Reviewed by Ken and John.

	<rdar://problem/3759228> REGRESSION (Mail): stray characters when entering text via input method right after newline

	* khtml/editing/htmlediting_impl.cpp:
        (khtml::CompositeEditCommandImpl::inputText): Add an optional
	selectInsertedText parameter.
        (khtml::ReplaceSelectionCommandImpl::doApply): Let the inputText operation
	select the text when inserting plain text, because it already knows all the right
	information to do so, and this function doesn't (sometimes text is inserted
	before the start of the old selection, not after!)
        * khtml/editing/htmlediting_impl.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7630 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5236a40d17c53bc9a7c884bbe1a13dc0ff634aed..80152e40851fa5599f181ae2426cf5e6c1c7caef 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2004-09-22  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Ken and John.
+
+       <rdar://problem/3759228> REGRESSION (Mail): stray characters when entering text via input method right after newline
+        
+       * khtml/editing/htmlediting_impl.cpp:
+        (khtml::CompositeEditCommandImpl::inputText): Add an optional 
+       selectInsertedText parameter.
+        (khtml::ReplaceSelectionCommandImpl::doApply): Let the inputText operation
+       select the text when inserting plain text, because it already knows all the right
+       information to do so, and this function doesn't (sometimes text is inserted
+       before the start of the old selection, not after!)
+        * khtml/editing/htmlediting_impl.h:
+
 2004-09-22  Richard Williamson   <rjw@apple.com>
 
        More tweaks to dashboard regions.

diff --git a/WebCore/khtml/editing/htmlediting_impl.cpp b/WebCore/khtml/editing/htmlediting_impl.cpp
index 6941d57fa67cc52c992b0cabb7ee0758b9762fd8..ffe342030fad2362628f4995951bc3cf5bba9b97 100644 (file)
--- a/WebCore/khtml/editing/htmlediting_impl.cpp
+++ b/WebCore/khtml/editing/htmlediting_impl.cpp
@@ -501,11 +501,11 @@ void CompositeEditCommandImpl::joinTextNodes(TextImpl *text1, TextImpl *text2)
     applyCommandToComposite(cmd);
 }
 
-void CompositeEditCommandImpl::inputText(const DOMString &text)
+void CompositeEditCommandImpl::inputText(const DOMString &text, bool selectInsertedText)
 {
     InputTextCommand cmd(document());
     applyCommandToComposite(cmd);
-    cmd.input(text);
+    cmd.input(text, selectInsertedText);
 }
 
 void CompositeEditCommandImpl::insertText(TextImpl *node, long offset, const DOMString &text)
@@ -1552,16 +1552,12 @@ Position InputTextCommandImpl::prepareForTextInsertion(bool adjustDownstream)
             LOG(Editing, "prepareForTextInsertion case 1");
             appendNode(nodeToInsert, pos.node());
         }
-        else if (pos.node()->id() == ID_BR && pos.offset() == 1) {
-            LOG(Editing, "prepareForTextInsertion case 2");
-            insertNodeAfter(nodeToInsert, pos.node());
-        }
         else if (pos.node()->caretMinOffset() == pos.offset()) {
-            LOG(Editing, "prepareForTextInsertion case 3");
+            LOG(Editing, "prepareForTextInsertion case 2");
             insertNodeBefore(nodeToInsert, pos.node());
         }
         else if (pos.node()->caretMaxOffset() == pos.offset()) {
-            LOG(Editing, "prepareForTextInsertion case 4");
+            LOG(Editing, "prepareForTextInsertion case 3");
             insertNodeAfter(nodeToInsert, pos.node());
         }
         else
@@ -1913,12 +1909,8 @@ void ReplaceSelectionCommandImpl::doApply()
         if (addTrailingSpace) {
             text += " ";
         }
-        inputText(text);
-        if (m_selectReplacement) {
-            // Select what was inserted.
-            setEndingSelection(Selection(selection.base(), endingSelection().extent()));
-        }
-        else {
+        inputText(text, m_selectReplacement);
+        if (!m_selectReplacement) {
             // Mark misspellings in the inserted content.
             markMisspellingsInSelection(Selection(upstreamStart, endingSelection().extent()));
         }

diff --git a/WebCore/khtml/editing/htmlediting_impl.h b/WebCore/khtml/editing/htmlediting_impl.h
index 1e4766b4bb7a9c44d27c515ce70800ecab7e24bf..f992cd02dc36d69da477dc5291632b89915dfad2 100644 (file)
--- a/WebCore/khtml/editing/htmlediting_impl.h
+++ b/WebCore/khtml/editing/htmlediting_impl.h
@@ -152,7 +152,7 @@ protected:
     void deleteSelection();
     void deleteSelection(const DOM::Selection &selection);
     void deleteText(DOM::TextImpl *node, long offset, long count);
-    void inputText(const DOM::DOMString &text);
+    void inputText(const DOM::DOMString &text, bool selectInsertedText = false);
     void insertNodeAfter(DOM::NodeImpl *insertChild, DOM::NodeImpl *refChild);
     void insertNodeAt(DOM::NodeImpl *insertChild, DOM::NodeImpl *refChild, long offset);
     void insertNodeBefore(DOM::NodeImpl *insertChild, DOM::NodeImpl *refChild);