Skip to content

Commit 66014ec

Browse files
Turbo87Turbo87
committed
mixins/pagination: Inline alias properties
1 parent 4d39723 commit 66014ec

File tree

12 files changed

+33
-45
lines changed

12 files changed

+33
-45
lines changed

‎app/mixins/pagination.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
import { computed } from '@ember/object';
2-
import { readOnly } from '@ember/object/computed';
32
import Mixin from '@ember/object/mixin';
43

54
const VIEWABLE_PAGES = 9;
65

76
// eslint-disable-next-line ember/no-new-mixins
87
export default Mixin.create({
98
pagination: pagination(),
10-
11-
currentPage: readOnly('pagination.currentPage'),
12-
currentPageStart: readOnly('pagination.currentPageStart'),
13-
currentPageEnd: readOnly('pagination.currentPageEnd'),
14-
15-
availablePages: readOnly('pagination.availablePages'),
16-
17-
nextPage: readOnly('pagination.nextPage'),
18-
prevPage: readOnly('pagination.prevPage'),
19-
20-
pages: readOnly('pagination.pages'),
219
});
2210

2311
function pagination() {

‎app/templates/categories.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<div local-class="results-meta">
66
<ResultsCount
7-
@start={{this.currentPageStart}}
8-
@end={{this.currentPageEnd}}
7+
@start={{this.pagination.currentPageStart}}
8+
@end={{this.pagination.currentPageEnd}}
99
@total={{this.totalItems}}
1010
data-test-categories-nav
1111
/>
@@ -37,7 +37,7 @@
3737
{{/each}}
3838
</div>
3939

40-
<Pagination @pages={{this.pages}} @prevPage={{this.prevPage}} @nextPage={{this.nextPage}} />
40+
<Pagination @pages={{this.pagination.pages}} @prevPage={{this.pagination.prevPage}} @nextPage={{this.pagination.nextPage}} />
4141

4242
<div local-class='categories-footer'>
4343
Want to categorize your crate?

‎app/templates/category/index.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<h2>Crates</h2>
3737
<div local-class="results-meta">
3838
<ResultsCount
39-
@start={{this.currentPageStart}}
40-
@end={{this.currentPageEnd}}
39+
@start={{this.pagination.currentPageStart}}
40+
@end={{this.pagination.currentPageEnd}}
4141
@total={{this.totalItems}}
4242
data-test-category-nav
4343
/>
@@ -60,4 +60,4 @@
6060
{{/each}}
6161
</div>
6262

63-
<Pagination @pages={{this.pages}} @prevPage={{this.prevPage}} @nextPage={{this.nextPage}} />
63+
<Pagination @pages={{this.pagination.pages}} @prevPage={{this.pagination.prevPage}} @nextPage={{this.pagination.nextPage}} />

‎app/templates/crate/reverse-dependencies.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<div local-class="results-meta">
66
<ResultsCount
7-
@start={{this.currentPageStart}}
8-
@end={{this.currentPageEnd}}
7+
@start={{this.pagination.currentPageStart}}
8+
@end={{this.pagination.currentPageEnd}}
99
@total={{this.totalItems}}
1010
@name="reverse dependencies of {{this.crate.name}}"
1111
/>
@@ -25,4 +25,4 @@
2525
{{/each}}
2626
</div>
2727

28-
<Pagination @pages={{this.pages}} @prevPage={{this.prevPage}} @nextPage={{this.nextPage}} />
28+
<Pagination @pages={{this.pagination.pages}} @prevPage={{this.pagination.prevPage}} @nextPage={{this.pagination.nextPage}} />

‎app/templates/crates.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
<div local-class="results-meta">
2121
<ResultsCount
22-
@start={{this.currentPageStart}}
23-
@end={{this.currentPageEnd}}
22+
@start={{this.pagination.currentPageStart}}
23+
@end={{this.pagination.currentPageEnd}}
2424
@total={{this.totalItems}}
2525
data-test-crates-nav
2626
/>
@@ -43,4 +43,4 @@
4343
{{/each}}
4444
</div>
4545

46-
<Pagination @pages={{this.pages}} @prevPage={{this.prevPage}} @nextPage={{this.nextPage}} />
46+
<Pagination @pages={{this.pagination.pages}} @prevPage={{this.pagination.prevPage}} @nextPage={{this.pagination.nextPage}} />

‎app/templates/keyword/index.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<div local-class="results-meta">
66
<ResultsCount
7-
@start={{this.currentPageStart}}
8-
@end={{this.currentPageEnd}}
7+
@start={{this.pagination.currentPageStart}}
8+
@end={{this.pagination.currentPageEnd}}
99
@total={{this.totalItems}}
1010
data-test-keyword-nav
1111
/>
@@ -28,4 +28,4 @@
2828
{{/each}}
2929
</div>
3030

31-
<Pagination @pages={{this.pages}} @prevPage={{this.prevPage}} @nextPage={{this.nextPage}} />
31+
<Pagination @pages={{this.pagination.pages}} @prevPage={{this.pagination.prevPage}} @nextPage={{this.pagination.nextPage}} />

‎app/templates/keywords.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<div local-class="results-meta">
66
<ResultsCount
7-
@start={{this.currentPageStart}}
8-
@end={{this.currentPageEnd}}
7+
@start={{this.pagination.currentPageStart}}
8+
@end={{this.pagination.currentPageEnd}}
99
@total={{this.totalItems}}
1010
data-test-keywords-nav
1111
/>
@@ -30,4 +30,4 @@
3030
{{/each}}
3131
</div>
3232

33-
<Pagination @pages={{this.pages}} @prevPage={{this.prevPage}} @nextPage={{this.nextPage}} />
33+
<Pagination @pages={{this.pagination.pages}} @prevPage={{this.pagination.prevPage}} @nextPage={{this.pagination.nextPage}} />

‎app/templates/me/crates.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
<div local-class="results-meta">
88
<ResultsCount
9-
@start={{this.currentPageStart}}
10-
@end={{this.currentPageEnd}}
9+
@start={{this.pagination.currentPageStart}}
10+
@end={{this.pagination.currentPageEnd}}
1111
@total={{this.totalItems}}
1212
/>
1313

@@ -29,4 +29,4 @@
2929
{{/each}}
3030
</div>
3131

32-
<Pagination @pages={{this.pages}} @prevPage={{this.prevPage}} @nextPage={{this.nextPage}} />
32+
<Pagination @pages={{this.pagination.pages}} @prevPage={{this.pagination.prevPage}} @nextPage={{this.pagination.nextPage}} />

‎app/templates/me/following.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<div local-class="results-meta">
66
<ResultsCount
7-
@start={{this.currentPageStart}}
8-
@end={{this.currentPageEnd}}
7+
@start={{this.pagination.currentPageStart}}
8+
@end={{this.pagination.currentPageEnd}}
99
@total={{this.totalItems}}
1010
/>
1111

@@ -24,4 +24,4 @@
2424
{{/each}}
2525
</div>
2626

27-
<Pagination @pages={{this.pages}} @prevPage={{this.prevPage}} @nextPage={{this.nextPage}} />
27+
<Pagination @pages={{this.pagination.pages}} @prevPage={{this.pagination.prevPage}} @nextPage={{this.pagination.nextPage}} />

‎app/templates/search.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
{{else if this.hasItems}}
1414
<div local-class="results-meta">
1515
<ResultsCount
16-
@start={{this.currentPageStart}}
17-
@end={{this.currentPageEnd}}
16+
@start={{this.pagination.currentPageStart}}
17+
@end={{this.pagination.currentPageEnd}}
1818
@total={{this.totalItems}}
1919
data-test-search-nav
2020
/>
@@ -48,7 +48,7 @@
4848
{{/each}}
4949
</div>
5050

51-
<Pagination @pages={{this.pages}} @prevPage={{this.prevPage}} @nextPage={{this.nextPage}} />
51+
<Pagination @pages={{this.pagination.pages}} @prevPage={{this.pagination.prevPage}} @nextPage={{this.pagination.nextPage}} />
5252
{{else}}
5353
<h2>0 crates found. <a href='https://doc.rust-lang.org/cargo/getting-started/'>Get started</a> and create your own.</h2>
5454
{{/if}}

‎app/templates/team.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
<div local-class="results-meta">
1919
<ResultsCount
20-
@start={{this.currentPageStart}}
21-
@end={{this.currentPageEnd}}
20+
@start={{this.pagination.currentPageStart}}
21+
@end={{this.pagination.currentPageEnd}}
2222
@total={{this.totalItems}}
2323
/>
2424

@@ -40,4 +40,4 @@
4040
{{/each}}
4141
</div>
4242

43-
<Pagination @pages={{this.pages}} @prevPage={{this.prevPage}} @nextPage={{this.nextPage}} />
43+
<Pagination @pages={{this.pagination.pages}} @prevPage={{this.pagination.prevPage}} @nextPage={{this.pagination.nextPage}} />

‎app/templates/user.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
<div local-class="results-meta">
1212
<ResultsCount
13-
@start={{this.currentPageStart}}
14-
@end={{this.currentPageEnd}}
13+
@start={{this.pagination.currentPageStart}}
14+
@end={{this.pagination.currentPageEnd}}
1515
@total={{this.totalItems}}
1616
/>
1717

@@ -33,4 +33,4 @@
3333
{{/each}}
3434
</div>
3535

36-
<Pagination @pages={{this.pages}} @prevPage={{this.prevPage}} @nextPage={{this.nextPage}} />
36+
<Pagination @pages={{this.pagination.pages}} @prevPage={{this.pagination.prevPage}} @nextPage={{this.pagination.nextPage}} />

0 commit comments

Comments
 (0)