mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-06 15:58:39 +09:00
moebius#53: HTML - input - support for dynamic maxlength
https://github.com/MoonchildProductions/moebius/pull/53
This commit is contained in:
parent
9617ae4781
commit
a3fc13a8fc
4 changed files with 114 additions and 18 deletions
|
|
@ -1418,19 +1418,16 @@ nsTextEditorState::PrepareEditor(const nsAString *aValue)
|
|||
}
|
||||
}
|
||||
|
||||
if (shouldInitializeEditor) {
|
||||
// Initialize the plaintext editor
|
||||
nsCOMPtr<nsIPlaintextEditor> textEditor(do_QueryInterface(newEditor));
|
||||
if (textEditor) {
|
||||
// Initialize the plaintext editor
|
||||
nsCOMPtr<nsIPlaintextEditor> textEditor = do_QueryInterface(newEditor);
|
||||
if (textEditor) {
|
||||
if (shouldInitializeEditor) {
|
||||
// Set up wrapping
|
||||
textEditor->SetWrapColumn(GetWrapCols());
|
||||
|
||||
// Set max text field length
|
||||
int32_t maxLength;
|
||||
if (GetMaxLength(&maxLength)) {
|
||||
textEditor->SetMaxTextLength(maxLength);
|
||||
}
|
||||
}
|
||||
|
||||
// Set max text field length
|
||||
textEditor->SetMaxTextLength(GetMaxLength());
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIContent> content = do_QueryInterface(mTextCtrlElement);
|
||||
|
|
@ -1895,22 +1892,22 @@ be called if @placeholder is the empty string when trimmed from line breaks");
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
bool
|
||||
nsTextEditorState::GetMaxLength(int32_t* aMaxLength)
|
||||
int32_t
|
||||
nsTextEditorState::GetMaxLength()
|
||||
{
|
||||
nsCOMPtr<nsIContent> content = do_QueryInterface(mTextCtrlElement);
|
||||
nsGenericHTMLElement* element =
|
||||
nsGenericHTMLElement::FromContentOrNull(content);
|
||||
NS_ENSURE_TRUE(element, false);
|
||||
if (NS_WARN_IF(!element)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
const nsAttrValue* attr = element->GetParsedAttr(nsGkAtoms::maxlength);
|
||||
if (attr && attr->Type() == nsAttrValue::eInteger) {
|
||||
*aMaxLength = attr->GetIntegerValue();
|
||||
|
||||
return true;
|
||||
return attr->GetIntegerValue();
|
||||
}
|
||||
|
||||
return false;
|
||||
return -1;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ public:
|
|||
* @param aMaxLength the value of the max length attr
|
||||
* @returns false if attr not defined
|
||||
*/
|
||||
bool GetMaxLength(int32_t* aMaxLength);
|
||||
int32_t GetMaxLength();
|
||||
|
||||
void ClearValueCache() { mCachedValue.Truncate(); }
|
||||
|
||||
|
|
|
|||
|
|
@ -224,6 +224,7 @@ skip-if = toolkit == 'android' # bug 1315898
|
|||
[test_bug1328023.html]
|
||||
[test_bug1330796.html]
|
||||
[test_bug1332876.html]
|
||||
[test_bug1352799.html]
|
||||
|
||||
[test_CF_HTML_clipboard.html]
|
||||
subsuite = clipboard
|
||||
|
|
|
|||
98
editor/libeditor/tests/test_bug1352799.html
Normal file
98
editor/libeditor/tests/test_bug1352799.html
Normal file
|
|
@ -0,0 +1,98 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=1352799
|
||||
-->
|
||||
<head>
|
||||
<title>Test for Bug 1352799</title>
|
||||
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
|
||||
</head>
|
||||
<body>
|
||||
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1352799">Mozilla Bug 1352799</a>
|
||||
<p id="display"></p>
|
||||
<div id="content">
|
||||
<div id="input-container" style="display: none;">
|
||||
<input id="input" maxlength="1">
|
||||
</div>
|
||||
</div>
|
||||
<pre id="test">
|
||||
<script type="application/javascript">
|
||||
|
||||
/** Test for Bug 1352799 **/
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
SimpleTest.waitForFocus(() => {
|
||||
var input = document.getElementById("input");
|
||||
|
||||
var inputcontainer = document.getElementById('input-container');
|
||||
input.setAttribute('maxlength', 2);
|
||||
inputcontainer.style.display = 'block';
|
||||
|
||||
input.focus();
|
||||
|
||||
synthesizeKey('1', {});
|
||||
synthesizeKey('2', {});
|
||||
synthesizeKey('3', {});
|
||||
|
||||
is(input.value, '12', 'value should be 12 with maxlength = 2');
|
||||
|
||||
input.value = '';
|
||||
inputcontainer.style.display = 'none';
|
||||
|
||||
window.setTimeout(() => {
|
||||
input.setAttribute('maxlength', 4);
|
||||
inputcontainer.style.display = 'block';
|
||||
|
||||
input.focus();
|
||||
|
||||
synthesizeKey('4', {});
|
||||
synthesizeKey('5', {});
|
||||
synthesizeKey('6', {});
|
||||
synthesizeKey('7', {});
|
||||
synthesizeKey('8', {});
|
||||
|
||||
is(input.value, '4567', 'value should be 4567 with maxlength = 4');
|
||||
|
||||
inputcontainer.style.display = 'none';
|
||||
|
||||
window.setTimeout(() => {
|
||||
input.setAttribute('maxlength', 2);
|
||||
inputcontainer.style.display = 'block';
|
||||
|
||||
input.focus();
|
||||
|
||||
synthesizeKey('1', {});
|
||||
synthesizeKey('2', {});
|
||||
|
||||
todo_is(input.value, '45', 'value should be 45 with maxlength = 2');
|
||||
|
||||
input.value = '';
|
||||
inputcontainer.style.display = 'none';
|
||||
|
||||
window.setTimeout(() => {
|
||||
input.removeAttribute('maxlength');
|
||||
inputcontainer.style.display = 'block';
|
||||
|
||||
input.focus();
|
||||
|
||||
synthesizeKey('1', {});
|
||||
synthesizeKey('2', {});
|
||||
synthesizeKey('3', {});
|
||||
synthesizeKey('4', {});
|
||||
synthesizeKey('5', {});
|
||||
synthesizeKey('6', {});
|
||||
synthesizeKey('7', {});
|
||||
synthesizeKey('8', {});
|
||||
|
||||
is(input.value, '12345678', 'value should be 12345678 without maxlength');
|
||||
|
||||
SimpleTest.finish();
|
||||
}, 0);
|
||||
}, 0);
|
||||
}, 0);
|
||||
});
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Add table
Add a link
Reference in a new issue