rollback to innerText

This commit is contained in:
Gabe Yuan
2023-08-03 15:29:54 +08:00
parent d735ee977c
commit 5aca06fb9c
8 changed files with 14 additions and 36 deletions

View File

@@ -2,7 +2,7 @@
"manifest_version": 3, "manifest_version": 3,
"name": "__MSG_app_name__", "name": "__MSG_app_name__",
"description": "__MSG_app_description__", "description": "__MSG_app_description__",
"version": "1.2.1", "version": "1.2.2",
"default_locale": "zh", "default_locale": "zh",
"author": "Gabe<yugang2002@gmail.com>", "author": "Gabe<yugang2002@gmail.com>",
"homepage_url": "https://github.com/fishjar/kiss-translator", "homepage_url": "https://github.com/fishjar/kiss-translator",

File diff suppressed because one or more lines are too long

View File

@@ -2,7 +2,7 @@
"manifest_version": 3, "manifest_version": 3,
"name": "__MSG_app_name__", "name": "__MSG_app_name__",
"description": "__MSG_app_description__", "description": "__MSG_app_description__",
"version": "1.2.1", "version": "1.2.2",
"default_locale": "zh", "default_locale": "zh",
"author": "Gabe<yugang2002@gmail.com>", "author": "Gabe<yugang2002@gmail.com>",
"homepage_url": "https://github.com/fishjar/kiss-translator", "homepage_url": "https://github.com/fishjar/kiss-translator",

File diff suppressed because one or more lines are too long

View File

@@ -2,7 +2,7 @@
"manifest_version": 2, "manifest_version": 2,
"name": "__MSG_app_name__", "name": "__MSG_app_name__",
"description": "__MSG_app_description__", "description": "__MSG_app_description__",
"version": "1.2.1", "version": "1.2.2",
"default_locale": "zh", "default_locale": "zh",
"author": "Gabe<yugang2002@gmail.com>", "author": "Gabe<yugang2002@gmail.com>",
"homepage_url": "https://github.com/fishjar/kiss-translator", "homepage_url": "https://github.com/fishjar/kiss-translator",

File diff suppressed because one or more lines are too long

View File

@@ -5,7 +5,6 @@ import {
MSG_TRANS_TOGGLE, MSG_TRANS_TOGGLE,
MSG_TRANS_GETRULE, MSG_TRANS_GETRULE,
MSG_TRANS_PUTRULE, MSG_TRANS_PUTRULE,
OPT_TRANS_OPENAI,
TRANS_MIN_LENGTH, TRANS_MIN_LENGTH,
TRANS_MAX_LENGTH, TRANS_MAX_LENGTH,
} from "./config"; } from "./config";
@@ -104,10 +103,7 @@ class Translator {
} }
// 除openai外保留code和a标签 // 除openai外保留code和a标签
const q = const q = this._rule.translator === el.innerText.trim();
this._rule.translator === OPT_TRANS_OPENAI
? el.innerText.trim()
: el.innerHTML.replace(/<(?!\/?(code|a))[^>]+>/gi, "").trim();
if (!q || q.length < TRANS_MIN_LENGTH || q.length > TRANS_MAX_LENGTH) { if (!q || q.length < TRANS_MIN_LENGTH || q.length > TRANS_MAX_LENGTH) {
// 太长或太短不翻译 // 太长或太短不翻译
return; return;

View File

@@ -7,7 +7,6 @@ import {
OPT_STYLE_WAVYLINE, OPT_STYLE_WAVYLINE,
OPT_STYLE_FUZZY, OPT_STYLE_FUZZY,
OPT_STYLE_HIGHTLIGHT, OPT_STYLE_HIGHTLIGHT,
OPT_TRANS_OPENAI,
} from "../../config"; } from "../../config";
import { useTranslate } from "../../hooks/Translate"; import { useTranslate } from "../../hooks/Translate";
@@ -77,30 +76,13 @@ export default function Content({ q, rule }) {
return ( return (
<> <>
{q.length > 40 ? <br /> : " "} {q.length > 40 ? <br /> : " "}
{rule.translator === OPT_TRANS_OPENAI ? ( <span
<span style={style}
style={style} onMouseEnter={handleMouseEnter}
onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}
onMouseLeave={handleMouseLeave} >
> {text}
{text} </span>
</span>
) : (
<span
style={style}
onMouseEnter={handleMouseEnter}
onMouseLeave={handleMouseLeave}
dangerouslySetInnerHTML={{
__html: text.replace(
/<code>(.*?)<\/code>/gi,
(_match, p1) =>
`<code>${p1
.replace(/</g, "&lt;")
.replace(/>/g, "&gt;")}</code>`
),
}}
/>
)}
</> </>
); );
} }