Skip to content

Commit b8a31ad

Browse files
borsbors
committed
Auto merge of #2017 - Turbo87:angle-brackets, r=locks
Convert curly component to angle bracket component invocations see https://emberjs.github.io/rfcs/0311-angle-bracket-invocation.html the main advantage from this is that arguments and attributes are both first-class citizens now and components invoked with angle bracket syntax can use "modifiers" (see emberjs/rfcs#353)
2 parents 7e562c6 + 6b5496e commit b8a31ad

35 files changed

+359
-357
lines changed

‎app/templates/application.hbs‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
{{head-layout}}
1+
<HeadLayout />
22

33
{{title "crates.io: Rust Package Registry" separator=' - ' prepend=true}}
4-
{{google-jsapi}}
4+
<GoogleJsapi />
55

66
<nav id="header">
7-
{{#link-to "index" tabindex="-1"}}
7+
<LinkTo @route="index" @tabindex="-1">
88
<img src="/assets/Cargo-Logo-Small.png" id="logo"
99
height="100" width="100" alt="Cargo Logo">
10-
{{/link-to}}
11-
{{#link-to "index"}}
10+
</LinkTo>
11+
<LinkTo @route="index">
1212
<h1>
1313
crates.io
1414
<span class="subtitle">Rust Package Registry</span>
1515
</h1>
16-
{{/link-to}}
16+
</LinkTo>
1717

1818
<form class='search' action='/search' {{ action "search" on="submit" }} data-test-search-form>
1919
<input type="text" class="search" name="q" id="cargo-desktop-search"
@@ -30,17 +30,17 @@
3030
</form>
3131

3232
<div class='nav'>
33-
{{#link-to "crates" (query-params letter=null page=1) data-test-all-crates-link}}
33+
<LinkTo @route="crates" @query={{hash letter=null page=1}} data-test-all-crates-link>
3434
Browse All Crates
35-
{{/link-to}}
35+
</LinkTo>
3636
<span class="sep">|</span>
37-
{{#rl-dropdown-container class="dropdown-container"}}
38-
{{#rl-dropdown-toggle class="dropdown"}}
37+
<RlDropdownContainer class="dropdown-container">
38+
<RlDropdownToggle class="dropdown">
3939
Docs
4040
<span class='arrow'></span>
41-
{{/rl-dropdown-toggle}}
41+
</RlDropdownToggle>
4242

43-
{{#rl-dropdown tagName="ul" id="doc-links" class="dropdown"}}
43+
<RlDropdown @tagName="ul" @id="doc-links" class="dropdown">
4444
<li><a href='https://doc.rust-lang.org/cargo/getting-started/'>Getting Started</a></li>
4545
<li><a href='https://doc.rust-lang.org/cargo/guide/'>Guide</a></li>
4646
<li><a href='https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html'>Specifying Dependencies</a></li>
@@ -53,52 +53,52 @@
5353
<li><a href='https://doc.rust-lang.org/cargo/reference/environment-variables.html'>Environment Variables</a></li>
5454
<li><a href='https://doc.rust-lang.org/cargo/reference/source-replacement.html'>Source Replacement</a></li>
5555
<li><a href='https://doc.rust-lang.org/cargo/reference/external-tools.html'>External Tools</a></li>
56-
<li>{{#link-to 'policies'}}Policies{{/link-to}}</li>
57-
<li>{{#link-to 'category-slugs'}}List of category slugs{{/link-to}}</li>
58-
{{/rl-dropdown}}
59-
{{/rl-dropdown-container}}
56+
<li><LinkTo @route="policies">Policies</LinkTo></li>
57+
<li><LinkTo @route="category-slugs">List of category slugs</LinkTo></li>
58+
</RlDropdown>
59+
</RlDropdownContainer>
6060
<span class="sep">|</span>
6161
{{#if session.currentUser}}
62-
{{#rl-dropdown-container class="dropdown-container"}}
63-
{{#rl-dropdown-toggle class="dropdown"}}
64-
{{user-avatar user=session.currentUser size='small'}}
62+
<RlDropdownContainer class="dropdown-container">
63+
<RlDropdownToggle class="dropdown">
64+
<UserAvatar @user={{session.currentUser}} @size="small" />
6565
{{ session.currentUser.name }}
6666
<span class='arrow'></span>
67-
{{/rl-dropdown-toggle}}
67+
</RlDropdownToggle>
6868

69-
{{#rl-dropdown tagName="ul" class="dropdown current-user-links"}}
70-
<li>{{#link-to 'dashboard'}}Dashboard{{/link-to}}</li>
71-
<li>{{#link-to 'me'}}Account Settings{{/link-to}}</li>
72-
<li>{{#link-to 'me.pending-invites'}}Owner Invites{{/link-to}}</li>
73-
<li class='last'>{{#link-to 'logout'}}Sign Out{{/link-to}}</li>
74-
{{/rl-dropdown}}
75-
{{/rl-dropdown-container}}
69+
<RlDropdown @tagName="ul" class="dropdown current-user-links">
70+
<li><LinkTo @route="dashboard">Dashboard</LinkTo></li>
71+
<li><LinkTo @route="me">Account Settings</LinkTo></li>
72+
<li><LinkTo @route="me.pending-invites">Owner Invites</LinkTo></li>
73+
<li class='last'><LinkTo @route="logout">Sign Out</LinkTo></li>
74+
</RlDropdown>
75+
</RlDropdownContainer>
7676
{{else}}
77-
{{#link-to "login" data-test-login-link}}
77+
<LinkTo @route="login" data-test-login-link>
7878
{{svg-jar "lock"}}
7979
Log in with GitHub
80-
{{/link-to}}
80+
</LinkTo>
8181
{{/if}}
8282
</div>
8383

8484
<div class='menu'>
85-
{{#rl-dropdown-container class='dropdown-container'}}
86-
{{#rl-dropdown-toggle class='dropdown'}}
85+
<RlDropdownContainer class="dropdown-container">
86+
<RlDropdownToggle class="dropdown">
8787
Menu
8888
<span class='arrow'></span>
89-
{{/rl-dropdown-toggle}}
90-
{{#rl-dropdown tagName='ul' class='dropdown current-user-links'}}
91-
<li>{{#link-to "crates"}}Browse All Crates{{/link-to}}</li>
89+
</RlDropdownToggle>
90+
<RlDropdown @tagName="ul" class="dropdown current-user-links">
91+
<li><LinkTo @route="crates">Browse All Crates</LinkTo></li>
9292
{{#if session.currentUser}}
93-
<li>{{#link-to 'dashboard'}}Dashboard{{/link-to}}</li>
94-
<li>{{#link-to 'me'}}Account Settings{{/link-to}}</li>
95-
<li>{{#link-to 'me.pending-invites'}}Owner Invites{{/link-to}}</li>
96-
<li class='last'>{{#link-to 'logout'}}Sign Out{{/link-to}}</li>
93+
<li><LinkTo @route="dashboard">Dashboard</LinkTo></li>
94+
<li><LinkTo @route="me">Account Settings</LinkTo></li>
95+
<li><LinkTo @route="me.pending-invites">Owner Invites</LinkTo></li>
96+
<li class='last'><LinkTo @route="logout">Sign Out</LinkTo></li>
9797
{{else}}
98-
<li>{{#link-to "login"}}Log in with GitHub{{/link-to}}</li>
98+
<li><LinkTo @route="login">Log in with GitHub</LinkTo></li>
9999
{{/if}}
100-
{{/rl-dropdown}}
101-
{{/rl-dropdown-container}}
100+
</RlDropdown>
101+
</RlDropdownContainer>
102102
</div>
103103

104104
<div class='links'>
@@ -116,7 +116,7 @@
116116
</form>
117117

118118
<main id="main" class='inner-content'>
119-
{{flash-message}}
119+
<FlashMessage />
120120

121121
{{outlet}}
122122
</main>
@@ -134,7 +134,7 @@
134134
<span class="sep">|</span>
135135
<a href='https://www.rust-lang.org/policies/privacy'>Privacy notice</a>
136136
<span class="sep">|</span>
137-
{{#link-to 'policies'}}Policies{{/link-to}}
137+
<LinkTo @route="policies">Policies</LinkTo>
138138
</footer>
139139

140140
<a href='https://github.com/rust-lang/crates.io' class='fork-me'>

‎app/templates/catch-all.hbs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
<p id='p404'>
44
Perhaps a search of the site may help?
55

6-
{{input type="text" class="search"
7-
placeholder="Search"
8-
value=search
9-
enter=(action "search")
10-
required=true}}
6+
<Input
7+
@type="text"
8+
class="search"
9+
placeholder="Search"
10+
@value={{search}}
11+
@enter={{action "search"}}
12+
required={{true}}
13+
/>
1114
</p>

‎app/templates/categories.hbs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@
1616

1717
<div class='sort' data-test-categories-sort>
1818
<span class='small'>Sort by</span>
19-
{{#rl-dropdown-container class="dropdown-container"}}
20-
{{#rl-dropdown-toggle tagName="a" class="dropdown" data-test-current-order=true}}
19+
<RlDropdownContainer class="dropdown-container">
20+
<RlDropdownToggle @tagName="a" class="dropdown" data-test-current-order>
2121
{{svg-jar "sort"}}
2222
{{ currentSortBy }}
2323
<span class='arrow'></span>
24-
{{/rl-dropdown-toggle}}
24+
</RlDropdownToggle>
2525

26-
{{#rl-dropdown tagName="ul" class="dropdown"}}
26+
<RlDropdown @tagName="ul" class="dropdown">
2727
<li>
28-
{{#link-to (query-params sort="alpha")}}
28+
<LinkTo @query={{hash sort="alpha"}}>
2929
Alphabetical
30-
{{/link-to}}
30+
</LinkTo>
3131
</li>
3232
<li>
33-
{{#link-to (query-params sort="crates")}}
33+
<LinkTo @query={{hash sort="crates"}}>
3434
# Crates
35-
{{/link-to}}
35+
</LinkTo>
3636
</li>
37-
{{/rl-dropdown}}
38-
{{/rl-dropdown-container}}
37+
</RlDropdown>
38+
</RlDropdownContainer>
3939
</div>
4040
</div>
4141

@@ -44,7 +44,7 @@
4444
<div class='row' data-test-category={{category.slug}}>
4545
<div class='desc'>
4646
<div class='info'>
47-
{{link-to category.category "category" category.slug}}
47+
<LinkTo @route="category" @model={{category.slug}}>{{category.category}}</LinkTo>
4848
<span class='small' data-test-crate-count>
4949
{{ pluralize (format-num category.crates_cnt) "crate" }}
5050
</span>
@@ -60,13 +60,13 @@
6060
</div>
6161

6262
<div class='pagination'>
63-
{{#link-to (query-params page=prevPage) class="prev" rel="prev" title="previous page"}}
63+
<LinkTo @query={{hash page=prevPage}} class="prev" @rel="prev" @title="previous page">
6464
{{svg-jar "left-pag"}}
65-
{{/link-to}}
65+
</LinkTo>
6666
{{#each pages as |page|}}
67-
{{#link-to (query-params page=page)}}{{ page }}{{/link-to}}
67+
<LinkTo @query={{hash page=page}}>{{ page }}</LinkTo>
6868
{{/each}}
69-
{{#link-to (query-params page=nextPage) class="next" rel="next" title="next page"}}
69+
<LinkTo @query={{hash page=nextPage}} class="next" @rel="next" @title="next page">
7070
{{svg-jar "right-pag"}}
71-
{{/link-to}}
71+
</LinkTo>
7272
</div>

‎app/templates/category/index.hbs‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{{ title category.category ' - Categories' }}
22

33
<div id='crates-heading'>
4-
{{#link-to "categories" (html-attributes aria-label="Categories")}}{{svg-jar "crate"}}{{/link-to}}
4+
<LinkTo @route="categories" aria-label="Categories">{{svg-jar "crate"}}</LinkTo>
55
<h1>
6-
{{#each category.parent_categories as |parent|}}{{link-to parent.category "category" parent.slug}}::{{/each}}
6+
{{#each category.parent_categories as |parent|}}<LinkTo @route="category" @model={{parent.slug}}>{{parent.category}}</LinkTo>::{{/each}}
77
{{~ category.category }}
88
</h1>
99
</div>
@@ -20,7 +20,7 @@
2020
<div class='row'>
2121
<div class='desc'>
2222
<div class='info'>
23-
{{link-to subcategory.category "category" subcategory.slug}}
23+
<LinkTo @route="category" @model={{subcategory.slug}}>{{subcategory.category}}</LinkTo>
2424
<span class='small'>
2525
{{ pluralize (format-num subcategory.crates_cnt) "crate" }}
2626
</span>
@@ -49,53 +49,53 @@
4949

5050
<div class='sort' data-test-category-sort>
5151
<span class='small'>Sort by</span>
52-
{{#rl-dropdown-container class="dropdown-container"}}
53-
{{#rl-dropdown-toggle tagName="a" class="dropdown" data-test-current-order=true}}
52+
<RlDropdownContainer class="dropdown-container">
53+
<RlDropdownToggle @tagName="a" class="dropdown" data-test-current-order>
5454
{{svg-jar "sort"}}
5555
{{ currentSortBy }}
5656
<span class='arrow'></span>
57-
{{/rl-dropdown-toggle}}
57+
</RlDropdownToggle>
5858

59-
{{#rl-dropdown tagName="ul" class="dropdown"}}
59+
<RlDropdown @tagName="ul" class="dropdown">
6060
<li>
61-
{{#link-to (query-params sort="alpha")}}
61+
<LinkTo @query={{hash sort="alpha"}}>
6262
Alphabetical
63-
{{/link-to}}
63+
</LinkTo>
6464
</li>
6565
<li>
66-
{{#link-to (query-params sort="downloads")}}
66+
<LinkTo @query={{hash sort="downloads"}}>
6767
All-Time Downloads
68-
{{/link-to}}
68+
</LinkTo>
6969
</li>
7070
<li>
71-
{{#link-to (query-params sort="recent-downloads")}}
71+
<LinkTo @query={{hash sort="recent-downloads"}}>
7272
Recent Downloads
73-
{{/link-to}}
73+
</LinkTo>
7474
</li>
7575
<li>
76-
{{#link-to (query-params sort="recent-updates")}}
76+
<LinkTo @query={{hash sort="recent-updates"}}>
7777
Recent Updates
78-
{{/link-to}}
78+
</LinkTo>
7979
</li>
80-
{{/rl-dropdown}}
81-
{{/rl-dropdown-container}}
80+
</RlDropdown>
81+
</RlDropdownContainer>
8282
</div>
8383
</div>
8484

8585
<div id='crates' class='white-rows'>
8686
{{#each model as |crate|}}
87-
{{crate-row crate=crate}}
87+
<CrateRow @crate={{crate}} />
8888
{{/each}}
8989
</div>
9090

9191
<div class='pagination'>
92-
{{#link-to (query-params page=prevPage) class="prev" rel="prev" title="previous page"}}
92+
<LinkTo @query={{hash page=prevPage}} class="prev" @rel="prev" @title="previous page">
9393
{{svg-jar "left-pag"}}
94-
{{/link-to}}
94+
</LinkTo>
9595
{{#each pages as |page|}}
96-
{{#link-to (query-params page=page)}}{{ page }}{{/link-to}}
96+
<LinkTo @query={{hash page=page}}>{{ page }}</LinkTo>
9797
{{/each}}
98-
{{#link-to (query-params page=nextPage) class="next" rel="next" title="next page"}}
98+
<LinkTo @query={{hash page=nextPage}} class="next" @rel="next" @title="next page">
9999
{{svg-jar "right-pag"}}
100-
{{/link-to}}
100+
</LinkTo>
101101
</div>

‎app/templates/components/api-token-row.hbs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<div class={{if api_token.isNew "row create-token" "row"}}>
22
<div class='name'>
33
{{#if api_token.isNew}}
4-
{{input
5-
type="text"
6-
placeholder="New token name"
7-
disabled=api_token.isSaving
8-
value=api_token.name
9-
autofocus="autofocus"
10-
enter="saveToken"
11-
data-test-focused-input=true
12-
}}
4+
<Input
5+
@type="text" placeholder="New token name"
6+
@disabled={{api_token.isSaving}}
7+
@value={{api_token.name}}
8+
@autofocus="autofocus"
9+
@enter="saveToken"
10+
data-test-focused-input
11+
/>
1312
{{else}}
1413
{{ api_token.name }}
1514
{{/if}}

‎app/templates/components/category-list.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<ul>
22
{{#each categories as |category|}}
33
<li>
4-
{{#link-to 'category' category.slug class='name'}}
4+
<LinkTo @route="category" @model={{category.slug}} class="name">
55
<span>{{ category.category }} ({{ format-num category.crates_cnt }})</span>
66
<div class='arrow-in-list'>
77
{{svg-jar "right-arrow"}}
88
</div>
9-
{{/link-to}}
9+
</LinkTo>
1010
</li>
1111
{{/each}}
1212
</ul>

‎app/templates/components/crate-downloads-list.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<ul>
22
{{#each crates as |crate|}}
33
<li>
4-
{{#link-to 'crate' crate.id class='name'}}
4+
<LinkTo @route="crate" @model={{crate.id}} class="name">
55
{{ crate.name }} ({{ crate.max_version }})
66
<div class='right'>
77
{{svg-jar "download-clear-back"}}
88
{{ format-num crate.downloads }}
99
</div>
10-
{{/link-to}}
10+
</LinkTo>
1111
</li>
1212
{{/each}}
1313
</ul>

‎app/templates/components/crate-list.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<ol>
22
{{#each crates as |crate index|}}
33
<li>
4-
{{#link-to 'crate' crate.id class='name' data-test-crate-link=index}}
4+
<LinkTo @route="crate" @model={{crate.id}} class="name" data-test-crate-link={{index}}>
55
<span>{{ crate.name }} ({{ crate.max_version }})</span>
66
<div class='arrow-in-list'>
77
{{svg-jar "right-arrow"}}
88
</div>
9-
{{/link-to}}
9+
</LinkTo>
1010
</li>
1111
{{/each}}
1212
</ol>

0 commit comments

Comments
 (0)