Skip to content

Commit 6da8e77

Browse files
FlaviusTitusFlaviusTitus
committed
update
1 parent 2f8cc25 commit 6da8e77

File tree

4 files changed

+34
-14
lines changed

4 files changed

+34
-14
lines changed

‎package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@default-js/defaultjs-dynamic-requester": "^1.0.0-beta.1",
4848
"@default-js/defaultjs-expression-language": "^1.0.0-beta.12",
4949
"@default-js/defaultjs-extdom": "^1.0.0-beta.24",
50-
"@default-js/defaultjs-template-language": "^1.0.0-beta.13"
50+
"@default-js/defaultjs-template-language": "^1.0.0-beta.14"
5151
},
5252
"directories": {
5353
"test": "test"

‎src/components/Pagination/index.js‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,30 @@ const ATTRIBUTES = [ATTR_PAGE, ATTR_COUNT, ATTR_SIZE, ATTR_TEMPLATE];
1212

1313
const DATA = new WeakData();
1414

15+
const TEMPLATE = create(`
16+
<nav class="pagination" jstl-if="\${pages.length > 1}">
17+
<ul>
18+
<li class="pagination-first \${page == 1 ? 'disabled' : ''}" ?@click:delegate="\${page != 1}" @click:delegate="pagination-to-page" data-page="1">first</li>
19+
<li class="pagination-back \${page == 1 ? 'disabled' : ''}" ?@click:delegate="\${page > 1}" @click:delegate="pagination-to-page" data-page="\${page - 1}">prev</li>
20+
21+
<jstl jstl-foreach="\${pages}">
22+
<li class="pagination-page \${item == page ? 'active' : ''}" ?@click:delegate="\${item != page}" @click:delegate="pagination-to-page" data-page="\${item}">\${item}</li>
23+
</jstl>
24+
25+
<li class="pagination-next \${page >= count ? 'disabled' : ''}" ?@click:delegate="\${count > page}" @click:delegate="pagination-to-page" data-page="\${page + 1}">next</li>
26+
<li class="pagination-last \${page >= count ? 'disabled' : ''}" ?@click:delegate="\${count != page}" @click:delegate="pagination-to-page" data-page="\${count}">last</li>
27+
</ul>
28+
</nav>
29+
`, true);
30+
1531
const getTemplate = (node) => {
1632
let template = node.find(":scope > template").first();
1733
if (!!template) return template;
18-
template = node.attr(ATTR_TEMPLATE);
19-
if (!!template) template = find(template).first();
34+
const value = node.attr(ATTR_TEMPLATE);
35+
if(!value) return TEMPLATE;
36+
if (!!value) template = find(value).first();
2037
if (!!template) return template;
21-
return new URL(template, location.origin);
38+
return new URL(value, location.origin);
2239
};
2340

2441
const toData = (page, count, size) => {

‎webcontent/pagination/index.html‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,26 @@
1212
<body>
1313
<template id="pagination">
1414
<nav class="pagination" jstl-if="${pages.length > 1}">
15-
<ul class="page-list">
16-
<li class="page ${page == 1 ? 'disabled' : ''}" ?@click="${page == 1}" @click:delegate="pagination-to-page" data-page="1">
15+
<ul>
16+
<li class="pagination-first ${page == 1 ? 'disabled' : ''}" ?@click:delegate="${page != 1}" @click:delegate="pagination-to-page" data-page="1">
1717
first
1818
</li>
19-
<li class="page ${page == 1 ? 'disabled' : ''}" ?@click="${page > 1}" @click:delegate="pagination-to-page" data-page="${page - 1}">
19+
<li class="pagination-back ${page == 1 ? 'disabled' : ''}" ?@click:delegate="${page > 1}" @click:delegate="pagination-to-page" data-page="${page - 1}">
2020
prev
2121
</li>
2222

2323
<jstl jstl-foreach="${pages}">
24-
<li class="page ${item == page ? 'active' : ''}" ?@click="${item != page}" @click:delegate="pagination-to-page" data-page="${item}">
24+
<li class="pagination-page ${item == page ? 'active' : ''}" ?@click:delegate="${item != page}" @click:delegate="pagination-to-page" data-page="${item}">
2525
${item}
2626
</li>
2727
</jstl>
2828

29-
<li class="page ${page >= count ? 'disabled' : ''}" ?@click="${count > page}" @click:delegate="pagination-to-page" data-page="${page + 1}">
29+
<li class="pagination-next ${page >= count ? 'disabled' : ''}" ?@click:delegate="${count > page}" @click:delegate="pagination-to-page" data-page="${page + 1}">
3030
next
3131
</li>
32-
<li class="page ${page >= count ? 'disabled' : ''}" ?@click="${count >= page}" @click:delegate="pagination-to-page" data-page="${count}">
32+
<li class="pagination-last ${page >= count ? 'disabled' : ''}" ?@click:delegate="${count != page}" @click:delegate="pagination-to-page" data-page="${count}">
3333
prev
3434
</li>
35-
3635
</ul>
3736
</nav>
3837
</template>
@@ -56,6 +55,10 @@ <h1>50. page</h1>
5655
<d-pagination page="50" count="50" size="5" template="#pagination"></d-pagination>
5756

5857

58+
<h1>without defined template</h1>
59+
<d-pagination page="25" count="50" size="5"></d-pagination>
60+
61+
5962
<script type="module" src="/browser-bundle.js"></script>
6063
</body>
6164
</html>

0 commit comments

Comments
 (0)