0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 更新删除操作确认提示

Browse source
This commit is contained in:
Liang Ding 2022-10-06 16:01:02 +08:00
parent 08a0f835ab
commit f76608bf90
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
16 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/appearance/langs/en_US.json
View file

@ -1,4 +1,5 @@
{
"deleteOpConfirm": "⚠️ Delete operation confirmation",
"filterDocNameEnter": "Filter doc name Enter",
"defBlock": "Def block",
"defBlockChildren": "Define block and its children",

1
app/appearance/langs/es_ES.json
View file

@ -1,4 +1,5 @@
{
"deleteOpConfirm": "⚠️ Confirmación de operación de eliminación",
"filterDocNameEnter": "Filtrar doc name Enter",
"defBlock": "Definir bloque",
"defBlockChildren": "Definir bloque y sus hijos",

1
app/appearance/langs/fr_FR.json
View file

@ -1,4 +1,5 @@
{
"deleteOpConfirm": "⚠️ Supprimer la confirmation de l'opération",
"filterDocNameEnter": "Filtre doc name Enter",
"defBlock": "Définir le bloc",
"defBlockChildren": "Définir le bloc et ses enfants",

1
app/appearance/langs/zh_CHT.json
View file

@ -1,4 +1,5 @@
{
"deleteOpConfirm": "⚠️ Delete operation confirmation",
"filterDocNameEnter": "過濾文檔名 Enter",
"defBlock": "定義塊",
"defBlockChildren": "定義塊及其子塊",

1
app/appearance/langs/zh_CN.json
View file

@ -1,4 +1,5 @@
{
"deleteOpConfirm": "⚠️ 删除操作确认",
"filterDocNameEnter": "过滤文档名 Enter",
"defBlock": "定义块",
"defBlockChildren": "定义块及其子块",

2
app/src/editor/deleteFile.ts
View file

@ -17,7 +17,7 @@ export const deleteFile = (notebookId: string, pathString: string, name: string)
if (response.data.subFileCount > 0) {
tip = `${window.siyuan.languages.confirmDelete} <b>${name}</b> ${window.siyuan.languages.andSubFile.replace("x", response.data.subFileCount)}?`;
}
confirmDialog(window.siyuan.languages.delete, tip, () => {
confirmDialog(window.siyuan.languages.deleteOpConfirm, tip, () => {
fetchPost("/api/filetree/removeDoc", {
notebook: notebookId,
path: pathString

2
app/src/layout/dock/Bookmark.ts
View file

@ -128,7 +128,7 @@ export class Bookmark extends Model {
label: window.siyuan.languages.remove,
click: () => {
const bookmark = (id ? element.parentElement.previousElementSibling : element).querySelector(".b3-list-item__text").textContent;
confirmDialog(window.siyuan.languages.delete, `${window.siyuan.languages.confirmDelete} <b>${escapeHtml(bookmark)}</b>?`, () => {
confirmDialog(window.siyuan.languages.deleteOpConfirm, `${window.siyuan.languages.confirmDelete} <b>${escapeHtml(bookmark)}</b>?`, () => {
if (id) {
fetchPost("/api/attr/setBlockAttrs", {id, attrs: {bookmark: ""}}, () => {
this.update();

2
app/src/layout/dock/Files.ts
View file

@ -117,7 +117,7 @@ export class Files extends Model {
event.preventDefault();
break;
} else if (type === "remove") {
confirmDialog(window.siyuan.languages.delete,
confirmDialog(window.siyuan.languages.deleteOpConfirm,
`${window.siyuan.languages.confirmDelete} <b>${escapeHtml(target.parentElement.querySelector(".b3-list-item__text").textContent)}</b>?`, () => {
fetchPost("/api/notebook/removeNotebook", {
notebook: target.getAttribute("data-url"),

4
app/src/layout/dock/Inbox.ts
View file

@ -108,7 +108,7 @@ export class Inbox extends Model {
this.update();
break;
case "delete":
confirmDialog(window.siyuan.languages.delete, window.siyuan.languages.confirmDelete + "?", () => {
confirmDialog(window.siyuan.languages.deleteOpConfirm, window.siyuan.languages.confirmDelete + "?", () => {
this.remove(detailsElement.getAttribute("data-id"));
});
break;
@ -209,7 +209,7 @@ ${(Lute.New()).MarkdownStr("", data.shorthandContent)}
label: window.siyuan.languages.remove,
icon: "iconTrashcan",
click: () => {
confirmDialog(window.siyuan.languages.delete, window.siyuan.languages.confirmDelete + "?", () => {
confirmDialog(window.siyuan.languages.deleteOpConfirm, window.siyuan.languages.confirmDelete + "?", () => {
this.remove();
});
}

2
app/src/layout/dock/Tag.ts
View file

@ -114,7 +114,7 @@ export class Tag extends Model {
icon: "iconTrashcan",
label: window.siyuan.languages.remove,
click: () => {
confirmDialog(window.siyuan.languages.delete, `${window.siyuan.languages.confirmDelete} <b>${escapeHtml(labelName)}</b>?`, () => {
confirmDialog(window.siyuan.languages.deleteOpConfirm, `${window.siyuan.languages.confirmDelete} <b>${escapeHtml(labelName)}</b>?`, () => {
fetchPost("/api/tag/removeTag", {label: labelName});
});
},

2
app/src/menus/navigation.ts
View file

@ -88,7 +88,7 @@ export const initNavigationMenu = (liElement: HTMLElement) => {
label: window.siyuan.languages.delete,
accelerator: "⌦",
click: () => {
confirmDialog(window.siyuan.languages.delete,
confirmDialog(window.siyuan.languages.deleteOpConfirm,
`${window.siyuan.languages.confirmDelete} <b>${Lute.EscapeHTMLStr(name)}</b>?`, () => {
fetchPost("/api/notebook/removeNotebook", {
notebook: notebookId,

2
app/src/mobile/util/MobileBookmarks.ts
View file

@ -36,7 +36,7 @@ export class MobileBookmarks {
if (actionElement) {
const bookmark = (id ? element.parentElement.previousElementSibling : element).querySelector(".b3-list-item__text").textContent;
if (actionElement.getAttribute("data-type") === "remove") {
confirmDialog(window.siyuan.languages.delete, `${window.siyuan.languages.confirmDelete} <b>${escapeHtml(bookmark)}</b>?`, () => {
confirmDialog(window.siyuan.languages.deleteOpConfirm, `${window.siyuan.languages.confirmDelete} <b>${escapeHtml(bookmark)}</b>?`, () => {
if (id) {
fetchPost("/api/attr/setBlockAttrs", {id, attrs: {bookmark: ""}}, () => {
this.update();

2
app/src/mobile/util/MobileFiles.ts
View file

@ -148,7 +148,7 @@ export class MobileFiles extends Model {
event.preventDefault();
break;
} else if (type === "remove") {
confirmDialog(window.siyuan.languages.delete,
confirmDialog(window.siyuan.languages.deleteOpConfirm,
`${window.siyuan.languages.confirmDelete} <b>${escapeHtml(target.parentElement.querySelector(".b3-list-item__text").textContent)}</b>?`, () => {
fetchPost("/api/notebook/removeNotebook", {
notebook: target.getAttribute("data-url"),

2
app/src/mobile/util/MobileTags.ts
View file

@ -60,7 +60,7 @@ export class MobileTags {
fetchPost("/api/tag/renameTag", {oldLabel: labelName, newLabel: inputElement.value});
});
} else {
confirmDialog(window.siyuan.languages.delete, `${window.siyuan.languages.confirmDelete} <b>${escapeHtml(labelName)}</b>?`, () => {
confirmDialog(window.siyuan.languages.deleteOpConfirm, `${window.siyuan.languages.confirmDelete} <b>${escapeHtml(labelName)}</b>?`, () => {
fetchPost("/api/tag/removeTag", {label: labelName});
});
}

2
app/src/util/globalShortcut.ts
View file

@ -984,7 +984,7 @@ const fileTreeKeydown = (event: KeyboardEvent) => {
if (isFile) {
deleteFile(notebookId, pathString, getDisplayName(liElement.getAttribute("data-name"), false, true));
} else {
confirmDialog(window.siyuan.languages.delete,
confirmDialog(window.siyuan.languages.deleteOpConfirm,
`${window.siyuan.languages.confirmDelete} <b>${Lute.EscapeHTMLStr(getNotebookName(notebookId))}</b>?`, () => {
fetchPost("/api/notebook/removeNotebook", {
notebook: notebookId,

2
app/src/util/history.ts
View file

@ -451,7 +451,7 @@ export const openHistory = () => {
break;
} else if (type === "removeRepoTagSnapshot" || type === "removeCloudRepoTagSnapshot") {
const tag = target.parentElement.getAttribute("data-tag");
confirmDialog(window.siyuan.languages.delete, `${window.siyuan.languages.confirmDelete} <i>${tag}</i>?`, () => {
confirmDialog(window.siyuan.languages.deleteOpConfirm, `${window.siyuan.languages.confirmDelete} <i>${tag}</i>?`, () => {
fetchPost("/api/repo/" + type, {tag}, () => {
renderRepo(repoElement, type === "removeRepoTagSnapshot" ? -1 : -2);
});