From 9ffb7aac532c78d1bc053f84fc522b5e6cb2c832 Mon Sep 17 00:00:00 2001 From: the1812 Date: Thu, 7 Feb 2019 20:25:58 +0800 Subject: [PATCH] Fix bugs --- bilibili-evolved.offline.user.js | 8 ++++++-- bilibili-evolved.preview-offline.user.js | 8 ++++++-- bilibili-evolved.preview.user.js | 6 +++++- bilibili-evolved.user.js | 6 +++++- min/skip-charge-list.min.js | 2 +- video/skip-charge-list/skip-charge-list.js | 2 +- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/bilibili-evolved.offline.user.js b/bilibili-evolved.offline.user.js index c50546546..f6df16865 100644 --- a/bilibili-evolved.offline.user.js +++ b/bilibili-evolved.offline.user.js @@ -952,7 +952,11 @@ } static async videoChange(callback) { - await SpinQuery.select(() => document.querySelector("#bilibiliPlayer")); + const player = await SpinQuery.select(() => document.querySelector("#bilibiliPlayer")); + if (player === null) + { + return null; + } return Observer.childList("#bofqi,#bilibiliPlayer", callback); } } @@ -1260,7 +1264,7 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/expand-description.min.js"] = (()=>{return(e,p)=>{p.applyStyle("expandDescriptionStyle")}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/default-danmaku-settings.min.js"] = (()=>{return(e,n)=>{async function t(e,n){const t=await SpinQuery.select(()=>document.querySelector(e));if(!t){return}t.checked=n;raiseEvent(t,"change")}const i={enableDanmaku:".bilibili-player-video-danmaku-switch>input",settingsIcon:".bilibili-player-video-danmaku-setting"};if(!e.enableDanmaku){t(i.enableDanmaku,false)}if(e.rememberDanmakuBlock){for(const n in e.danmakuBlockSettings){i[n]=`.bilibili-player-block-filter-type[ftype=${n}]`}async function a(){await SpinQuery.unsafeJquery();const n=await SpinQuery.any(()=>unsafeWindow.$(i.settingsIcon));if(!n){return}n.mouseover().mouseout();for(const[n,t]of Object.entries(e.danmakuBlockSettings)){if(t===true){const e=await SpinQuery.select(()=>document.querySelector(i[n]));e.click()}}}async function c(){for(const n in e.danmakuBlockSettings){const t=await SpinQuery.select(()=>document.querySelector(i[n]));if(!t){return}t.addEventListener("click",()=>{e.danmakuBlockSettings[n]=t.classList.contains("disabled");saveSettings(e)})}}a();c()}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/skip-charge-list.min.css"] = `.bilibili-player .bilibili-player-area .bilibili-player-electric-panel{display:none!important}`; -offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/skip-charge-list.min.js"] = (()=>{return(e,i)=>{async function n(){const e=await SpinQuery.select(()=>document.querySelector("video"));e.addEventListener("ended",async()=>{const e=await SpinQuery.select(()=>document.querySelector(".bilibili-player-electric-panel-jump"));e&&e.click()})}if(Observer.videoChange){Observer.videoChange(n)}else{Observer.childList("#bofqi",n)}}})(); +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/skip-charge-list.min.js"] = (()=>{return(e,i)=>{async function n(){const e=await SpinQuery.select(()=>document.querySelector("video"));e&&e.addEventListener("ended",async()=>{const e=await SpinQuery.select(()=>document.querySelector(".bilibili-player-electric-panel-jump"));e&&e.click()})}if(Observer.videoChange){Observer.videoChange(n)}else{Observer.childList("#bofqi",n)}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/default-player-layout.min.js"] = (()=>{return(e,t)=>{(async()=>{const t=await SpinQuery.select(()=>document.querySelector(`input[key=defaultPlayerLayout]`));const s=await SpinQuery.select(()=>document.querySelector(`input[key=defaultBangumiLayout]`));const o=await SpinQuery.select(()=>document.querySelector(`input[key=overrideNavBar]`));if(!t||!s){logError("无法加载播放器布局选项.");return}class i{setCookie(e,t){document.cookie=`${e}=${t};path=/;domain=.bilibili.com;max-age=31536000`}clearCookie(e){document.cookie=`${e}=;path=/;domain=.bilibili.com;max-age=0`}getValue(e){return document.cookie.replace(new RegExp(`(?:(?:^|.*;\\s*)${e}\\s*\\=\\s*([^;]*).*$)|^.*$`),"$1")}checkSettings(){return e.useDefaultPlayerLayout}checkCookies(){if(!this.checkSettings()){return}}useNewLayout(){if(!this.checkSettings()){return}}useOldLayout(){if(!this.checkSettings()){return}}setLayout(e){if(e){this.useNewLayout()}else{this.useOldLayout()}}}class u extends i{checkCookies(){super.checkCookies();const t=this.getValue(this.cookieKey);if(t===""||parseInt(t)<0&&e.defaultPlayerLayout!=="旧版"){this.useNewLayout()}else if(e.defaultPlayerLayout!=="新版"){this.useOldLayout()}}constructor(){super();this.cookieKey="stardustvideo";this.checkCookies()}useNewLayout(){super.useNewLayout();this.setCookie(this.cookieKey,1);o.disabled=false;$(o).change()}useOldLayout(){super.useOldLayout();this.setCookie(this.cookieKey,-1);if(e.overrideNavBar){o.checked=false;o.disabled=true;$(o).change();e.overrideNavBar=false;saveSettings(e);Toast.info(`已关闭搜索栏置顶功能, 因为旧版视频播放器布局不兼容此功能.`,"提示",5e3)}}}class a extends i{checkCookies(){super.checkCookies();const t=this.getValue(this.cookieKey);if(t===""||parseInt(t)<=0&&e.defaultBangumiLayout!=="旧版"){this.useNewLayout()}else if(e.defaultBangumiLayout!=="新版"){this.useOldLayout()}}constructor(){super();this.cookieKey="stardustpgcv";this.checkCookies()}useNewLayout(){super.useNewLayout();this.setCookie(this.cookieKey,"0606")}useOldLayout(){super.useOldLayout();this.setCookie(this.cookieKey,0)}}const c=new u;$(t).on("input",()=>{c.setLayout(t.value==="新版")});const r=new a;$(s).on("input",()=>{r.setLayout(s.value==="新版")})})()}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/compact-layout.min.css"] = `.groom-module{margin:0!important;width:192px!important;height:120px!important}.bangumi-timing-module .card-timing,.groom-module{-webkit-tap-highlight-color:transparent}.chief-recommend-module .recommend-module,.groom-box-m,.nominate-m .video-card-box{height:240px!important}.groom-module .lazy-img,.groom-module .pic{width:100%!important;height:100%!important;transition:.2s}.groom-module:hover .lazy-img,.groom-module:hover .pic{filter:blur(8px)}.groom-module .card-mark{width:calc(100% - 20px)!important;top:88px;padding:10px!important}.groom-module:hover .card-mark{top:0!important}.chief-recommend-module .carousel-box,.chief-recommend-module .carousel-box img{height:240px!important;width:480px!important}.nominate-m .carousel-box,.nominate-m .carousel-box img{height:240px!important;width:672px!important}.live-module .storey-box .card-live-module,.special-module,.storey-box .spread-module,.video-item-biref{margin:0!important;width:192px!important;height:168px!important;-webkit-tap-highlight-color:transparent}.special-module{height:192px!important}.special-module .pic .title{line-height:unset!important;height:auto!important}.special-recommend-module .storey-box{height:180px!important}.special-module .user{transform:translatey(24px)}.live-module .storey-box .card-live-module .pic,.mod-1 .l .spread-module,.mod-2 .spread-module,.mod-2 li .l,.mod-3 .l .spread-module,.mod-3 .l-item .l,.special-module .pic-box,.spread-module .pic,.video-item-biref .biref-img{width:192px!important;height:120px!important}.mod-2 li .l-item{height:auto}.mod-3 .l-item,.mod-3 li{width:192px!important}.mod-3 .l .spread-module{margin:0!important}.mod-1 .r,.mod-1 li,.mod-2 li .l-item,.mod-3 li{padding:0!important}.mod-3 .r .title,.mod-3 .r .up-info,.mod-3 .r .v-info{padding-top:4px!important;margin-top:0!important}.mod-2 li .r .v-desc{padding:0!important;margin:10px 0!important}.live-module .storey-box .card-live-module .num,.spread-module .num{padding-left:8px;padding-right:8px;bottom:6px}.live-module .storey-box .card-live-module .t,.special-module .pic .title,.spread-module .t,.video-item-biref .biref-info .biref-title{padding-left:4px;padding-right:4px;padding-top:4px}.sec-rank .rank-list-wrap .rank-list{min-height:288px}.hot-recom-module{height:auto!important}.game-groom-box-m,.game-groom-box-m .game-groom-m{height:100%!important}.card-live-module .pic .mask,.carousel-box .carousel-module .panel,.carousel-wrapper,.game-groom-box-m .game-groom-m,.groom-module,.live-module .storey-box .card-live-module .pic,.mod-3 .l-item,.special-module .pic-box,.spread-module .pic,.video-item-biref .biref-img{border-radius:0!important}.card-timing-module .pic,.rank-list .rank-item .ri-num,.timeline-box .timeline-item .preview,.timeline-box .timeline-item .preview img{border-radius:50%!important}.cover-preview-module .cover{width:160px;transform-origin:left top 0;transform:scale(1.3)}.bangumi-timing-module .card-timing{width:205px}.card-timing-module .r-text{width:120px}.recommend-module .rec-btn.prev{left:0!important}.primary-menu{display:flex;align-items:center;margin:0;width:100%}.primary-menu .nav-menu{flex:1 0 auto;display:flex;justify-content:space-between;align-items:center;margin-right:28px}.primary-menu .nav-menu>li .num-wrap span{padding:2.5px;line-height:unset;height:auto;min-width:30px}.primary-menu .nav-menu .side-nav .side-link i.blackroom,.primary-menu .nav-menu .side-nav .side-link i.live,.primary-menu .nav-menu .side-nav .side-link i.square,.primary-menu .nav-menu .side-nav .side-link i.zhuanlan,.primary-menu .nav-menu>li.home>a{background-size:contain;background-repeat:no-repeat;background-position:initial}.primary-menu .nav-menu>li .num-wrap{top:0;position:static;height:auto}.primary-menu .nav-menu li .nav-name{line-height:unset;height:auto}.primary-menu .nav-menu>li:not(.home) .nav-name{height:auto;padding:0}.nav-gif{position:static;flex:0 0 auto}.primary-menu .nav-menu li.home>a .nav-name{visibility:hidden;display:block;position:static}.primary-menu .nav-menu .sub-nav{top:36px;padding-top:4px}@media screen and (min-width:1300px){.bili-wrapper,.cinema-home-wrapper{width:1248px!important}.block-area .block-left{width:960px!important}.timeline-box .timeline-item{padding-right:32px!important}.elevator-module{margin-left:630px!important}.bili-wrapper .l-con{width:988px!important}.bangumi-timing-module .card-timing{padding:36px 30px 0 0}.bangumi-timing-module .card-timing:nth-child(4):nth-child(4){padding-top:0}.mod-1 li .r{width:750px!important}.mod-2 li .r{width:245px!important}.mod-2 li .r .up-info .v-author,.mod-2 li .r .v-info .v-info-i{width:70px!important}.bangumi-timing-module .headline .bili-tab{width:700px;display:flex;justify-content:space-evenly}}@media screen and (max-width:1300px){.bili-wrapper,.cinema-home-wrapper{width:1056px!important}.block-area .block-left{width:768px!important}.elevator-module{margin-left:540px!important}.bili-wrapper .l-con{width:768px!important}.bangumi-timing-module .card-timing{padding:36px 36px 0 0}#ranking_guochuang{width:260px!important;transform:translatex(28px)}.mod-1 li .r{width:530px!important}.mod-2 li .r{width:160px!important}.mod-2 li .r .up-info .v-author,.mod-2 li .r .v-info .v-info-i{width:50px!important}}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/compact-layout.min.js"] = (()=>{return(t,i)=>{const c=["https://www.bilibili.com/","https://www.bilibili.com/watchlater/#/list"];if(c.indexOf(location.href.replace(location.search,""))!==-1){document.documentElement.classList.add("compact")}}})(); diff --git a/bilibili-evolved.preview-offline.user.js b/bilibili-evolved.preview-offline.user.js index 42247abfe..4d308959a 100644 --- a/bilibili-evolved.preview-offline.user.js +++ b/bilibili-evolved.preview-offline.user.js @@ -952,7 +952,11 @@ } static async videoChange(callback) { - await SpinQuery.select(() => document.querySelector("#bilibiliPlayer")); + const player = await SpinQuery.select(() => document.querySelector("#bilibiliPlayer")); + if (player === null) + { + return null; + } return Observer.childList("#bofqi,#bilibiliPlayer", callback); } } @@ -1260,7 +1264,7 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/expand-description.min.js"] = (()=>{return(e,p)=>{p.applyStyle("expandDescriptionStyle")}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/default-danmaku-settings.min.js"] = (()=>{return(e,n)=>{async function t(e,n){const t=await SpinQuery.select(()=>document.querySelector(e));if(!t){return}t.checked=n;raiseEvent(t,"change")}const i={enableDanmaku:".bilibili-player-video-danmaku-switch>input",settingsIcon:".bilibili-player-video-danmaku-setting"};if(!e.enableDanmaku){t(i.enableDanmaku,false)}if(e.rememberDanmakuBlock){for(const n in e.danmakuBlockSettings){i[n]=`.bilibili-player-block-filter-type[ftype=${n}]`}async function a(){await SpinQuery.unsafeJquery();const n=await SpinQuery.any(()=>unsafeWindow.$(i.settingsIcon));if(!n){return}n.mouseover().mouseout();for(const[n,t]of Object.entries(e.danmakuBlockSettings)){if(t===true){const e=await SpinQuery.select(()=>document.querySelector(i[n]));e.click()}}}async function c(){for(const n in e.danmakuBlockSettings){const t=await SpinQuery.select(()=>document.querySelector(i[n]));if(!t){return}t.addEventListener("click",()=>{e.danmakuBlockSettings[n]=t.classList.contains("disabled");saveSettings(e)})}}a();c()}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/skip-charge-list.min.css"] = `.bilibili-player .bilibili-player-area .bilibili-player-electric-panel{display:none!important}`; -offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/skip-charge-list.min.js"] = (()=>{return(e,i)=>{async function n(){const e=await SpinQuery.select(()=>document.querySelector("video"));e.addEventListener("ended",async()=>{const e=await SpinQuery.select(()=>document.querySelector(".bilibili-player-electric-panel-jump"));e&&e.click()})}if(Observer.videoChange){Observer.videoChange(n)}else{Observer.childList("#bofqi",n)}}})(); +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/skip-charge-list.min.js"] = (()=>{return(e,i)=>{async function n(){const e=await SpinQuery.select(()=>document.querySelector("video"));e&&e.addEventListener("ended",async()=>{const e=await SpinQuery.select(()=>document.querySelector(".bilibili-player-electric-panel-jump"));e&&e.click()})}if(Observer.videoChange){Observer.videoChange(n)}else{Observer.childList("#bofqi",n)}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/default-player-layout.min.js"] = (()=>{return(e,t)=>{(async()=>{const t=await SpinQuery.select(()=>document.querySelector(`input[key=defaultPlayerLayout]`));const s=await SpinQuery.select(()=>document.querySelector(`input[key=defaultBangumiLayout]`));const o=await SpinQuery.select(()=>document.querySelector(`input[key=overrideNavBar]`));if(!t||!s){logError("无法加载播放器布局选项.");return}class i{setCookie(e,t){document.cookie=`${e}=${t};path=/;domain=.bilibili.com;max-age=31536000`}clearCookie(e){document.cookie=`${e}=;path=/;domain=.bilibili.com;max-age=0`}getValue(e){return document.cookie.replace(new RegExp(`(?:(?:^|.*;\\s*)${e}\\s*\\=\\s*([^;]*).*$)|^.*$`),"$1")}checkSettings(){return e.useDefaultPlayerLayout}checkCookies(){if(!this.checkSettings()){return}}useNewLayout(){if(!this.checkSettings()){return}}useOldLayout(){if(!this.checkSettings()){return}}setLayout(e){if(e){this.useNewLayout()}else{this.useOldLayout()}}}class u extends i{checkCookies(){super.checkCookies();const t=this.getValue(this.cookieKey);if(t===""||parseInt(t)<0&&e.defaultPlayerLayout!=="旧版"){this.useNewLayout()}else if(e.defaultPlayerLayout!=="新版"){this.useOldLayout()}}constructor(){super();this.cookieKey="stardustvideo";this.checkCookies()}useNewLayout(){super.useNewLayout();this.setCookie(this.cookieKey,1);o.disabled=false;$(o).change()}useOldLayout(){super.useOldLayout();this.setCookie(this.cookieKey,-1);if(e.overrideNavBar){o.checked=false;o.disabled=true;$(o).change();e.overrideNavBar=false;saveSettings(e);Toast.info(`已关闭搜索栏置顶功能, 因为旧版视频播放器布局不兼容此功能.`,"提示",5e3)}}}class a extends i{checkCookies(){super.checkCookies();const t=this.getValue(this.cookieKey);if(t===""||parseInt(t)<=0&&e.defaultBangumiLayout!=="旧版"){this.useNewLayout()}else if(e.defaultBangumiLayout!=="新版"){this.useOldLayout()}}constructor(){super();this.cookieKey="stardustpgcv";this.checkCookies()}useNewLayout(){super.useNewLayout();this.setCookie(this.cookieKey,"0606")}useOldLayout(){super.useOldLayout();this.setCookie(this.cookieKey,0)}}const c=new u;$(t).on("input",()=>{c.setLayout(t.value==="新版")});const r=new a;$(s).on("input",()=>{r.setLayout(s.value==="新版")})})()}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/compact-layout.min.css"] = `.groom-module{margin:0!important;width:192px!important;height:120px!important}.bangumi-timing-module .card-timing,.groom-module{-webkit-tap-highlight-color:transparent}.chief-recommend-module .recommend-module,.groom-box-m,.nominate-m .video-card-box{height:240px!important}.groom-module .lazy-img,.groom-module .pic{width:100%!important;height:100%!important;transition:.2s}.groom-module:hover .lazy-img,.groom-module:hover .pic{filter:blur(8px)}.groom-module .card-mark{width:calc(100% - 20px)!important;top:88px;padding:10px!important}.groom-module:hover .card-mark{top:0!important}.chief-recommend-module .carousel-box,.chief-recommend-module .carousel-box img{height:240px!important;width:480px!important}.nominate-m .carousel-box,.nominate-m .carousel-box img{height:240px!important;width:672px!important}.live-module .storey-box .card-live-module,.special-module,.storey-box .spread-module,.video-item-biref{margin:0!important;width:192px!important;height:168px!important;-webkit-tap-highlight-color:transparent}.special-module{height:192px!important}.special-module .pic .title{line-height:unset!important;height:auto!important}.special-recommend-module .storey-box{height:180px!important}.special-module .user{transform:translatey(24px)}.live-module .storey-box .card-live-module .pic,.mod-1 .l .spread-module,.mod-2 .spread-module,.mod-2 li .l,.mod-3 .l .spread-module,.mod-3 .l-item .l,.special-module .pic-box,.spread-module .pic,.video-item-biref .biref-img{width:192px!important;height:120px!important}.mod-2 li .l-item{height:auto}.mod-3 .l-item,.mod-3 li{width:192px!important}.mod-3 .l .spread-module{margin:0!important}.mod-1 .r,.mod-1 li,.mod-2 li .l-item,.mod-3 li{padding:0!important}.mod-3 .r .title,.mod-3 .r .up-info,.mod-3 .r .v-info{padding-top:4px!important;margin-top:0!important}.mod-2 li .r .v-desc{padding:0!important;margin:10px 0!important}.live-module .storey-box .card-live-module .num,.spread-module .num{padding-left:8px;padding-right:8px;bottom:6px}.live-module .storey-box .card-live-module .t,.special-module .pic .title,.spread-module .t,.video-item-biref .biref-info .biref-title{padding-left:4px;padding-right:4px;padding-top:4px}.sec-rank .rank-list-wrap .rank-list{min-height:288px}.hot-recom-module{height:auto!important}.game-groom-box-m,.game-groom-box-m .game-groom-m{height:100%!important}.card-live-module .pic .mask,.carousel-box .carousel-module .panel,.carousel-wrapper,.game-groom-box-m .game-groom-m,.groom-module,.live-module .storey-box .card-live-module .pic,.mod-3 .l-item,.special-module .pic-box,.spread-module .pic,.video-item-biref .biref-img{border-radius:0!important}.card-timing-module .pic,.rank-list .rank-item .ri-num,.timeline-box .timeline-item .preview,.timeline-box .timeline-item .preview img{border-radius:50%!important}.cover-preview-module .cover{width:160px;transform-origin:left top 0;transform:scale(1.3)}.bangumi-timing-module .card-timing{width:205px}.card-timing-module .r-text{width:120px}.recommend-module .rec-btn.prev{left:0!important}.primary-menu{display:flex;align-items:center;margin:0;width:100%}.primary-menu .nav-menu{flex:1 0 auto;display:flex;justify-content:space-between;align-items:center;margin-right:28px}.primary-menu .nav-menu>li .num-wrap span{padding:2.5px;line-height:unset;height:auto;min-width:30px}.primary-menu .nav-menu .side-nav .side-link i.blackroom,.primary-menu .nav-menu .side-nav .side-link i.live,.primary-menu .nav-menu .side-nav .side-link i.square,.primary-menu .nav-menu .side-nav .side-link i.zhuanlan,.primary-menu .nav-menu>li.home>a{background-size:contain;background-repeat:no-repeat;background-position:initial}.primary-menu .nav-menu>li .num-wrap{top:0;position:static;height:auto}.primary-menu .nav-menu li .nav-name{line-height:unset;height:auto}.primary-menu .nav-menu>li:not(.home) .nav-name{height:auto;padding:0}.nav-gif{position:static;flex:0 0 auto}.primary-menu .nav-menu li.home>a .nav-name{visibility:hidden;display:block;position:static}.primary-menu .nav-menu .sub-nav{top:36px;padding-top:4px}@media screen and (min-width:1300px){.bili-wrapper,.cinema-home-wrapper{width:1248px!important}.block-area .block-left{width:960px!important}.timeline-box .timeline-item{padding-right:32px!important}.elevator-module{margin-left:630px!important}.bili-wrapper .l-con{width:988px!important}.bangumi-timing-module .card-timing{padding:36px 30px 0 0}.bangumi-timing-module .card-timing:nth-child(4):nth-child(4){padding-top:0}.mod-1 li .r{width:750px!important}.mod-2 li .r{width:245px!important}.mod-2 li .r .up-info .v-author,.mod-2 li .r .v-info .v-info-i{width:70px!important}.bangumi-timing-module .headline .bili-tab{width:700px;display:flex;justify-content:space-evenly}}@media screen and (max-width:1300px){.bili-wrapper,.cinema-home-wrapper{width:1056px!important}.block-area .block-left{width:768px!important}.elevator-module{margin-left:540px!important}.bili-wrapper .l-con{width:768px!important}.bangumi-timing-module .card-timing{padding:36px 36px 0 0}#ranking_guochuang{width:260px!important;transform:translatex(28px)}.mod-1 li .r{width:530px!important}.mod-2 li .r{width:160px!important}.mod-2 li .r .up-info .v-author,.mod-2 li .r .v-info .v-info-i{width:50px!important}}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/compact-layout.min.js"] = (()=>{return(t,i)=>{const c=["https://www.bilibili.com/","https://www.bilibili.com/watchlater/#/list"];if(c.indexOf(location.href.replace(location.search,""))!==-1){document.documentElement.classList.add("compact")}}})(); diff --git a/bilibili-evolved.preview.user.js b/bilibili-evolved.preview.user.js index f6d0a39a0..5ca423b3d 100644 --- a/bilibili-evolved.preview.user.js +++ b/bilibili-evolved.preview.user.js @@ -951,7 +951,11 @@ } static async videoChange(callback) { - await SpinQuery.select(() => document.querySelector("#bilibiliPlayer")); + const player = await SpinQuery.select(() => document.querySelector("#bilibiliPlayer")); + if (player === null) + { + return null; + } return Observer.childList("#bofqi,#bilibiliPlayer", callback); } } diff --git a/bilibili-evolved.user.js b/bilibili-evolved.user.js index 102a1d108..fee1435e9 100644 --- a/bilibili-evolved.user.js +++ b/bilibili-evolved.user.js @@ -951,7 +951,11 @@ } static async videoChange(callback) { - await SpinQuery.select(() => document.querySelector("#bilibiliPlayer")); + const player = await SpinQuery.select(() => document.querySelector("#bilibiliPlayer")); + if (player === null) + { + return null; + } return Observer.childList("#bofqi,#bilibiliPlayer", callback); } } diff --git a/min/skip-charge-list.min.js b/min/skip-charge-list.min.js index 982aac3dc..08e82264b 100644 --- a/min/skip-charge-list.min.js +++ b/min/skip-charge-list.min.js @@ -1 +1 @@ -(()=>{return(e,i)=>{async function n(){const e=await SpinQuery.select(()=>document.querySelector("video"));e.addEventListener("ended",async()=>{const e=await SpinQuery.select(()=>document.querySelector(".bilibili-player-electric-panel-jump"));e&&e.click()})}if(Observer.videoChange){Observer.videoChange(n)}else{Observer.childList("#bofqi",n)}}})(); \ No newline at end of file +(()=>{return(e,i)=>{async function n(){const e=await SpinQuery.select(()=>document.querySelector("video"));e&&e.addEventListener("ended",async()=>{const e=await SpinQuery.select(()=>document.querySelector(".bilibili-player-electric-panel-jump"));e&&e.click()})}if(Observer.videoChange){Observer.videoChange(n)}else{Observer.childList("#bofqi",n)}}})(); \ No newline at end of file diff --git a/video/skip-charge-list/skip-charge-list.js b/video/skip-charge-list/skip-charge-list.js index 58e51d3bc..65a1b4d1d 100644 --- a/video/skip-charge-list/skip-charge-list.js +++ b/video/skip-charge-list/skip-charge-list.js @@ -5,7 +5,7 @@ async function skipChargeList() { const video = await SpinQuery.select(() => document.querySelector("video")); - video.addEventListener("ended", async () => + video && video.addEventListener("ended", async () => { const jumpButton = await SpinQuery.select(() => document.querySelector(".bilibili-player-electric-panel-jump")); jumpButton && jumpButton.click();