Update scripts in master branch

This commit is contained in:
the1812 2018-07-24 23:42:37 +08:00
parent 97aaf2ddd6
commit e367273e2f
3 changed files with 128 additions and 63 deletions

View File

@ -1,12 +1,14 @@
// ==UserScript==
// @name Bilibili Evolved
// @version 0.9.0
// @version 0.9.2
// @description 增强哔哩哔哩Web端体验.
// @author Grant Howard
// @match *://*.bilibili.com/*
// @match *://*.bilibili.com
// @grant unsafeWindow
// @require https://static.hdslb.com/js/jquery.min.js
// @grant GM_getValue
// @grant GM_setValue
// @require https://code.jquery.com/jquery-3.2.1.min.js
// @icon https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/images/logo.png
// ==/UserScript==
(self$ =>
@ -35,19 +37,13 @@
grey: "#757575",
blueGrey: "#607D8B"
};
// User settings will overwrite default settings below
const userSettings = {
customStyleColor: colors.pink,
showBanner: false,
useDarkStyle: true
};
const settings = {
// remove ads
removeAds: true,
// max retry count used for query elements
touchNavBar: true,
touchNavBar: false,
// (Experimental) touch support for video player
touchVideoPlayer: true,
touchVideoPlayer: false,
// redirect to original sites in watchlater list
watchLaterRedirect: true,
// auto expand danmaku list
@ -65,15 +61,11 @@
// show top banner
showBanner: true,
// [New Styles]
// (Not Implemented) use dark mode
useDarkStyle: true,
// (Experimental) use dark mode
useDarkStyle: false,
// use new styles for nav bar and player
useNewStyle: true
};
for (const key in userSettings)
{
settings[key] = userSettings[key];
}
const ajaxReload = [
"touchVideoPlayer",
"watchLaterRedirect",
@ -116,7 +108,42 @@
xhr.open("GET", url);
xhr.send();
}
function reload(resources)
{
settings.guiSettings = true;
for (const key in settings)
{
if (settings[key] === true)
{
const func = eval(resources.data[key]);
if (func)
{
func(settings, resources);
if (ajaxReload.indexOf(key) !== -1)
{
$(document).ajaxComplete(() =>
{
func(settings, resources);
});
}
}
}
}
}
function loadSettings()
{
for (const key in settings)
{
settings[key] = GM_getValue(key, settings[key]);
}
}
function saveSettings()
{
for (const key in settings)
{
GM_setValue(key, settings[key]);
}
}
class ExternalResource
{
static get resourceUrls()
@ -219,28 +246,11 @@
}
}
loadSettings();
const resources = new ExternalResource();
resources.ready(() =>
{
settings.guiSettings = true;
for (const key in settings)
{
if (settings[key] === true)
{
const func = eval(resources.data[key]);
if (func)
{
func(settings, resources);
if (ajaxReload.indexOf(key) !== -1)
{
$(document).ajaxComplete(() =>
{
func(settings, resources);
});
}
}
}
}
reload(resources);
});
});
})(window.jQuery.noConflict(true));

View File

@ -7,8 +7,42 @@
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 textValidate = {
"customStyleColor": text =>
{
const match = text.match(/^#([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$/);
if (match)
{
if (text.length < 7)
{
return `#${text[0]}${text[0]}${text[1]}${text[1]}${text[2]}${text[2]}`;
}
else
{
return text;
}
}
else
{
return settings.customStyleColor;
}
},
"blurBackgroundOpacity": text =>
{
const match = text.match(/^([-\+]?\d+)(\.\d+)?$/);
if (match)
{
const value = parseFloat(text);
if (value >= 0 && value <= 1)
{
return text;
}
}
return settings.blurBackgroundOpacity;
}
};
waitForQuery()(
() => $("body"),
() => $(".gr__bilibili_com>body"),
it => it.length > 0,
it =>
{
@ -29,6 +63,14 @@
const settingsBox = resources.data.guiSettingsDom;
if (settingsBox)
{
const reloadGuiSettings = () =>
{
for (const key in settings)
{
$(`input[type='checkbox'][key='${key}']`).prop("checked", settings[key]);
$(`input[type='text'][key='${key}']`).val(settings[key]);
}
};
$("body").append(settingsBox);
$(".gui-settings-header .gui-settings-close").on("click", () =>
{
@ -36,10 +78,18 @@
});
$("button.save").on("click", () =>
{
$("input[type='checkbox'][key]").each((_, element) =>
$("input[type='checkbox'][key]")
.each((_, element) =>
{
settings[$(element).attr("key")] = $(element).prop("checked");
});
$("input[type='text'][key]")
.each((_, element) =>
{
const key = $(element).attr("key");
const value = $(element).val();
settings[key] = textValidate[key](value);
});
saveSettings();
const svg = $(".gui-settings-footer svg.gui-settings-ok");
if (parseInt(svg.css("width")) === 0)
@ -56,16 +106,15 @@
});
}, 3000);
}
reloadGuiSettings();
});
$(".gui-settings-close path").attr("d", svgData.close);
$(".gui-settings-ok path").attr("d", svgData.ok);
$(".gui-settings svg path").attr("d", svgData.settings);
reloadGuiSettings();
const dependencies = {};
for (const key in settings)
{
$(`input[type='checkbox'][key='${key}']`).prop("checked", settings[key]);
$(`input[dependencies]`).each((_, element) =>
{
dependencies[$(element).attr("key")] = $(element).attr("dependencies");
@ -85,13 +134,19 @@
value = false;
}
$(`input[key='${key}']`).prop("disabled", value);
if (value)
{
$(`input[key='${key}'][type='text']`).parent().addClass("disabled");
}
else
{
$(`input[key='${key}'][type='text']`).parent().removeClass("disabled");
}
}
}
});
}
}
}
);
};
})();

View File

@ -1 +1 @@
(()=>(t,e)=>{const s="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",i="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",n="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z";waitForQuery()(()=>$("body"),t=>t.length>0,c=>{0===$(".gui-settings").length&&(c.append("<div class='gui-settings-icon-panel'><div class='gui-settings'>\n <svg style=\"width:24px;height:24px\" viewBox=\"0 0 24 24\">\n <path/>\n </svg>\n </div></div>"),$(".gui-settings").on("click",()=>{$(".gui-settings-panel").css("display","flex")}));const g=e.getStyle("guiSettingsStyle","gui-settings-style");$("body").after(g);const o=e.data.guiSettingsDom;if(o){$("body").append(o),$(".gui-settings-header .gui-settings-close").on("click",()=>{$(".gui-settings-panel").css("display","none")}),$("button.save").on("click",()=>{$("input[type='checkbox'][key]").each((e,s)=>{t[$(s).attr("key")]=$(s).prop("checked")}),saveSettings();const e=$(".gui-settings-footer svg.gui-settings-ok");0===parseInt(e.css("width"))&&(e.css({width:"30px",marginLeft:"3rem"}),setTimeout(()=>{e.css({width:"0",marginLeft:"0"})},3e3))}),$(".gui-settings-close path").attr("d",i),$(".gui-settings-ok path").attr("d",n),$(".gui-settings svg path").attr("d",s);const e={};for(const s in t)$(`input[type='checkbox'][key='${s}']`).prop("checked",t[s]),$("input[dependencies]").each((t,s)=>{e[$(s).attr("key")]=$(s).attr("dependencies")}),$("input[type='checkbox']").on("change",t=>{const s=$(t.srcElement),i=s.prop("checked");for(const t in e){const n=e[t].split(" ");if(-1!==n.indexOf(s.attr("key"))){let e=!0;i&&n.every(t=>$(`input[key='${t}']`).prop("checked"))&&(e=!1),$(`input[key='${t}']`).prop("disabled",e)}}})}})})();
(()=>(t,e)=>{const s="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",i="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",n="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z",c={customStyleColor:e=>{const s=e.match(/^#([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$/);return s?e.length<7?`#${e[0]}${e[0]}${e[1]}${e[1]}${e[2]}${e[2]}`:e:t.customStyleColor},blurBackgroundOpacity:e=>{const s=e.match(/^([-\+]?\d+)(\.\d+)?$/);if(s){const t=parseFloat(e);if(t>=0&&t<=1)return e}return t.blurBackgroundOpacity}};waitForQuery()(()=>$(".gr__bilibili_com>body"),t=>t.length>0,a=>{0===$(".gui-settings").length&&(a.append("<div class='gui-settings-icon-panel'><div class='gui-settings'>\n <svg style=\"width:24px;height:24px\" viewBox=\"0 0 24 24\">\n <path/>\n </svg>\n </div></div>"),$(".gui-settings").on("click",()=>{$(".gui-settings-panel").css("display","flex")}));const o=e.getStyle("guiSettingsStyle","gui-settings-style");$("body").after(o);const p=e.data.guiSettingsDom;if(p){const e=()=>{for(const e in t)$(`input[type='checkbox'][key='${e}']`).prop("checked",t[e]),$(`input[type='text'][key='${e}']`).val(t[e])};$("body").append(p),$(".gui-settings-header .gui-settings-close").on("click",()=>{$(".gui-settings-panel").css("display","none")}),$("button.save").on("click",()=>{$("input[type='checkbox'][key]").each((e,s)=>{t[$(s).attr("key")]=$(s).prop("checked")}),$("input[type='text'][key]").each((e,s)=>{const i=$(s).attr("key"),n=$(s).val();t[i]=c[i](n)}),saveSettings();const s=$(".gui-settings-footer svg.gui-settings-ok");0===parseInt(s.css("width"))&&(s.css({width:"30px",marginLeft:"3rem"}),setTimeout(()=>{s.css({width:"0",marginLeft:"0"})},3e3)),e()}),$(".gui-settings-close path").attr("d",i),$(".gui-settings-ok path").attr("d",n),$(".gui-settings svg path").attr("d",s),e();const a={};$("input[dependencies]").each((t,e)=>{a[$(e).attr("key")]=$(e).attr("dependencies")}),$("input[type='checkbox']").on("change",t=>{const e=$(t.srcElement),s=e.prop("checked");for(const t in a){const i=a[t].split(" ");if(-1!==i.indexOf(e.attr("key"))){let e=!0;s&&i.every(t=>$(`input[key='${t}']`).prop("checked"))&&(e=!1),$(`input[key='${t}']`).prop("disabled",e),e?$(`input[key='${t}'][type='text']`).parent().addClass("disabled"):$(`input[key='${t}'][type='text']`).parent().removeClass("disabled")}}})}})})();