From c5cd91f274eb483aaba7aa71592aa6dc4e5eafc7 Mon Sep 17 00:00:00 2001 From: MotooriKashin <60416767+MotooriKashin@users.noreply.github.com> Date: Mon, 19 Aug 2024 15:10:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=81=A2=E5=A4=8D=E7=BF=BB?= =?UTF-8?q?=E9=A1=B5=E8=AF=84=E8=AE=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chrome/package-lock.json | 76 ------------ chrome/package.json | 2 +- src/core/comment.ts | 178 ++++++++++++++--------------- src/core/ui.ts | 2 +- tampermonkey/comment/main.user.js | 171 +++++++++++++-------------- tampermonkey/comment/manifest.json | 2 +- tampermonkey/main.user.js | 175 ++++++++++++++-------------- tampermonkey/manifest.json | 2 +- 8 files changed, 261 insertions(+), 347 deletions(-) delete mode 100644 chrome/package-lock.json diff --git a/chrome/package-lock.json b/chrome/package-lock.json deleted file mode 100644 index 61d1e0412..000000000 --- a/chrome/package-lock.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "name": "chrome", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "devDependencies": { - "@types/chrome": "^0.0.212" - } - }, - "node_modules/@types/chrome": { - "version": "0.0.212", - "resolved": "https://registry.npmmirror.com/@types/chrome/-/chrome-0.0.212.tgz", - "integrity": "sha512-O9blKfj6mQyBvkexEa71xcpRfkjAu8izQD3qGYfdwffk+mJhF7eogz628bZr5dETT6Eu7vU0stUGYG/+EQWj9g==", - "dev": true, - "dependencies": { - "@types/filesystem": "*", - "@types/har-format": "*" - } - }, - "node_modules/@types/filesystem": { - "version": "0.0.32", - "resolved": "https://registry.npmmirror.com/@types/filesystem/-/filesystem-0.0.32.tgz", - "integrity": "sha512-Yuf4jR5YYMR2DVgwuCiP11s0xuVRyPKmz8vo6HBY3CGdeMj8af93CFZX+T82+VD1+UqHOxTq31lO7MI7lepBtQ==", - "dev": true, - "dependencies": { - "@types/filewriter": "*" - } - }, - "node_modules/@types/filewriter": { - "version": "0.0.29", - "resolved": "https://registry.npmmirror.com/@types/filewriter/-/filewriter-0.0.29.tgz", - "integrity": "sha512-BsPXH/irW0ht0Ji6iw/jJaK8Lj3FJemon2gvEqHKpCdDCeemHa+rI3WBGq5z7cDMZgoLjY40oninGxqk+8NzNQ==", - "dev": true - }, - "node_modules/@types/har-format": { - "version": "1.2.10", - "resolved": "https://registry.npmmirror.com/@types/har-format/-/har-format-1.2.10.tgz", - "integrity": "sha512-o0J30wqycjF5miWDKYKKzzOU1ZTLuA42HZ4HE7/zqTOc/jTLdQ5NhYWvsRQo45Nfi1KHoRdNhteSI4BAxTF1Pg==", - "dev": true - } - }, - "dependencies": { - "@types/chrome": { - "version": "0.0.212", - "resolved": "https://registry.npmmirror.com/@types/chrome/-/chrome-0.0.212.tgz", - "integrity": "sha512-O9blKfj6mQyBvkexEa71xcpRfkjAu8izQD3qGYfdwffk+mJhF7eogz628bZr5dETT6Eu7vU0stUGYG/+EQWj9g==", - "dev": true, - "requires": { - "@types/filesystem": "*", - "@types/har-format": "*" - } - }, - "@types/filesystem": { - "version": "0.0.32", - "resolved": "https://registry.npmmirror.com/@types/filesystem/-/filesystem-0.0.32.tgz", - "integrity": "sha512-Yuf4jR5YYMR2DVgwuCiP11s0xuVRyPKmz8vo6HBY3CGdeMj8af93CFZX+T82+VD1+UqHOxTq31lO7MI7lepBtQ==", - "dev": true, - "requires": { - "@types/filewriter": "*" - } - }, - "@types/filewriter": { - "version": "0.0.29", - "resolved": "https://registry.npmmirror.com/@types/filewriter/-/filewriter-0.0.29.tgz", - "integrity": "sha512-BsPXH/irW0ht0Ji6iw/jJaK8Lj3FJemon2gvEqHKpCdDCeemHa+rI3WBGq5z7cDMZgoLjY40oninGxqk+8NzNQ==", - "dev": true - }, - "@types/har-format": { - "version": "1.2.10", - "resolved": "https://registry.npmmirror.com/@types/har-format/-/har-format-1.2.10.tgz", - "integrity": "sha512-o0J30wqycjF5miWDKYKKzzOU1ZTLuA42HZ4HE7/zqTOc/jTLdQ5NhYWvsRQo45Nfi1KHoRdNhteSI4BAxTF1Pg==", - "dev": true - } - } -} diff --git a/chrome/package.json b/chrome/package.json index 640d77f26..3c63b343c 100644 --- a/chrome/package.json +++ b/chrome/package.json @@ -6,6 +6,6 @@ "author": "MotooriKashin", "license": "MIT", "devDependencies": { - "@types/chrome": "^0.0.212" + "@types/chrome": "*" } } \ No newline at end of file diff --git a/src/core/comment.ts b/src/core/comment.ts index 853daa5e7..853052be3 100644 --- a/src/core/comment.ts +++ b/src/core/comment.ts @@ -157,8 +157,8 @@ export class Comment { /** 修补评论组件 */ protected bbCommentModify() { this.styleFix(); - // this.initAbtest(); - // this._renderBottomPagination(); + this.initAbtest(); + this._renderBottomPagination(); this._createListCon(); this._createSubReplyItem(); this._registerEvent(); @@ -178,104 +178,104 @@ export class Comment { addCss('.image-exhibition {margin-top: 8px;user-select: none;} .image-exhibition .image-item-wrap {max-width: 240px;display: flex;justify-content: center;position: relative;border-radius: 4px;overflow: hidden;cursor: zoom-in;} .image-exhibition .image-item-wrap.vertical {flex-direction: column} .image-exhibition .image-item-wrap.extra-long {justify-content: start;} .image-exhibition .image-item-wrap img {width: 100%;}', 'image-exhibition'); } /** 退出abtest，获取翻页评论区 */ - // protected initAbtest() { - // const that = this; - // Feedback.prototype.initAbtest = function () { + protected initAbtest() { + const that = this; + Feedback.prototype.initAbtest = function () { - // this.abtest = {}; - // this.abtest.optimize = false; //abtest.web_reply_list + this.abtest = {}; + this.abtest.optimize = false; //abtest.web_reply_list - // if (this.jumpId || this.noPage) { - // this.abtest.optimize = false; - // } // TODO: 漫画独立处理他们的pc 端内容 + if (this.jumpId || this.noPage) { + this.abtest.optimize = false; + } // TODO: 漫画独立处理他们的pc 端内容 - // if (this.appMode === 'comic') { - // this.abtest.optimize = false; - // } + if (this.appMode === 'comic') { + this.abtest.optimize = false; + } - // // 优先获取评论总数 - // that.getPageCount(this).finally(() => { - // this.init(); - // if (!document.querySelector('.b-head')) { - // // 补充评论总数节点 - // const div = addElement('div', { class: `b-head` }, undefined, '评论'); - // const com = document.querySelector('.bb-comment'); - // com?.insertAdjacentElement('beforebegin', div); - // com?.parentElement?.classList.add('common'); - // addCss('.b-head {\ - // font-size: 18px;\ - // line-height: 24px;\ - // color: #222;\ - // margin: 0 0 20px;\ - // }\ - // .b-head .results {\ - // margin-right: 10px;\ - // }', 'b-head'); - // } - // }); + // 优先获取评论总数 + that.getPageCount(this).finally(() => { + this.init(); + if (!document.querySelector('.b-head')) { + // 补充评论总数节点 + const div = addElement('div', { class: `b-head` }, undefined, '评论'); + const com = document.querySelector('.bb-comment'); + com?.insertAdjacentElement('beforebegin', div); + com?.parentElement?.classList.add('common'); + addCss('.b-head {\ + font-size: 18px;\ + line-height: 24px;\ + color: #222;\ + margin: 0 0 20px;\ +}\ +.b-head .results {\ + margin-right: 10px;\ +}', 'b-head'); + } + }); - // this._registerEvent(); - // }; - // } + this._registerEvent(); + }; + } /** 添加回小页码区 */ - // protected _renderBottomPagination() { - // Feedback.prototype._renderBottomPagination = function (pageInfo: any) { - // if (this.noPage) { - // var isLastPage = pageInfo.count <= this.pageSize; - // var html = ''; + protected _renderBottomPagination() { + Feedback.prototype._renderBottomPagination = function (pageInfo: any) { + if (this.noPage) { + var isLastPage = pageInfo.count <= this.pageSize; + var html = ''; - // if (isLastPage) { - // html = '没有更多了～'; - // } else { - // html = '查看更多评论'; - // } + if (isLastPage) { + html = '没有更多了～'; + } else { + html = '查看更多评论'; + } - // this.$root.find('.bottom-page').addClass('center').html(html); - // return; - // } + this.$root.find('.bottom-page').addClass('center').html(html); + return; + } - // const count = Math.ceil(pageInfo.count / pageInfo.size); + const count = Math.ceil(pageInfo.count / pageInfo.size); - // if (count > 1) { - // this.$root.find(".header-interaction").addClass("paging-box").paging({ - // pageCount: count, - // current: pageInfo.num, - // backFn: (p: any) => { - // this.$root.trigger('replyPageChange', { - // p: p, - // isBottom: true - // }); - // this.trigger('replyPageChange', { - // p: p, - // isBottom: true - // }); - // this.currentPage = p; - // } - // }) - // this.$root.find('.bottom-page').paging({ - // pageCount: count, - // current: pageInfo.num, - // jump: true, - // smallSize: this.smallPager, - // backFn: (p: any) => { - // this.$root.trigger('replyPageChange', { - // p: p, - // isBottom: true - // }); - // this.trigger('replyPageChange', { - // p: p, - // isBottom: true - // }); - // this.currentPage = p; - // } - // }); - // } else { - // this.$root.find(".header-page").html(""); - // this.$root.find('.bottom-page').html(''); - // } - // }; - // } + if (count > 1) { + this.$root.find(".header-interaction").addClass("paging-box").paging({ + pageCount: count, + current: pageInfo.num, + backFn: (p: any) => { + this.$root.trigger('replyPageChange', { + p: p, + isBottom: true + }); + this.trigger('replyPageChange', { + p: p, + isBottom: true + }); + this.currentPage = p; + } + }) + this.$root.find('.bottom-page').paging({ + pageCount: count, + current: pageInfo.num, + jump: true, + smallSize: this.smallPager, + backFn: (p: any) => { + this.$root.trigger('replyPageChange', { + p: p, + isBottom: true + }); + this.trigger('replyPageChange', { + p: p, + isBottom: true + }); + this.currentPage = p; + } + }); + } else { + this.$root.find(".header-page").html(""); + this.$root.find('.bottom-page').html(''); + } + }; + } /** 顶层评论ip属地 */ protected _createListCon() { Feedback.prototype._createListCon = function (item: any, i: any, pos: any) { diff --git a/src/core/ui.ts b/src/core/ui.ts index 13454c624..8fcb80ef1 100644 --- a/src/core/ui.ts +++ b/src/core/ui.ts @@ -230,7 +230,7 @@ export class UI { protected initSettingStyle() { this.menuitem.style.addSetting([ this.switch('header', '恢复旧版顶栏', '替换所有B站页面中的顶栏为旧版', undefined, undefined, '除非替换后实在不和谐，一般都会进行替换。'), - // this.switch('comment', '恢复评论翻页', '替换瀑布流评论区', undefined, undefined, '评论区版本将被固定，可能享受不到B站后续为评论区推出的新功能。本功能有专门独立为一个脚本，不要重复安装。'), + this.switch('comment', '恢复评论翻页', '替换瀑布流评论区', undefined, undefined, '评论区版本将被固定，可能享受不到B站后续为评论区推出的新功能。本功能有专门独立为一个脚本，不要重复安装。'), this.switch('staff', '合作UP主', '联合投稿显示合作UP主', undefined, undefined, '在原av页up主信息处列出所有合作up主。'), this.switch('bangumiEplist', '保留bangumi分P', '牺牲特殊背景图', undefined, undefined, '旧版bangumi遇到有特殊背景图的视频时，会隐藏播放器下方的分集选择界面，二者不可得兼。'), this.switch('jointime', '注册时间', '个人空间显示账户注册时间'), diff --git a/tampermonkey/comment/main.user.js b/tampermonkey/comment/main.user.js index 67be68902..595a9953b 100644 --- a/tampermonkey/comment/main.user.js +++ b/tampermonkey/comment/main.user.js @@ -1,7 +1,7 @@ // ==UserScript== // @name Bilibili 翻页评论区 // @namespace MotooriKashin -// @version 2.2.6 +// @version 2.2.7 // @description 恢复评论区翻页功能。 // @author MotooriKashin // @homepage https://github.com/MotooriKashin/Bilibili-Old @@ -839,7 +839,7 @@ var PreviewImage = class extends HTMLElement { document.body.style.overflow = "hidden"; } }; -customElements.get(`preview-image-${"d1taabnn0j6"}`) || customElements.define(`preview-image-${"d1taabnn0j6"}`, PreviewImage); +customElements.get(`preview-image-${"81g6kk2st1y"}`) || customElements.define(`preview-image-${"81g6kk2st1y"}`, PreviewImage); // src/core/comment.ts var Feedback; @@ -987,6 +987,8 @@ var Comment = class _Comment { /** 修补评论组件 */ bbCommentModify() { this.styleFix(); + this.initAbtest(); + this._renderBottomPagination(); this._createListCon(); this._createSubReplyItem(); this._registerEvent(); @@ -1003,94 +1005,85 @@ var Comment = class _Comment { addCss(".image-exhibition {margin-top: 8px;user-select: none;} .image-exhibition .image-item-wrap {max-width: 240px;display: flex;justify-content: center;position: relative;border-radius: 4px;overflow: hidden;cursor: zoom-in;} .image-exhibition .image-item-wrap.vertical {flex-direction: column} .image-exhibition .image-item-wrap.extra-long {justify-content: start;} .image-exhibition .image-item-wrap img {width: 100%;}", "image-exhibition"); } /** 退出abtest，获取翻页评论区 */ - // protected initAbtest() { - // const that = this; - // Feedback.prototype.initAbtest = function () { - // this.abtest = {}; - // this.abtest.optimize = false; //abtest.web_reply_list - // if (this.jumpId || this.noPage) { - // this.abtest.optimize = false; - // } // TODO: 漫画独立处理他们的pc 端内容 - // if (this.appMode === 'comic') { - // this.abtest.optimize = false; - // } - // // 优先获取评论总数 - // that.getPageCount(this).finally(() => { - // this.init(); - // if (!document.querySelector('.b-head')) { - // // 补充评论总数节点 - // const div = addElement('div', { class: `b-head` }, undefined, '评论'); - // const com = document.querySelector('.bb-comment'); - // com?.insertAdjacentElement('beforebegin', div); - // com?.parentElement?.classList.add('common'); - // addCss('.b-head {\ - // font-size: 18px;\ - // line-height: 24px;\ - // color: #222;\ - // margin: 0 0 20px;\ - // }\ - // .b-head .results {\ - // margin-right: 10px;\ - // }', 'b-head'); - // } - // }); - // this._registerEvent(); - // }; - // } + initAbtest() { + const that = this; + Feedback.prototype.initAbtest = function() { + this.abtest = {}; + this.abtest.optimize = false; + if (this.jumpId || this.noPage) { + this.abtest.optimize = false; + } + if (this.appMode === "comic") { + this.abtest.optimize = false; + } + that.getPageCount(this).finally(() => { + var _a; + this.init(); + if (!document.querySelector(".b-head")) { + const div = addElement("div", { class: `b-head` }, void 0, '评论'); + const com = document.querySelector(".bb-comment"); + com == null ? void 0 : com.insertAdjacentElement("beforebegin", div); + (_a = com == null ? void 0 : com.parentElement) == null ? void 0 : _a.classList.add("common"); + addCss(".b-head { font-size: 18px; line-height: 24px; color: #222; margin: 0 0 20px;}.b-head .results { margin-right: 10px;}", "b-head"); + } + }); + this._registerEvent(); + }; + } /** 添加回小页码区 */ - // protected _renderBottomPagination() { - // Feedback.prototype._renderBottomPagination = function (pageInfo: any) { - // if (this.noPage) { - // var isLastPage = pageInfo.count <= this.pageSize; - // var html = ''; - // if (isLastPage) { - // html = '没有更多了～'; - // } else { - // html = '查看更多评论'; - // } - // this.$root.find('.bottom-page').addClass('center').html(html); - // return; - // } - // const count = Math.ceil(pageInfo.count / pageInfo.size); - // if (count > 1) { - // this.$root.find(".header-interaction").addClass("paging-box").paging({ - // pageCount: count, - // current: pageInfo.num, - // backFn: (p: any) => { - // this.$root.trigger('replyPageChange', { - // p: p, - // isBottom: true - // }); - // this.trigger('replyPageChange', { - // p: p, - // isBottom: true - // }); - // this.currentPage = p; - // } - // }) - // this.$root.find('.bottom-page').paging({ - // pageCount: count, - // current: pageInfo.num, - // jump: true, - // smallSize: this.smallPager, - // backFn: (p: any) => { - // this.$root.trigger('replyPageChange', { - // p: p, - // isBottom: true - // }); - // this.trigger('replyPageChange', { - // p: p, - // isBottom: true - // }); - // this.currentPage = p; - // } - // }); - // } else { - // this.$root.find(".header-page").html(""); - // this.$root.find('.bottom-page').html(''); - // } - // }; - // } + _renderBottomPagination() { + Feedback.prototype._renderBottomPagination = function(pageInfo) { + if (this.noPage) { + var isLastPage = pageInfo.count <= this.pageSize; + var html = ""; + if (isLastPage) { + html = "没有更多了～"; + } else { + html = '查看更多评论'; + } + this.$root.find(".bottom-page").addClass("center").html(html); + return; + } + const count = Math.ceil(pageInfo.count / pageInfo.size); + if (count > 1) { + this.$root.find(".header-interaction").addClass("paging-box").paging({ + pageCount: count, + current: pageInfo.num, + backFn: (p) => { + this.$root.trigger("replyPageChange", { + p, + isBottom: true + }); + this.trigger("replyPageChange", { + p, + isBottom: true + }); + this.currentPage = p; + } + }); + this.$root.find(".bottom-page").paging({ + pageCount: count, + current: pageInfo.num, + jump: true, + smallSize: this.smallPager, + backFn: (p) => { + this.$root.trigger("replyPageChange", { + p, + isBottom: true + }); + this.trigger("replyPageChange", { + p, + isBottom: true + }); + this.currentPage = p; + } + }); + } else { + this.$root.find(".header-page").html(""); + this.$root.find(".bottom-page").html(""); + } + }; + } /** 顶层评论ip属地 */ _createListCon() { Feedback.prototype._createListCon = function(item, i, pos) { diff --git a/tampermonkey/comment/manifest.json b/tampermonkey/comment/manifest.json index aa1c0c9d2..fd115700b 100644 --- a/tampermonkey/comment/manifest.json +++ b/tampermonkey/comment/manifest.json @@ -1,7 +1,7 @@ { "name": "Bilibili 翻页评论区", "namespace": "MotooriKashin", - "version": "2.2.6", + "version": "2.2.7", "description": "恢复评论区翻页功能。", "author": "MotooriKashin", "homepage": "https://github.com/MotooriKashin/Bilibili-Old", diff --git a/tampermonkey/main.user.js b/tampermonkey/main.user.js index 1e4c74449..e83157518 100644 --- a/tampermonkey/main.user.js +++ b/tampermonkey/main.user.js @@ -1,7 +1,7 @@ // ==UserScript== // @name Bilibili 旧播放页 // @namespace MotooriKashin -// @version 10.8.2-1272ee50230293555dec1d2e23fc5c74215b4c86 +// @version 10.8.3-1272ee50230293555dec1d2e23fc5c74215b4c86 // @description 恢复Bilibili旧版页面，为了那些念旧的人。 // @author MotooriKashin, wly5556 // @homepage https://github.com/MotooriKashin/Bilibili-Old @@ -1635,6 +1635,7 @@ const MODULES = ` case 5: this.skip(4); break; + /* istanbul ignore next */ default: throw Error("invalid wire type " + wireType + " at offset " + this.pos); } @@ -3087,6 +3088,7 @@ const MODULES = ` break; case "uint64": isUnsigned = true; + // eslint-disable-next-line no-fallthrough case "int64": case "sint64": case "fixed64": @@ -3158,6 +3160,7 @@ const MODULES = ` break; case "uint64": isUnsigned = true; + // eslint-disable-next-line no-fallthrough case "int64": case "sint64": case "fixed64": @@ -7105,6 +7108,7 @@ const MODULES = ` case "meta": case "param": case "path": + // svg专属 case "source": case "track": case "wbr": @@ -28960,6 +28964,8 @@ const MODULES = ` /** 修补评论组件 */ bbCommentModify() { this.styleFix(); + this.initAbtest(); + this._renderBottomPagination(); this._createListCon(); this._createSubReplyItem(); this._registerEvent(); @@ -28976,94 +28982,85 @@ const MODULES = ` addCss(".image-exhibition {margin-top: 8px;user-select: none;} .image-exhibition .image-item-wrap {max-width: 240px;display: flex;justify-content: center;position: relative;border-radius: 4px;overflow: hidden;cursor: zoom-in;} .image-exhibition .image-item-wrap.vertical {flex-direction: column} .image-exhibition .image-item-wrap.extra-long {justify-content: start;} .image-exhibition .image-item-wrap img {width: 100%;}", "image-exhibition"); } /** 退出abtest，获取翻页评论区 */ - // protected initAbtest() { - // const that = this; - // Feedback.prototype.initAbtest = function () { - // this.abtest = {}; - // this.abtest.optimize = false; //abtest.web_reply_list - // if (this.jumpId || this.noPage) { - // this.abtest.optimize = false; - // } // TODO: 漫画独立处理他们的pc 端内容 - // if (this.appMode === 'comic') { - // this.abtest.optimize = false; - // } - // // 优先获取评论总数 - // that.getPageCount(this).finally(() => { - // this.init(); - // if (!document.querySelector('.b-head')) { - // // 补充评论总数节点 - // const div = addElement('div', { class: \`b-head\` }, undefined, '评论'); - // const com = document.querySelector('.bb-comment'); - // com?.insertAdjacentElement('beforebegin', div); - // com?.parentElement?.classList.add('common'); - // addCss('.b-head {\\ - // font-size: 18px;\\ - // line-height: 24px;\\ - // color: #222;\\ - // margin: 0 0 20px;\\ - // }\\ - // .b-head .results {\\ - // margin-right: 10px;\\ - // }', 'b-head'); - // } - // }); - // this._registerEvent(); - // }; - // } + initAbtest() { + const that = this; + Feedback.prototype.initAbtest = function() { + this.abtest = {}; + this.abtest.optimize = false; + if (this.jumpId || this.noPage) { + this.abtest.optimize = false; + } + if (this.appMode === "comic") { + this.abtest.optimize = false; + } + that.getPageCount(this).finally(() => { + var _a3; + this.init(); + if (!document.querySelector(".b-head")) { + const div = addElement("div", { class: \`b-head\` }, void 0, '评论'); + const com = document.querySelector(".bb-comment"); + com == null ? void 0 : com.insertAdjacentElement("beforebegin", div); + (_a3 = com == null ? void 0 : com.parentElement) == null ? void 0 : _a3.classList.add("common"); + addCss(".b-head { font-size: 18px; line-height: 24px; color: #222; margin: 0 0 20px;}.b-head .results { margin-right: 10px;}", "b-head"); + } + }); + this._registerEvent(); + }; + } /** 添加回小页码区 */ - // protected _renderBottomPagination() { - // Feedback.prototype._renderBottomPagination = function (pageInfo: any) { - // if (this.noPage) { - // var isLastPage = pageInfo.count <= this.pageSize; - // var html = ''; - // if (isLastPage) { - // html = '没有更多了～'; - // } else { - // html = '查看更多评论'; - // } - // this.\$root.find('.bottom-page').addClass('center').html(html); - // return; - // } - // const count = Math.ceil(pageInfo.count / pageInfo.size); - // if (count > 1) { - // this.\$root.find(".header-interaction").addClass("paging-box").paging({ - // pageCount: count, - // current: pageInfo.num, - // backFn: (p: any) => { - // this.\$root.trigger('replyPageChange', { - // p: p, - // isBottom: true - // }); - // this.trigger('replyPageChange', { - // p: p, - // isBottom: true - // }); - // this.currentPage = p; - // } - // }) - // this.\$root.find('.bottom-page').paging({ - // pageCount: count, - // current: pageInfo.num, - // jump: true, - // smallSize: this.smallPager, - // backFn: (p: any) => { - // this.\$root.trigger('replyPageChange', { - // p: p, - // isBottom: true - // }); - // this.trigger('replyPageChange', { - // p: p, - // isBottom: true - // }); - // this.currentPage = p; - // } - // }); - // } else { - // this.\$root.find(".header-page").html(""); - // this.\$root.find('.bottom-page').html(''); - // } - // }; - // } + _renderBottomPagination() { + Feedback.prototype._renderBottomPagination = function(pageInfo) { + if (this.noPage) { + var isLastPage = pageInfo.count <= this.pageSize; + var html = ""; + if (isLastPage) { + html = "没有更多了～"; + } else { + html = '查看更多评论'; + } + this.\$root.find(".bottom-page").addClass("center").html(html); + return; + } + const count = Math.ceil(pageInfo.count / pageInfo.size); + if (count > 1) { + this.\$root.find(".header-interaction").addClass("paging-box").paging({ + pageCount: count, + current: pageInfo.num, + backFn: (p) => { + this.\$root.trigger("replyPageChange", { + p, + isBottom: true + }); + this.trigger("replyPageChange", { + p, + isBottom: true + }); + this.currentPage = p; + } + }); + this.\$root.find(".bottom-page").paging({ + pageCount: count, + current: pageInfo.num, + jump: true, + smallSize: this.smallPager, + backFn: (p) => { + this.\$root.trigger("replyPageChange", { + p, + isBottom: true + }); + this.trigger("replyPageChange", { + p, + isBottom: true + }); + this.currentPage = p; + } + }); + } else { + this.\$root.find(".header-page").html(""); + this.\$root.find(".bottom-page").html(""); + } + }; + } /** 顶层评论ip属地 */ _createListCon() { Feedback.prototype._createListCon = function(item, i, pos) { @@ -39725,7 +39722,7 @@ const MODULES = ` initSettingStyle() { this.menuitem.style.addSetting([ this.switch("header", "恢复旧版顶栏", "替换所有B站页面中的顶栏为旧版", void 0, void 0, "除非替换后实在不和谐，一般都会进行替换。"), - // this.switch('comment', '恢复评论翻页', '替换瀑布流评论区', undefined, undefined, '评论区版本将被固定，可能享受不到B站后续为评论区推出的新功能。本功能有专门独立为一个脚本，不要重复安装。'), + this.switch("comment", "恢复评论翻页", "替换瀑布流评论区", void 0, void 0, "评论区版本将被固定，可能享受不到B站后续为评论区推出的新功能。本功能有专门独立为一个脚本，不要重复安装。"), this.switch("staff", "合作UP主", "联合投稿显示合作UP主", void 0, void 0, "在原av页up主信息处列出所有合作up主。"), this.switch("bangumiEplist", "保留bangumi分P", "牺牲特殊背景图", void 0, void 0, "旧版bangumi遇到有特殊背景图的视频时，会隐藏播放器下方的分集选择界面，二者不可得兼。"), this.switch("jointime", "注册时间", "个人空间显示账户注册时间"), diff --git a/tampermonkey/manifest.json b/tampermonkey/manifest.json index 5a2c0a13c..c4aa2ec3f 100644 --- a/tampermonkey/manifest.json +++ b/tampermonkey/manifest.json @@ -1,7 +1,7 @@ { "name": "Bilibili 旧播放页", "namespace": "MotooriKashin", - "version": "10.8.2", + "version": "10.8.3", "description": "恢复Bilibili旧版页面，为了那些念旧的人。", "author": "MotooriKashin, wly5556", "homepage": "https://github.com/MotooriKashin/Bilibili-Old",