Skip to content

repo sync #18399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 2, 2022
Merged

repo sync #18399

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2339bef
Don't skip code term wrapping with single anchor child (#28175)
rsese Jun 2, 2022
8b08112
Merge branch 'main' into repo-sync
Octomerger Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions components/lib/wrap-code-terms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ export default function wrapCodeTerms() {
if (!codeTerms) return

codeTerms.forEach((node) => {
// Return early if a child node is an anchor element
const hasChildAnchor = Array.from(node.childNodes).some((child) => child.nodeName === 'A')
if (hasChildAnchor) return

// Do the wrapping on the inner text only
// Do the wrapping on the inner text only. With anchor element children
// we'll only handle the case where the code term only has a single child
// and that child is an anchor element.
const oldText = escape(node.textContent || '')
const anchorChild = node.querySelector('a')

const newText = oldText.replace(wordsLongerThan18Chars, (str) => {
return (
Expand All @@ -33,6 +32,10 @@ export default function wrapCodeTerms() {
)
})

node.innerHTML = node.innerHTML.replace(oldText, newText)
if (anchorChild && node.childNodes.length === 1) {
anchorChild.innerHTML = anchorChild.innerHTML.replace(oldText, newText)
} else {
node.innerHTML = node.innerHTML.replace(oldText, newText)
}
})
}