Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
87d60308
Commit
87d60308
authored
Nov 08, 2020
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master
parents
58d485cb
2ff286b6
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
18 deletions
+34
-18
caliBlur.css
cps/static/css/caliBlur.css
+3
-3
main.js
cps/static/js/main.js
+30
-14
layout.html
cps/templates/layout.html
+1
-1
No files found.
cps/static/css/caliBlur.css
View file @
87d60308
...
@@ -637,7 +637,7 @@ div[aria-label="Edit/Delete book"] > .btn > span:hover {
...
@@ -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 {
...
@@ -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
...
...
cps/static/js/main.js
View file @
87d60308
...
@@ -172,7 +172,7 @@ $(function() {
...
@@ -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() {
...
@@ -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"
,
...
...
cps/templates/layout.html
View file @
87d60308
...
@@ -166,7 +166,7 @@
...
@@ -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')}}
»
</a></li>
}}"
>
{{_('Next')}}
»
</a></li>
{% endif %}
{% endif %}
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment