waveterm/wails
0
0
Fork 0
mirror of https://github.com/wavetermdev/wails.git synced 2026-08-05 13:53:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3-alpha_linux' into v3-alpha

Browse Source 
# Conflicts:
#	v3/STATUS.md
#	v3/examples/menu/main.go
#	v3/go.mod
#	v3/pkg/application/application.go
#	v3/pkg/application/webview_window.go
This commit is contained in:
Lea Anthony
2023-06-22 19:46:10 +10:00
parent 29b9c5200f 9da5df354e
commit b317efaf2c
33 changed files with 4794 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v3/pkg/application/messageprocessor_call.go
+2 -5
View File
@@ -4,19 +4,16 @@ import (
"encoding/json"
"fmt"
"net/http"
"strconv"
)
func (m *MessageProcessor) callErrorCallback(window *WebviewWindow, message string, callID *string, err error) {
errorMsg := fmt.Sprintf(message, err)
m.Error(errorMsg)
msg := "_wails.callErrorCallback('" + *callID + "', " + strconv.Quote(errorMsg) + ");"
window.ExecJS(msg)
window.CallError(callID, errorMsg)
}
func (m *MessageProcessor) callCallback(window *WebviewWindow, callID *string, result string, isJSON bool) {
msg := fmt.Sprintf("_wails.callCallback('%s', %s, %v);", *callID, strconv.Quote(result), isJSON)
window.ExecJS(msg)
window.CallResponse(callID, result)
}
func (m *MessageProcessor) processCallMethod(method string, rw http.ResponseWriter, _ *http.Request, window *WebviewWindow, params QueryParams) {