branch: master commit 67350aac0bb34cdb39855be35f171bd40f0020a7 Author: Michael[tm] Smith <m...@w3.org> Commit: Michael[tm] Smith <m...@w3.org>
Allow ARIA role=switch Fixes #135 --- aria.rnc | 11 +++++++++++ common.rnc | 1 + phrase.rnc | 1 + web-forms.rnc | 8 ++++++++ 4 files changed, 21 insertions(+), 0 deletions(-) diff --git a/aria.rnc b/aria.rnc index 4f2d22b..61e007b 100644 --- a/aria.rnc +++ b/aria.rnc @@ -1111,6 +1111,17 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark common.attrs.aria |= aria.status common.attrs.aria.role.status |= aria.status +## switch + aria.switch = + ( aria.role.switch + & aria.state.checked #required! + ) + aria.role.switch = + attribute role { string "switch" } + + common.attrs.aria |= aria.switch + common.attrs.aria.role.switch |= aria.switch + ## tab aria.tab = ( aria.role.tab diff --git a/common.rnc b/common.rnc index 4436010..97c09de 100644 --- a/common.rnc +++ b/common.rnc @@ -462,6 +462,7 @@ common.attrs.aria.role.separator = ( notAllowed ) common.attrs.aria.role.slider = ( notAllowed ) common.attrs.aria.role.spinbutton = ( notAllowed ) common.attrs.aria.role.status = ( notAllowed ) +common.attrs.aria.role.switch = ( notAllowed ) common.attrs.aria.role.tab = ( notAllowed ) common.attrs.aria.role.tablist = ( notAllowed ) common.attrs.aria.role.tabpanel = ( notAllowed ) diff --git a/phrase.rnc b/phrase.rnc index dc70881..f8fa725 100644 --- a/phrase.rnc +++ b/phrase.rnc @@ -30,6 +30,7 @@ datatypes w = "http://whattf.org/datatype-draft" | common.attrs.aria.role.menuitem | common.attrs.aria.role.menuitemcheckbox | common.attrs.aria.role.menuitemradio + | common.attrs.aria.role.switch | common.attrs.aria.role.tab | common.attrs.aria.role.treeitem )? diff --git a/web-forms.rnc b/web-forms.rnc index 1372b7a..c58e652 100644 --- a/web-forms.rnc +++ b/web-forms.rnc @@ -114,6 +114,7 @@ datatypes w = "http://whattf.org/datatype-draft" & ( common.attrs.aria.implicit.checkbox | common.attrs.aria.role.checkbox | common.attrs.aria.role.menuitemcheckbox + | common.attrs.aria.role.switch )? ) input.checkbox.attrs.type = @@ -169,6 +170,7 @@ datatypes w = "http://whattf.org/datatype-draft" | common.attrs.aria.role.menuitemcheckbox | common.attrs.aria.role.menuitemradio | common.attrs.aria.role.radio + | common.attrs.aria.role.switch )? ) input.button.attrs.type = @@ -293,6 +295,7 @@ datatypes w = "http://whattf.org/datatype-draft" | common.attrs.aria.role.menuitemcheckbox | common.attrs.aria.role.menuitemradio | common.attrs.aria.role.radio + | common.attrs.aria.role.switch )? ) input.image.attrs.type = @@ -450,6 +453,7 @@ datatypes w = "http://whattf.org/datatype-draft" & button.attrs.value? & ( common.attrs.aria.implicit.button | common.attrs.aria.role.button + | common.attrs.aria.role.checkbox | common.attrs.aria.role.link | common.attrs.aria.role.menuitem | common.attrs.aria.role.menuitemcheckbox @@ -475,11 +479,13 @@ datatypes w = "http://whattf.org/datatype-draft" & button.attrs.value? #REVISIT I guess this still affects the DOM & ( common.attrs.aria.implicit.button | common.attrs.aria.role.button + | common.attrs.aria.role.checkbox | common.attrs.aria.role.link | common.attrs.aria.role.menuitem | common.attrs.aria.role.menuitemcheckbox | common.attrs.aria.role.menuitemradio | common.attrs.aria.role.radio + | common.attrs.aria.role.switch )? ) button.reset.attrs.type = @@ -500,11 +506,13 @@ datatypes w = "http://whattf.org/datatype-draft" & button.attrs.value? #REVISIT I guess this still affects the DOM & ( common.attrs.aria.implicit.button | common.attrs.aria.role.button + | common.attrs.aria.role.checkbox | common.attrs.aria.role.link | common.attrs.aria.role.menuitem | common.attrs.aria.role.menuitemcheckbox | common.attrs.aria.role.menuitemradio | common.attrs.aria.role.radio + | common.attrs.aria.role.switch )? ) button.button.attrs.type =