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

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

Browse source
This commit is contained in:
Vanessa 2024-09-05 22:39:22 +08:00
commit e006713e7c
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/util/runtime.go
View file

@ -49,7 +49,7 @@ func WaitForUILoaded() {
for !IsUILoaded {
time.Sleep(200 * time.Millisecond)
if time.Since(start) > 30*time.Second {
logging.LogErrorf("wait for ui loaded timeout")
logging.LogErrorf("wait for ui loaded timeout: %s", logging.ShortStack())
break
}
}

4
kernel/util/websocket.go
View file

@ -153,27 +153,23 @@ func PushTxErr(msg string, code int, data interface{}) {
}
func PushUpdateMsg(msgId string, msg string, timeout int) {
WaitForUILoaded()
BroadcastByType("main", "msg", 0, msg, map[string]interface{}{"id": msgId, "closeTimeout": timeout})
return
}
func PushMsg(msg string, timeout int) (msgId string) {
WaitForUILoaded()
msgId = gulu.Rand.String(7)
BroadcastByType("main", "msg", 0, msg, map[string]interface{}{"id": msgId, "closeTimeout": timeout})
return
}
func PushErrMsg(msg string, timeout int) (msgId string) {
WaitForUILoaded()
msgId = gulu.Rand.String(7)
BroadcastByType("main", "msg", -1, msg, map[string]interface{}{"id": msgId, "closeTimeout": timeout})
return
}
func PushStatusBar(msg string) {
WaitForUILoaded()
msg += " (" + time.Now().Format("2006-01-02 15:04:05") + ")"
BroadcastByType("main", "statusbar", 0, msg, nil)
}