diff --git a/.eslintrc b/.eslintrc index a398ae9af..5a1533c71 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,36 +1,22 @@ { "parser": "@babel/eslint-parser", - "extends": ["standard", "prettier"], + "extends": "eslint:recommended", "env": { "browser": true, "es6": true }, "globals": { - "Artplayer": false - }, - "rules": { - "no-shadow": 0, - "no-param-reassign": 0, - "no-restricted-exports": 0, - "no-loss-of-precision": 0, - "no-promise-executor-return": 0, - "no-unreachable-loop": 0, - "no-unsafe-optional-chaining": 0, - "no-useless-backreference": 0, - "default-case-last": 0, - "no-nonoctal-decimal-escape": 0, - "prefer-object-spread": 0, - "prefer-destructuring": 0, - "arrow-body-style": 0, - "accessor-pairs": 0, - "import/named": 0 + "require": "readonly", + "process": "readonly" }, "parserOptions": { "sourceType": "module", - "ecmaVersion": 8, + "ecmaVersion": "latest", "requireConfigFile": false, "babelOptions": { - "presets": ["@babel/preset-react"] + "presets": [ + "@babel/preset-react" + ] } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index dfbb135f8..693535936 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,8 @@ "homepage": "https://artPlayer.org", "browserslist": "> 0.5%, last 2 versions, not dead", "dependencies": { + "@babel/eslint-parser": "^7.17.0", + "@babel/preset-react": "^7.16.7", "@parcel/config-default": "^2.5.0", "@parcel/core": "^2.5.0", "@parcel/reporter-cli": "^2.5.0", @@ -45,4 +47,4 @@ "servor": "^4.0.2", "workbox-build": "^6.5.3" } -} +} \ No newline at end of file diff --git a/packages/artplayer-document/src/script/main.js b/packages/artplayer-document/src/script/main.js index e9183aa00..befceb029 100644 --- a/packages/artplayer-document/src/script/main.js +++ b/packages/artplayer-document/src/script/main.js @@ -1,3 +1,3 @@ -if (typeof window !== "undefined") { - require("./bugfix"); +if (typeof window !== 'undefined') { + require('./bugfix'); } diff --git a/packages/artplayer/package.json b/packages/artplayer/package.json index 58b28384a..441f43032 100644 --- a/packages/artplayer/package.json +++ b/packages/artplayer/package.json @@ -1,30 +1,28 @@ { "name": "artplayer", - "version": "4.3.11", + "version": "4.3.12", "expose": "Artplayer", - "description": "ArtPlayer.js is a modern and full featured HTML5 video player", "main": "dist/artplayer.js", "types": "types/artplayer.d.ts", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, + "homepage": "https://artPlayer.org", + "author": "Harvey Zack ", + "description": "ArtPlayer.js is a modern and full featured HTML5 video player", "repository": { "type": "git", "url": "git+https://github.com/zhw2590582/ArtPlayer.git" }, "keywords": [ + "html5", "video", "player" ], - "author": "Harvey Zack ", - "license": "MIT", "bugs": { "url": "https://github.com/zhw2590582/ArtPlayer/issues" }, - "homepage": "https://github.com/zhw2590582/ArtPlayer#readme", "dependencies": { "option-validator": "^2.0.6", "screenfull": "^6.0.1" }, + "license": "MIT", "gitHead": "5ea211ef738351668e4acace326af4ff6947e2ee" } \ No newline at end of file diff --git a/packages/artplayer/src/notice.js b/packages/artplayer/src/notice.js index 8557e8c1c..640c11992 100644 --- a/packages/artplayer/src/notice.js +++ b/packages/artplayer/src/notice.js @@ -7,14 +7,21 @@ export default class Notice { } set show(msg) { - const { $player, $noticeInner } = this.art.template; - if (!msg) return removeClass($player, 'art-notice-show'); - $noticeInner.innerText = msg instanceof Error ? msg.message.trim() : msg; - addClass($player, 'art-notice-show'); - clearTimeout(this.timer); - this.timer = setTimeout(() => { - $noticeInner.innerText = ''; + const { + constructor, + template: { $player, $noticeInner }, + } = this.art; + + if (msg) { + $noticeInner.innerText = msg instanceof Error ? msg.message.trim() : msg; + addClass($player, 'art-notice-show'); + clearTimeout(this.timer); + this.timer = setTimeout(() => { + $noticeInner.innerText = ''; + removeClass($player, 'art-notice-show'); + }, constructor.NOTICE_TIME); + } else { removeClass($player, 'art-notice-show'); - }, this.art.constructor.NOTICE_TIME); + } } }