From 67a0efee1b2f793cc51c0db4ef70b15183cb7423 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Wed, 5 Apr 2023 09:34:46 +0800 Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/7886 --- app/appearance/langs/en_US.json | 1 + app/appearance/langs/es_ES.json | 1 + app/appearance/langs/fr_FR.json | 1 + app/appearance/langs/zh_CHT.json | 1 + app/appearance/langs/zh_CN.json | 1 + app/src/mobile/util/MobileBackFoward.ts | 7 ++++++- 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 03fcaed9f..c40a05396 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,5 @@ { + "returnDesktop": "Press back again again to exit.", "enterNew": "Enter to create", "enterNewTip": "No documents found, Enter to create a new document.", "searchTip1": "to navigate", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 51615428f..2b4d8ab5c 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,5 @@ { + "returnDesktop": "Presiona atrás de nuevo para salir.", "enterNew": "Ingresar para crear", "enterNewTip": "No se encontraron documentos, ingrese para crear un nuevo documento.", "searchTip1": "para navegar", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index a78a7e0ab..5139ee5bd 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,5 @@ { + "returnDesktop": "Appuyez à nouveau pour quitter.", "enterNew": "Entrez pour créer", "enterNewTip": "Aucun document trouvé, entrez pour créer un nouveau document.", "searchTip1": "pour naviguer", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 416e66adb..64c47e3a4 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,5 @@ { + "returnDesktop": "再按一次退出應用", "enterNew": "回車創建", "enterNewTip": "搜索結果為空,回車創建新文檔", "searchTip1": "導航", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 0abb6f1c6..809ab1256 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,5 @@ { + "returnDesktop": "再按一次退出应用", "enterNew": "回车创建", "enterNewTip": "搜索结果为空,回车创建新文档", "searchTip1": "导航", diff --git a/app/src/mobile/util/MobileBackFoward.ts b/app/src/mobile/util/MobileBackFoward.ts index 34166eed8..a5285a0ee 100644 --- a/app/src/mobile/util/MobileBackFoward.ts +++ b/app/src/mobile/util/MobileBackFoward.ts @@ -9,6 +9,7 @@ import {blockRender} from "../../protyle/markdown/blockRender"; import {disabledForeverProtyle, disabledProtyle, enableProtyle} from "../../protyle/util/onGet"; import {setStorageVal} from "../../protyle/util/compatibility"; import {closePanel} from "./closePanel"; +import {showMessage} from "../../dialog/message"; const forwardStack: IBackStack[] = []; @@ -133,7 +134,11 @@ export const goBack = () => { return; } if (window.JSAndroid && window.siyuan.backStack.length < 1) { - window.JSAndroid.returnDesktop(); + if (document.querySelector('#message [data-id="exitTip"]')) { + window.JSAndroid.returnDesktop(); + } else { + showMessage(window.siyuan.languages.returnDesktop, 3000, "info", "exitTip"); + } return; } if (window.siyuan.backStack.length < 1) {