Skip to content

Commit 4069e57

Browse files
committed
update to current idioms
1 parent 0344cd2 commit 4069e57

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed
+10-10
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
import { computed } from "@ember/object";
2-
import { equal } from "@ember/object/computed";
31
import Controller from "@ember/controller";
2+
import { tracked } from "@glimmer/tracking";
43

54
export default class MediaController extends Controller {
65
queryParams = ["filter"];
7-
filter = "albums";
6+
@tracked filter = "albums";
87

9-
@equal("filter", "albums")
10-
showAlbums;
8+
get showAlbums() {
9+
return this.filter === "albums";
10+
}
1111

12-
@equal("filter", "movies")
13-
showMovies;
12+
get showMovies() {
13+
return this.filter === "movies";
14+
}
1415

15-
@computed("showAlbums", "showMovies")
1616
get media() {
1717
if (this.showAlbums) {
1818
return this.model.albums;
1919
} else if (this.showMovies) {
2020
return this.model.movies;
21-
} else {
22-
return [];
2321
}
22+
23+
return [];
2424
}
2525
}

examples/routing/app/templates/application.hbs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<nav>
22
<ul>
33
<li>
4-
{{link-to "Home" "index"}}
4+
<LinkTo @route="index">Home</LinkTo>
55
</li>
66
<li>
7-
{{link-to "Media" "media"}}
7+
<LinkTo @route="media">Media</LinkTo>
88
</li>
99
<li>
10-
{{link-to "Error" "fail"}}
10+
<LinkTo @route="fail">Error</LinkTo>
1111
</li>
1212
<li>
1313
<a href="/unknown-page">Unknown Page</a>

examples/routing/app/templates/media.hbs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<h1>Media</h1>
22

3-
{{link-to "Albums" (query-params filter="albums")}}
4-
{{link-to "Movies" (query-params filter="movies")}}
3+
<LinkTo @query={{hash filter="albums"}}>Albums</LinkTo>
4+
<LinkTo @query={{hash filter="movies"}}>Movies</LinkTo>
55

66
<ul>
7-
{{#each media as |medium i|}}
7+
{{#each this.media as |medium i|}}
88
<li>
9-
{{#link-to "media.medium" i}}
9+
<LinkTo @route="media.medium" @model={{i}}>
1010
{{medium.title}}
11-
{{/link-to}}
11+
</LinkTo>
1212
</li>
1313
{{/each}}
1414
</ul>
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<h1>Medium</h1>
22

3-
<p>{{model.title}}</p>
3+
<p>{{this.model.title}}</p>

0 commit comments

Comments
 (0)