Skip to content

Commit 296adf2

Browse files
committed
Merge branch 'develop'
2 parents 6ca61e4 + bb0a261 commit 296adf2

File tree

27 files changed

+1860
-537
lines changed

27 files changed

+1860
-537
lines changed

config/webpack.content-scripts.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ module.exports = env => {
1717
return merge(baseConfig, {
1818
entry: {
1919
app: './src/content_scripts/main.js',
20-
'fanbox-cs': './src/fanbox/content_scripts/app.js'
20+
'fanbox-cs': './src/fanbox/content_scripts/app.js',
21+
'pixivcomic-cs': './src/pixiv_comic/content_scripts/app.js'
2122
},
2223
output: {
2324
path: utils.resolve(`dist/${platform}/content_scripts`),

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pixiv-toolkits",
3-
"version": "5.5.0",
3+
"version": "5.5.1",
44
"description": "A web extension for adding features on Pixiv",
55
"author": "leoding86 <leoding86@msn.com>",
66
"private": false,
@@ -14,6 +14,7 @@
1414
"build:firefox": "cross-env NODE_ENV=production PLATFORM_ENV=firefox webpack --config webpack.config.js --env.platform=firefox"
1515
},
1616
"dependencies": {
17+
"md5": "^2.3.0",
1718
"moment": "^2.29.1",
1819
"pouchdb": "^7.2.2",
1920
"pouchdb-find": "^7.2.2",

src/config/default.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,4 +213,19 @@ export default Object.assign({}, {
213213
*/
214214
downloadPanelPosition: 'center',
215215
downloadPanelStyle: 1,
216+
217+
/**
218+
* @since 5.5.1
219+
*/
220+
showReloadInPopup: false,
221+
showPixivOmina: true,
222+
223+
/**
224+
* @sinace 5.6.0
225+
*/
226+
pixivComicRenameFormat: '{episodeId}_{episodeTitle}',
227+
pixivComicImageRenameFormat: '{episodeId}_{episodeTitle}_p{pageNum}',
228+
pixivComicRelativeLocation: '',
229+
pixivComicPageNumberStartWithOne: false,
230+
pixivComicPageNumberLength: 0,
216231
});

src/content_scripts/Detector.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ class Detector {
1717

1818
static NOVEL_TYPE = 9;
1919

20+
static UNSUPPORTED_TYPE = -1;
21+
2022
constructor() {
2123
this.request;
2224
this.currentUrl;

0 commit comments

Comments
 (0)