github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-03 04:11:05 +08:00
Code Projects Activity

Revert "Allow use of custom HTML (#545)"

Browse Source 
This reverts commit dc605c1683.
This commit is contained in:
Lea Anthony 2020-10-31 16:15:29 +11:00
parent e2599c0f76
commit f97341abbe
6 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/cmd-mewn.go
View File

File diff suppressed because one or more lines are too long

30
config.go
View File

@ -1,8 +1,7 @@
package wails package wails
import ( import (
b64 "encoding/base64" "github.com/leaanthony/mewn"
"github.com/wailsapp/wails/runtime" "github.com/wailsapp/wails/runtime"
) )
@ -10,6 +9,7 @@ import (
type AppConfig struct { type AppConfig struct {
Width, Height int Width, Height int
Title string Title string
defaultHTML string
HTML string HTML string
JS string JS string
CSS string CSS string
@ -33,9 +33,9 @@ func (a *AppConfig) GetTitle() string {
return a.Title return a.Title
} }
// GetHTML returns the HTML for the app // GetDefaultHTML returns the default HTML
func (a *AppConfig) GetHTML() string { func (a *AppConfig) GetDefaultHTML() string {
return "data:text/html;base64," + b64.URLEncoding.EncodeToString([]byte(a.HTML)) return a.defaultHTML
} }
// GetResizable returns true if the window should be resizable // GetResizable returns true if the window should be resizable
@ -75,10 +75,6 @@ func (a *AppConfig) merge(in *AppConfig) error {
a.Colour = in.Colour a.Colour = in.Colour
} }
if in.HTML != "" {
a.HTML = in.HTML
}
if in.JS != "" { if in.JS != "" {
a.JS = in.JS a.JS = in.JS
} }
@ -103,7 +99,7 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
Resizable: true, Resizable: true,
Title: "My Wails App", Title: "My Wails App",
Colour: "#FFF", // White by default Colour: "#FFF", // White by default
HTML: defaultHTML, HTML: mewn.String("./runtime/assets/default.html"),
} }
if userConfig != nil { if userConfig != nil {
@ -115,17 +111,3 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
return result, nil return result, nil
} }
var defaultHTML = `<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
</head>
<body>
<div id="app"></div>
</body>
</html>`

4
lib/interfaces/appconfig.go
View File

@ -6,9 +6,9 @@ type AppConfig interface {
GetHeight() int GetHeight() int
GetTitle() string GetTitle() string
GetResizable() bool GetResizable() bool
GetHTML() string GetDefaultHTML() string
GetDisableInspector() bool GetDisableInspector() bool
GetColour() string GetColour() string
GetCSS() string GetCSS() string
GetJS() string GetJS() string
} }

2
lib/renderer/renderer-mewn.go
View File

File diff suppressed because one or more lines are too long

2
lib/renderer/webview.go
View File

@ -58,7 +58,7 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
Height: config.GetHeight(), Height: config.GetHeight(),
Title: config.GetTitle(), Title: config.GetTitle(),
Resizable: config.GetResizable(), Resizable: config.GetResizable(),
URL: config.GetHTML(), URL: config.GetDefaultHTML(),
Debug: !config.GetDisableInspector(), Debug: !config.GetDisableInspector(),
ExternalInvokeCallback: func(_ wv.WebView, message string) { ExternalInvokeCallback: func(_ wv.WebView, message string) {
w.ipc.Dispatch(message, w.callback) w.ipc.Dispatch(message, w.callback)

18
runtime/assets/default.html Normal file
View File

@ -0,0 +1,18 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
</head>
<body>
<div id="app"></div>
<script type="text/javascript">function AddScript(js, callbackID) {
var script = document.createElement('script');
script.text = js;
document.body.appendChild(script);
}</script>
</body>
</html>