corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 253870 - Make disabled form controls selectable. r=masayuki,MarcoZ

Browse Source 
This rejiggers a bit the way selection focus is handled so that focusing a
disabled form control with the mouse handles selection properly, and hides the
document selection and so on.

This matches the behavior of other browsers as far as I can tell.

Given now readonly and disabled editors behave the same, we can simplify a bit
the surrounding editor code.

Differential Revision: https://phabricator.services.mozilla.com/D66464
This commit is contained in:
Emilio Cobos Álvarez
2020-03-19 13:18:16 +00:00
parent 06fecea7d2
commit b9ac81d824
32 changed files with 347 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
layout/forms/nsTextControlFrame.cpp
View File

@@ -1053,42 +1053,21 @@ nsresult nsTextControlFrame::AttributeChanged(int32_t aNameSpaceID,
return NS_OK;
}
if (nsGkAtoms::readonly == aAttribute) {
if (AttributeExists(nsGkAtoms::readonly)) { // set readonly
if (nsGkAtoms::readonly == aAttribute || nsGkAtoms::disabled == aAttribute) {
if (AttributeExists(aAttribute)) {
if (nsContentUtils::IsFocusedContent(mContent)) {
selCon->SetCaretEnabled(false);
}
textEditor->AddFlags(nsIEditor::eEditorReadonlyMask);
} else { // unset readonly
if (!textEditor->IsDisabled() &&
nsContentUtils::IsFocusedContent(mContent)) {
selCon->SetCaretEnabled(true);
}
textEditor->RemoveFlags(nsIEditor::eEditorReadonlyMask);
}
return NS_OK;
}
if (nsGkAtoms::disabled == aAttribute) {
int16_t displaySelection = nsISelectionController::SELECTION_OFF;
const bool focused = nsContentUtils::IsFocusedContent(mContent);
const bool hasAttr = AttributeExists(nsGkAtoms::disabled);
bool disable;
if (hasAttr) { // set disabled
disable = true;
} else { // unset disabled
disable = false;
displaySelection = focused ? nsISelectionController::SELECTION_ON
: nsISelectionController::SELECTION_HIDDEN;
}
selCon->SetDisplaySelection(displaySelection);
if (focused) {
selCon->SetCaretEnabled(!hasAttr);
}
if (disable) {
textEditor->AddFlags(nsIEditor::eEditorDisabledMask);
} else {
textEditor->RemoveFlags(nsIEditor::eEditorDisabledMask);
if (!AttributeExists(aAttribute == nsGkAtoms::readonly
? nsGkAtoms::disabled
: nsGkAtoms::readonly)) {
if (nsContentUtils::IsFocusedContent(mContent)) {
selCon->SetCaretEnabled(true);
}
textEditor->RemoveFlags(nsIEditor::eEditorReadonlyMask);
}
}
return NS_OK;
}