Fixed pagination not updating with async requests.
This commit is contained in:
@@ -73,4 +73,15 @@ const emit = defineEmits(['country']);
|
||||
text-overflow: ellipsis;
|
||||
padding: .25rem .5rem;
|
||||
}
|
||||
|
||||
.filter-remove {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: .5rem;
|
||||
fill: var(--shadow);
|
||||
|
||||
&:hover {
|
||||
fill: var(--error);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -169,8 +169,12 @@ function go(page, event) {
|
||||
}
|
||||
|
||||
function getPath(page) {
|
||||
if (!routeParams.path && props.includeQuery) {
|
||||
return `${pageContext.urlParsed.pathname}${page}${urlParsed.searchOriginal}`;
|
||||
const query = typeof window === 'undefined'
|
||||
? urlParsed.searchOriginal
|
||||
: window.location.search;
|
||||
|
||||
if (!routeParams.path && props.includeQuery && query) {
|
||||
return `${pageContext.urlParsed.pathname}${page}${query}`;
|
||||
}
|
||||
|
||||
if (!routeParams.path) {
|
||||
@@ -187,8 +191,8 @@ function getPath(page) {
|
||||
})
|
||||
.join('');
|
||||
|
||||
if (props.includeQuery && urlParsed.searchOriginal) {
|
||||
return `${path}${urlParsed.searchOriginal}`;
|
||||
if (props.includeQuery && query) {
|
||||
return `${path}${query}`;
|
||||
}
|
||||
|
||||
return path;
|
||||
|
||||
@@ -2,38 +2,40 @@
|
||||
<div
|
||||
class="scenes-page"
|
||||
>
|
||||
<Filters
|
||||
v-if="showFilters"
|
||||
:class="{ loading }"
|
||||
>
|
||||
<div class="filter">
|
||||
<input
|
||||
v-model="filters.search"
|
||||
type="search"
|
||||
placeholder="Search scenes"
|
||||
class="search input"
|
||||
@search="search"
|
||||
>
|
||||
</div>
|
||||
<transition name="sidebar">
|
||||
<Filters
|
||||
v-if="showFilters"
|
||||
:class="{ loading }"
|
||||
>
|
||||
<div class="filter">
|
||||
<input
|
||||
v-model="filters.search"
|
||||
type="search"
|
||||
placeholder="Search scenes"
|
||||
class="search input"
|
||||
@search="search"
|
||||
>
|
||||
</div>
|
||||
|
||||
<TagsFilter
|
||||
:filters="filters"
|
||||
:tags="aggTags"
|
||||
@update="updateFilter"
|
||||
/>
|
||||
<TagsFilter
|
||||
:filters="filters"
|
||||
:tags="aggTags"
|
||||
@update="updateFilter"
|
||||
/>
|
||||
|
||||
<ChannelsFilter
|
||||
:filters="filters"
|
||||
:channels="aggChannels"
|
||||
@update="updateFilter"
|
||||
/>
|
||||
<ChannelsFilter
|
||||
:filters="filters"
|
||||
:channels="aggChannels"
|
||||
@update="updateFilter"
|
||||
/>
|
||||
|
||||
<ActorsFilter
|
||||
:filters="filters"
|
||||
:actors="aggActors"
|
||||
@update="updateFilter"
|
||||
/>
|
||||
</Filters>
|
||||
<ActorsFilter
|
||||
:filters="filters"
|
||||
:actors="aggActors"
|
||||
@update="updateFilter"
|
||||
/>
|
||||
</Filters>
|
||||
</transition>
|
||||
|
||||
<div
|
||||
class="scenes-container"
|
||||
@@ -104,7 +106,10 @@
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<Pagination />
|
||||
<Pagination
|
||||
:total="total"
|
||||
:page="currentPage"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Ellipsis
|
||||
|
||||
Reference in New Issue
Block a user