Reviewed by Darin

        Fix for this bug:

        <rdar://problem/3915047> HItting return in empty document inserts <p> but
        insertion point does not move

        * khtml/editing/htmlediting.cpp:
        (khtml::InsertParagraphSeparatorCommand::doApply): The issue is that the
        code to insert the <p> element for the return is not detecting the fact
        that the document is empty. Inserting a <p> into an empty body will not
        "add a new line" as the user expects. With this change, we'll add a second
        <p> when the root editable element has no rendered kids.

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a1d450fa92c047184dc32740988fc97f6ccb973b..e62019e6290963f9e3e5b72f90e5265e5627e720 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2004-12-10  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by Darin
+
+        Fix for this bug:
+        
+        <rdar://problem/3915047> HItting return in empty document inserts <p> but 
+        insertion point does not move
+
+        * khtml/editing/htmlediting.cpp:
+        (khtml::InsertParagraphSeparatorCommand::doApply): The issue is that the
+        code to insert the <p> element for the return is not detecting the fact
+        that the document is empty. Inserting a <p> into an empty body will not
+        "add a new line" as the user expects. With this change, we'll add a second 
+        <p> when the root editable element has no rendered kids.
+
 2004-12-10  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by John.

diff --git a/WebCore/khtml/editing/htmlediting.cpp b/WebCore/khtml/editing/htmlediting.cpp
index a18a607080109a97b49f18c1682e8af5d46bcffd..4f01bae82bdeb0708c8d7a46708825fa41e87dda 100644 (file)
--- a/WebCore/khtml/editing/htmlediting.cpp
+++ b/WebCore/khtml/editing/htmlediting.cpp
@@ -2199,8 +2199,21 @@ void InsertParagraphSeparatorCommand::doApply()
     // If the start block is the body, just make a P tag, otherwise, make a shallow clone
     // of the the start block.
     NodeImpl *addedBlock = 0;
-    if (startBlock->id() == ID_BODY) {
+    if (startBlock == startBlock->rootEditableElement()) {
         int exceptionCode = 0;
+        if (startBlock->renderer() && !startBlock->renderer()->firstChild()) {
+            // No rendered kids in the root editable element.
+            // Just inserting a <p> in this situation is not enough, since this operation
+            // is supposed to add an additional user-visible line to the content.
+            // So, insert an extra <p> to make the one we insert right appear as the second
+            // line in the root editable element.
+            NodeImpl *extraBlock = document()->createHTMLElement("P", exceptionCode);
+            ASSERT(exceptionCode == 0);
+            appendNode(extraBlock, startBlock);
+            extraBlock->ref();
+            insertBlockPlaceholderIfNeeded(extraBlock);
+            clonedNodes.append(extraBlock);
+        }
         addedBlock = document()->createHTMLElement("P", exceptionCode);
         ASSERT(exceptionCode == 0);
         appendNode(addedBlock, startBlock);