[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a9ca633 04/23: Make input[type]-specific error msgs more c
|
From: |
Stefan Monnier |
|
Subject: |
[elpa] master a9ca633 04/23: Make input[type]-specific error msgs more clear. |
|
Date: |
Thu, 14 Jan 2016 19:22:33 +0000 |
branch: master
commit a9ca633814ff43a1193c533cba3be701921f4359
Author: Michael[tm] Smith <address@hidden>
Commit: Michael[tm] Smith <address@hidden>
Make input[type]-specific error msgs more clear.
Fixes #49. Thanks @cvrebert.
---
web-forms2.rnc | 237 +++++++++++++++++++++-----------------------------------
1 files changed, 90 insertions(+), 147 deletions(-)
diff --git a/web-forms2.rnc b/web-forms2.rnc
index e83c399..e9ddb55 100644
--- a/web-forms2.rnc
+++ b/web-forms2.rnc
@@ -80,6 +80,18 @@ datatypes w = "http://whattf.org/datatype-draft";
## Shared attributes for <input>
+ shared-input.attrs =
+ ( input.attrs.autocomplete?
+ & shared-form.attrs.autofocus?
+ & input.attrs.list?
+ & shared-form.attrs.maxlength?
+ & shared-form.attrs.pattern?
+ & shared-form.attrs.placeholder?
+ & shared-form.attrs.readonly?
+ & shared-form.attrs.required?
+ & shared-form.attrs.size?
+ )
+
input.attrs.autocomplete =
attribute autocomplete {
w:string "on" | w:string "off"
@@ -108,77 +120,73 @@ datatypes w = "http://whattf.org/datatype-draft";
## Text Field: <input type='text'>, Extensions
input.text.attrs &=
- ( input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & shared-form.attrs.pattern?
- & shared-form.attrs.required?
- & shared-form.attrs.placeholder?
+ ( input.attrs.autocomplete?
+ & shared-form.attrs.autofocus?
& shared-form.attrs.dirname?
+ & input.attrs.list?
+ & shared-form.attrs.pattern?
+ & shared-form.attrs.required?
+ & shared-form.attrs.placeholder?
)
## Password Field: <input type='password'>, Extensions
input.password.attrs &=
- ( input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & shared-form.attrs.pattern?
- & shared-form.attrs.required?
+ ( input.attrs.autocomplete?
+ & shared-form.attrs.autofocus?
+ & input.attrs.list?
+ & shared-form.attrs.pattern?
& shared-form.attrs.placeholder?
+ & shared-form.attrs.required?
)
## Checkbox <input type='checkbox'>, Extensions
input.checkbox.attrs &=
- ( shared-form.attrs.autofocus?
- & shared-form.attrs.required?
- )
+ ( shared-input.attrs )
## Radiobutton: <input type='radio'>, Extensions
input.radio.attrs &=
- ( shared-form.attrs.autofocus?
- & shared-form.attrs.required?
- )
+ ( shared-input.attrs )
## Scripting Hook Button: <input type='button'>, Extensions
input.button.attrs &=
- ( shared-form.attrs.autofocus? )
+ ( shared-input.attrs )
## Submit Button: <input type='submit'>, Extensions
input.submit.attrs &=
- ( shared-form.attrs.formaction?
- & shared-form.attrs.autofocus?
- & shared-form.attrs.formenctype?
- & shared-form.attrs.formmethod?
- & shared-form.attrs.formtarget?
- & shared-form.attrs.formnovalidate?
+ ( shared-input.attrs
+ & shared-form.attrs.formaction?
+ & shared-form.attrs.formenctype?
+ & shared-form.attrs.formmethod?
+ & shared-form.attrs.formtarget?
+ & shared-form.attrs.formnovalidate?
)
## Reset Button: <input type='reset'>, Extensions
input.reset.attrs &=
- ( shared-form.attrs.autofocus? )
+ ( shared-input.attrs )
## File Upload: <input type='file'>, Extensions
input.file.attrs &=
- ( shared-form.attrs.autofocus?
- & shared-form.attrs.required?
- & input.attrs.multiple?
+ ( shared-input.attrs
+ & input.attrs.multiple?
)
## Image Submit Button: <input type='image'>, Extensions
input.image.attrs &=
- ( shared-form.attrs.formaction?
- & shared-form.attrs.autofocus?
- & shared-form.attrs.formenctype?
- & shared-form.attrs.formmethod?
- & shared-form.attrs.formtarget?
- & shared-form.attrs.formnovalidate?
+ ( shared-input.attrs
+ & shared-form.attrs.formaction?
+ & shared-form.attrs.formenctype?
+ & shared-form.attrs.formmethod?
+ & shared-form.attrs.formtarget?
+ & shared-form.attrs.formnovalidate?
& input.image.attrs.height?
& input.image.attrs.width?
)
@@ -198,16 +206,12 @@ datatypes w = "http://whattf.org/datatype-draft";
input.datetime.attrs =
( common.attrs
& common-form.attrs
+ & shared-input.attrs
& input.datetime.attrs.type
- & input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & input.datetime.attrs.min?
- & input.datetime.attrs.max?
- & input.attrs.step.float?
- & shared-form.attrs.readonly?
- & shared-form.attrs.required?
- & input.datetime.attrs.value?
+ & input.datetime.attrs.min?
+ & input.datetime.attrs.max?
+ & input.attrs.step.float?
+ & input.datetime.attrs.value?
& common.attrs.aria?
)
input.datetime.attrs.type =
@@ -236,16 +240,12 @@ datatypes w = "http://whattf.org/datatype-draft";
input.datetime-local.attrs =
( common.attrs
& common-form.attrs
+ & shared-input.attrs
& input.datetime-local.attrs.type
- & input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & input.datetime-local.attrs.min?
- & input.datetime-local.attrs.max?
- & input.attrs.step.float?
- & shared-form.attrs.readonly?
- & shared-form.attrs.required?
- & input.datetime-local.attrs.value?
+ & input.datetime-local.attrs.min?
+ & input.datetime-local.attrs.max?
+ & input.attrs.step.float?
+ & input.datetime-local.attrs.value?
& common.attrs.aria?
)
input.datetime-local.attrs.type =
@@ -274,16 +274,12 @@ datatypes w = "http://whattf.org/datatype-draft";
input.date.attrs =
( common.attrs
& common-form.attrs
+ & shared-input.attrs
& input.date.attrs.type
- & input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & input.date.attrs.min?
- & input.date.attrs.max?
- & input.attrs.step.integer?
- & shared-form.attrs.readonly?
- & shared-form.attrs.required?
- & input.date.attrs.value?
+ & input.date.attrs.min?
+ & input.date.attrs.max?
+ & input.attrs.step.integer?
+ & input.date.attrs.value?
& common.attrs.aria?
)
input.date.attrs.type =
@@ -312,16 +308,12 @@ datatypes w = "http://whattf.org/datatype-draft";
input.month.attrs =
( common.attrs
& common-form.attrs
+ & shared-input.attrs
& input.month.attrs.type
- & input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & input.month.attrs.min?
- & input.month.attrs.max?
- & input.attrs.step.integer?
- & shared-form.attrs.readonly?
- & shared-form.attrs.required?
- & input.month.attrs.value?
+ & input.month.attrs.min?
+ & input.month.attrs.max?
+ & input.attrs.step.integer?
+ & input.month.attrs.value?
& common.attrs.aria?
)
input.month.attrs.type =
@@ -350,16 +342,12 @@ datatypes w = "http://whattf.org/datatype-draft";
input.time.attrs =
( common.attrs
& common-form.attrs
+ & shared-input.attrs
& input.time.attrs.type
- & input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & input.time.attrs.min?
- & input.time.attrs.max?
- & input.attrs.step.float?
- & shared-form.attrs.readonly?
- & shared-form.attrs.required?
- & input.time.attrs.value?
+ & input.time.attrs.min?
+ & input.time.attrs.max?
+ & input.attrs.step.float?
+ & input.time.attrs.value?
& common.attrs.aria?
)
input.time.attrs.type =
@@ -388,16 +376,12 @@ datatypes w = "http://whattf.org/datatype-draft";
input.week.attrs =
( common.attrs
& common-form.attrs
+ & shared-input.attrs
& input.week.attrs.type
- & input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & input.week.attrs.min?
- & input.week.attrs.max?
- & input.attrs.step.integer?
- & shared-form.attrs.readonly?
- & shared-form.attrs.required?
- & input.week.attrs.value?
+ & input.week.attrs.min?
+ & input.week.attrs.max?
+ & input.attrs.step.integer?
+ & input.week.attrs.value?
& common.attrs.aria?
)
input.week.attrs.type =
@@ -426,17 +410,12 @@ datatypes w = "http://whattf.org/datatype-draft";
input.number.attrs =
( common.attrs
& common-form.attrs
+ & shared-input.attrs
& input.number.attrs.type
- & input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & input.number.attrs.min?
- & input.number.attrs.max?
- & input.attrs.step.float?
- & shared-form.attrs.readonly?
- & shared-form.attrs.required?
- & shared-form.attrs.placeholder?
- & input.number.attrs.value?
+ & input.number.attrs.min?
+ & input.number.attrs.max?
+ & input.attrs.step.float?
+ & input.number.attrs.value?
& ( common.attrs.aria.implicit.spinbutton
| common.attrs.aria.role.spinbutton
)?
@@ -467,14 +446,12 @@ datatypes w = "http://whattf.org/datatype-draft";
input.range.attrs =
( common.attrs
& common-form.attrs
+ & shared-input.attrs
& input.range.attrs.type
- & input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & input.range.attrs.min?
- & input.range.attrs.max?
- & input.attrs.step.float?
- & input.range.attrs.value?
+ & input.range.attrs.min?
+ & input.range.attrs.max?
+ & input.attrs.step.float?
+ & input.range.attrs.value?
& ( common.attrs.aria.implicit.slider
| common.attrs.aria.role.slider
)?
@@ -505,16 +482,8 @@ datatypes w = "http://whattf.org/datatype-draft";
input.email.attrs =
( common.attrs
& common-form.attrs
+ & shared-input.attrs
& input.email.attrs.type
- & input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & shared-form.attrs.maxlength?
- & shared-form.attrs.pattern?
- & shared-form.attrs.readonly?
- & shared-form.attrs.required?
- & shared-form.attrs.size?
- & shared-form.attrs.placeholder?
& ( ( input.attrs.multiple
& input.email.attrs.value.multiple?
)
@@ -548,17 +517,9 @@ datatypes w = "http://whattf.org/datatype-draft";
input.url.attrs =
( common.attrs
& common-form.attrs
+ & shared-input.attrs
& input.url.attrs.type
- & input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & shared-form.attrs.maxlength?
- & shared-form.attrs.pattern?
- & shared-form.attrs.readonly?
- & shared-form.attrs.required?
- & shared-form.attrs.size?
- & shared-form.attrs.placeholder?
- & input.url.attrs.value?
+ & input.url.attrs.value?
& ( common.attrs.aria.implicit.textbox
| common.attrs.aria.implicit.combobox
| common.attrs.aria.role.textbox
@@ -583,18 +544,10 @@ datatypes w = "http://whattf.org/datatype-draft";
input.search.attrs =
( common.attrs
& common-form.attrs
+ & shared-input.attrs
& input.search.attrs.type
- & input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & shared-form.attrs.maxlength?
- & shared-form.attrs.pattern?
- & shared-form.attrs.readonly?
- & shared-form.attrs.required?
- & shared-form.attrs.size?
- & shared-form.attrs.placeholder?
+ & input.search.attrs.value?
& shared-form.attrs.dirname?
- & input.search.attrs.value?
& ( common.attrs.aria.implicit.textbox
| common.attrs.aria.implicit.combobox
| common.attrs.aria.role.textbox
@@ -619,17 +572,9 @@ datatypes w = "http://whattf.org/datatype-draft";
input.tel.attrs =
( common.attrs
& common-form.attrs
+ & shared-input.attrs
& input.tel.attrs.type
- & input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & shared-form.attrs.maxlength?
- & shared-form.attrs.pattern?
- & shared-form.attrs.readonly?
- & shared-form.attrs.required?
- & shared-form.attrs.size?
- & shared-form.attrs.placeholder?
- & input.tel.attrs.value?
+ & input.tel.attrs.value?
& ( common.attrs.aria.implicit.textbox
| common.attrs.aria.implicit.combobox
| common.attrs.aria.role.textbox
@@ -655,10 +600,8 @@ datatypes w = "http://whattf.org/datatype-draft";
( common.attrs
& common-form.attrs
& input.color.attrs.type
- & input.attrs.autocomplete?
- & shared-form.attrs.autofocus?
- & input.attrs.list?
- & input.color.attrs.value?
+ & input.color.attrs.value?
+ & shared-input.attrs
& common.attrs.aria?
)
input.color.attrs.type =
- [elpa] master updated (9ac55ab -> a426434), Stefan Monnier, 2016/01/14
- [elpa] master 9b44795 03/23: Exit the meta[name]-checking business., Stefan Monnier, 2016/01/14
- [elpa] master 2d5e35e 05/23: Report warning for inputmode (instead of error)., Stefan Monnier, 2016/01/14
- [elpa] master c531523 02/23: Added warning that assertions.sch isn't maintained, Stefan Monnier, 2016/01/14
- [elpa] master 242f515 07/23: Emit error for empty form-control `name` attr., Stefan Monnier, 2016/01/14
- [elpa] master e2f495e 06/23: Allow ruby <rb> & <rtc> elements., Stefan Monnier, 2016/01/14
- [elpa] master 8b4cba1 08/23: Corrected the content model for the ruby element., Stefan Monnier, 2016/01/14
- [elpa] master a9ca633 04/23: Make input[type]-specific error msgs more clear.,
Stefan Monnier <=
- [elpa] master 85521bf 13/23: Make "integrity" checking more helpful, Stefan Monnier, 2016/01/14
- [elpa] master 103dc56 09/23: (Re)corrected content model for the ruby element., Stefan Monnier, 2016/01/14
- [elpa] master 76e0657 10/23: Allow ol>li[role=menuitem] & ol>li[role=tab]., Stefan Monnier, 2016/01/14
- [elpa] master c3b8596 14/23: Sync up with latest ARIA-in-HTML spec changes, Stefan Monnier, 2016/01/14
- [elpa] master 1c11a56 12/23: Add the "integrity" attribute, Stefan Monnier, 2016/01/14
- [elpa] master f1cac66 11/23: Refine some ARIA checking to sync w/ current spec, Stefan Monnier, 2016/01/14
- [elpa] master ae3a23b 19/23: Allow the "nonce" attribute, Stefan Monnier, 2016/01/14
- [elpa] master 44fe4a7 16/23: Allow "minlength", Stefan Monnier, 2016/01/14
- [elpa] master 67350aa 15/23: Allow ARIA role=switch, Stefan Monnier, 2016/01/14
- [elpa] master fec8cdf 20/23: Add CSP syntax checking for <meta> & HTTP header, Stefan Monnier, 2016/01/14