From 90f027307d6b5b1c4438fbe7e879b176bb1610f8 Mon Sep 17 00:00:00 2001 From: the1812 Date: Sun, 5 Apr 2020 00:36:00 +0800 Subject: [PATCH] Remove namespace in main script --- bilibili-evolved.offline.user.js | 3 +-- bilibili-evolved.preview-offline.user.js | 3 +-- bilibili-evolved.preview.user.js | 1 - bilibili-evolved.user.js | 1 - min/bundle.zip | Bin 2171324 -> 2171316 bytes min/custom-navbar.min.js | 2 +- min/dark.user.css | 2 +- src/client/bilibili-evolved.js | 1 - 8 files changed, 4 insertions(+), 9 deletions(-) diff --git a/bilibili-evolved.offline.user.js b/bilibili-evolved.offline.user.js index 64745a680..f5ff4b8ac 100644 --- a/bilibili-evolved.offline.user.js +++ b/bilibili-evolved.offline.user.js @@ -1,7 +1,6 @@ // ==UserScript== // @name Bilibili Evolved (Offline) -// @namespace Bilibili-Evolved -// @version 626.87 +// @version 628.37 // @description Bilibili Evolved 的离线版, 所有功能都已内置于脚本中. // @author Grant Howard, Coulomb-G // @copyright 2020, Grant Howard (https://github.com/the1812) & Coulomb-G (https://github.com/Coulomb-G) diff --git a/bilibili-evolved.preview-offline.user.js b/bilibili-evolved.preview-offline.user.js index 3e14f9fe8..a33daee1c 100644 --- a/bilibili-evolved.preview-offline.user.js +++ b/bilibili-evolved.preview-offline.user.js @@ -1,7 +1,6 @@ // ==UserScript== // @name Bilibili Evolved (Preview Offline) -// @namespace Bilibili-Evolved -// @version 626.87 +// @version 628.37 // @description Bilibili Evolved 的预览离线版, 可以抢先体验新功能, 并且所有功能都已内置于脚本中. // @author Grant Howard, Coulomb-G // @copyright 2020, Grant Howard (https://github.com/the1812) & Coulomb-G (https://github.com/Coulomb-G) diff --git a/bilibili-evolved.preview.user.js b/bilibili-evolved.preview.user.js index a17d2bbcd..5370b38c6 100644 --- a/bilibili-evolved.preview.user.js +++ b/bilibili-evolved.preview.user.js @@ -1,6 +1,5 @@ // ==UserScript== // @name Bilibili Evolved (Preview) -// @namespace Bilibili-Evolved // @version 1.10.14 // @description Bilibili Evolved 的预览版, 可以抢先体验新功能. // @author Grant Howard, Coulomb-G diff --git a/bilibili-evolved.user.js b/bilibili-evolved.user.js index d498e7b0d..5074197ba 100644 --- a/bilibili-evolved.user.js +++ b/bilibili-evolved.user.js @@ -1,6 +1,5 @@ // ==UserScript== // @name Bilibili Evolved -// @namespace Bilibili-Evolved // @version 1.10.14 // @description 强大的哔哩哔哩增强脚本: 下载视频, 音乐, 封面, 弹幕 / 简化直播间, 评论区, 首页 / 自定义顶栏, 删除广告, 夜间模式 / 触屏设备支持 // @author Grant Howard, Coulomb-G diff --git a/min/bundle.zip b/min/bundle.zip index 8c3b88eec8a7fb93af11632e16b556d51ad23682..622e5ba7e338b767f6d15dae06272b6cab3896b0 100644 GIT binary patch delta 2523 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,i)=>{const a=["//www.bilibili.com","//t.bilibili.com","//search.bilibili.com","//space.bilibili.com","//account.bilibili.com","//pay.bilibili.com","//member.bilibili.com","//big.bilibili.com","//message.bilibili.com","//app.bilibili.com","//passport.bilibili.com","//game.bilibili.com","//live.bilibili.com/blackboard/"];const s=["//t.bilibili.com/vote/h5/index/#/result","//t.bilibili.com/lottery/h5/index/#/result","//member.bilibili.com/video/upload","//space.bilibili.com/ajax/","//www.bilibili.com/h5/comment/","//www.bilibili.com/blackboard/","//member.bilibili.com/v2"];const e=()=>{document.body.style.setProperty("--navbar-bounds-padding",`0 ${t.customNavbarBoundsPadding}%`);document.body.style.setProperty("--navbar-blur-opacity",(t.customNavbarBlurOpacity||.7).toString());addSettingsListener("customNavbarBlurOpacity",t=>{document.body.style.setProperty("--navbar-blur-opacity",t)})};const n=(t,i,a)=>{a.classList.toggle(t,i)};const o=t=>{dq(".custom-navbar").classList.toggle("dark",t);dq(".custom-navbar-settings").classList.toggle("dark",t)};return(()=>{if(isIframe()){return}e();const c=!(!a.some(t=>document.URL.includes(t))||s.some(t=>document.URL.includes(t)))||document.URL.includes("//www.bilibili.com/blackboard/bnj2020.html");if(c){document.body.classList.add("custom-navbar-loading");(async()=>{const a=await i.importAsync((()=>"customNavbarHtml")());document.body.insertAdjacentHTML("beforeend",a);addSettingsListener("useDarkStyle",o,true);const s=()=>dq(".custom-navbar");["Fill","Shadow","Compact","Blur"].forEach(t=>{const i="customNavbar"+t;addSettingsListener(i,i=>n(t.toLowerCase(),i,s()),true)});SpinQuery.condition(()=>dq("#banner_link,.international-header .bili-banner"),t=>t===null?false:Boolean(t.style.backgroundImage),i=>{Observer.attributes(i,()=>{const a=dqa(".custom-navbar .blur-layer");a.forEach(t=>{t.style.backgroundImage=i.style.backgroundImage;t.setAttribute("data-image",i.style.backgroundImage)});addSettingsListener("customNavbarTransparent",i=>{if(!t.hideBanner){s().classList.toggle("transparent",i)}},true);addSettingsListener("hideBanner",i=>{if(t.customNavbarTransparent){s().classList.toggle("transparent",!i)}})})});const{Blank:e}=await i.importAsync("custom-navbar-blank");const{Logo:c}=await i.importAsync("custom-navbar-logo");const{Category:r}=await i.importAsync("custom-navbar-category");const{SimpleLink:l}=await i.importAsync("custom-navbar-simple-link");const{UserInfo:m}=await i.importAsync("custom-navbar-user-info");const{SearchBox:b}=await i.importAsync("custom-navbar-search-box");const{Iframe:u}=await i.importAsync("custom-navbar-iframe");const d=[new e(1),new c,new r,new l("排行","https://www.bilibili.com/ranking","ranking"),new l("相簿","https://h.bilibili.com","drawing"),new l("音频","https://www.bilibili.com/audio/home/","music"),new u("游戏中心","https://game.bilibili.com/",{src:`https://www.bilibili.com/page-proxy/game-nav.html`,width:`680px`,height:`260px`,lazy:true,iframeName:"games"}),new u("直播","https://live.bilibili.com",{src:`https://live.bilibili.com/blackboard/dropdown-menu.html`,width:`528px`,height:`266px`,lazy:true,iframeName:"lives"}),new l("会员购","https://show.bilibili.com","shop"),new l("漫画","https://manga.bilibili.com","manga"),new e(2),new b,new m];if(getUID()){const{WatchlaterList:t}=await i.importAsync("custom-navbar-watchlater-list");const{Messages:a}=await i.importAsync("custom-navbar-messages");const{Activities:s}=await i.importAsync("custom-navbar-activities");const{Subscriptions:e}=await i.importAsync("custom-navbar-subscriptions");const{FavoritesList:n}=await i.importAsync("custom-navbar-favorites-list");const{HistoryList:o}=await i.importAsync("custom-navbar-history-list");d.push(new a,new e,new s,new t,new n,new o)}const{Upload:p}=await i.importAsync("custom-navbar-upload");d.push(new p,new e(3));new Vue({el:".custom-navbar",data:{components:d},methods:{async requestPopup(t){if(!t.requestedPopup&&!t.disabled){this.$set(t,`requestedPopup`,true);if(t.initialPopup){t.initialPopup()}}if(t.onPopup){t.onPopup()}}},mounted(){document.body.classList.remove("custom-navbar-loading");const t=()=>{const t=()=>{d.forEach(t=>t.checkPosition())};addSettingsListener("customNavbarOrder",t,true);addSettingsListener("customNavbarHidden",t);addSettingsListener("customNavbarBoundsPadding",t);window.addEventListener("resize",t)};if("requestIdleCallback"in unsafeWindow&&GM.info.scriptHandler!=="Violentmonkey"){unsafeWindow.requestIdleCallback(t)}else{setTimeout(t)}}})})()}return{widget:{content:`\n
\n\n顶栏布局\n
`,condition:()=>c,success:async()=>{const{initSettingsPanel:t}=await i.importAsync("custom-navbar-settings");await t()}},unload:()=>{const t=dqa(".custom-navbar,.custom-navbar-settings");t.forEach(t=>t.style.display="none");i.removeStyle("customNavbarStyle")},reload:()=>{const t=dqa(".custom-navbar,.custom-navbar-settings");t.forEach(t=>t.style.display="flex");i.applyImportantStyle("customNavbarStyle")}}})()}})(); \ No newline at end of file +(()=>{return(t,i)=>{const a=["//www.bilibili.com","//t.bilibili.com","//search.bilibili.com","//space.bilibili.com","//account.bilibili.com","//pay.bilibili.com","//member.bilibili.com","//big.bilibili.com","//message.bilibili.com","//app.bilibili.com","//passport.bilibili.com","//game.bilibili.com","//live.bilibili.com/blackboard/"];const s=["//t.bilibili.com/vote/h5/index/#/result","//t.bilibili.com/lottery/h5/index/#/result","//member.bilibili.com/video/upload","//space.bilibili.com/ajax/","//www.bilibili.com/h5/comment/","//www.bilibili.com/blackboard/","//member.bilibili.com/v2"];const e=()=>{document.body.style.setProperty("--navbar-bounds-padding",`0 ${t.customNavbarBoundsPadding}%`);document.body.style.setProperty("--navbar-blur-opacity",(t.customNavbarBlurOpacity||.7).toString());addSettingsListener("customNavbarBlurOpacity",t=>{document.body.style.setProperty("--navbar-blur-opacity",t)})};const n=(t,i,a)=>{a.classList.toggle(t,i)};const o=t=>{dq(".custom-navbar").classList.toggle("dark",t);dq(".custom-navbar-settings").classList.toggle("dark",t)};return(()=>{if(isIframe()){return}e();const c=!(!a.some(t=>document.URL.includes(t))||s.some(t=>document.URL.includes(t)))||document.URL.includes("//www.bilibili.com/blackboard/bnj2020.html");if(c){document.body.classList.add("custom-navbar-loading");(async()=>{const a=await i.importAsync("customNavbarHtml");document.body.insertAdjacentHTML("beforeend",a);addSettingsListener("useDarkStyle",o,true);const s=()=>dq(".custom-navbar");["Fill","Shadow","Compact","Blur"].forEach(t=>{const i="customNavbar"+t;addSettingsListener(i,i=>n(t.toLowerCase(),i,s()),true)});SpinQuery.condition(()=>dq("#banner_link,.international-header .bili-banner"),t=>t===null?false:Boolean(t.style.backgroundImage),i=>{Observer.attributes(i,()=>{const a=dqa(".custom-navbar .blur-layer");a.forEach(t=>{t.style.backgroundImage=i.style.backgroundImage;t.setAttribute("data-image",i.style.backgroundImage)});addSettingsListener("customNavbarTransparent",i=>{if(!t.hideBanner){s().classList.toggle("transparent",i)}},true);addSettingsListener("hideBanner",i=>{if(t.customNavbarTransparent){s().classList.toggle("transparent",!i)}})})});const{Blank:e}=await i.importAsync("custom-navbar-blank");const{Logo:c}=await i.importAsync("custom-navbar-logo");const{Category:r}=await i.importAsync("custom-navbar-category");const{SimpleLink:l}=await i.importAsync("custom-navbar-simple-link");const{UserInfo:m}=await i.importAsync("custom-navbar-user-info");const{SearchBox:b}=await i.importAsync("custom-navbar-search-box");const{Iframe:u}=await i.importAsync("custom-navbar-iframe");const d=[new e(1),new c,new r,new l("排行","https://www.bilibili.com/ranking","ranking"),new l("相簿","https://h.bilibili.com","drawing"),new l("音频","https://www.bilibili.com/audio/home/","music"),new u("游戏中心","https://game.bilibili.com/",{src:`https://www.bilibili.com/page-proxy/game-nav.html`,width:`680px`,height:`260px`,lazy:true,iframeName:"games"}),new u("直播","https://live.bilibili.com",{src:`https://live.bilibili.com/blackboard/dropdown-menu.html`,width:`528px`,height:`266px`,lazy:true,iframeName:"lives"}),new l("会员购","https://show.bilibili.com","shop"),new l("漫画","https://manga.bilibili.com","manga"),new e(2),new b,new m];if(getUID()){const{WatchlaterList:t}=await i.importAsync("custom-navbar-watchlater-list");const{Messages:a}=await i.importAsync("custom-navbar-messages");const{Activities:s}=await i.importAsync("custom-navbar-activities");const{Subscriptions:e}=await i.importAsync("custom-navbar-subscriptions");const{FavoritesList:n}=await i.importAsync("custom-navbar-favorites-list");const{HistoryList:o}=await i.importAsync("custom-navbar-history-list");d.push(new a,new e,new s,new t,new n,new o)}const{Upload:p}=await i.importAsync("custom-navbar-upload");d.push(new p,new e(3));new Vue({el:".custom-navbar",data:{components:d},methods:{async requestPopup(t){if(!t.requestedPopup&&!t.disabled){this.$set(t,`requestedPopup`,true);if(t.initialPopup){t.initialPopup()}}if(t.onPopup){t.onPopup()}}},mounted(){document.body.classList.remove("custom-navbar-loading");const t=()=>{const t=()=>{d.forEach(t=>t.checkPosition())};addSettingsListener("customNavbarOrder",t,true);addSettingsListener("customNavbarHidden",t);addSettingsListener("customNavbarBoundsPadding",t);window.addEventListener("resize",t)};if("requestIdleCallback"in unsafeWindow&&GM.info.scriptHandler!=="Violentmonkey"){unsafeWindow.requestIdleCallback(t)}else{setTimeout(t)}}})})()}return{widget:{content:`\n
\n\n顶栏布局\n
`,condition:()=>c,success:async()=>{const{initSettingsPanel:t}=await i.importAsync("custom-navbar-settings");await t()}},unload:()=>{const t=dqa(".custom-navbar,.custom-navbar-settings");t.forEach(t=>t.style.display="none");i.removeStyle("customNavbarStyle")},reload:()=>{const t=dqa(".custom-navbar,.custom-navbar-settings");t.forEach(t=>t.style.display="flex");i.applyImportantStyle("customNavbarStyle")}}})()}})(); \ No newline at end of file diff --git a/min/dark.user.css b/min/dark.user.css index da7db553e..557b8b38b 100644 --- a/min/dark.user.css +++ b/min/dark.user.css @@ -3,7 +3,7 @@ @namespace Bilibili-Evolved @homepageURL https://github.com/the1812/Bilibili-Evolved @updateURL https://cdn.jsdelivr.net/gh/the1812/Bilibili-Evolved@preview/min/dark.user.css -@version 626.08 +@version 628.37 @license MIT @author Grant Howard (https://github.com/the1812), Coulomb-G (https://github.com/Coulomb-G) ==/UserStyle== */ diff --git a/src/client/bilibili-evolved.js b/src/client/bilibili-evolved.js index 6acb456e2..6502609e8 100644 --- a/src/client/bilibili-evolved.js +++ b/src/client/bilibili-evolved.js @@ -1,6 +1,5 @@ // ==UserScript== // @name Bilibili Evolved (Preview) -// @namespace Bilibili-Evolved // @version 1.10.14 // @description Bilibili Evolved 的预览版, 可以抢先体验新功能. // @author Grant Howard, Coulomb-G