github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-02 21:10:54 +08:00
Code Projects Activity

[v2] Refactor assets type

Browse Source
This commit is contained in:
Lea Anthony 2021-09-07 07:06:58 +10:00
parent a78b9a5b9b
commit dacea399ab
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
v2/internal/frontend/desktop/windows/frontend.go
View File

@ -342,17 +342,15 @@ func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger.
result.servingFromDisk = true
}
if appoptions.Assets != nil {
bindingsJSON, err := appBindings.ToJSON()
if err != nil {
log.Fatal(err)
}
assets, err := assetserver.NewDesktopAssetServer(ctx, *appoptions.Assets, bindingsJSON)
if err != nil {
log.Fatal(err)
}
result.assets = assets
bindingsJSON, err := appBindings.ToJSON()
if err != nil {
log.Fatal(err)
}
assets, err := assetserver.NewDesktopAssetServer(ctx, appoptions.Assets, bindingsJSON)
if err != nil {
log.Fatal(err)
}
result.assets = assets
return result
}

2
v2/pkg/options/options.go
View File

@ -27,7 +27,7 @@ type App struct {
StartHidden bool
HideWindowOnClose bool
RGBA int
Assets *embed.FS
Assets embed.FS
Menu *menu.Menu
Logger logger.Logger `json:"-"`
LogLevel logger.LogLevel