Skip to content

Commit 06dfc18

Browse files
committed
🔥 移除document-body和document-menu
1 parent 43b407a commit 06dfc18

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

src/pages/popup/App.tsx

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ function App() {
4747
const message = IoC.instance(MessageInternal) as MessageInternal;
4848
useEffect(() => {
4949
systemManage.getNotice().then((res) => {
50-
setNotice(res.notice);
51-
setIsRead(res.isRead);
50+
if (res) {
51+
setNotice(res.notice);
52+
setIsRead(res.isRead);
53+
}
5254
});
5355
systemManage.getVersion().then((res) => {
54-
setVersion(res);
56+
res && setVersion(res);
5557
});
5658
chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
5759
if (!tabs.length) {
@@ -89,8 +91,10 @@ function App() {
8991
type="text"
9092
icon={<IconHome />}
9193
iconOnly
92-
href="/src/options.html"
93-
target="_blank"
94+
onClick={() => {
95+
// 用a链接的方式,vivaldi竟然会直接崩溃
96+
window.open("/src/options.html", "_blank");
97+
}}
9498
/>
9599
<Badge count={isRead ? 0 : 1} dot offset={[-8, 6]}>
96100
<Button
@@ -121,7 +125,8 @@ function App() {
121125
},
122126
});
123127
window.open(
124-
"/src/options.html#/script/editor?target=initial"
128+
"/src/options.html#/script/editor?target=initial",
129+
"_blank"
125130
);
126131
}
127132
});

src/runtime/background/runtime.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -372,17 +372,13 @@ export default class Runtime extends Manager {
372372
[runAt] = script.metadata["run-at"];
373373
}
374374
switch (runAt) {
375-
case "document-body":
376-
case "document-menu":
377375
case "document-start":
378376
runAt = "document_start";
379377
break;
380378
case "document-end":
381379
runAt = "document_end";
382380
break;
383381
case "document-idle":
384-
runAt = "document_idle";
385-
break;
386382
default:
387383
runAt = "document_idle";
388384
break;

0 commit comments

Comments
 (0)