Skip to content

Commit

Permalink
Merge pull request #2 from w3c/master
Browse files Browse the repository at this point in the history 
update fork
  • Loading branch information
Matt Garrish committed Mar 3, 2015
2 parents dca5c67 + 4b02aa6 commit c08a226
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 37 deletions.
4 changes: 2 additions & 2 deletions accname-aam/accname-aam.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,15 +496,15 @@ <h2>Name and Description Change Events</h2>
<th><a class="termref"><code>accessible name</code></a></th>
<td><code>EVENT_OBJECT_NAMECHANGE</code></td>
<td><code>EVENT_OBJECT_NAMECHANGE</code></td>
<td><code>ProperyChangeEvent</code></td>
<td><code>PropertyChangeEvent</code></td>
<td><code>object:property-change:accessible-name</code></td>
<td><code>TitleChangedNotification</code></td>
</tr>
<tr id="accDescChange">
<th><a class="termref"><code>accessible description</code></a></th>
<td><code>EVENT_OBJECT_DESCRIPTIONHANGE</code></td>
<td><code>EVENT_OBJECT_DESCRIPTIONCHANGE</code></td>
<td><code>ProperyChangeEvent</code></td>
<td><code>PropertyChangeEvent</code></td>
<td><code>object:property-change:accessible-description</code></td>
<td>TBD.</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions common/terms.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
expose information about <a title="object">objects</a> and <a title="event">events</a> to <a>assistive
technologies</a>. Assistive technologies use these interfaces to get
information about and interact with those <a title="widget">widgets</a>.
Examples of accessibility APIs are <a href="http://msdn.microsoft.com/en-us/library/ms697270(VS.85).aspx">Microsoft
Active Accessibility</a> [[MSAA]], <a href="http://msdn.microsoft.com/en-us/library/ee684013%28VS.85%29.aspx">Microsoft User Interface Automation</a> [[UI-AUTOMATION]], <abbr title="Microsoft Active Accessibility">MSAA</abbr> with <cite><a href="http://msdn.microsoft.com/en-us/library/windows/desktop/dd561898(v=vs.85).aspx"><abbr title="User Interface Automation">UIA</abbr> Express</a></cite> [[UIA-EXPRESS]], the
Examples of accessibility APIs are <a href="https://msdn.microsoft.com/en-us/library/ms697270(VS.85).aspx">Microsoft
Active Accessibility</a> [[MSAA]], <a href="https://msdn.microsoft.com/en-us/library/ee684013%28VS.85%29.aspx">Microsoft User Interface Automation</a> [[UI-AUTOMATION]], <abbr title="Microsoft Active Accessibility">MSAA</abbr> with <cite><a href="https://msdn.microsoft.com/en-us/library/windows/desktop/dd561898(v=vs.85).aspx"><abbr title="User Interface Automation">UIA</abbr> Express</a></cite> [[UIA-EXPRESS]], the
<a href="https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/Accessibility/cocoaAXIntro/cocoaAXintro.html">Mac <abbr title="OS Ten">OS X</abbr> Accessibility Protocol</a> [[AXAPI]],
the <cite><a href="https://developer.gnome.org/atk/unstable/">Linux/Unix Accessibility Toolkit</a></cite> [[ATK]] and <cite><a href="https://developer.gnome.org/libatspi/stable/">Assistive Technology Service Provider Interface</a></cite> [[AT-SPI]], and <a href="http://www.linuxfoundation.org/collaborate/workgroups/accessibility/iaccessible2">IAccessible2</a> [[IAccessible2]].</p>
</dd>
Expand Down
34 changes: 28 additions & 6 deletions core-aam/core-aam.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -942,10 +942,12 @@ <h3>Role Mapping Table</h3>
<td>If the object is in the accessibility tree, expose as <code>ROLE_SYSTEM_PANE</code>
<p>See <a href="#mapping_general">General rules for exposing <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> semantics</a></p></td>
<td>
<p>If the object is in the accessibility tree, expose using the <code>text</code> pattern. In particular, this applies to cells within a table or grid with <code>role="none"</code>, and to list items within a list with <code>role="none"</code>. </p>
<p>If the object is in the accessibility tree, expose using the <code>text</code> pattern.
<p>For objects that have required owned descendants (e.g., a grid owns gridcells, a list owns listitems), expose each leaf descendant using the <code>text</code> pattern. </p>
<p>See <a href="#mapping_general">General rules for exposing <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> semantics</a></p></td>
<td>
<p>If the object is in the accessibility tree, expose as <code>ROLE_SECTION</code>. In particular, this applies to cells within a table or grid with <code>role="none"</code>, and to list items within a list with <code>role="none"</code>. </p>
<p>If the object is in the accessibility tree, expose as <code>ROLE_SECTION</code>
<p>For objects that have required owned descendants (e.g., a grid owns gridcells, a list owns listitems), expose each leaf descendant as <code>ROLE_SECTION</code>. </p>
<p>See <a href="#mapping_general">General rules for exposing <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> semantics</a></p></td>
<td><p>Not mapped</p>
<p>See <a href="#mapping_general">General rules for exposing <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> semantics</a></p></td>
Expand Down Expand Up @@ -982,10 +984,12 @@ <h3>Role Mapping Table</h3>
<td>If the object is in the accessibility tree, expose as <code>ROLE_SYSTEM_PANE</code>
<p>See <a href="#mapping_general">General rules for exposing <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> semantics</a></p></td>
<td>
<p>If the object is in the accessibility tree, expose using the <code>text</code> pattern. In particular, this applies to cells within a table or grid with <code>role="presentation"</code>, and to list items within a list with <code>role="presentation"</code>. </p>
<p>If the object is in the accessibility tree, expose using the <code>text</code> pattern.
<p>For objects that have required owned descendants (e.g., a grid owns gridcells, a list owns listitems), expose each leaf descendant using the <code>text</code> pattern. </p>
<p>See <a href="#mapping_general">General rules for exposing <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> semantics</a></p></td>
<td>
<p>If the object is in the accessibility tree, expose as <code>ROLE_SECTION</code>. In particular, this applies to cells within a table or grid with <code>role="presentation"</code>, and to list items within a list with <code>role="presentation"</code>. </p>
<p>If the object is in the accessibility tree, expose as <code>ROLE_SECTION</code>
<p>For objects that have required owned descendants (e.g., a grid owns gridcells, a list owns listitems), expose each leaf descendant as <code>ROLE_SECTION</code>. </p>
<p>See <a href="#mapping_general">General rules for exposing <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> semantics</a></p>
</td>
<td><p>Not mapped</p>
Expand Down Expand Up @@ -1140,7 +1144,9 @@ <h3>Role Mapping Table</h3>
<td>TBD (<a href="https://www.w3.org/WAI/PF/Group/track/actions/1564">ACTION-1564</a>)</td>
<td>Control type/role is <code>Button</code> + <code>Toggle</code> Pattern. Localized Control Type is "<code>toggleswitch</code>".</td>
<td><code>ROLE_TOGGLE_BUTTON</code></td>
<td>TBD (<a href="https://www.w3.org/WAI/PF/Group/track/actions/1563">ACTION-1563</a>)</td>
<td>AXRole: <code>AXCheckBox</code><br />
AXSubrole: <code>AXSwitch</code><br />
AXRoleDescription: <code>'switch'</code> <span class="ednote">Double check the role description</span></td>
</tr>
<tr id="role-map-tab">
<th><a class="role-reference" href="#tab"><code>tab</code></a>
Expand Down Expand Up @@ -2264,6 +2270,14 @@ <h3>State and Property Change Events</h3>
<td><code>object:state-changed:enabled</code> and <code>object:state-changed:sensitive</code></td>
<td>Not mapped</td>
</tr>
<tr id="event-aria-describedby">
<th> <a class="property-reference" href="#aria-describedby"><code>aria-describedby</code></a></th>
<td>See the <a class="accname" href="#events">Name and Description Change Events</a> section in [[!ACCNAME-AAM]].</td>
<td>See the <a class="accname" href="#events">Name and Description Change Events</a> section in [[!ACCNAME-AAM]].</td>
<td>See the <a class="accname" href="#events">Name and Description Change Events</a> section in [[!ACCNAME-AAM]].</td>
<td>See the <a class="accname" href="#events">Name and Description Change Events</a> section in [[!ACCNAME-AAM]].</td>
<td>See the <a class="accname" href="#events">Name and Description Change Events</a> section in [[!ACCNAME-AAM]].</td>
</tr>
<tr id="event-aria-dropeffect">
<th><a class="property-reference" href="#aria-dropeffect"><code>aria-dropeffect</code></a> (property)</th>
<td>Not mapped</td>
Expand Down Expand Up @@ -2292,7 +2306,7 @@ <h3>State and Property Change Events</h3>
<td>Not mapped</td>
</tr>
<tr id="event-aria-hidden">
<th><a class="state-reference" href="#aria-hidden"><code>aria-hidden</code> (state)</a></th>
<th><a class="state-reference" href="#aria-hidden"><code>aria-hidden</code></a> (state)</th>
<td><code>EVENT_OBJECT_HIDE</code>, <code>EVENT_OBJECT_SHOW</code></td>
<td>IAccessible2: <code> IA2_EVENT_OBJECT_ATTRIBUTE_CHANGED</code></td>
<td><code>StructureChangedEvent</code></td>
Expand All @@ -2308,6 +2322,14 @@ <h3>State and Property Change Events</h3>
<td><code>object:state-changed:invalid_entry</code></td>
<td><code>AXInvalidStatusChanged</code></td>
</tr>
<tr id="event-aria-label">
<th> <a class="property-reference" href="#aria-label"><code>aria-label</code></a> and <a class="property-reference" href="#aria-labelledby"><code>aria-labelledby</code></a></th>
<td>See the <a class="accname" href="#events">Name and Description Change Events</a> section in [[!ACCNAME-AAM]].</td>
<td>See the <a class="accname" href="#events">Name and Description Change Events</a> section in [[!ACCNAME-AAM]].</td>
<td>See the <a class="accname" href="#events">Name and Description Change Events</a> section in [[!ACCNAME-AAM]].</td>
<td>See the <a class="accname" href="#events">Name and Description Change Events</a> section in [[!ACCNAME-AAM]].</td>
<td>See the <a class="accname" href="#events">Name and Description Change Events</a> section in [[!ACCNAME-AAM]].</td>
</tr>
<tr id="event-aria-pressed">
<th><a class="state-reference" href="#aria-pressed"><code>aria-pressed</code></a> (state)</th>
<td><code>EVENT_OBJECT_STATECHANGE</code></td>
Expand Down
Loading

0 comments on commit c08a226

Please sign in to comment.