Skip to content

Commit

Permalink
Release 1.0.0-21
Browse files Browse the repository at this point in the history
  • Loading branch information
windingwind committed Oct 29, 2023
1 parent e74b2bf commit fc3b13a
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 29 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zotero-actions-tags",
"version": "1.0.0-20",
"version": "1.0.0-21",
"description": "Action it, tag it, sorted.",
"config": {
"addonName": "Actions and Tags for Zotero",
Expand Down
5 changes: 4 additions & 1 deletion src/addon.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { ProgressWindowHelper } from "zotero-plugin-toolkit/dist/helpers/progressWindow";
import { ColumnOptions, VirtualizedTableHelper } from "zotero-plugin-toolkit/dist/helpers/virtualizedTable";
import {
ColumnOptions,
VirtualizedTableHelper,
} from "zotero-plugin-toolkit/dist/helpers/virtualizedTable";
import { createZToolkit } from "./utils/ztoolkit";
import { ActionMap } from "./utils/actions";
import { KeyModifier } from "./utils/shorcut";
Expand Down
6 changes: 3 additions & 3 deletions src/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ async function onStartup() {

await addon.api.actionManager.dispatchActionByEvent(
ActionEventTypes.programStartup,
{}
{},
);

initReaderShortcuts();
Expand All @@ -47,7 +47,7 @@ async function onMainWindowLoad(win: Window): Promise<void> {
ActionEventTypes.mainWindowLoad,
{
window: win,
}
},
);
}

Expand All @@ -57,7 +57,7 @@ async function onMainWindowUnload(win: Window): Promise<void> {
ActionEventTypes.mainWindowUnload,
{
window: win,
}
},
);
}

Expand Down
12 changes: 6 additions & 6 deletions src/modules/menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function initMenu(win: Window) {
},
],
},
win.document.querySelector("popupset")!
win.document.querySelector("popupset")!,
);
const image =
"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsSAAALEgHS3X78AAAA40lEQVRYCWP8//8/AyFwJL/hjsbXJ8oEFSKBG9wyd20mNqgQUsdESMGCypkppFoOAiA924s711PsAOmfb2NItRwGWP7/FaTYAbQGow4YdcCoA0YdMOqAUQcMuANYCCm4yS394AWboD05hn9k5XrgSqkDjgloPiDHcih4kENAwWgaGHXAqAModcBFKB4QB4AsdoBish1BrgPAli8rNvsAwpQ4ghwHLIRZDhNAcsRCUg0jWBSjW76s2CwBmwTUEQlRvadA3HhiDSQlBHBajuYQkBqiQ4JYBxQSYzmaIwoJKmRgYAAAgCNBYXH3oBUAAAAASUVORK5CYII=";
Expand Down Expand Up @@ -85,23 +85,23 @@ function initMenu(win: Window) {
classList: ["button-background"],
},
],
})
}),
);
append(
ztoolkit.UI.createElement(doc, "style", {
id: `${config.addonRef}-reader-button`,
properties: {
textContent: readerButtonCSS,
},
})
}),
);
});
}

function buildItemMenu(win: Window, target: "item" | "reader") {
const doc = win.document;
const popup = doc.querySelector(
`#${config.addonRef}-${target}-popup`
`#${config.addonRef}-${target}-popup`,
) as XUL.MenuPopup;
// Remove all children in popup
while (popup.firstChild) {
Expand Down Expand Up @@ -140,7 +140,7 @@ function buildItemMenu(win: Window, target: "item" | "reader") {
};
}),
},
popup
popup,
);
}
}
Expand All @@ -162,7 +162,7 @@ function getActionsByMenu() {
}
return ((x[sortBy] as string) || "").localeCompare(
(y[sortBy] || "") as string,
Zotero.locale
Zotero.locale,
);
});
}
Expand Down
14 changes: 7 additions & 7 deletions src/modules/preferenceWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async function initUI() {
const renderLock = Zotero.Promise.defer();
if (!isWindowAlive(addon.data.prefs.window)) return;
addon.data.prefs.tableHelper = new ztoolkit.VirtualizedTable(
addon.data.prefs.window!
addon.data.prefs.window!,
)
.setContainerId(`${config.addonRef}-table-container`)
.setProp({
Expand Down Expand Up @@ -99,7 +99,7 @@ function initEvents() {
.querySelector(`#${config.addonRef}-rule-add`)
?.addEventListener("command", (e) => {
const key = addon.api.actionManager.updateAction(
Object.assign({}, emptyAction)
Object.assign({}, emptyAction),
);
updateUI();
editAction(key);
Expand Down Expand Up @@ -134,7 +134,7 @@ function getRowData(index: number) {
return {
event: getString(`prefs-rule-event-${ActionEventTypes[action.event]}`),
operation: getString(
`prefs-rule-operation-${ActionOperationTypes[action.operation]}`
`prefs-rule-operation-${ActionOperationTypes[action.operation]}`,
),
data: action.data,
shortcut: action.shortcut,
Expand Down Expand Up @@ -274,7 +274,7 @@ async function editAction(currentKey?: string) {
const content = await openEditorWindow(dialogData.data);
(
dialog.window.document.querySelector(
"#data-input"
"#data-input",
) as HTMLTextAreaElement
).value = content;
dialogData.data = content;
Expand Down Expand Up @@ -308,7 +308,7 @@ async function editAction(currentKey?: string) {
const key = ev.target as HTMLElement;
const win = dialog.window;
key.textContent = `[${getString(
"prefs-rule-edit-shortcut-placeholder"
"prefs-rule-edit-shortcut-placeholder",
)}]`;
dialogData.shortcut = "";
const keyDownListener = (e: KeyboardEvent) => {
Expand Down Expand Up @@ -414,7 +414,7 @@ async function editAction(currentKey?: string) {
menu: dialogData.menu,
name: dialogData.name,
},
currentKey
currentKey,
);
updateUI();
}
Expand All @@ -436,7 +436,7 @@ async function openEditorWindow(content: string) {
const editorWin = addon.data.prefs.window?.openDialog(
"chrome://scaffold/content/monaco/monaco.html",
"monaco",
"chrome,centerscreen,dialog=no,resizable,scrollbars=yes,width=800,height=600"
"chrome,centerscreen,dialog=no,resizable,scrollbars=yes,width=800,height=600",
) as
| (Window & {
loadMonaco: (options: Record<string, any>) => Promise<{ editor: any }>;
Expand Down
4 changes: 2 additions & 2 deletions src/modules/shortcuts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ function initReaderShortcuts() {
() => (reader._internalReader?._primaryView as any)?._iframeWindow,
() =>
_initShortcuts(
(reader._internalReader._primaryView as any)?._iframeWindow
)
(reader._internalReader._primaryView as any)?._iframeWindow,
),
);
});
}
Expand Down
14 changes: 7 additions & 7 deletions src/utils/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ function initActions() {
addon.data.actions.map = new ztoolkit.LargePref(
`${config.prefsPrefix}.rules`,
`${config.prefsPrefix}.rules.`,
"parser"
"parser",
).asMapLike() as ActionMap;
if (!getPref("rulesInit")) {
for (const key of defaultActions.keys()) {
Expand Down Expand Up @@ -149,7 +149,7 @@ function initActions() {

function updateCachedActionKeys() {
addon.data.actions.cachedKeys = Array.from(
addon.data.actions.map.keys()
addon.data.actions.map.keys(),
).sort((a, b) => {
const actionA = addon.data.actions.map.get(a);
const actionB = addon.data.actions.map.get(b);
Expand All @@ -160,13 +160,13 @@ function updateCachedActionKeys() {
actionA[
addon.data.prefs.columns[addon.data.prefs.columnIndex]
.dataKey as keyof ActionData
] || ""
] || "",
);
const valueB = String(
actionB[
addon.data.prefs.columns[addon.data.prefs.columnIndex]
.dataKey as keyof ActionData
] || ""
] || "",
);

return addon.data.prefs.columnAscending
Expand Down Expand Up @@ -222,7 +222,7 @@ async function applyAction(rule: ActionData, args: ActionArgs) {
}
}
message = `Toggle tag ${tags.join(",")} to item ${item?.getField(
"title"
"title",
)}`;
break;
}
Expand Down Expand Up @@ -269,7 +269,7 @@ async function applyAction(rule: ActionData, args: ActionArgs) {
const actions = getActions();
// Find the action by name
const action = Object.values(actions).find(
(action) => action.name === rule.data
(action) => action.name === rule.data,
);
if (action) {
await applyAction(action, args);
Expand All @@ -290,7 +290,7 @@ async function applyAction(rule: ActionData, args: ActionArgs) {
function getActions(): Record<string, ActionData>;
function getActions(key: string): ActionData | undefined;
function getActions(
key?: string
key?: string,
): Record<string, ActionData> | ActionData | undefined {
if (!key) {
const map = addon.data.actions.map;
Expand Down
4 changes: 2 additions & 2 deletions update-beta.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"zoterotag@euclpts.com": {
"updates": [
{
"version": "1.0.0-20",
"update_link": "https://github.com/windingwind/zotero-actions-tags/releases/download/v1.0.0-20/zotero-actions-tags.xpi",
"version": "1.0.0-21",
"update_link": "https://github.com/windingwind/zotero-actions-tags/releases/download/v1.0.0-21/zotero-actions-tags.xpi",
"applications": {
"zotero": {
"strict_min_version": "6.999"
Expand Down

0 comments on commit fc3b13a

Please sign in to comment.