From fa585e536aa4e2831630cc7e2cc5fb73d333c940 Mon Sep 17 00:00:00 2001 From: Harvey Zack Date: Tue, 30 Apr 2019 15:10:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B4=E4=BD=93=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- docs/assets/example/{danmu.js => danmuku.js} | 6 +- docs/index.html | 4 +- docs/uncompiled/artplayer-plugin-danmu.js | 54 +- docs/uncompiled/artplayer-plugin-danmu.js.map | 2 +- docs/uncompiled/artplayer-plugin-danmuku.js | 621 ++++++++++++++++++ .../artplayer-plugin-danmuku.js.map | 1 + docs/uncompiled/artplayer.css | 25 +- docs/uncompiled/artplayer.css.map | 2 +- docs/uncompiled/artplayer.js | 183 +++--- docs/uncompiled/artplayer.js.map | 2 +- .../.npmignore | 0 .../.npmrc | 0 .../README.md | 32 +- .../dist/artplayer-plugin-danmu.css | 0 .../dist/artplayer-plugin-danmu.js | 0 .../package.json | 6 +- .../src/bilibiliDanmuParse.js | 0 .../src/danmuku.js | 51 +- .../src/getDanmuTop.js | 0 .../src/index.js | 14 +- packages/artplayer/src/contextmenu/index.js | 18 +- packages/artplayer/src/controls/index.js | 2 + packages/artplayer/src/hotkey.js | 2 +- packages/artplayer/src/icons/index.js | 4 +- .../src/icons/{play-big.svg => state.svg} | 0 packages/artplayer/src/index.js | 5 +- packages/artplayer/src/info.js | 34 +- packages/artplayer/src/layers.js | 15 +- packages/artplayer/src/loading.js | 20 +- packages/artplayer/src/mask.js | 20 +- packages/artplayer/src/notice.js | 16 +- packages/artplayer/src/setting/index.js | 13 +- packages/artplayer/src/style/artplayer.scss | 13 +- packages/artplayer/src/style/bottom.scss | 2 +- packages/artplayer/src/style/contextmenu.scss | 9 +- packages/artplayer/src/style/danmuku.scss | 14 + packages/artplayer/src/style/index.js | 1 + packages/artplayer/src/style/info.scss | 9 +- packages/artplayer/src/style/layers.scss | 8 +- packages/artplayer/src/style/loading.scss | 8 +- packages/artplayer/src/style/mask.scss | 10 +- packages/artplayer/src/style/notice.scss | 8 +- packages/artplayer/src/style/pip.scss | 2 +- packages/artplayer/src/style/setting.scss | 31 +- packages/artplayer/src/style/subtitle.scss | 8 +- packages/artplayer/src/style/video.scss | 1 - packages/artplayer/src/subtitle.js | 24 +- packages/artplayer/src/template.js | 2 + 49 files changed, 984 insertions(+), 322 deletions(-) rename docs/assets/example/{danmu.js => danmuku.js} (73%) create mode 100644 docs/uncompiled/artplayer-plugin-danmuku.js create mode 100644 docs/uncompiled/artplayer-plugin-danmuku.js.map rename packages/{artplayer-plugin-danmu => artplayer-plugin-danmuku}/.npmignore (100%) rename packages/{artplayer-plugin-danmu => artplayer-plugin-danmuku}/.npmrc (100%) rename packages/{artplayer-plugin-danmu => artplayer-plugin-danmuku}/README.md (54%) rename packages/{artplayer-plugin-danmu => artplayer-plugin-danmuku}/dist/artplayer-plugin-danmu.css (100%) rename packages/{artplayer-plugin-danmu => artplayer-plugin-danmuku}/dist/artplayer-plugin-danmu.js (100%) rename packages/{artplayer-plugin-danmu => artplayer-plugin-danmuku}/package.json (77%) rename packages/{artplayer-plugin-danmu => artplayer-plugin-danmuku}/src/bilibiliDanmuParse.js (100%) rename packages/{artplayer-plugin-danmu => artplayer-plugin-danmuku}/src/danmuku.js (89%) rename packages/{artplayer-plugin-danmu => artplayer-plugin-danmuku}/src/getDanmuTop.js (100%) rename packages/{artplayer-plugin-danmu => artplayer-plugin-danmuku}/src/index.js (57%) rename packages/artplayer/src/icons/{play-big.svg => state.svg} (100%) create mode 100644 packages/artplayer/src/style/danmuku.scss diff --git a/README.md b/README.md index cd95b5b28..5338fd6dc 100644 --- a/README.md +++ b/README.md @@ -31,12 +31,12 @@ | Project | Description | Demo | | --------------------------------------------------------------------------------------------------------------------- | ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------- | -| [artplayer-plugin-danmu](https://github.com/zhw2590582/ArtPlayer/tree/master/packages/artplayer-plugin-danmu) | Danmu plugin for ArtPlayer | [demo](https://artplayer.org/?libs=.%2Funcompiled%2Fartplayer-plugin-danmu.js&example=danmu) | +| [artplayer-plugin-danmuku](https://github.com/zhw2590582/ArtPlayer/tree/master/packages/artplayer-plugin-danmuku) | Danmuku plugin for ArtPlayer | [demo](https://artplayer.org/?libs=.%2Funcompiled%2Fartplayer-plugin-danmuku.js&example=danmuku) | | [artplayer-plugin-gif](https://github.com/zhw2590582/ArtPlayer/tree/master/packages/artplayer-plugin-gif) | Gif plugin for ArtPlayer | [demo](https://artplayer.org/?libs=.%2Funcompiled%2Fartplayer-plugin-gif.js&example=gif) | | [artplayer-plugin-backlight](https://github.com/zhw2590582/ArtPlayer/tree/master/packages/artplayer-plugin-backlight) | Backlight plugin for ArtPlayer | [demo](https://artplayer.org/?libs=.%2Funcompiled%2Fartplayer-plugin-backlight.js&example=backlight) | | [artplayer-plugin-playlist](https://github.com/zhw2590582/ArtPlayer/tree/master/packages/artplayer-plugin-playlist) | Playlist plugin for ArtPlayer | [demo](https://artplayer.org/?libs=.%2Funcompiled%2Fartplayer-plugin-playlist.js%0A.%2Funcompiled%2Fartplayer-plugin-playlist.css&example=playlist) | | [artplayer-tool-thumbnail](https://github.com/zhw2590582/ArtPlayer/tree/master/packages/artplayer-tool-thumbnail) | Thumbnail tool for ArtPlayer | [demo](https://artplayer.org/?libs=.%2Funcompiled%2Fartplayer-tool-thumbnail.js&example=thumbnail) | -| [artplayer-tool-github](https://github.com/zhw2590582/ArtPlayer/tree/master/packages/artplayer-tool-github) | Github api tool for ArtPlayer | [demo](https://artplayer.org/?libs=.%2Funcompiled%2Fartplayer-tool-github.js%0A.%2Funcompiled%2Fartplayer-plugin-danmu.js&example=github) | +| [artplayer-tool-github](https://github.com/zhw2590582/ArtPlayer/tree/master/packages/artplayer-tool-github) | Github api tool for ArtPlayer | [demo](https://artplayer.org/?libs=.%2Funcompiled%2Fartplayer-tool-github.js%0A.%2Funcompiled%2Fartplayer-plugin-danmuku.js&example=github) | | [artplayer-react](https://github.com/zhw2590582/ArtPlayer/tree/master/packages/artplayer-react) | React Component for Artplayer | [demo](https://codesandbox.io/s/n74859y9rl) | | [artplayer-vue](https://github.com/zhw2590582/ArtPlayer/tree/master/packages/artplayer-vue) | Vue Component for Artplayer | [demo](https://codesandbox.io/s/6z76lm109n) | diff --git a/docs/assets/example/danmu.js b/docs/assets/example/danmuku.js similarity index 73% rename from docs/assets/example/danmu.js rename to docs/assets/example/danmuku.js index 8ebd1fb9b..57320745e 100644 --- a/docs/assets/example/danmu.js +++ b/docs/assets/example/danmuku.js @@ -3,8 +3,8 @@ var art = new Artplayer({ container: '.artplayer-app', url: url + '/video/you-name.mp4', autoSize: true, - plugins: [artplayerPluginDanmu({ - danmus: url + '/danmuku/you-name.xml', + plugins: [artplayerPluginDanmuku({ + danmuku: url + '/danmuku/you-name.xml', speed: 5, opacity: 1, color: '#fff', @@ -15,6 +15,6 @@ var art = new Artplayer({ }); console.info('弹幕加载中...'); -art.on('artplayerPluginDanmu:loaded', () => { +art.on('artplayerPluginDanmuku:loaded', () => { console.info('弹幕准备就绪'); }); \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index 6dc01ce70..6aa313ddd 100644 --- a/docs/index.html +++ b/docs/index.html @@ -28,13 +28,13 @@
  • Plugins
  • artplayer-plugin-gif
  • artplayer-plugin-backlight
  • -
  • artplayer-plugin-danmu
  • +
  • artplayer-plugin-danmuku
  • artplayer-plugin-playlist