Merge branch 'main' into 0.14

This commit is contained in:
Alexei Anoshenko 2024-04-29 12:28:39 +03:00 committed by GitHub
commit a9f59e3080
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 67 additions and 1 deletions

View File

@ -313,8 +313,19 @@ function keyEvent(element, event, tag) {
message += ",timeStamp=" + event.timeStamp;
}
if (event.key) {
switch (event.key) {
case '"':
message += ",key=`\"`";
break
case '\\':
message += ",key=`\\`";
break
default:
message += ",key=\"" + event.key + "\"";
}
}
if (event.code) {
message += ",code=\"" + event.code + "\"";
}

55
httpHandler.go Normal file
View File

@ -0,0 +1,55 @@
package rui
import (
"net/http"
"strings"
)
type httpHandler struct {
app *application
prefix string
}
func (h *httpHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
switch req.Method {
case http.MethodGet:
path := `/` + strings.TrimPrefix(req.URL.Path, `/`)
req.URL.Path = `/` + strings.TrimPrefix(strings.TrimPrefix(path, h.prefix), `/`)
h.app.ServeHTTP(w, req)
}
}
/*
NewHandler is used to embed the rui application in third-party web frameworks (net/http, gin, echo...).
Example for echo:
e := echo.New()
e.Any(`/ui/*`, func()echo.HandlerFunc{
rui.AddEmbedResources(&resources)
h := rui.NewHandler("/ui", CreateSessionContent, rui.AppParams{
Title: `Awesome app`,
Icon: `favicon.png`,
})
return func(c echo.Context) error {
h.ServeHTTP(c.Response(), c.Request())
return nil
}
})
*/
func NewHandler(urlPrefix string, createContentFunc func(Session) SessionContent, params AppParams) *httpHandler {
app := new(application)
app.params = params
app.sessions = map[int]Session{}
app.createContentFunc = createContentFunc
apps = append(apps, app)
h := &httpHandler{
app: app,
prefix: `/` + strings.Trim(urlPrefix, `/`),
}
return h
}