Skip to content

Commit b77a401

Browse files
MartiiMartii
committed
Merge pull request #543 from Martii/Issue-531noPaginationRendering
Programmatic toggle and disable only page pagination Auto-merge
2 parents 3f30956 + f0a6594 commit b77a401

15 files changed

Lines changed: 101 additions & 14 deletions

‎libs/templateHelpers.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ var paginateTemplate = function (aOpts) {
2121
var distVisible = aOpts.distVisible || 4;
2222
var firstVisible = aOpts.firstVisible || true;
2323
var lastVisible = aOpts.firstVisible || true;
24+
var soleVisible = aOpts.soleVisible || false;
25+
26+
if (!soleVisible && lastPage === 1) {
27+
return null;
28+
}
2429

2530
var linkedPages = [];
2631

@@ -33,6 +38,10 @@ var paginateTemplate = function (aOpts) {
3338
if (lastVisible && linkedPages.length > 0 && linkedPages[linkedPages.length - 1] !== lastPage)
3439
linkedPages.push(lastPage);
3540

41+
if (linkedPages.length === 0) {
42+
return null;
43+
}
44+
3645
var html = '';
3746
html += '<ul class="pagination">';
3847
for (var i = 0; i < linkedPages.length; i++) {

‎views/includes/scripts/commentReplyScript.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Show spacer div
44
$('#reply-control').on('show.bs.collapse', function () {
55
$('#show-reply-form-when-visible').css({
6-
height: '210px'
6+
height: '{{#paginationRendered}}210{{/paginationRendered}}{{^paginationRendered}}268{{/paginationRendered}}px'
77
});
88
});
99

‎views/pages/categoryListPage.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,27 @@ <h4 class="list-group-item-heading">{{name}}</h4>
2222
{{/categoryList}}
2323
</div>
2424
<div class="panel-group col-sm-offset-0 col-md-offset-2 col-lg-offset-3">
25+
{{#paginationRendered}}
2526
<div class="text-center collapse">
2627
{{{paginationRendered}}}
2728
</div>
29+
{{/paginationRendered}}
2830
<div class="panel panel-default col-sm-12 col-md-12 col-lg-12">
2931
{{> includes/discussionList.html }}
3032
</div>
33+
{{#paginationRendered}}
3134
<div class="text-center">
3235
{{{paginationRendered}}}
3336
</div>
37+
{{/paginationRendered}}
3438
</div>
3539
</div>
3640
</div>
3741
</div>
3842
{{> includes/footer.html }}
39-
{{> includes/scripts/showTopPagination.html }}
43+
{{#paginationRendered}}
44+
{{> includes/scripts/showTopPagination.html }}
45+
{{/paginationRendered}}
4046
{{> includes/scripts/tableTrLinkScript.html }}
4147
</body>
4248
</html>

‎views/pages/discussionListPage.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,26 @@
1818
<i class="fa fa-plus"></i> Create Topic
1919
</a>
2020
</div>
21+
{{#paginationRendered}}
2122
<div class="text-center collapse">
2223
{{{paginationRendered}}}
2324
</div>
25+
{{/paginationRendered}}
2426
<div class="panel panel-default">
2527
{{> includes/discussionList.html }}
2628
</div>
29+
{{#paginationRendered}}
2730
<div class="text-center">
2831
{{{paginationRendered}}}
2932
</div>
33+
{{/paginationRendered}}
3034
</div>
3135
</div>
3236
</div>
3337
{{> includes/footer.html }}
34-
{{> includes/scripts/showTopPagination.html }}
38+
{{#paginationRendered}}
39+
{{> includes/scripts/showTopPagination.html }}
40+
{{/paginationRendered}}
3541
{{> includes/scripts/tableTrLinkScript.html }}
3642
</body>
3743
</html>

‎views/pages/discussionPage.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,19 @@
3131
<div class="container-fluid comments">
3232
<div class="row">
3333
<section class="topic-area list-group">
34+
{{#paginationRendered}}
3435
<div class="text-center collapse">
3536
{{{paginationRendered}}}
3637
</div>
38+
{{/paginationRendered}}
3739
{{#commentList}}
3840
{{> includes/comment.html }}
3941
{{/commentList}}
42+
{{#paginationRendered}}
4043
<div class="text-center">
4144
{{{paginationRendered}}}
4245
</div>
46+
{{/paginationRendered}}
4347
</section>
4448
</div>
4549
</div>
@@ -53,7 +57,9 @@
5357
<div id="show-reply-form-when-visible"></div>
5458
{{> includes/commentForm.html }}
5559
{{> includes/footer.html }}
56-
{{> includes/scripts/showTopPagination.html }}
60+
{{#paginationRendered}}
61+
{{> includes/scripts/showTopPagination.html }}
62+
{{/paginationRendered}}
5763
{{#authedUser}}
5864
{{> includes/scripts/markdownEditor.html }}
5965
{{> includes/scripts/commentReplyScript.html }}

‎views/pages/groupListPage.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@
1212
<h2 class="page-heading">
1313
Groups
1414
</h2>
15+
{{#paginationRendered}}
1516
<div class="text-center collapse">
1617
{{{paginationRendered}}}
1718
</div>
19+
{{/paginationRendered}}
1820
<div class="panel panel-default">
1921
{{> includes/groupList.html }}
2022
</div>
23+
{{#paginationRendered}}
2124
<div class="text-center">
2225
{{{paginationRendered}}}
2326
</div>
27+
{{/paginationRendered}}
2428
</div>
2529
<div class="col-sm-4">
2630
{{> includes/searchBarPanel.html }}
@@ -29,7 +33,9 @@ <h2 class="page-heading">
2933
</div>
3034
</div>
3135
{{> includes/footer.html }}
32-
{{> includes/scripts/showTopPagination.html }}
36+
{{#paginationRendered}}
37+
{{> includes/scripts/showTopPagination.html }}
38+
{{/paginationRendered}}
3339
{{> includes/scripts/tableTrLinkScript.html }}
3440
</body>
3541
</html>

‎views/pages/groupScriptListPage.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@
1212
<h2 class="page-heading">
1313
<a href="{{{group.groupPageUrl}}}" class="script-name">{{group.name}}</a>
1414
</h2>
15+
{{#paginationRendered}}
1516
<div class="text-center collapse">
1617
{{{paginationRendered}}}
1718
</div>
19+
{{/paginationRendered}}
1820
<div class="panel panel-default">
1921
{{> includes/scriptList.html }}
2022
</div>
23+
{{#paginationRendered}}
2124
<div class="text-center">
2225
{{{paginationRendered}}}
2326
</div>
27+
{{/paginationRendered}}
2428
</div>
2529
<div class="col-sm-4">
2630
{{> includes/searchBarPanel.html }}
@@ -31,7 +35,9 @@ <h2 class="page-heading">
3135
</div>
3236
{{> includes/footer.html }}
3337
{{> includes/scripts/tableTrLinkScript.html }}
34-
{{> includes/scripts/showTopPagination.html }}
38+
{{#paginationRendered}}
39+
{{> includes/scripts/showTopPagination.html }}
40+
{{/paginationRendered}}
3541
{{> includes/scripts/lazyIconScript.html }}
3642
</body>
3743
</html>

‎views/pages/removedItemListPage.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@
1212
<h2 class="page-heading">
1313
Removed Items
1414
</h2>
15+
{{#paginationRendered}}
1516
<div class="text-center collapse">
1617
{{{paginationRendered}}}
1718
</div>
19+
{{/paginationRendered}}
1820
<div class="panel panel-default">
1921
{{> includes/removedItemList.html }}
2022
</div>
23+
{{#paginationRendered}}
2124
<div class="text-center">
2225
{{{paginationRendered}}}
2326
</div>
27+
{{/paginationRendered}}
2428
</div>
2529
<div class="col-sm-4">
2630
{{> includes/searchBarPanel.html }}
@@ -35,6 +39,8 @@ <h3>Filters</h3>
3539
</div>
3640
{{> includes/footer.html }}
3741
{{> includes/scripts/tableTrLinkScript.html }}
38-
{{> includes/scripts/showTopPagination.html }}
42+
{{#paginationRendered}}
43+
{{> includes/scripts/showTopPagination.html }}
44+
{{/paginationRendered}}
3945
</body>
4046
</html>

‎views/pages/scriptIssueListPage.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,19 @@
2929
The script author requests that you use their preferred primary support method when filing an issue. Please consider using that for regular issues.
3030
</div>
3131
{{/script.hasSupport}}
32+
{{#paginationRendered}}
3233
<div class="text-center collapse">
3334
{{{paginationRendered}}}
3435
</div>
36+
{{/paginationRendered}}
3537
<div class="panel panel-default">
3638
{{> includes/discussionList.html }}
3739
</div>
40+
{{#paginationRendered}}
3841
<div class="text-center">
3942
{{{paginationRendered}}}
4043
</div>
44+
{{/paginationRendered}}
4145
</div>
4246
<div class="container-fluid col-sm-4">
4347
{{> includes/searchBarPanel.html }}
@@ -54,7 +58,9 @@
5458
</div>
5559
{{> includes/footer.html }}
5660
{{> includes/scripts/tableTrLinkScript.html }}
57-
{{> includes/scripts/showTopPagination.html }}
61+
{{#paginationRendered}}
62+
{{> includes/scripts/showTopPagination.html }}
63+
{{/paginationRendered}}
5864
{{> includes/scripts/lazyIconScript.html }}
5965
</body>
6066
</html>

‎views/pages/scriptIssuePage.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,19 @@
3939
<div class="container-fluid comments">
4040
<div class="row">
4141
<section class="topic-area list-group">
42+
{{#paginationRendered}}
4243
<div class="text-center collapse">
4344
{{{paginationRendered}}}
4445
</div>
46+
{{/paginationRendered}}
4547
{{#commentList}}
4648
{{> includes/comment.html }}
4749
{{/commentList}}
50+
{{#paginationRendered}}
4851
<div class="text-center">
4952
{{{paginationRendered}}}
5053
</div>
54+
{{/paginationRendered}}
5155
</section>
5256
</div>
5357
</div>
@@ -62,7 +66,9 @@
6266
<div id="show-reply-form-when-visible"></div>
6367
{{> includes/commentForm.html }}
6468
{{> includes/footer.html }}
65-
{{> includes/scripts/showTopPagination.html }}
69+
{{#paginationRendered}}
70+
{{> includes/scripts/showTopPagination.html }}
71+
{{/paginationRendered}}
6672
{{> includes/scripts/lazyIconScript.html }}
6773
{{#authedUser}}
6874
{{> includes/scripts/markdownEditor.html }}

0 commit comments

Comments
 (0)