diff --git a/bilibili-evolved.offline.user.js b/bilibili-evolved.offline.user.js index bcd32f1c4..c16bd67d5 100644 --- a/bilibili-evolved.offline.user.js +++ b/bilibili-evolved.offline.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Bilibili Evolved (Offline) -// @version 100.20 +// @version 100.83 // @description 增强哔哩哔哩Web端体验.(离线版) // @author Grant Howard, Coulomb-G // @match *://*.bilibili.com/* @@ -56,8 +56,9 @@ notifyNewVersion: true, clearCache: true, fixFullscreen: false, + downloadVideo: true, latestVersionLink: "https://github.com/the1812/Bilibili-Evolved/raw/master/bilibili-evolved.offline.user.js", - currentVersion: "1.5.10" + currentVersion: "1.5.12" }; function loadSettings() { @@ -104,9 +105,11 @@ toastStyle: new Resource("min/toast.min.scss", 9), blurVideoControlStyle: new Resource("min/blur-video-control.min.css", 10), forceWideStyle: new Resource("min/force-wide.min.scss"), + downloadVideoStyle: new Resource("min/download-video.min.scss"), guiSettingsDom: new Resource("min/gui-settings.min.html"), imageViewerDom: new Resource("min/image-viewer.min.html"), + downloadVideoDom: new Resource("min/download-video.min.html"), latestVersion: new Resource("version.txt"), guiSettings: new Resource("min/gui-settings.min.js"), @@ -129,7 +132,8 @@ blurVideoControl: new Resource("min/blur-video-control.min.js"), darkSchedule: new Resource("min/dark-schedule.min.js"), forceWide: new Resource("min/force-wide.min.js"), - clearCache: new Resource("min/clear-cache.min.js") + clearCache: new Resource("min/clear-cache.min.js"), + downloadVideo: new Resource("min/download-video.min.js") }; (function () { @@ -207,6 +211,7 @@ const xhr = new XMLHttpRequest(); xhr.addEventListener("load", () => load && load(xhr.responseText)); xhr.addEventListener("error", () => error && error(xhr.responseText)); + xhr.withCredentials = true; xhr.open("GET", url); xhr.send(); } @@ -510,9 +515,11 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/toast.min.scss"] = `.toast-card-container{position:fixed;left:16px;bottom:16px;display:flex;flex-direction:column;align-items:start;z-index:100001;}.toast-card{background:#444;min-width:240px;border-radius:8px;box-shadow:0 1px 20px rgba(0,0,0,.1);height:0;transition:all 0.3s cubic-bezier(0.18,0.89,0.32,1.28);transform:translateY(16px);transform-origin:bottom;opacity:0;overflow:hidden;display:flex;flex-direction:column;}.toast-card.visible{height:96px;transform:scale(1) translateY(0);opacity:0.95;margin-top:16px;}.toast-card-header{display:flex;align-items:center;}.toast-card-title{font-size:18px;color:#fff6;margin:16px;font-weight:bold;flex:1 1 auto;}svg.toast-card-dismiss{height:24px;width:24px;flex:0 0 auto;padding:16px;cursor:pointer;-webkit-tap-highlight-color:transparent;transition:all .2s ease-out;transform-origin:center;}svg.toast-card-dismiss:hover{transform:scale(1.2);}svg.toast-card-dismiss:active{transform:scale(1.1);}svg.toast-card-dismiss path{fill:#fff6;}.toast-card-message{color:#eeed;font-size:14px;margin:16px;margin-top:0;}.toast-card.toast-default{background:#444;}.toast-card.toast-error{background:#652020;}.toast-card.toast-info{background:#303d61;}.toast-card.toast-success{background:#274227;}.toast-card span,.toast-card .link{display:inline-block;padding:4px 8px;background-color:rgba(0,0,0,.1);border-radius:4px;text-decoration:none;color:#eeed;transition:all .2s ease-out;}.toast-card .link:hover{background-color:rgba(0,0,0,.2);}.toast-card .link:active{background-color:rgba(0,0,0,.1);}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/blur-video-control.min.css"] = `@supports (backdrop-filter: blur(48px)) or (-webkit-backdrop-filter: blur(48px)){.video-control-blur-layer{width:100%;height:100%;position:absolute;-webkit-backdrop-filter:blur(48px);backdrop-filter:blur(48px);z-index:-1;}.bui-slider .bui-track.bui-track-video-progress .bui-bar-wrap{background-color:transparent!important;}.bilibili-player-area .bilibili-player-video-control-wrap{transition:none!important;}}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/force-wide.min.scss"] = `@media screen and (min-width: $forceWideMinWidth){.bili-wrapper{width:1160px;}.bili-wrapper .l-con{width:900px;}.bili-header-m .bili-wrapper{width:1160px;}.bili-header-m .bili-wrapper .l-con{width:900px;}.gg-floor-module{width:1160px;max-height:96px;}.bangumi-timing-module .headline .bili-tab{width:650px;}.bangumi-timing-module .headline .bili-tab .bili-tab-item{width:70px;}.bangumi-timing-module .card-timing:first-child:nth-child(4),.bangumi-timing-module .card-timing:nth-child(2):nth-child(4),.bangumi-timing-module .card-timing:nth-child(3):nth-child(4),.bangumi-timing-module .card-timing:nth-child(4):nth-child(4){padding-top:0;}.bangumi-timing-module .card-timing{padding:36px 34px 0 0;}.audio-list .song-list .song-li:nth-child(5n) .content .text{margin-right:0;}.audiolist-list .song-list .song-li:nth-child(5n) .content .text{margin-right:0;}.elevator-module{margin-left:590px;}#primary_menu,#primary_menu>ul.nav-menu,.uns_box li.u-i.b-post{display:flex;align-items:center;justify-content:space-between;}.primary-menu{width:100%;}.primary-menu .nav-menu{flex-grow:1;}.primary-menu .nav-gif{position:static;margin-left:2%;}.primary-menu .nav-menu>li{margin-right:0!important;}.primary-menu .nav-menu>li.home{padding-right:1%;}}`; +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/download-video.min.scss"] = `#download-video{position:relative;}.download-video-panel.opened{transform:scale(1);}.download-video-panel{position:absolute;top:0;transition:all .2s ease-out;transform-origin:top;transform:scale(0);}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/gui-settings.min.html"] = `
设置
    样式
  • 顶栏(对横幅)不透明度起始时间结束时间显示顶部横幅触发宽度工具视频与直播触摸优化启用实验性动画效果启用双击控制其他模糊设置面板背景启用缓存
`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/image-viewer.min.html"] = `
`; -offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/version.txt"] = `1.5.10`; +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/download-video.min.html"] = ``; +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/version.txt"] = `1.5.12`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/gui-settings.min.js"] = (()=>{return(e,t)=>{const n={red:"#e57373",pink:"#F06292",purple:"#BA68C8",deepPurple:"#9575CD",indigo:"#7986CB",blue:"#2196F3",lightBlue:"#00A0D8",cyan:"#00ACC1",teal:"#26A69A",green:"#81C784",lightGreen:"#9CCC65",orange:"#FF9800",deepOrange:"#FF7043",brown:"#A1887F",grey:"#757575",blueGrey:"#78909C"};const i={settings:"M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z",close:"M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z",ok:"M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z"};const o={forceWideMinWidth:e=>e,customStyleColor:t=>{const n=t.match(/^#([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$/);if(n){if(t.length<7){return`#${t[1]}${t[1]}${t[2]}${t[2]}${t[3]}${t[3]}`}else{return t}}else{return e.customStyleColor}},blurBackgroundOpacity:t=>{const n=t.match(/^([-\+]?\d+)(\.\d+)?$/);if(n){const e=parseFloat(t);if(e>=0&&e<=1){return t}}return e.blurBackgroundOpacity}};function s(e,t){const n=e.match(/^([\d]{1,2}):([\d]{1,2})$/);if(n&&n.length>=3){const e={hour:parseInt(n[1]),minute:parseInt(n[2])};(function(){while(this.minute<0){this.minute+=60;this.hour-=1}while(this.minute>=60){this.minute-=60;this.hour+=1}while(this.hour<0){this.hour+=24}while(this.hour>=24){this.hour-=24}}).call(e);return`${e.hour}:${e.minute<10?"0"+e.minute:e.minute}`}else{return t}}o.darkScheduleStart=(t=>s(t,e.darkScheduleStart));o.darkScheduleEnd=(t=>s(t,e.darkScheduleEnd));function c(e,t,n){$(`input[type='checkbox'][key='${e}']`).prop("checked",n);$(`input[type='text'][key='${e}']`).val(n)}function r(){for(const t in e){c(t,undefined,e[t])}}function a(){$(".gui-settings-header .gui-settings-close").on("click",()=>{$(".gui-settings-panel").removeClass("opened")});$("input[key='customStyleColor']").on("input",()=>{const e=o.customStyleColor($("input[key='customStyleColor']").val());$("div.custom-color-preview").css("background",e)});$("input[type='text'][key]").each((t,n)=>{$(n).attr("placeholder",e[$(n).attr("key")])});$("div.custom-color-preview").on("click",()=>{const e=$(".predefined-colors");e.toggleClass("opened")});onSettingsChange(c)}function u(){const t=()=>{$("input[type='checkbox'][key]").each((t,n)=>{e[$(n).attr("key")]=$(n).prop("checked")});$("input[type='text'][key]").each((t,n)=>{const i=$(n).attr("key");const s=$(n).val();e[i]=o[i](s)});saveSettings(e)};$("input[type='checkbox'][key]").on("change",()=>t());$("input[type='text'][key]").on("change",()=>t())}function l(){$(".gui-settings-close path").attr("d",i.close);$(".gui-settings-ok path").attr("d",i.ok);$(".gui-settings svg path").attr("d",i.settings)}function d(){const e={};$(`input[dependencies]`).each((t,n)=>{const i=$(n).attr("dependencies");if(i){e[$(n).attr("key")]=i}});const t=t=>{const n=t.prop("checked");for(const i in e){const o=e[i].split(" ");if(o.indexOf(t.attr("key"))!==-1){let e=true;if(n&&o.every(e=>$(`input[key='${e}']`).prop("checked"))){e=false}$(`input[key='${i}']`).prop("disabled",e);if(e){$(`input[key='${i}'][type='text']`).parent().addClass("disabled")}else{$(`input[key='${i}'][type='text']`).parent().removeClass("disabled")}}}const i=$(".predefined-colors");if(i.hasClass("opened")){i.removeClass("opened")}};$(`input[type='checkbox'][key]`).on("change",e=>t($(e.target))).each((e,n)=>t($(n)))}function p(e){if($(".gui-settings").length===0){e.append(`
\n \n \n \n
`);$(".gui-settings").on("click",()=>{$(".gui-settings-panel").addClass("opened")})}t.applyStyle("guiSettingsStyle")}function g(){const e=$(".predefined-colors-grid");for(const t of Object.values(n)){$(`
`).appendTo(e).css("background",t).attr("data-color",t).on("click",e=>{$(`input[key='customStyleColor']`).val($(e.target).attr("data-color")).trigger("input").change();$("div.custom-color-preview").on("click")})}}p($("body"));const h=t.data.guiSettingsDom.text;if(h){$("body").append(h);a();l();r();d();g();u();if(e.blurSettingsPanel){$(".gui-settings-box").addClass("blur")}else{$(".gui-settings-panel").addClass("animation")}if(typeof offlineData!=="undefined"){$("input[key=useCache]").prop("disabled",true)}}new SpinQuery(()=>$("body"),e=>e.length>0&&!(unsafeWindow.parent.window===unsafeWindow),e=>$(".gui-settings-icon-panel").css("display","none")).start()}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/dark-styles.min.js"] = (()=>{return(l,e)=>{if(l.useDarkStyle){e.applyStyle("scrollbarStyle");SpinQuery.any(()=>$(".custom-scrollbar"),l=>l.removeClass("custom-scrollbar"));if($("#banner_link").length===0||$("#banner_link").length>0&&l.overrideNavBar&&!l.showBanner){e.applyImportantStyle("darkStyleNavBar")}e.applyStyle("darkStyle");e.applyImportantStyle("darkStyleImportant")}else{$("#bilibili-scrollbar-style,#bilibili-new-style-dark-nav-bar,#bilibili-new-style-dark,#bilibili-new-style-dark-important").remove()}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/new-styles.min.js"] = (()=>{return(e,t)=>{if(document.URL===`https://h.bilibili.com/`){return}t.applyStyle("scrollbarStyle");SpinQuery.any(()=>$(".custom-scrollbar"),e=>e.removeClass("custom-scrollbar"));const l={selectors:["div.nav-con.fl","#link-navbar-vm",".link-navbar",".nav-header-wrapper",".z_top .z_header"],get allSelectors(){return this.selectors.reduce((e,t)=>e+","+t)},get navbar(){let e=null;for(const t of this.selectors){e=e||document.querySelector(t)}return e},supports(e){if(e instanceof Element){const t=parseInt(window.getComputedStyle(e).height);const l=[60,50,0,56];return l.indexOf(t)!==-1}return false}};SpinQuery.any(()=>$(l.allSelectors),()=>{const e=l.navbar;if(l.supports(e)){t.applyStyle("style","bilibili-style-optimization")}else{t.applyStyle("oldStyle","bilibili-style-optimization")}})}})(); @@ -534,6 +541,7 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/dark-schedule.min.js"] = (()=>{return(e,t)=>{class s{constructor(e){if(arguments.length===0){const e=new Date;this.hour=e.getHours();this.minute=e.getMinutes()}else if(arguments.length===1){[this.hour,this.minute]=e.split(":").slice(0,2).map(e=>this.validatePart(e));this.normalize()}else if(arguments.length===2){[this.hour,this.minute]=arguments}}validatePart(e){const t=parseInt(e);if(!isNaN(t)&&0<=t&&t<=59){return t}else{return null}}normalize(){while(this.minute<0){this.minute+=60;this.hour-=1}while(this.minute>=60){this.minute-=60;this.hour+=1}while(this.hour<0){this.hour+=24}while(this.hour>=24){this.hour-=24}}lessThan(e){if(this.houre.hour||this.hour===e.hour&&this.minute>e.minute){return true}return false}equals(e){return this.hour===e.hour&&this.minute===e.minute}isInRange(e,t){if(e.equals(t)){return false}let s=this.greaterThan(e)&&this.lessThan(t);if(e.greaterThan(t)){s=this.greaterThan(e)||this.lessThan(t)}const i=s||this.equals(e);return i}static millisecondsBefore(e){const t=new s;const i=(new Date).getSeconds();const r=1e3*(t.hour*3600+t.minute*60+i);const n=1e3*(e.hour*3600+e.minute*60);let h=n-r;if(t.greaterThan(e)||t.equals(e)&&i!==0){h+=24*3600*1e3}return h}}function i(){if(e.darkSchedule){const r=new s(e.darkScheduleStart);const n=new s(e.darkScheduleEnd);const h=new s;const u=h.isInRange(r,n);if(e.useDarkStyle!==u){e.useDarkStyle=u;saveSettings(e);t.fetchByKey("useDarkStyle")}let o=0;if(u){o=s.millisecondsBefore(n)}else{o=s.millisecondsBefore(r)}if(o!==0){setTimeout(()=>i(),o)}}}i();return{export:s}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/force-wide.min.js"] = (()=>{return(e,t)=>{t.applyImportantStyle("forceWideStyle")}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/clear-cache.min.js"] = (()=>{return(e,n)=>{return{settingsWidget:{after:()=>$("input[key=useCache]").parent().parent(),content:`
  • \n \n 清除缓存\n \n
  • `,success:()=>{$("#clear-cache").on("click",()=>{e.cache={};Toast.show("已删除全部缓存.","清除缓存",5e3)});if(typeof offlineData!=="undefined"){$("button#clear-cache").parent().addClass("hidden")}}}}}})(); +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/download-video.min.js"] = (()=>{return(t,e)=>{class a{constructor(t,e,a){this.quality=t;this.internalName=e;this.displayName=a}static get availableFormats(){return new Promise((t,e)=>{const i=`https://api.bilibili.com/x/player/playurl?avid=${unsafeWinodw.aid}&cid=${unsafeWinodw.cid}&otype=json`;downloadText(i,e=>{const i=JSON.parse(e).data;const n=i.accept_quality;const s=i.accept_format.split(",");const o=i.accept_description;const l=[];while(n.length>0){const t=new a(n.pop(),s.pop(),o.pop());l.push(t)}t(l)},t=>e(`获取清晰度信息失败: ${t}`))})}}class i{constructor(t,e,a,i){this.length=t;this.size=e;this.url=a;this.backupUrls=i}}class n{constructor(t,e){this.format=t;this.fragments=e||[]}fetchVideoInfo(){return new Promise((t,e)=>{const a=`https://api.bilibili.com/x/player/playurl?avid=${unsafeWinodw.aid}&cid=${unsafeWinodw.cid}&qn=${this.format.quality}&otype=json`;downloadText(a,a=>{const n=JSON.parse(a).data;if(n.quality!==this.format.quality){e("获取下载链接失败, 请确认当前账号有下载权限后重试.")}const s=n.durl;this.fragments=s.map(t=>new i(t.length,t.size,t.url,t.backup_url));if(this.fragments.length>1){e("暂不支持分段视频的下载.")}t()})})}}return{settingsWidget:{after:()=>$("span.settings-category").filter((t,e)=>e.innerHTML==="视频与直播").parent(),content:e.data.downloadVideoDom.text,success:()=>{new SpinQuery(()=>$("#download-video"),t=>t.length>0&&typeof unsafeWinodw!=="undefined",()=>{a.availableFormats.then(t=>{t.forEach(t=>{$("ol.video-quality").append(`
  • ${t.displayName}
  • `)});e.applyStyle("downloadVideoStyle");$("#download-video").on("click",()=>{$(".download-video-panel").toggleClass("opened")}).parent().removeClass("hidden")})}).start()}}}}})(); class ResourceType { diff --git a/bilibili-evolved.preview-offline.user.js b/bilibili-evolved.preview-offline.user.js index e56342adf..33492aaab 100644 --- a/bilibili-evolved.preview-offline.user.js +++ b/bilibili-evolved.preview-offline.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Bilibili Evolved (Preview Offline) -// @version 100.20 +// @version 100.83 // @description 增强哔哩哔哩Web端体验.(预览离线版) // @author Grant Howard, Coulomb-G // @match *://*.bilibili.com/* @@ -56,8 +56,9 @@ notifyNewVersion: true, clearCache: true, fixFullscreen: false, + downloadVideo: true, latestVersionLink: "https://github.com/the1812/Bilibili-Evolved/raw/preview/bilibili-evolved.preview-offline.user.js", - currentVersion: "1.5.10" + currentVersion: "1.5.12" }; function loadSettings() { @@ -104,9 +105,11 @@ toastStyle: new Resource("min/toast.min.scss", 9), blurVideoControlStyle: new Resource("min/blur-video-control.min.css", 10), forceWideStyle: new Resource("min/force-wide.min.scss"), + downloadVideoStyle: new Resource("min/download-video.min.scss"), guiSettingsDom: new Resource("min/gui-settings.min.html"), imageViewerDom: new Resource("min/image-viewer.min.html"), + downloadVideoDom: new Resource("min/download-video.min.html"), latestVersion: new Resource("version.txt"), guiSettings: new Resource("min/gui-settings.min.js"), @@ -129,7 +132,8 @@ blurVideoControl: new Resource("min/blur-video-control.min.js"), darkSchedule: new Resource("min/dark-schedule.min.js"), forceWide: new Resource("min/force-wide.min.js"), - clearCache: new Resource("min/clear-cache.min.js") + clearCache: new Resource("min/clear-cache.min.js"), + downloadVideo: new Resource("min/download-video.min.js") }; (function () { @@ -207,6 +211,7 @@ const xhr = new XMLHttpRequest(); xhr.addEventListener("load", () => load && load(xhr.responseText)); xhr.addEventListener("error", () => error && error(xhr.responseText)); + xhr.withCredentials = true; xhr.open("GET", url); xhr.send(); } @@ -510,9 +515,11 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/toast.min.scss"] = `.toast-card-container{position:fixed;left:16px;bottom:16px;display:flex;flex-direction:column;align-items:start;z-index:100001;}.toast-card{background:#444;min-width:240px;border-radius:8px;box-shadow:0 1px 20px rgba(0,0,0,.1);height:0;transition:all 0.3s cubic-bezier(0.18,0.89,0.32,1.28);transform:translateY(16px);transform-origin:bottom;opacity:0;overflow:hidden;display:flex;flex-direction:column;}.toast-card.visible{height:96px;transform:scale(1) translateY(0);opacity:0.95;margin-top:16px;}.toast-card-header{display:flex;align-items:center;}.toast-card-title{font-size:18px;color:#fff6;margin:16px;font-weight:bold;flex:1 1 auto;}svg.toast-card-dismiss{height:24px;width:24px;flex:0 0 auto;padding:16px;cursor:pointer;-webkit-tap-highlight-color:transparent;transition:all .2s ease-out;transform-origin:center;}svg.toast-card-dismiss:hover{transform:scale(1.2);}svg.toast-card-dismiss:active{transform:scale(1.1);}svg.toast-card-dismiss path{fill:#fff6;}.toast-card-message{color:#eeed;font-size:14px;margin:16px;margin-top:0;}.toast-card.toast-default{background:#444;}.toast-card.toast-error{background:#652020;}.toast-card.toast-info{background:#303d61;}.toast-card.toast-success{background:#274227;}.toast-card span,.toast-card .link{display:inline-block;padding:4px 8px;background-color:rgba(0,0,0,.1);border-radius:4px;text-decoration:none;color:#eeed;transition:all .2s ease-out;}.toast-card .link:hover{background-color:rgba(0,0,0,.2);}.toast-card .link:active{background-color:rgba(0,0,0,.1);}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/blur-video-control.min.css"] = `@supports (backdrop-filter: blur(48px)) or (-webkit-backdrop-filter: blur(48px)){.video-control-blur-layer{width:100%;height:100%;position:absolute;-webkit-backdrop-filter:blur(48px);backdrop-filter:blur(48px);z-index:-1;}.bui-slider .bui-track.bui-track-video-progress .bui-bar-wrap{background-color:transparent!important;}.bilibili-player-area .bilibili-player-video-control-wrap{transition:none!important;}}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/force-wide.min.scss"] = `@media screen and (min-width: $forceWideMinWidth){.bili-wrapper{width:1160px;}.bili-wrapper .l-con{width:900px;}.bili-header-m .bili-wrapper{width:1160px;}.bili-header-m .bili-wrapper .l-con{width:900px;}.gg-floor-module{width:1160px;max-height:96px;}.bangumi-timing-module .headline .bili-tab{width:650px;}.bangumi-timing-module .headline .bili-tab .bili-tab-item{width:70px;}.bangumi-timing-module .card-timing:first-child:nth-child(4),.bangumi-timing-module .card-timing:nth-child(2):nth-child(4),.bangumi-timing-module .card-timing:nth-child(3):nth-child(4),.bangumi-timing-module .card-timing:nth-child(4):nth-child(4){padding-top:0;}.bangumi-timing-module .card-timing{padding:36px 34px 0 0;}.audio-list .song-list .song-li:nth-child(5n) .content .text{margin-right:0;}.audiolist-list .song-list .song-li:nth-child(5n) .content .text{margin-right:0;}.elevator-module{margin-left:590px;}#primary_menu,#primary_menu>ul.nav-menu,.uns_box li.u-i.b-post{display:flex;align-items:center;justify-content:space-between;}.primary-menu{width:100%;}.primary-menu .nav-menu{flex-grow:1;}.primary-menu .nav-gif{position:static;margin-left:2%;}.primary-menu .nav-menu>li{margin-right:0!important;}.primary-menu .nav-menu>li.home{padding-right:1%;}}`; +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/download-video.min.scss"] = `#download-video{position:relative;}.download-video-panel.opened{transform:scale(1);}.download-video-panel{position:absolute;top:0;transition:all .2s ease-out;transform-origin:top;transform:scale(0);}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/gui-settings.min.html"] = `
    设置
      样式
    • 顶栏(对横幅)不透明度起始时间结束时间显示顶部横幅触发宽度工具视频与直播触摸优化启用实验性动画效果启用双击控制其他模糊设置面板背景启用缓存
    `; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/image-viewer.min.html"] = `
    `; -offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/version.txt"] = `1.5.10`; +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/download-video.min.html"] = ``; +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/version.txt"] = `1.5.12`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/gui-settings.min.js"] = (()=>{return(e,t)=>{const n={red:"#e57373",pink:"#F06292",purple:"#BA68C8",deepPurple:"#9575CD",indigo:"#7986CB",blue:"#2196F3",lightBlue:"#00A0D8",cyan:"#00ACC1",teal:"#26A69A",green:"#81C784",lightGreen:"#9CCC65",orange:"#FF9800",deepOrange:"#FF7043",brown:"#A1887F",grey:"#757575",blueGrey:"#78909C"};const i={settings:"M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z",close:"M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z",ok:"M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z"};const o={forceWideMinWidth:e=>e,customStyleColor:t=>{const n=t.match(/^#([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$/);if(n){if(t.length<7){return`#${t[1]}${t[1]}${t[2]}${t[2]}${t[3]}${t[3]}`}else{return t}}else{return e.customStyleColor}},blurBackgroundOpacity:t=>{const n=t.match(/^([-\+]?\d+)(\.\d+)?$/);if(n){const e=parseFloat(t);if(e>=0&&e<=1){return t}}return e.blurBackgroundOpacity}};function s(e,t){const n=e.match(/^([\d]{1,2}):([\d]{1,2})$/);if(n&&n.length>=3){const e={hour:parseInt(n[1]),minute:parseInt(n[2])};(function(){while(this.minute<0){this.minute+=60;this.hour-=1}while(this.minute>=60){this.minute-=60;this.hour+=1}while(this.hour<0){this.hour+=24}while(this.hour>=24){this.hour-=24}}).call(e);return`${e.hour}:${e.minute<10?"0"+e.minute:e.minute}`}else{return t}}o.darkScheduleStart=(t=>s(t,e.darkScheduleStart));o.darkScheduleEnd=(t=>s(t,e.darkScheduleEnd));function c(e,t,n){$(`input[type='checkbox'][key='${e}']`).prop("checked",n);$(`input[type='text'][key='${e}']`).val(n)}function r(){for(const t in e){c(t,undefined,e[t])}}function a(){$(".gui-settings-header .gui-settings-close").on("click",()=>{$(".gui-settings-panel").removeClass("opened")});$("input[key='customStyleColor']").on("input",()=>{const e=o.customStyleColor($("input[key='customStyleColor']").val());$("div.custom-color-preview").css("background",e)});$("input[type='text'][key]").each((t,n)=>{$(n).attr("placeholder",e[$(n).attr("key")])});$("div.custom-color-preview").on("click",()=>{const e=$(".predefined-colors");e.toggleClass("opened")});onSettingsChange(c)}function u(){const t=()=>{$("input[type='checkbox'][key]").each((t,n)=>{e[$(n).attr("key")]=$(n).prop("checked")});$("input[type='text'][key]").each((t,n)=>{const i=$(n).attr("key");const s=$(n).val();e[i]=o[i](s)});saveSettings(e)};$("input[type='checkbox'][key]").on("change",()=>t());$("input[type='text'][key]").on("change",()=>t())}function l(){$(".gui-settings-close path").attr("d",i.close);$(".gui-settings-ok path").attr("d",i.ok);$(".gui-settings svg path").attr("d",i.settings)}function d(){const e={};$(`input[dependencies]`).each((t,n)=>{const i=$(n).attr("dependencies");if(i){e[$(n).attr("key")]=i}});const t=t=>{const n=t.prop("checked");for(const i in e){const o=e[i].split(" ");if(o.indexOf(t.attr("key"))!==-1){let e=true;if(n&&o.every(e=>$(`input[key='${e}']`).prop("checked"))){e=false}$(`input[key='${i}']`).prop("disabled",e);if(e){$(`input[key='${i}'][type='text']`).parent().addClass("disabled")}else{$(`input[key='${i}'][type='text']`).parent().removeClass("disabled")}}}const i=$(".predefined-colors");if(i.hasClass("opened")){i.removeClass("opened")}};$(`input[type='checkbox'][key]`).on("change",e=>t($(e.target))).each((e,n)=>t($(n)))}function p(e){if($(".gui-settings").length===0){e.append(`
    \n \n \n \n
    `);$(".gui-settings").on("click",()=>{$(".gui-settings-panel").addClass("opened")})}t.applyStyle("guiSettingsStyle")}function g(){const e=$(".predefined-colors-grid");for(const t of Object.values(n)){$(`
    `).appendTo(e).css("background",t).attr("data-color",t).on("click",e=>{$(`input[key='customStyleColor']`).val($(e.target).attr("data-color")).trigger("input").change();$("div.custom-color-preview").on("click")})}}p($("body"));const h=t.data.guiSettingsDom.text;if(h){$("body").append(h);a();l();r();d();g();u();if(e.blurSettingsPanel){$(".gui-settings-box").addClass("blur")}else{$(".gui-settings-panel").addClass("animation")}if(typeof offlineData!=="undefined"){$("input[key=useCache]").prop("disabled",true)}}new SpinQuery(()=>$("body"),e=>e.length>0&&!(unsafeWindow.parent.window===unsafeWindow),e=>$(".gui-settings-icon-panel").css("display","none")).start()}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/dark-styles.min.js"] = (()=>{return(l,e)=>{if(l.useDarkStyle){e.applyStyle("scrollbarStyle");SpinQuery.any(()=>$(".custom-scrollbar"),l=>l.removeClass("custom-scrollbar"));if($("#banner_link").length===0||$("#banner_link").length>0&&l.overrideNavBar&&!l.showBanner){e.applyImportantStyle("darkStyleNavBar")}e.applyStyle("darkStyle");e.applyImportantStyle("darkStyleImportant")}else{$("#bilibili-scrollbar-style,#bilibili-new-style-dark-nav-bar,#bilibili-new-style-dark,#bilibili-new-style-dark-important").remove()}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/new-styles.min.js"] = (()=>{return(e,t)=>{if(document.URL===`https://h.bilibili.com/`){return}t.applyStyle("scrollbarStyle");SpinQuery.any(()=>$(".custom-scrollbar"),e=>e.removeClass("custom-scrollbar"));const l={selectors:["div.nav-con.fl","#link-navbar-vm",".link-navbar",".nav-header-wrapper",".z_top .z_header"],get allSelectors(){return this.selectors.reduce((e,t)=>e+","+t)},get navbar(){let e=null;for(const t of this.selectors){e=e||document.querySelector(t)}return e},supports(e){if(e instanceof Element){const t=parseInt(window.getComputedStyle(e).height);const l=[60,50,0,56];return l.indexOf(t)!==-1}return false}};SpinQuery.any(()=>$(l.allSelectors),()=>{const e=l.navbar;if(l.supports(e)){t.applyStyle("style","bilibili-style-optimization")}else{t.applyStyle("oldStyle","bilibili-style-optimization")}})}})(); @@ -534,6 +541,7 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/dark-schedule.min.js"] = (()=>{return(e,t)=>{class s{constructor(e){if(arguments.length===0){const e=new Date;this.hour=e.getHours();this.minute=e.getMinutes()}else if(arguments.length===1){[this.hour,this.minute]=e.split(":").slice(0,2).map(e=>this.validatePart(e));this.normalize()}else if(arguments.length===2){[this.hour,this.minute]=arguments}}validatePart(e){const t=parseInt(e);if(!isNaN(t)&&0<=t&&t<=59){return t}else{return null}}normalize(){while(this.minute<0){this.minute+=60;this.hour-=1}while(this.minute>=60){this.minute-=60;this.hour+=1}while(this.hour<0){this.hour+=24}while(this.hour>=24){this.hour-=24}}lessThan(e){if(this.houre.hour||this.hour===e.hour&&this.minute>e.minute){return true}return false}equals(e){return this.hour===e.hour&&this.minute===e.minute}isInRange(e,t){if(e.equals(t)){return false}let s=this.greaterThan(e)&&this.lessThan(t);if(e.greaterThan(t)){s=this.greaterThan(e)||this.lessThan(t)}const i=s||this.equals(e);return i}static millisecondsBefore(e){const t=new s;const i=(new Date).getSeconds();const r=1e3*(t.hour*3600+t.minute*60+i);const n=1e3*(e.hour*3600+e.minute*60);let h=n-r;if(t.greaterThan(e)||t.equals(e)&&i!==0){h+=24*3600*1e3}return h}}function i(){if(e.darkSchedule){const r=new s(e.darkScheduleStart);const n=new s(e.darkScheduleEnd);const h=new s;const u=h.isInRange(r,n);if(e.useDarkStyle!==u){e.useDarkStyle=u;saveSettings(e);t.fetchByKey("useDarkStyle")}let o=0;if(u){o=s.millisecondsBefore(n)}else{o=s.millisecondsBefore(r)}if(o!==0){setTimeout(()=>i(),o)}}}i();return{export:s}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/force-wide.min.js"] = (()=>{return(e,t)=>{t.applyImportantStyle("forceWideStyle")}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/clear-cache.min.js"] = (()=>{return(e,n)=>{return{settingsWidget:{after:()=>$("input[key=useCache]").parent().parent(),content:`
  • \n \n 清除缓存\n \n
  • `,success:()=>{$("#clear-cache").on("click",()=>{e.cache={};Toast.show("已删除全部缓存.","清除缓存",5e3)});if(typeof offlineData!=="undefined"){$("button#clear-cache").parent().addClass("hidden")}}}}}})(); +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/download-video.min.js"] = (()=>{return(t,e)=>{class a{constructor(t,e,a){this.quality=t;this.internalName=e;this.displayName=a}static get availableFormats(){return new Promise((t,e)=>{const i=`https://api.bilibili.com/x/player/playurl?avid=${unsafeWinodw.aid}&cid=${unsafeWinodw.cid}&otype=json`;downloadText(i,e=>{const i=JSON.parse(e).data;const n=i.accept_quality;const s=i.accept_format.split(",");const o=i.accept_description;const l=[];while(n.length>0){const t=new a(n.pop(),s.pop(),o.pop());l.push(t)}t(l)},t=>e(`获取清晰度信息失败: ${t}`))})}}class i{constructor(t,e,a,i){this.length=t;this.size=e;this.url=a;this.backupUrls=i}}class n{constructor(t,e){this.format=t;this.fragments=e||[]}fetchVideoInfo(){return new Promise((t,e)=>{const a=`https://api.bilibili.com/x/player/playurl?avid=${unsafeWinodw.aid}&cid=${unsafeWinodw.cid}&qn=${this.format.quality}&otype=json`;downloadText(a,a=>{const n=JSON.parse(a).data;if(n.quality!==this.format.quality){e("获取下载链接失败, 请确认当前账号有下载权限后重试.")}const s=n.durl;this.fragments=s.map(t=>new i(t.length,t.size,t.url,t.backup_url));if(this.fragments.length>1){e("暂不支持分段视频的下载.")}t()})})}}return{settingsWidget:{after:()=>$("span.settings-category").filter((t,e)=>e.innerHTML==="视频与直播").parent(),content:e.data.downloadVideoDom.text,success:()=>{new SpinQuery(()=>$("#download-video"),t=>t.length>0&&typeof unsafeWinodw!=="undefined",()=>{a.availableFormats.then(t=>{t.forEach(t=>{$("ol.video-quality").append(`
  • ${t.displayName}
  • `)});e.applyStyle("downloadVideoStyle");$("#download-video").on("click",()=>{$(".download-video-panel").toggleClass("opened")}).parent().removeClass("hidden")})}).start()}}}}})(); class ResourceType { diff --git a/bilibili-evolved.preview.user.js b/bilibili-evolved.preview.user.js index 67321e8c1..40199b9db 100644 --- a/bilibili-evolved.preview.user.js +++ b/bilibili-evolved.preview.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Bilibili Evolved (Preview) -// @version 1.5.11 +// @version 1.5.12 // @description 增强哔哩哔哩Web端体验. (预览版分支) // @author Grant Howard, Coulomb-G // @match *://*.bilibili.com/* @@ -56,8 +56,9 @@ notifyNewVersion: true, clearCache: true, fixFullscreen: false, + downloadVideo: true, latestVersionLink: "https://github.com/the1812/Bilibili-Evolved/raw/preview/bilibili-evolved.preview.user.js", - currentVersion: "1.5.10" + currentVersion: "1.5.12" }; function loadSettings() { @@ -104,9 +105,11 @@ toastStyle: new Resource("min/toast.min.scss", 9), blurVideoControlStyle: new Resource("min/blur-video-control.min.css", 10), forceWideStyle: new Resource("min/force-wide.min.scss"), + downloadVideoStyle: new Resource("min/download-video.min.scss"), guiSettingsDom: new Resource("min/gui-settings.min.html"), imageViewerDom: new Resource("min/image-viewer.min.html"), + downloadVideoDom: new Resource("min/download-video.min.html"), latestVersion: new Resource("version.txt"), guiSettings: new Resource("min/gui-settings.min.js"), @@ -129,7 +132,8 @@ blurVideoControl: new Resource("min/blur-video-control.min.js"), darkSchedule: new Resource("min/dark-schedule.min.js"), forceWide: new Resource("min/force-wide.min.js"), - clearCache: new Resource("min/clear-cache.min.js") + clearCache: new Resource("min/clear-cache.min.js"), + downloadVideo: new Resource("min/download-video.min.js") }; (function () { diff --git a/bilibili-evolved.user.js b/bilibili-evolved.user.js index 93dd42b3c..4f3e507f3 100644 --- a/bilibili-evolved.user.js +++ b/bilibili-evolved.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Bilibili Evolved -// @version 1.5.10 +// @version 1.5.12 // @description 增强哔哩哔哩Web端体验. // @author Grant Howard, Coulomb-G // @match *://*.bilibili.com/* @@ -56,8 +56,9 @@ notifyNewVersion: true, clearCache: true, fixFullscreen: false, + downloadVideo: true, latestVersionLink: "https://github.com/the1812/Bilibili-Evolved/raw/master/bilibili-evolved.user.js", - currentVersion: "1.5.10" + currentVersion: "1.5.12" }; function loadSettings() { @@ -104,9 +105,11 @@ toastStyle: new Resource("min/toast.min.scss", 9), blurVideoControlStyle: new Resource("min/blur-video-control.min.css", 10), forceWideStyle: new Resource("min/force-wide.min.scss"), + downloadVideoStyle: new Resource("min/download-video.min.scss"), guiSettingsDom: new Resource("min/gui-settings.min.html"), imageViewerDom: new Resource("min/image-viewer.min.html"), + downloadVideoDom: new Resource("min/download-video.min.html"), latestVersion: new Resource("version.txt"), guiSettings: new Resource("min/gui-settings.min.js"), @@ -129,7 +132,8 @@ blurVideoControl: new Resource("min/blur-video-control.min.js"), darkSchedule: new Resource("min/dark-schedule.min.js"), forceWide: new Resource("min/force-wide.min.js"), - clearCache: new Resource("min/clear-cache.min.js") + clearCache: new Resource("min/clear-cache.min.js"), + downloadVideo: new Resource("min/download-video.min.js") }; (function () { @@ -207,6 +211,7 @@ const xhr = new XMLHttpRequest(); xhr.addEventListener("load", () => load && load(xhr.responseText)); xhr.addEventListener("error", () => error && error(xhr.responseText)); + xhr.withCredentials = true; xhr.open("GET", url); xhr.send(); } diff --git a/min/download-video.min.html b/min/download-video.min.html new file mode 100644 index 000000000..9b344262b --- /dev/null +++ b/min/download-video.min.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/min/download-video.min.js b/min/download-video.min.js new file mode 100644 index 000000000..9c534a1ab --- /dev/null +++ b/min/download-video.min.js @@ -0,0 +1 @@ +(()=>{return(t,e)=>{class a{constructor(t,e,a){this.quality=t;this.internalName=e;this.displayName=a}static get availableFormats(){return new Promise((t,e)=>{const i=`https://api.bilibili.com/x/player/playurl?avid=${unsafeWinodw.aid}&cid=${unsafeWinodw.cid}&otype=json`;downloadText(i,e=>{const i=JSON.parse(e).data;const n=i.accept_quality;const s=i.accept_format.split(",");const o=i.accept_description;const l=[];while(n.length>0){const t=new a(n.pop(),s.pop(),o.pop());l.push(t)}t(l)},t=>e(`获取清晰度信息失败: ${t}`))})}}class i{constructor(t,e,a,i){this.length=t;this.size=e;this.url=a;this.backupUrls=i}}class n{constructor(t,e){this.format=t;this.fragments=e||[]}fetchVideoInfo(){return new Promise((t,e)=>{const a=`https://api.bilibili.com/x/player/playurl?avid=${unsafeWinodw.aid}&cid=${unsafeWinodw.cid}&qn=${this.format.quality}&otype=json`;downloadText(a,a=>{const n=JSON.parse(a).data;if(n.quality!==this.format.quality){e("获取下载链接失败, 请确认当前账号有下载权限后重试.")}const s=n.durl;this.fragments=s.map(t=>new i(t.length,t.size,t.url,t.backup_url));if(this.fragments.length>1){e("暂不支持分段视频的下载.")}t()})})}}return{settingsWidget:{after:()=>$("span.settings-category").filter((t,e)=>e.innerHTML==="视频与直播").parent(),content:e.data.downloadVideoDom.text,success:()=>{new SpinQuery(()=>$("#download-video"),t=>t.length>0&&typeof unsafeWinodw!=="undefined",()=>{a.availableFormats.then(t=>{t.forEach(t=>{$("ol.video-quality").append(`
  • ${t.displayName}
  • `)});e.applyStyle("downloadVideoStyle");$("#download-video").on("click",()=>{$(".download-video-panel").toggleClass("opened")}).parent().removeClass("hidden")})}).start()}}}}})(); \ No newline at end of file diff --git a/min/download-video.min.scss b/min/download-video.min.scss new file mode 100644 index 000000000..ea8180466 --- /dev/null +++ b/min/download-video.min.scss @@ -0,0 +1 @@ +#download-video{position:relative;}.download-video-panel.opened{transform:scale(1);}.download-video-panel{position:absolute;top:0;transition:all .2s ease-out;transform-origin:top;transform:scale(0);} \ No newline at end of file diff --git a/version.txt b/version.txt index 0edd95ce6..b7fd43df7 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.5.10 \ No newline at end of file +1.5.12 \ No newline at end of file diff --git a/video/download-video/download-video.js b/video/download-video/download-video.js index 5c24ccc6b..1374e558d 100644 --- a/video/download-video/download-video.js +++ b/video/download-video/download-video.js @@ -85,7 +85,24 @@ content: resources.data.downloadVideoDom.text, success: () => { - resources.applyStyle("downloadVideoStyle"); + new SpinQuery(() => $("#download-video"), + it => it.length > 0 && typeof unsafeWinodw !== "undefined", + () => + { + VideoFormat.availableFormats.then((formats) => + { + formats.forEach(format => + { + $("ol.video-quality").append(`
  • ${format.displayName}
  • `); + }); + resources.applyStyle("downloadVideoStyle"); + $("#download-video").on("click", () => + { + $(".download-video-panel").toggleClass("opened"); + }).parent().removeClass("hidden"); + }); + } + ).start(); } } }; diff --git a/video/download-video/download-video.scss b/video/download-video/download-video.scss index 527bae156..164256fe9 100644 --- a/video/download-video/download-video.scss +++ b/video/download-video/download-video.scss @@ -2,3 +2,15 @@ { position: relative; } +.download-video-panel.opened +{ + transform: scale(1); +} +.download-video-panel +{ + position: absolute; + top: 0; + transition: all .2s ease-out; + transform-origin: top; + transform: scale(0); +} \ No newline at end of file