WebCore:
2009-04-11 Adele Peterson <adele@apple.com>
Reviewed by Dan Bernstein.
Fix for <rdar://problem/6609479> Pressing return inside a table cell that's inside quoted content will split the table
Test: editing/inserting/6609479.html
Don't break a blockquote if pasting or inserting into a table.
* editing/ReplaceSelectionCommand.cpp: (WebCore::ReplaceSelectionCommand::doApply):
* editing/TypingCommand.cpp: (WebCore::TypingCommand::insertParagraphSeparatorInQuotedContent):
LayoutTests:
2009-04-11 Adele Peterson <adele@apple.com>
Reviewed by Dan Bernstein.
Tests for <rdar://problem/6609479> Pressing return inside a table cell that's inside quoted content will split the table
* editing/inserting/5418891.html: Changed test so it doesn't involve tables.
* editing/inserting/6609479-expected.txt: Added.
* editing/inserting/6609479.html: Added.
* platform/mac/editing/inserting/5418891-expected.checksum:
* platform/mac/editing/inserting/5418891-expected.png:
* platform/mac/editing/inserting/5418891-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@42425 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/editing/TypingCommand.cpp b/WebCore/editing/TypingCommand.cpp
index 6235f7a..ecd9111 100644
--- a/WebCore/editing/TypingCommand.cpp
+++ b/WebCore/editing/TypingCommand.cpp
@@ -358,6 +358,13 @@
void TypingCommand::insertParagraphSeparatorInQuotedContent()
{
+ // If the selection starts inside a table, just insert the paragraph separator normally
+ // Breaking the blockquote would also break apart the table, which is unecessary when inserting a newline
+ if (enclosingNodeOfType(endingSelection().start(), &isTableStructureNode)) {
+ insertParagraphSeparator();
+ return;
+ }
+
applyCommandToComposite(BreakBlockquoteCommand::create(document()));
typingAddedToOpenCommand();
}
