diff --git a/.eslintrc b/.eslintrc index 8f50c57c8..190bc4e97 100644 --- a/.eslintrc +++ b/.eslintrc @@ -5,31 +5,9 @@ "browser": true, "es6": true }, - "globals": { - "Artplayer": false, - "jQuery": false - }, "rules": { - "class-methods-use-this": 2, - "no-console": 0, - "import/no-cycle": 1, - "no-const-assign": 1, "no-shadow": 0, - "no-this-before-super": 1, - "no-undef": 1, - "no-unreachable": 1, - "no-unused-vars": 1, - "constructor-super": 1, - "valid-typeof": 1, - "indent": [2, 4, { "SwitchCase": 1 }], - "quotes": [2, "single", "avoid-escape"], - "semi": [2, "always"], - "eqeqeq": [2, "always"], - "one-var": [2, "never"], - "comma-dangle": [2, "always-multiline"], - "spaced-comment": [2, "always"], - "no-restricted-globals": 2, - "no-param-reassign": [2, { "props": false }] + "no-param-reassign": 0 }, "parserOptions": { "sourceType": "module" diff --git a/packages/artplayer-tool-thumbnail/src/index.js b/packages/artplayer-tool-thumbnail/src/index.js index ae59ce435..2f463e6f6 100644 --- a/packages/artplayer-tool-thumbnail/src/index.js +++ b/packages/artplayer-tool-thumbnail/src/index.js @@ -104,7 +104,7 @@ class ArtplayerToolThumbnail extends Emitter { }) .catch(err => { this.emit('error', err.message); - console.error(err); + throw err; }); } } @@ -135,7 +135,7 @@ class ArtplayerToolThumbnail extends Emitter { }); }) .catch(err => { - console.error(err); + throw err; }); }); }); @@ -150,13 +150,13 @@ class ArtplayerToolThumbnail extends Emitter { .catch(err => { this.processing = false; this.emit('error', err.message); - console.error(err); + throw err; }), ) .catch(err => { this.processing = false; this.emit('error', err.message); - console.error(err); + throw err; }); } diff --git a/packages/artplayer/src/player/pipMix.js b/packages/artplayer/src/player/pipMix.js index b3ab3cc03..acd12ea1a 100644 --- a/packages/artplayer/src/player/pipMix.js +++ b/packages/artplayer/src/player/pipMix.js @@ -17,12 +17,12 @@ function nativePip(art, player) { if (value) { $video.requestPictureInPicture().catch(error => { notice.show(error, true, 3000); - console.warn(error); + throw error; }); } else { document.exitPictureInPicture().catch(error => { notice.show(error, true, 3000); - console.warn(error); + throw error; }); } }, diff --git a/packages/artplayer/src/player/playMix.js b/packages/artplayer/src/player/playMix.js index 2391a4ba4..47b96f24b 100644 --- a/packages/artplayer/src/player/playMix.js +++ b/packages/artplayer/src/player/playMix.js @@ -13,7 +13,7 @@ export default function playMix(art, player) { if (promise !== undefined) { promise.then().catch(err => { notice.show(err, true, 3000); - console.warn(err); + throw err; }); } diff --git a/packages/artplayer/src/player/screenshotMix.js b/packages/artplayer/src/player/screenshotMix.js index 8f4db0961..913f0cd1d 100644 --- a/packages/artplayer/src/player/screenshotMix.js +++ b/packages/artplayer/src/player/screenshotMix.js @@ -17,8 +17,7 @@ export default function screenshotMix(art, player) { return canvas.toDataURL('image/png'); } catch (error) { notice.show(error); - console.warn(error); - return null; + throw error; } }, }); diff --git a/packages/artplayer/src/plugins/localPreview.js b/packages/artplayer/src/plugins/localPreview.js index e8d3f9aae..6b33535ff 100644 --- a/packages/artplayer/src/plugins/localPreview.js +++ b/packages/artplayer/src/plugins/localPreview.js @@ -1,5 +1,5 @@ export default function localPreview(art) { - const { append, setStyle, setStyles, sleep } = art.constructor.utils; + const { append, setStyle, setStyles, sleep, errorHandle } = art.constructor.utils; const { events: { proxy }, option, @@ -37,7 +37,7 @@ export default function localPreview(art) { } else { const tip = `${i18n.get('Playback of this file format is not supported')}: ${file.type}`; notice.show(tip, true, 3000); - console.warn(tip); + errorHandle(false, tip); } } } diff --git a/packages/artplayer/src/subtitle.js b/packages/artplayer/src/subtitle.js index accb49cb8..832c41a55 100644 --- a/packages/artplayer/src/subtitle.js +++ b/packages/artplayer/src/subtitle.js @@ -59,17 +59,14 @@ export default class Subtitle { return response.text(); }) .then(text => { - let vttUrl = ''; if (/x-subrip/gi.test(type)) { - vttUrl = vttToBlob(srtToVtt(text)); - } else { - vttUrl = url; + return vttToBlob(srtToVtt(text)); } - return vttUrl; + return url; }) .catch(err => { notice.show(err); - console.warn(err); + throw err; }); }