Merge pull request #349 from the1812/preview

Update to v1.10.6
This commit is contained in:
Grant Howard 2020-02-26 14:28:40 +08:00 committed by GitHub
commit aa5bbc3ea7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 103 additions and 88 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -30,7 +30,7 @@
"compact-layout.min.js": "B20609A7CBBDB1845FA0156FB5BE6B1E1A1B8B069EA85F65D16241DD2C12D738",
"custom-control-background.min.css": "1981FD2BF3B17ECF33F98D5DEDAF0D32ACBE9532A51FDB70822286991AB98EF3",
"custom-control-background.min.js": "2A439B045A51D24F5115DD25995ED37E3D0371A074199FE6C727F2235F39C4D9",
"custom-navbar.min.css": "C833A67D03A03DE6CB76A675CBA40995C60B46B301BB5524FAADA5CD2325860A",
"custom-navbar.min.css": "570D309DFD6243607AB20F0FFA10C8C56434415E4A8D84FFB22390C445C6B4B2",
"custom-navbar.min.html": "17FD1B1727E8D62E7997F10002FE7BF23472F390042D44DE3376A7A5A5FF2FDF",
"custom-navbar.min.js": "1C0AA734393EC68E0B03E9E39F3BA40259FEE4E83580E98412B8DC108971FB43",
"custom-navbar-activities.min.js": "7CCA4AF4555CF9E9D338FE7285879C9F1396112F1FCD7293AD92EEE965E656C3",
@ -97,7 +97,7 @@
"full-tweets-title.min.css": "13A0CF1C96F374CED3FA59A532E28B4B620D7A4C374385A363F32AD1A7656764",
"full-tweets-title.min.js": "DD57BB732ABEF7739CA84AEFF97E86F8984FCC4A8A75B957213622350B2A7C37",
"gui-settings.min.css": "C2433494617BC7A6BD35D67D9ACB685D89BDEE1B61E2E23E4E69CB1F23DA124E",
"gui-settings.min.html": "B12C7D4FFB6B7E46C70F24D6F0770836D1392AA683BF8962FCCB1DCFDEEFB530",
"gui-settings.min.html": "A9B15D8AF585FF0853306E81E10BA64771AC3BC89D79AE225C8877315CAF0DDC",
"gui-settings.min.js": "029562CA0C0DEFCCBFF38C662C56C651C09847CDB78A99873E3ABA9936B428BA",
"haruna-scale.min.js": "D046864416831B101582DD87E602AE21309FDE2DB64A8F24D57B6ADBE67E6D7B",
"hide-bangumi-reviews.min.js": "7265C0CE994FDA926355A9A4F9B207E7E68E749D47332F3C537EF93E97927A23",

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name Bilibili Evolved (Preview)
// @version 1.10.5
// @version 1.10.6
// @description Bilibili Evolved 的预览版, 可以抢先体验新功能.
// @author Grant Howard, Coulomb-G
// @copyright 2020, Grant Howard (https://github.com/the1812) & Coulomb-G (https://github.com/Coulomb-G)

View File

@ -64,6 +64,7 @@ export class Resource {
// [key]: this.text
// })
if (this.alwaysPreview) {
// console.log('Load preview data', key)
Ajax.monkey({ url: this.url })
.then(text => {
// console.log(`load preview data: ${key}`)
@ -71,12 +72,16 @@ export class Resource {
settings.cache = Object.assign(settings.cache, {
[key]: text
})
// console.log('Preview data loaded', key)
// resolve(this.text)
})
.catch(error => reject(error))
}
if (text) {
// console.log(`load online data: ${key}`)
// if (this.alwaysPreview) {
// console.log('Get fallback text', key)
// }
this.text = text
resolve(this.text)
}

View File

@ -11,15 +11,15 @@ export const customNavbarDefaultOrders = {
mangaLink: 9,
blank2: 10,
search: 11,
userInfo: 12,
messages: 13,
activities: 14,
bangumi: 15,
watchlaterList: 16,
favoritesList: 17,
historyList: 18,
upload: 19,
blank3: 20,
blank3: 12,
userInfo: 13,
messages: 14,
activities: 15,
bangumi: 16,
watchlaterList: 17,
favoritesList: 18,
historyList: 19,
upload: 20,
}
export const simpleHomeCategoryDefaultOrders = {
anime: 0,
@ -113,7 +113,6 @@ export const settings = {
i18nLanguage: '日本語',
playerFocus: false,
playerFocusOffset: -10,
oldTweets: false,
simplifyLiveroom: false,
simplifyLiveroomSettings: {
vip: true,
@ -141,8 +140,8 @@ export const settings = {
customNavbarBlur: false,
customNavbarBlurOpacity: 0.7,
customNavbarOrder: { ...customNavbarDefaultOrders },
customNavbarHidden: [],
customNavbarBoundsPadding: 5,
customNavbarHidden: ['blank1', 'drawingLink', 'musicLink', 'gamesIframe'],
customNavbarBoundsPadding: 10,
playerShadow: false,
narrowDanmaku: true,
favoritesRedirect: true,
@ -239,6 +238,7 @@ const fixedSettings = {
allNavbarFill: false,
showDeadVideoTitle: false,
blurVideoControl: false,
oldTweets: false,
latestVersionLink: 'https://cdn.jsdelivr.net/gh/the1812/Bilibili-Evolved@preview/bilibili-evolved.preview.user.js',
currentVersion: GM.info.script.version,
}

View File

@ -314,7 +314,7 @@ li.nav-item[report-id="playpage_dynamic"] .i-frame,
height: 100%;
display: flex;
align-items: center;
padding: 0 16px;
padding: 0 10px;
color: var(--navbar-foreground);
user-select: none;
}
@ -938,15 +938,15 @@ li.nav-item[report-id="playpage_dynamic"] .i-frame,
border-radius: 6px;
}
@media screen and (max-width: 1400px) {
.custom-navbar .main-content {
padding: 0 10px;
}
}
// @media screen and (max-width: 1400px) {
// .custom-navbar .main-content {
// padding: 0 10px;
// }
// }
@media screen and (max-width: 1300px) {
.custom-navbar .main-content {
padding: 0 8px;
}
// .custom-navbar .main-content {
// padding: 0 8px;
// }
.custom-navbar form input {
width: 200px;
}

View File

@ -115,7 +115,7 @@
<checkbox indent="0" key="foldComment" dependencies=""></checkbox>
<checkbox indent="0" key="fullTweetsTitle" dependencies=""></checkbox>
<checkbox indent="0" key="fullActivityContent" dependencies=""></checkbox>
<checkbox indent="0" key="oldTweets" dependencies=""></checkbox>
<!-- <checkbox indent="0" key="oldTweets" dependencies=""></checkbox> -->
<checkbox indent="0" key="feedsFilter" dependencies=""></checkbox>
<!-- <checkbox indent="0" key="feedsTranslate" dependencies=""></checkbox>
<dropdown indent="1" key="feedsTranslateProvider" dependencies="feedsTranslate"></dropdown> -->

View File

@ -1 +1 @@
1.10.5
1.10.6