Skip to content

Commit 22bee77

Browse files
committed
[css-navigation-1] Use at/with rather than current/other, for now.
For now, this changes the keywords to use at/with rather than current/other, but has issues about the option to switch.
1 parent a12a01b commit 22bee77

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

css-navigation-1/Overview.bs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ with <<navigation-condition>> defined as:
223223
<<navigation-type-test>>
224224
225225
<dfn><<navigation-location-test>></dfn> = <<navigation-location-keyword>> : <<navigation-location>>
226-
<dfn><<navigation-location-keyword>></dfn> = at | other | from | to
226+
<dfn><<navigation-location-keyword>></dfn> = at | with | from | to
227227
<dfn><<navigation-location>></dfn> = <<route-name>> | <<url-pattern()>>
228228
<dfn><<route-name>></dfn> = <<dashed-ident>>
229229
@@ -234,7 +234,7 @@ with <<navigation-condition>> defined as:
234234
<dfn><<navigation-type-keyword>></dfn> = traverse | back | forward | reload
235235
</pre>
236236

237-
ISSUE: Should we use ''at'' or ''current''?
237+
ISSUE: Should we use ''at''/''with''/''from''/''to'' or ''current''/''other''/''from''/''to''?
238238

239239
The above grammar is purposely very loose for forwards-compatibility reasons,
240240
since the <<general-enclosed>> production
@@ -274,7 +274,7 @@ as follows:
274274
the [=navigation location URL pattern=] of <<navigation-location>>
275275
and <var>input</var> as the document's [=Document/URL=].
276276

277-
: other: <<navigation-location>>
277+
: with: <<navigation-location>>
278278
:: The result is true if
279279
the [=current other URL=] <var>other</var> of the document is non-null and
280280
[=URL pattern/match|match a URL pattern=] is non-null when
@@ -447,7 +447,7 @@ by matching the relevant parts of the navigation URL to the link URL.
447447

448448
This depends on the --movie-details-with-id route
449449
declaring the ID but not the language with a named
450-
parameter, and the use of match-params(navigation-other).
450+
parameter, and the use of match-params(navigation-with).
451451

452452
This means that both the of the link and the other URL of
453453
the current navigation match the URL pattern defined by
@@ -458,7 +458,7 @@ by matching the relevant parts of the navigation URL to the link URL.
458458
*/
459459
.movie-container:has(
460460
> .movie-title:link-to(--movie-details-with-id
461-
with match-params(navigation-other))) {
461+
with match-params(navigation-with))) {
462462

463463
view-transition-name: movie-container;
464464

@@ -485,11 +485,12 @@ and the pseudo-class matches any element where:
485485
// with identical syntax.
486486
<dfn><<navigation-match>></dfn> = <<pattern-match-type>>( <<navigation-match-target>> )
487487
<dfn><<pattern-match-type>></dfn> = match-pattern | match-params | match-url
488-
<dfn><<navigation-match-target>></dfn> = navigation-other | navigation-current |
488+
<dfn><<navigation-match-target>></dfn> = navigation-at | navigation-with |
489489
navigation-from | navigation-to
490490
</pre>
491491

492-
ISSUE: Should we use ''navigation-at'' or ''navigation-current''?
492+
ISSUE: Should we use ''navigation-''-(''at''/''with''/''from''/''to'') or
493+
''navigation-''/(''current''/''other''/''from''/''to'')?
493494

494495
ISSUE: Should the '':link-to()'' variant that has a <<link-condition>> have a different name,
495496
such as '':navigating-link()''?
@@ -530,10 +531,10 @@ if the following steps return true:
530531
1. Let <var>matchTarget</var> be the <<navigation-match-target>> argument
531532
of the <<navigation-match>>.
532533
1. Let <var>navigationURL</var> be:
533-
: If <var>matchTarget</var> is ''navigation-other'',
534-
:: the <a>current other URL</a> of the document.
535-
: Otherwise, if <var>matchTarget</var> is ''navigation-current'',
534+
: If <var>matchTarget</var> is ''navigation-at'',
536535
:: the document's [[=Document/URL=]].
536+
: Otherwise, if <var>matchTarget</var> is ''navigation-with'',
537+
:: the <a>current other URL</a> of the document.
537538
: Otherwise, if <var>matchTarget</var> is ''navigation-from'',
538539
:: the <a>current from URL</a> of the document.
539540
: Otherwise (Assert: <var>matchTarget</var> is ''navigation-to''),

0 commit comments

Comments
 (0)