Improve handling of multiple selections.
This commit is contained in:
parent
25e72e5fea
commit
33c856dd71
|
@ -3344,12 +3344,18 @@ HTMLEditor::GetIsSelectionEditable(bool* aIsSelectionEditable)
|
|||
RefPtr<Selection> selection = GetSelection();
|
||||
NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
|
||||
|
||||
nsINode* anchorNode = selection->GetAnchorNode();
|
||||
nsINode* focusNode = selection->GetFocusNode();
|
||||
if (!anchorNode || !focusNode) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
// Per the editing spec as of June 2012: we have to have a selection whose
|
||||
// start and end nodes are editable, and which share an ancestor editing
|
||||
// host. (Bug 766387.)
|
||||
*aIsSelectionEditable = selection->RangeCount() &&
|
||||
selection->GetAnchorNode()->IsEditable() &&
|
||||
selection->GetFocusNode()->IsEditable();
|
||||
anchorNode->IsEditable() &&
|
||||
focusNode->IsEditable();
|
||||
|
||||
if (*aIsSelectionEditable) {
|
||||
nsINode* commonAncestor =
|
||||
|
|
|
@ -3844,7 +3844,7 @@ Selection::AddItem(nsRange* aItem, int32_t* aOutIndex, bool aNoStartSelect)
|
|||
|
||||
if (mUserInitiated) {
|
||||
AutoTArray<RefPtr<nsRange>, 4> rangesToAdd;
|
||||
*aOutIndex = -1;
|
||||
*aOutIndex = int32_t(mRanges.Length()) - 1;
|
||||
|
||||
nsIDocument* doc = GetParentObject();
|
||||
bool selectEventsEnabled =
|
||||
|
|
Loading…
Reference in New Issue