mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-25 02:57:22 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master

Browse Source
This commit is contained in:
Ozzieisaacs 2020-11-08 19:29:10 +01:00
commit 87d60308f2
3 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cps/static/css/caliBlur.css
View File

@ -637,7 +637,7 @@ div[aria-label="Edit/Delete book"] > .btn > span:hover {
color: var(--color-primary) color: var(--color-primary)
} }
.book { /* .book {
width: 225px; width: 225px;
max-width: 225px; max-width: 225px;
position: relative !important; position: relative !important;
@ -648,7 +648,7 @@ div[aria-label="Edit/Delete book"] > .btn > span:hover {
transform: none !important; transform: none !important;
min-width: 225px; min-width: 225px;
display: block display: block
} } */
#infscr-loading img, body > div.container-fluid > div > div.col-sm-10 > div.discover > div.isotope:after, body > div.container-fluid > div > div.col-sm-10 > div.discover > div.isotope:before { #infscr-loading img, body > div.container-fluid > div > div.col-sm-10 > div.discover > div.isotope:after, body > div.container-fluid > div > div.col-sm-10 > div.discover > div.isotope:before {
display: none display: none

20
cps/static/js/main.js
View File

@ -172,7 +172,7 @@ $(function() {
layoutMode : "fitColumns" layoutMode : "fitColumns"
}); });
if ($(".load-more").length && $(".next").length) {
var $loadMore = $(".load-more .row").infiniteScroll({ var $loadMore = $(".load-more .row").infiniteScroll({
debug: false, debug: false,
// selector for the paged navigation (it will be hidden) // selector for the paged navigation (it will be hidden)
@ -183,10 +183,26 @@ $(function() {
//extraScrollPx: 300 //extraScrollPx: 300
}); });
$loadMore.on( "append.infiniteScroll", function( event, response, path, data ) { $loadMore.on( "append.infiniteScroll", function( event, response, path, data ) {
$(".pagination").addClass("hidden"); if ($("body").hasClass("blur")) {
$(".pagination").addClass("hidden").html(() => $(response).find(".pagination").html());
}
$(".load-more .row").isotope( "appended", $(data), null ); $(".load-more .row").isotope( "appended", $(data), null );
}); });
// fix for infinite scroll on CaliBlur Theme (#981)
if ($("body").hasClass("blur")) {
$(".col-sm-10").bind("scroll", function () {
if (
$(this).scrollTop() + $(this).innerHeight() >=
$(this)[0].scrollHeight
) {
$loadMore.infiniteScroll("loadNextPage");
window.history.replaceState({}, null, $loadMore.infiniteScroll("getAbsolutePath"));
}
});
}
}
$("#restart").click(function() { $("#restart").click(function() {
$.ajax({ $.ajax({
dataType: "json", dataType: "json",

2
cps/templates/layout.html
View File

@ -166,7 +166,7 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if pagination.has_next %} {% if pagination.has_next %}
<li class="page-item page-next"><a class="page-link" aria-label="next page" href="{{ (pagination.page + 1)|url_for_other_page <li class="page-item page-next"><a class="page-link next" aria-label="next page" href="{{ (pagination.page + 1)|url_for_other_page
}}">{{_('Next')}} &raquo;</a></li> }}">{{_('Next')}} &raquo;</a></li>
{% endif %} {% endif %}
</div> </div>