Bug 482481 - Commands doesn't work on contained contentEditable elements; PromoteInlineRange checks that selection is editable; r+sr=peterv
This commit is contained in:
Родитель
cef3606bda
Коммит
41b3ae9881
|
@ -926,6 +926,7 @@ nsresult nsHTMLEditor::PromoteInlineRange(nsIDOMRange *inRange)
|
||||||
|
|
||||||
while ( startNode &&
|
while ( startNode &&
|
||||||
!nsTextEditUtils::IsBody(startNode) &&
|
!nsTextEditUtils::IsBody(startNode) &&
|
||||||
|
IsEditable(startNode) &&
|
||||||
IsAtFrontOfNode(startNode, startOffset) )
|
IsAtFrontOfNode(startNode, startOffset) )
|
||||||
{
|
{
|
||||||
res = GetNodeLocation(startNode, address_of(parent), &startOffset);
|
res = GetNodeLocation(startNode, address_of(parent), &startOffset);
|
||||||
|
@ -936,6 +937,7 @@ nsresult nsHTMLEditor::PromoteInlineRange(nsIDOMRange *inRange)
|
||||||
|
|
||||||
while ( endNode &&
|
while ( endNode &&
|
||||||
!nsTextEditUtils::IsBody(endNode) &&
|
!nsTextEditUtils::IsBody(endNode) &&
|
||||||
|
IsEditable(endNode) &&
|
||||||
IsAtEndOfNode(endNode, endOffset) )
|
IsAtEndOfNode(endNode, endOffset) )
|
||||||
{
|
{
|
||||||
res = GetNodeLocation(endNode, address_of(parent), &endOffset);
|
res = GetNodeLocation(endNode, address_of(parent), &endOffset);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче