Skip to content

Commit d45ff84

Browse files
committed
fix: 统一将事件注册归到notifier.ts中
1 parent 50ee63c commit d45ff84

File tree

3 files changed

+47
-41
lines changed

3 files changed

+47
-41
lines changed

src/hooks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import { registerMenu } from "./modules/menu";
1010
import {
1111
registerExtraColumnWithCustomCell,
1212
registerNotifiers,
13+
registerTab,
1314
} from "./modules/notifier";
1415
import { injectStylesLink } from "./modules/styles";
1516
import { updateTranslators } from "./modules/translators";
1617
import { getPref } from "./utils/prefs";
17-
import { registerTab } from "./modules/tab";
1818

1919
async function onStartup() {
2020
await Promise.all([

src/modules/notifier.ts

Lines changed: 46 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -79,26 +79,26 @@ async function onAddItem(
7979
}
8080

8181
// TODO: Complete the notifier.
82-
async function onOpenTab(
83-
event: string,
84-
type: string,
85-
ids: Array<string | number>,
86-
extraData: { [key: string]: any },
87-
) {
88-
const id = ids[0];
89-
if (
90-
(event == "select" || event == "load") &&
91-
type == "tab" &&
92-
extraData[id].type == "reader"
93-
) {
94-
ztoolkit.log("onOpenTab", event, type, extraData);
95-
if (getPref("enableBookmark")) {
96-
await registerOutline(id as string);
97-
} else {
98-
ztoolkit.log("Jasminum bookmark is disabled");
99-
}
100-
}
101-
}
82+
// async function onOpenTab(
83+
// event: string,
84+
// type: string,
85+
// ids: Array<string | number>,
86+
// extraData: { [key: string]: any },
87+
// ) {
88+
// const id = ids[0];
89+
// if (
90+
// (event == "select" || event == "load") &&
91+
// type == "tab" &&
92+
// extraData[id].type == "reader"
93+
// ) {
94+
// ztoolkit.log("onOpenTab", event, type, extraData);
95+
// if (getPref("enableBookmark")) {
96+
// await registerOutline(id as string);
97+
// } else {
98+
// ztoolkit.log("Jasminum bookmark is disabled");
99+
// }
100+
// }
101+
// }
102102

103103
export async function registerExtraColumnWithCustomCell() {
104104
const registeredDataKey = Zotero.ItemTreeManager.registerColumn({
@@ -119,3 +119,29 @@ export async function registerExtraColumnWithCustomCell() {
119119
// },
120120
});
121121
}
122+
123+
// For Outline register.
124+
export function registerTab() {
125+
Zotero.Reader.registerEventListener(
126+
"renderToolbar",
127+
tabRegisterCallback,
128+
config.addonID,
129+
);
130+
131+
Zotero.Reader.registerEventListener(
132+
"renderTextSelectionPopup",
133+
(event: any) => {
134+
ztoolkit.log(event);
135+
event.append("<div>Jasminum</div>");
136+
},
137+
);
138+
}
139+
140+
async function tabRegisterCallback(event: any) {
141+
if (getPref("enableBookmark")) {
142+
const { reader } = event;
143+
await registerOutline(reader.tabID);
144+
} else {
145+
ztoolkit.log("Jasminum bookmark is disabled");
146+
}
147+
}

src/modules/tab.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)