From f95384b41ad90744ca63c5374d8913aede9da1b6 Mon Sep 17 00:00:00 2001 From: Harvey Zack Date: Thu, 28 Apr 2022 07:19:48 +0800 Subject: [PATCH] remove outline util --- packages/artplayer/src/style/subtitle.scss | 3 ++- packages/artplayer/src/subtitle.js | 7 ++----- packages/artplayer/src/utils/subtitle.js | 15 --------------- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/packages/artplayer/src/style/subtitle.scss b/packages/artplayer/src/style/subtitle.scss index 4416748f2..27ed85593 100644 --- a/packages/artplayer/src/style/subtitle.scss +++ b/packages/artplayer/src/style/subtitle.scss @@ -10,7 +10,8 @@ color: #fff; font-size: 20px; pointer-events: none; - text-shadow: 0.5px 0.5px 0.5px rgba(0, 0, 0, 0.5); + text-shadow: rgb(0 0 0) 1px 0px 1px, rgb(0 0 0) 0px 1px 1px, rgb(0 0 0) -1px 0px 1px, rgb(0 0 0) 0px -1px 1px, + rgb(0 0 0) 1px 1px 1px, rgb(0 0 0) -1px -1px 1px, rgb(0 0 0) 1px -1px 1px, rgb(0 0 0) -1px 1px 1px; p { word-break: break-all; diff --git a/packages/artplayer/src/subtitle.js b/packages/artplayer/src/subtitle.js index 001042afa..8439b38ba 100644 --- a/packages/artplayer/src/subtitle.js +++ b/packages/artplayer/src/subtitle.js @@ -1,4 +1,4 @@ -import { setStyle, setStyles, srtToVtt, vttToBlob, getExt, assToVtt, escape, errorHandle, outline } from './utils'; +import { setStyle, setStyles, srtToVtt, vttToBlob, getExt, assToVtt, escape, errorHandle } from './utils'; import Component from './utils/component'; import validator from 'option-validator'; import scheme from './scheme'; @@ -80,10 +80,7 @@ export default class Subtitle extends Component { proxy(this.textTrack, 'cuechange', this.update.bind(this)); } - this.style({ - 'text-shadow': outline(), - ...subtitleOption.style, - }); + this.style(subtitleOption.style); errorHandle(window.fetch, 'fetch not support'); return fetch(subtitleOption.url) diff --git a/packages/artplayer/src/utils/subtitle.js b/packages/artplayer/src/utils/subtitle.js index 8b74ad6b5..767f43c36 100644 --- a/packages/artplayer/src/utils/subtitle.js +++ b/packages/artplayer/src/utils/subtitle.js @@ -80,18 +80,3 @@ export function assToVtt(ass) { .filter((line) => line.trim()) .join('\n\n')}`; } - -export function outline(outlineColor = '#000', outlineSize = 1, blurSize = 1) { - return [ - [outlineSize, 0], - [0, outlineSize], - [-outlineSize, 0], - [0, -outlineSize], - [outlineSize, outlineSize], - [-outlineSize, -outlineSize], - [outlineSize, -outlineSize], - [-outlineSize, outlineSize], - ] - .map((item) => `${outlineColor} ${item[0]}px ${item[1]}px ${blurSize}px`) - .join(','); -}