Skip to content

Commit 65a9644

Browse files
scottaoharascottaohara
authored
Merge branch 'main' into aria-labelledby-spelling-variants
2 parents 7c638f7 + a2d34fe commit 65a9644

33 files changed

+2193
-187
lines changed

‎.github/pull_request_template.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ Closes #????
22

33
Describe Change Here!
44

5-
<!--- IF EDITORIAL or CHORE, delete the rest of this template -->
5+
And a few other todo items (delete this section after performing them):
6+
* [ ] For every spec that this PR edits, please add the appropriate `spec:<spec_name>` label. If you don't have privileges to do this, editors will do it for you.
7+
* [ ] If the change is [editorial](https://github.com/w3c/aria/blob/main/documentation/process.md#editorial-changes), please add "Editorial:" at the start of your PR name, and delete the "Test, Documentation and Implementation tracking" section below.
68

79
# Test, Documentation and Implementation tracking
810
Once this PR has been reviewed and has consensus from the working group, tests should be written and issues should be opened on browsers. Add N/A and check when not applicable.

‎.github/workflows/accname.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: |
1717
curl -L -X POST \
1818
-H "Accept: application/vnd.github+json" \
19-
-H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
19+
-H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
2020
-H "X-GitHub-Api-Version: 2022-11-28" \
2121
https://api.github.com/repos/w3c/accname/actions/workflows/build-from-monorepo.yaml/dispatches \
2222
-d '{"ref":"gh-pages"}'
@@ -52,7 +52,7 @@ jobs:
5252
repository: w3c/accname
5353
ref: gh-pages
5454
path: accname
55-
token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
55+
token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
5656
- uses: actions/download-artifact@v4
5757
with:
5858
name: accname

‎.github/workflows/core-aam.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: |
1717
curl -L -X POST \
1818
-H "Accept: application/vnd.github+json" \
19-
-H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
19+
-H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
2020
-H "X-GitHub-Api-Version: 2022-11-28" \
2121
https://api.github.com/repos/w3c/core-aam/actions/workflows/build-from-monorepo.yaml/dispatches \
2222
-d '{"ref":"gh-pages"}'
@@ -53,7 +53,7 @@ jobs:
5353
repository: w3c/core-aam
5454
ref: gh-pages
5555
path: core-aam
56-
token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
56+
token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
5757
- uses: actions/download-artifact@v4
5858
with:
5959
name: core-aam

‎.github/workflows/dpub-aam.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: |
1717
curl -L -X POST \
1818
-H "Accept: application/vnd.github+json" \
19-
-H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
19+
-H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
2020
-H "X-GitHub-Api-Version: 2022-11-28" \
2121
https://api.github.com/repos/w3c/dpub-aam/actions/workflows/build-from-monorepo.yaml/dispatches \
2222
-d '{"ref":"gh-pages"}'
@@ -52,7 +52,7 @@ jobs:
5252
repository: w3c/dpub-aam
5353
ref: gh-pages
5454
path: dpub-aam
55-
token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
55+
token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
5656
- uses: actions/download-artifact@v4
5757
with:
5858
name: dpub-aam

‎.github/workflows/dpub-aria.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: |
1717
curl -L -X POST \
1818
-H "Accept: application/vnd.github+json" \
19-
-H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
19+
-H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
2020
-H "X-GitHub-Api-Version: 2022-11-28" \
2121
https://api.github.com/repos/w3c/dpub-aria/actions/workflows/build-from-monorepo.yaml/dispatches \
2222
-d '{"ref":"gh-pages"}'
@@ -52,7 +52,7 @@ jobs:
5252
repository: w3c/dpub-aria
5353
ref: gh-pages
5454
path: dpub-aria
55-
token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
55+
token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
5656
- uses: actions/download-artifact@v4
5757
with:
5858
name: dpub-aria

‎.github/workflows/graphics-aam.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: |
1717
curl -L -X POST \
1818
-H "Accept: application/vnd.github+json" \
19-
-H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
19+
-H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
2020
-H "X-GitHub-Api-Version: 2022-11-28" \
2121
https://api.github.com/repos/w3c/graphics-aam/actions/workflows/build-from-monorepo.yaml/dispatches \
2222
-d '{"ref":"gh-pages"}'
@@ -43,7 +43,7 @@ jobs:
4343
repository: w3c/graphics-aam
4444
ref: gh-pages
4545
path: graphics-aam
46-
token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
46+
token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
4747
- uses: actions/download-artifact@v4
4848
with:
4949
name: graphics-aam

‎.github/workflows/html-amm.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: |
1717
curl -L -X POST \
1818
-H "Accept: application/vnd.github+json" \
19-
-H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
19+
-H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
2020
-H "X-GitHub-Api-Version: 2022-11-28" \
2121
https://api.github.com/repos/w3c/html-aam/actions/workflows/build-from-monorepo.yaml/dispatches \
2222
-d '{"ref":"gh-pages"}'
@@ -53,7 +53,7 @@ jobs:
5353
repository: w3c/html-aam
5454
ref: gh-pages
5555
path: html-aam
56-
token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
56+
token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
5757
- uses: actions/download-artifact@v4
5858
with:
5959
name: html-aam

‎.github/workflows/mathml-aam.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: |
1717
curl -L -X POST \
1818
-H "Accept: application/vnd.github+json" \
19-
-H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
19+
-H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
2020
-H "X-GitHub-Api-Version: 2022-11-28" \
2121
https://api.github.com/repos/w3c/mathml-aam/actions/workflows/build-from-monorepo.yaml/dispatches \
2222
-d '{"ref":"gh-pages"}'
@@ -43,7 +43,7 @@ jobs:
4343
repository: w3c/mathml-aam
4444
ref: gh-pages
4545
path: mathml-aam
46-
token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
46+
token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
4747
- uses: actions/download-artifact@v4
4848
with:
4949
name: mathml-aam

‎.github/workflows/pdf-aam.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: |
1717
curl -L -X POST \
1818
-H "Accept: application/vnd.github+json" \
19-
-H "Authorization: Bearer ${{secrets.ARIA_EDITOR_DRAFTS}}" \
19+
-H "Authorization: Bearer ${{secrets.W3CGRUNTBOT_TOKEN}}" \
2020
-H "X-GitHub-Api-Version: 2022-11-28" \
2121
https://api.github.com/repos/w3c/pdf-aam/actions/workflows/build-from-monorepo.yaml/dispatches \
2222
-d '{"ref":"gh-pages"}'
@@ -52,13 +52,13 @@ jobs:
5252
repository: w3c/pdf-aam
5353
ref: gh-pages
5454
path: pdf-aam
55-
token: ${{ secrets.ARIA_EDITOR_DRAFTS }}
55+
token: ${{ secrets.W3CGRUNTBOT_TOKEN }}
5656
- uses: actions/download-artifact@v4
5757
with:
5858
name: pdf-aam
5959
- name: Copy files
6060
run: |
61-
cp -r aria/pdf-aam/** pdf-aam/
61+
cp -r aria.common/aria/pdf-aam/** pdf-aam/
6262
- name: Push new files to child repo
6363
run: |
6464
git config user.name "github-actions[bot]"

‎accname/index.html

+11-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<script src="../common/script/resolveReferences.js" class="remove"></script>
99
<script src="../common/script/utility.js" class="remove"></script>
1010
<script src="../common/biblio.js" class="remove" defer="defer"></script>
11+
<script src="../common/script/participants.js" class="remove"></script>
1112
<script class="remove">
1213
var respecConfig = {
1314
github: "w3c/accname",
@@ -131,7 +132,7 @@
131132
REC: "https://www.w3.org/WAI/ARIA/apg/",
132133
},
133134

134-
preProcess: [linkCrossReferences],
135+
preProcess: [linkCrossReferences, getParticipants],
135136
postProcess: [addPlatformMaintainers],
136137
//Pointing to the 1.2 versions but should remove the version in the publishing branch
137138
xref: ["dom", "core-aam-1.2", "wai-aria-1.2", "infra"],
@@ -784,7 +785,15 @@ <h2>Substantive changes since the <a href="https://www.w3.org/TR/accname-1.1/">A
784785
<section class="appendix informative section" id="acknowledgements">
785786
<h3>Acknowledgments</h3>
786787
<p>The following people contributed to the development of this document.</p>
787-
<div data-include="../common/acknowledgements/aria-wg-active.html" data-include-replace="true"></div>
788+
<ul id="gh-contributors">
789+
<!-- GitHub contributors go here -->
790+
</ul>
791+
<section class="section" id="ack_group">
792+
<h4>ARIA WG participants at the time of publication</h4>
793+
<ul>
794+
<!-- List of participants is injected here -->
795+
</ul>
796+
</section>
788797
<div data-include="../common/acknowledgements/funders.html" data-include-replace="true"></div>
789798
</section>
790799
</section>

‎common/script/participants.js

+13-42
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,19 @@ function getParticipants() {
88
// Define the ID of the list element where the user information will be inserted
99
const LIST_ID = "ack_group";
1010

11-
/**
12-
* Fetches users and their affiliations from the API and returns an array of user information.
13-
* Each element in the array is an object containing the user's title and affiliation.
14-
*
15-
* @async
16-
* @function getUsersInfo
17-
* @returns {Promise<Array<{title: string, affiliation: string}>>} - A promise that resolves to an array of user information.
18-
*/
1911
async function getUsersInfo() {
20-
// Send a GET request to the users endpoint
2112
const response = await fetch(`${BASE_URL}/users`);
22-
// Fetch the JSON data from the response
2313
const data = await response.json();
24-
// Extract the list of users
2514
const users = data._links.users;
26-
27-
// Initialize an empty array to store user information
28-
let usersInfo = [];
29-
// Iterate over each user
30-
for (const user of users) {
31-
// Fetch the affiliation of the current user
15+
16+
const usersInfo = await Promise.all(users.map(async (user) => {
3217
const affiliation = await getAffiliation(user);
33-
// Push an object containing the user's title and affiliation to the usersInfo array
34-
usersInfo.push({ title: user.title, affiliation: affiliation });
35-
}
36-
// Return the array containing information of all users
18+
return { title: user.title, affiliation: affiliation };
19+
}));
20+
3721
return usersInfo;
3822
}
39-
40-
/**
41-
* Fetches the affiliation of a given user from the API.
42-
*
43-
* @async
44-
* @function getAffiliation
45-
* @param {Object} user - The user object.
46-
* @returns {Promise<string>} - A promise that resolves to the title of the user's affiliation.
47-
*/
23+
4824
async function getAffiliation(user) {
4925
// Send a GET request to the affiliations endpoint of the user
5026
const response = await fetch(user.href + "/affiliations/");
@@ -58,23 +34,18 @@ function getParticipants() {
5834
// Return the title of the affiliation
5935
return affiliation;
6036
}
61-
62-
/**
63-
* Fetches users and their affiliations, creates a list item for each user with their title and affiliation,
64-
* and appends these list items to a specified list in the document.
65-
*
66-
* @async
67-
* @function insertUsersInfoIntoDocument
68-
*/
6937
async function insertUsersInfoIntoDocument() {
7038
const usersInfo = await getUsersInfo();
7139
const usersList = document.querySelector(`#${LIST_ID} ul`);
72-
73-
for (const user of usersInfo) {
40+
const fragment = document.createDocumentFragment();
41+
42+
usersInfo.forEach(user => {
7443
const li = document.createElement("li");
7544
li.textContent = `${user.title} (${user.affiliation})`;
76-
usersList.appendChild(li);
77-
}
45+
fragment.appendChild(li);
46+
});
47+
48+
usersList.appendChild(fragment);
7849
}
7950

8051
insertUsersInfoIntoDocument();

0 commit comments

Comments
 (0)