Skip to content
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

Jump to bottom

fix(macros/cssxref): correct URL generation for data types and functions #8766

Merged
merged 6 commits into from
Mar 28, 2024
Merged

fix(macros/cssxref): correct URL generation for data types and functions #8766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c027d38
Fix `{{CSSXref}}` for CSS functions
yarusome May 4, 2023
76a3d5d
Merge branch 'mdn:main' into cssxref
yarusome May 5, 2023
79c22cc
Update test case
yarusome May 5, 2023
14b0817
Merge branch 'main' into cssxref
caugner Nov 8, 2023
3d6abf6
Merge branch 'main' into cssxref
caugner Mar 1, 2024
5c9c759
Merge branch 'main' into cssxref
caugner Mar 28, 2024
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
50 changes: 21 additions & 29 deletions kumascript/macros/cssxref.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,34 @@

Examples:
{{cssxref("background")}} =>
<a href="/en-US/docs/Web/CSS/background" title="The background CSS
property is..."><code>background</code></a>
<a href="/en-US/docs/Web/CSS/background"><code>background</code></a>
{{cssxref("length")}} =>
<a href="/en-US/docs/Web/CSS/length" title="The <length> CSS data type
denotes..."><code>&lt;length&gt;</code></a>
{{cssxref("linear-gradient()")}} =>
<a href="/en-US/docs/Web/CSS/linear-gradient()" title="The CSS
linear-gradient() function creates..."><code>linear-gradient()</code></a>
<a href="/en-US/docs/Web/CSS/length"><code>&lt;length&gt;</code></a>
{{cssxref("calc()")}} =>
<a href="/en-US/docs/Web/CSS/calc"><code>calc()</code></a>
{{cssxref("margin-top", "top margin")}} =>
<a href="/en-US/docs/Web/CSS/margin-top" title="The margin-top CSS
property of an element sets..."><code>top margin</code></a>
{{cssxref("filter", "", "#url")}} =>
<a href="/en-US/docs/Web/CSS/filter#url()"><code>filter</code></a>
<a href="/en-US/docs/Web/CSS/margin-top"><code>top margin</code></a>
{{cssxref("attr()", "", "#values")}} =>
<a href="/en-US/docs/Web/CSS/attr#values"><code>attr()</code></a>
*/

var lang = env.locale;
var url = "";
var urlWithoutAnchor = "";
var displayName = ($1 || $0);
const lang = env.locale;
let url = "";
let urlWithoutAnchor = "";
let displayName = ($1 || $0);

// Deal with CSS data types by removing <>
var slug = $0.replace(/&lt;(.*)&gt;/g, '$1');
// Deal with CSS data types and functions by removing <> and ()
let slug = $0.replace(/&lt;(.*)&gt;/g, "$1")
.replace(/\(\)/g, "");

// Special case <color>, <flex>, and <position>
switch ($0) {
case '&lt;color&gt;':
slug = 'color_value';
break;

case '&lt;flex&gt;':
slug = 'flex_value';
break;
// Special case <color>, <flex>, <overflow>, and <position>
if (/^&lt;(color|flex|overflow|position)&gt;$/.test($0)) {
slug += "_value";
}

case '&lt;position&gt;':
slug = 'position_value';
break;
// Special case :host() and fit-content()
if (/^(:host|fit-content)\(\)$/.test($0)) {
slug += "_function";
}

const basePath = `/${lang}/docs/Web/CSS/`;
Expand Down
4 changes: 2 additions & 2 deletions kumascript/tests/macros/cssxref.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ const MOCK_PAGES = {
},
},
attr: {
url: [CSS_BASE_URL, "attr()"].join("/"),
url: [CSS_BASE_URL, "attr"].join("/"),
data: {
url: [CSS_BASE_URL, "attr()"].join("/"),
url: [CSS_BASE_URL, "attr"].join("/"),
summary:
'The <strong><code>attr()</code></strong> <a href="/en-US/docs/Web/CSS">CSS</a> function is used to retrieve the value of an attribute of the selected element and use it in the style sheet.',
pageType: "css-function",
Expand Down
Loading