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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-11-09 10:07:50 +08:00
commit 311f182009
1 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

44
kernel/server/serve.go
View file

@ -317,19 +317,39 @@ func serveCheckAuth(c *gin.Context) {
return
}
keymapHideWindow := "⌥M"
if nil != (*model.Conf.Keymap)["general"] {
switch (*model.Conf.Keymap)["general"].(type) {
case map[string]interface{}:
keymapGeneral := (*model.Conf.Keymap)["general"].(map[string]interface{})
if nil != keymapGeneral["toggleWin"] {
switch keymapGeneral["toggleWin"].(type) {
case map[string]interface{}:
toggleWin := keymapGeneral["toggleWin"].(map[string]interface{})
if nil != toggleWin["custom"] {
keymapHideWindow = toggleWin["custom"].(string)
}
}
}
}
if "" == keymapHideWindow {
keymapHideWindow = "⌥M"
}
}
model := map[string]interface{}{
"l0": model.Conf.Language(173),
"l1": model.Conf.Language(174),
"l2": template.HTML(model.Conf.Language(172)),
"l3": model.Conf.Language(175),
"l4": model.Conf.Language(176),
"l5": model.Conf.Language(177),
"l6": model.Conf.Language(178),
"l7": template.HTML(model.Conf.Language(184)),
"appearanceMode": model.Conf.Appearance.Mode,
"appearanceModeOS": model.Conf.Appearance.ModeOS,
"workspace": filepath.Base(util.WorkspaceDir),
"workspacePath": util.WorkspaceDir,
"l0": model.Conf.Language(173),
"l1": model.Conf.Language(174),
"l2": template.HTML(model.Conf.Language(172)),
"l3": model.Conf.Language(175),
"l4": model.Conf.Language(176),
"l5": model.Conf.Language(177),
"l6": model.Conf.Language(178),
"l7": template.HTML(model.Conf.Language(184)),
"appearanceMode": model.Conf.Appearance.Mode,
"appearanceModeOS": model.Conf.Appearance.ModeOS,
"workspace": filepath.Base(util.WorkspaceDir),
"workspacePath": util.WorkspaceDir,
"keymapGeneralToggleWin": keymapHideWindow,
}
buf := &bytes.Buffer{}
if err = tpl.Execute(buf, model); nil != err {