Merge pull request #1655 from TeamPiped/revert-1654-master

Revert "fix nextpage = undefined"
This commit is contained in:
Kavin 2022-11-01 15:14:40 +00:00 committed by GitHub
commit 00e7d22bdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -142,7 +142,7 @@ export default {
}); });
}, },
handleScroll() { handleScroll() {
if (this.loading || !this.channel) return; if (this.loading || !this.channel || !this.channel.nextpage) return;
if (window.innerHeight + window.scrollY >= document.body.offsetHeight - window.innerHeight) { if (window.innerHeight + window.scrollY >= document.body.offsetHeight - window.innerHeight) {
this.loading = true; this.loading = true;
if (this.selectedTab == 0) { if (this.selectedTab == 0) {
@ -153,7 +153,6 @@ export default {
} }
}, },
fetchChannelNextPage() { fetchChannelNextPage() {
if (!this.channel.nextpage) return;
this.fetchJson(this.apiUrl() + "/nextpage/channel/" + this.channel.id, { this.fetchJson(this.apiUrl() + "/nextpage/channel/" + this.channel.id, {
nextpage: this.channel.nextpage, nextpage: this.channel.nextpage,
}).then(json => { }).then(json => {
@ -164,7 +163,6 @@ export default {
}); });
}, },
fetchChannelTabNextPage() { fetchChannelTabNextPage() {
if (!this.tabNextPage) return;
this.fetchJson(this.apiUrl() + "/channels/tabs", { this.fetchJson(this.apiUrl() + "/channels/tabs", {
data: this.tabs[this.selectedTab].data, data: this.tabs[this.selectedTab].data,
nextpage: this.tabNextPage, nextpage: this.tabNextPage,