icecat: add release icecat-140.6.0-1gnu1 for aramo
This commit is contained in:
parent
92fef42cd6
commit
17ba0259bf
3382 changed files with 457689 additions and 569094 deletions
|
|
@ -435,6 +435,7 @@ nsresult HTMLEditor::Init(Document& aDocument,
|
|||
|
||||
MOZ_ASSERT(!mInitSucceeded, "HTMLEditor::Init() shouldn't be nested");
|
||||
mInitSucceeded = true;
|
||||
editActionData.OnEditorInitialized();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
@ -4699,6 +4700,22 @@ nsresult HTMLEditor::EnsureNoFollowingUnnecessaryLineBreak(
|
|||
return NS_OK;
|
||||
}
|
||||
if (unnecessaryLineBreak->IsHTMLBRElement()) {
|
||||
// If the found unnecessary <br> is a preceding one of a mailcite which is a
|
||||
// <span> styled as block, we need to preserve the <br> element for the
|
||||
// serializer to cause a line break before the mailcite.
|
||||
if (IsPlaintextMailComposer()) {
|
||||
const WSScanResult nextThing =
|
||||
WSRunScanner::ScanInclusiveNextVisibleNodeOrBlockBoundary(
|
||||
WSRunScanner::Scan::All,
|
||||
unnecessaryLineBreak->After<EditorRawDOMPoint>(),
|
||||
BlockInlineCheck::UseComputedDisplayOutsideStyle);
|
||||
if (nextThing.ReachedOtherBlockElement() &&
|
||||
HTMLEditUtils::IsMailCite(*nextThing.ElementPtr()) &&
|
||||
HTMLEditUtils::IsInlineContent(
|
||||
*nextThing.ElementPtr(), BlockInlineCheck::UseHTMLDefaultStyle)) {
|
||||
return NS_OK;
|
||||
}
|
||||
}
|
||||
// If the invisible break is a placeholder of ancestor inline elements, we
|
||||
// should not delete it to allow users to insert text with the format
|
||||
// specified by them.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue