diff --git a/src/public/app/dialogs/options/etapi.js b/src/public/app/dialogs/options/etapi.js index aba500d44..58718ef7f 100644 --- a/src/public/app/dialogs/options/etapi.js +++ b/src/public/app/dialogs/options/etapi.js @@ -1,5 +1,5 @@ import server from "../../services/server.js"; -import utils from "../../services/utils.js"; +import dialogService from "../../widgets/dialog.js"; const TPL = `

ETAPI

@@ -42,16 +42,14 @@ const TPL = ` .token-table-button:hover { border: 1px solid var(--main-border-color); } - -`; +`; export default class EtapiOptions { constructor() { $("#options-etapi").html(TPL); $("#create-etapi-token").on("click", async () => { - const promptDialog = await import('../../dialogs/prompt.js'); - const tokenName = await promptDialog.ask({ + const tokenName = await dialogService.prompt({ title: "New ETAPI token", message: "Please enter new token's name", defaultValue: "new token" @@ -64,7 +62,7 @@ export default class EtapiOptions { const {authToken} = await server.post('etapi-tokens', {tokenName}); - await promptDialog.ask({ + await dialogService.prompt({ title: "ETAPI token created", message: 'Copy the created token into clipboard. Trilium stores the token hashed and this is the last time you see it.', defaultValue: authToken @@ -104,8 +102,7 @@ export default class EtapiOptions { } async renameToken(etapiTokenId, oldName) { - const promptDialog = await import('../../dialogs/prompt.js'); - const tokenName = await promptDialog.ask({ + const tokenName = await dialogService.prompt({ title: "Rename token", message: "Please enter new token's name", defaultValue: oldName diff --git a/src/public/app/dialogs/prompt.js b/src/public/app/dialogs/prompt.js deleted file mode 100644 index 94a8e9c46..000000000 --- a/src/public/app/dialogs/prompt.js +++ /dev/null @@ -1,59 +0,0 @@ -import utils from "../services/utils.js"; - -const $dialog = $("#prompt-dialog"); -const $dialogBody = $dialog.find(".modal-body"); - -let $question; -let $answer; - -const $form = $("#prompt-dialog-form"); - -let resolve; -let shownCb; - -export function ask({ title, message, defaultValue, shown }) { - shownCb = shown; - - $("#prompt-title").text(title || "Prompt"); - - $question = $("