diff options
Diffstat (limited to 'WebCore/editing/JoinTextNodesCommand.cpp')
| -rw-r--r-- | WebCore/editing/JoinTextNodesCommand.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/editing/JoinTextNodesCommand.cpp b/WebCore/editing/JoinTextNodesCommand.cpp index f981481..fa0987d 100644 --- a/WebCore/editing/JoinTextNodesCommand.cpp +++ b/WebCore/editing/JoinTextNodesCommand.cpp @@ -45,6 +45,10 @@ void JoinTextNodesCommand::doApply() if (m_text1->nextSibling() != m_text2) return; + Node* parent = m_text2->parentNode(); + if (!parent || !parent->isContentEditable()) + return; + ExceptionCode ec = 0; m_text2->insertData(0, m_text1->data(), ec); if (ec) @@ -59,7 +63,7 @@ void JoinTextNodesCommand::doUnapply() return; Node* parent = m_text2->parentNode(); - if (!parent) + if (!parent || !parent->isContentEditable()) return; ExceptionCode ec = 0; |