diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index b0c1805e3..c92271996 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -218,8 +218,6 @@ "changeIcon": "Change icon", "includeSubFile": "\nInclude x subfiles", "untitled": "Untitled", - "goForward": "Go forward", - "goBack": "Go back", "lockScreen": "Lock Screen", "cloudIntro1": "End-to-end encrypted data synchronization", "cloudIntro2": "The encryption and decryption process is completely performed on the local device", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 04458dc20..bbe4d76a6 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -218,8 +218,6 @@ "changeIcon": "Cambiar el icono", "includeSubFile": "\nIncluir x subfichas", "untitled": "Sin título", - "goForward": "Ir hacia adelante", - "goBack": "Ir hacia atrás", "lockScreen": "Pantalla de bloqueo", "cloudIntro1": "Sincronización de datos cifrada de extremo a extremo", "cloudIntro2": "El proceso de cifrado y descifrado se realiza completamente en el dispositivo local", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index fbe695219..ff1c86529 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -218,8 +218,6 @@ "changeIcon": "Changer l'icône", "includeSubFile": "\nInclure x sous-fichiers", "untitled": "Sans titre", - "goForward": "Suivant", - "goBack": "Retour", "lockScreen": "Verrouiller Écran", "cloudIntro1": "Synchronisation des données cryptées de bout en bout", "cloudIntro2": "Le processus de cryptage et de décryptage est entièrement réalisé sur le dispositif local", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 85aeebe44..c6c408c7c 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -218,8 +218,6 @@ "changeIcon": "修改圖示", "includeSubFile": "\n包含 x 個子文檔", "untitled": "新文檔", - "goForward": "前進", - "goBack": "後退", "lockScreen": "鎖定畫面", "cloudIntro1": "端到端加密資料同步", "cloudIntro2": "加密和解密過程完全在本地設備上進行", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index cbf9cf7ba..0ce5186a4 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -218,8 +218,6 @@ "changeIcon": "修改图标", "includeSubFile": "\n包含 x 个子文档", "untitled": "新文档", - "goForward": "前进", - "goBack": "后退", "lockScreen": "锁屏", "cloudIntro1": "端到端加密数据同步", "cloudIntro2": "加密和解密过程完全在本地设备上进行", diff --git a/app/src/assets/scss/_reset.scss b/app/src/assets/scss/_reset.scss index cc351ebff..b9c1a7dc4 100644 --- a/app/src/assets/scss/_reset.scss +++ b/app/src/assets/scss/_reset.scss @@ -21,7 +21,6 @@ body { &.body--win32 { -webkit-font-smoothing: auto; - border: 1px solid var(--b3-border-color); .toolbar { padding-left: 0; diff --git a/app/src/util/backForward.ts b/app/src/util/backForward.ts index 055794319..e603f8b34 100644 --- a/app/src/util/backForward.ts +++ b/app/src/util/backForward.ts @@ -181,16 +181,12 @@ const focusStack = async (stack: IBackStack) => { }; export const goBack = async () => { - if (document.querySelector("#barBack").classList.contains("toolbar__item--disabled")) { - return; - } if (window.siyuan.backStack.length === 0) { if (forwardStack.length > 0) { await focusStack(forwardStack[forwardStack.length - 1]); } return; } - document.querySelector("#barForward").classList.remove("toolbar__item--disabled"); if (!previousIsBack) { forwardStack.push(window.siyuan.backStack.pop()); @@ -205,24 +201,16 @@ export const goBack = async () => { stack = window.siyuan.backStack.pop(); } } - - if (window.siyuan.backStack.length === 0) { - document.querySelector("#barBack").classList.add("toolbar__item--disabled"); - } previousIsBack = true; }; export const goForward = async () => { - if (document.querySelector("#barForward").classList.contains("toolbar__item--disabled")) { - return; - } if (forwardStack.length === 0) { if (window.siyuan.backStack.length > 0) { await focusStack(window.siyuan.backStack[window.siyuan.backStack.length - 1]); } return; } - document.querySelector("#barBack").classList.remove("toolbar__item--disabled"); if (previousIsBack) { window.siyuan.backStack.push(forwardStack.pop()); } @@ -237,10 +225,6 @@ export const goForward = async () => { stack = forwardStack.pop(); } } - - if (forwardStack.length === 0) { - document.querySelector("#barForward").classList.add("toolbar__item--disabled"); - } previousIsBack = false; }; @@ -273,7 +257,6 @@ export const pushBack = (protyle: IProtyle, range?: Range, blockElement?: Elemen window.siyuan.backStack.push(forwardStack.pop()); } forwardStack = []; - document.querySelector("#barForward").classList.add("toolbar__item--disabled"); } window.siyuan.backStack.push({ position, @@ -286,9 +269,5 @@ export const pushBack = (protyle: IProtyle, range?: Range, blockElement?: Elemen } previousIsBack = false; } - - if (window.siyuan.backStack.length > 1) { - document.querySelector("#barBack").classList.remove("toolbar__item--disabled"); - } } }; diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts index c08f90597..52d24a849 100644 --- a/app/src/util/onGetConfig.ts +++ b/app/src/util/onGetConfig.ts @@ -171,12 +171,6 @@ const initBar = () => {
- -
开发版，使用前请进行备份 Development version, please backup before use
@@ -194,11 +188,7 @@ const initBar = () => { document.querySelector(".toolbar").addEventListener("click", (event: MouseEvent) => { let target = event.target as HTMLElement; while (!target.classList.contains("toolbar")) { - if (target.id === "barBack") { - goBack(); - event.stopPropagation(); - break; - } else if (target.id === "barSync") { + if (target.id === "barSync") { syncGuide(target); event.stopPropagation(); break; @@ -235,10 +225,6 @@ const initBar = () => { window.siyuan.menus.menu.popup({x: event.clientX, y: event.clientY + 8}); event.stopPropagation(); break; - } else if (target.id === "barForward") { - goForward(); - event.stopPropagation(); - break; } else if (target.id === "barHistory") { openHistory(); event.stopPropagation();