Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 09:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🐛 fix https://github.com/siyuan-note/siyuan/issues/6622

Browse source
This commit is contained in:
Vanessa 2022-11-16 23:09:20 +08:00
parent cb58fb0f42
commit 06b4d8ea26
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/util/newFile.ts
View file

@ -1,6 +1,6 @@
import {showMessage} from "../dialog/message"; import {showMessage} from "../dialog/message";
import {getAllModels} from "../layout/getAll"; import {getAllModels} from "../layout/getAll";
import {hasTopClosestByTag} from "../protyle/util/hasClosest"; import {hasClosestByClassName, hasTopClosestByTag} from "../protyle/util/hasClosest";
import {getDockByType} from "../layout/util"; import {getDockByType} from "../layout/util";
/// #if !MOBILE /// #if !MOBILE
import {Files} from "../layout/dock/Files"; import {Files} from "../layout/dock/Files";
@ -23,7 +23,7 @@ export const newFile = (notebookId?: string, currentPath?: string, open?: boolea
if (currentElement.classList.contains("item--focus")) { if (currentElement.classList.contains("item--focus")) {
notebookId = item.editor.protyle.notebookId; notebookId = item.editor.protyle.notebookId;
currentPath = pathPosix().dirname(item.editor.protyle.path); currentPath = pathPosix().dirname(item.editor.protyle.path);
if (currentElement.parentElement.parentElement.classList.contains("layout__wnd--active")) { if (hasClosestByClassName(currentElement, "layout__wnd--active")) {
return true; return true;
} }
} }

4
app/src/util/onGetConfig.ts
View file

@ -191,7 +191,7 @@ const initBar = () => {
<div id="barSetting" class="toolbar__item b3-tooltips b3-tooltips__sw${window.siyuan.config.readonly ? " fn__none" : ""}" aria-label="${window.siyuan.languages.config} ${updateHotkeyTip(window.siyuan.config.keymap.general.config.custom)}"> <div id="barSetting" class="toolbar__item b3-tooltips b3-tooltips__sw${window.siyuan.config.readonly ? " fn__none" : ""}" aria-label="${window.siyuan.languages.config} ${updateHotkeyTip(window.siyuan.config.keymap.general.config.custom)}">
<svg><use xlink:href="#iconSettings"></use></svg> <svg><use xlink:href="#iconSettings"></use></svg>
</div> </div>
<div id="barHelp" class="toolbar__item b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.openBy} ${window.siyuan.languages.help}"> <div id="barTopHelp" class="toolbar__item b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.openBy} ${window.siyuan.languages.help}">
<svg><use xlink:href="#iconHelp"></use></svg> <svg><use xlink:href="#iconHelp"></use></svg>
</div> </div>
<div class="fn__flex" id="windowControls"></div>`; <div class="fn__flex" id="windowControls"></div>`;
@ -251,7 +251,7 @@ const initBar = () => {
openSetting(); openSetting();
event.stopPropagation(); event.stopPropagation();
break; break;
} else if (target.id === "barHelp") { } else if (target.id === "barTopHelp") {
mountHelp(); mountHelp();
event.stopPropagation(); event.stopPropagation();
break; break;