Added more docs around config

Update HTML escaping
Fix custom HTML
2026-04-03 13:48:55 -07:00 · 2020-11-01 06:29:49 +11:00 · 2020-11-01 06:08:17 +11:00 · 2020-10-31 21:04:51 +11:00 · 2020-10-31 16:24:35 +11:00 · 2020-10-31 16:23:23 +11:00
6 changed files with 51 additions and 16 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -39,3 +39,4 @@ Wails is what it is because of the time and effort given by these great people.
  * [Kyle](https://github.com/kmuchmore)
  * [Balakrishna Prasad Ganne](https://github.com/aayush420)
  * [Charaf Rezrazi](https://github.com/Rezrazi)
+  * [misitebao](https://github.com/misitebao)
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v1.8.1-pre6"
+const Version = "v1.9.1"
--- a/cmd/wails/4_build.go
+++ b/cmd/wails/4_build.go
@@ -73,7 +73,6 @@ func init() {
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
 		projectOptions.Verbose = verbose
-		projectOptions.UseFirebug = usefirebug

 		// Check we are in project directory
 		// Check project.json loads correctly
@@ -83,6 +82,9 @@ func init() {
 			return fmt.Errorf("Unable to find 'project.json'. Please check you are in a Wails project directory")
 		}

+		// Set firebug flag
+		projectOptions.UseFirebug = usefirebug
+
 		// Check that this platform is supported
 		if !projectOptions.PlatformSupported() {
 			logger.Yellow("WARNING: This project is unsupported on %s - it probably won't work!\n         Valid platforms: %s\n", runtime.GOOS, strings.Join(projectOptions.Platforms, ", "))
--- a/config.go
+++ b/config.go
@@ -1,20 +1,39 @@
 package wails

 import (
+	"fmt"
+	"net/url"
+	"strings"
+
 	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails/runtime"
 )

 // AppConfig is the configuration structure used when creating a Wails App object
 type AppConfig struct {
-	Width, Height    int
-	Title            string
-	defaultHTML      string
-	HTML             string
-	JS               string
-	CSS              string
-	Colour           string
-	Resizable        bool
+	// The width and height of your application in pixels
+	Width, Height int
+
+	// The title to put in the title bar
+	Title string
+
+	// The HTML your app should use. If you leave it blank, a default will be used:
+	// <!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="IE=edge" content="IE=edge"></head><body><div id="app"></div><script type="text/javascript"></script></body></html>
+	HTML string
+
+	// The Javascript your app should use. Normally this should be generated by a bundler.
+	JS string
+
+	// The CSS your app should use. Normally this should be generated by a bundler.
+	CSS string
+
+	// The colour of your window. Can take "#fff", "rgb(255,255,255)", "rgba(255,255,255,1)" formats
+	Colour string
+
+	// Indicates whether your app should be resizable
+	Resizable bool
+
+	// Indicated if the devtools should be disabled
 	DisableInspector bool
 }

@@ -33,9 +52,14 @@ func (a *AppConfig) GetTitle() string {
 	return a.Title
 }

-// GetDefaultHTML returns the default HTML
-func (a *AppConfig) GetDefaultHTML() string {
-	return a.defaultHTML
+// GetHTML returns the default HTML
+func (a *AppConfig) GetHTML() string {
+	if len(a.HTML) > 0 {
+		a.HTML = url.QueryEscape(a.HTML)
+		a.HTML = "data:text/html," + strings.ReplaceAll(a.HTML, "+", "%20")
+		a.HTML = strings.ReplaceAll(a.HTML, "%3D", "=")
+	}
+	return a.HTML
 }

 // GetResizable returns true if the window should be resizable
@@ -79,6 +103,10 @@ func (a *AppConfig) merge(in *AppConfig) error {
 		a.JS = in.JS
 	}

+	if in.HTML != "" {
+		a.HTML = in.HTML
+	}
+
 	if in.Width != 0 {
 		a.Width = in.Width
 	}
@@ -109,5 +137,9 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		}
 	}

+	println("****************************************************")
+	fmt.Printf("%+v\n", result)
+	println("****************************************************")
+
 	return result, nil
 }
--- a/lib/interfaces/appconfig.go
+++ b/lib/interfaces/appconfig.go
@@ -6,9 +6,9 @@ type AppConfig interface {
 	GetHeight() int
 	GetTitle() string
 	GetResizable() bool
-	GetDefaultHTML() string
+	GetHTML() string
 	GetDisableInspector() bool
 	GetColour() string
 	GetCSS() string
 	GetJS() string
-}
+}
--- a/lib/renderer/webview.go
+++ b/lib/renderer/webview.go
@@ -58,7 +58,7 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 		Height:    config.GetHeight(),
 		Title:     config.GetTitle(),
 		Resizable: config.GetResizable(),
-		URL:       config.GetDefaultHTML(),
+		URL:       config.GetHTML(),
 		Debug:     !config.GetDisableInspector(),
 		ExternalInvokeCallback: func(_ wv.WebView, message string) {
 			w.ipc.Dispatch(message, w.callback)
Author	SHA1	Message	Date
Lea Anthony	b6dd999757	Added more docs around config	2020-11-01 06:29:49 +11:00
Lea Anthony	e572345068	Update HTML escaping	2020-11-01 06:08:17 +11:00
Lea Anthony	1ddb74c6ce	Fix custom HTML	2020-10-31 21:04:51 +11:00
Lea Anthony	73ee9ef530	v1.9.1	2020-10-31 16:24:35 +11:00
Lea Anthony	003eecc4ff	Fix firebug flag	2020-10-31 16:23:23 +11:00
Lea Anthony	f97341abbe	Revert "Allow use of custom HTML (#545 )" This reverts commit `dc605c1683`.	2020-10-31 16:15:29 +11:00
Lea Anthony	e2599c0f76	v1.9.0	2020-10-29 20:20:26 +11:00
Lea Anthony	39878c1a52	v1.8.1	2020-10-29 20:17:42 +11:00
Lea Anthony	c0932f3fa4	Merge branches '542-use-supplied-HTML' and 'develop' of github.com:wailsapp/wails into develop	2020-10-29 20:17:37 +11:00
Lea Anthony	dc605c1683	Allow use of custom HTML (#545 )	2020-10-29 19:57:11 +11:00
Lea Anthony	c7c9ace232	Allow use of custom HTML	2020-10-29 19:54:49 +11:00
Lea Anthony	5be197b68f	Update contributors	2020-10-28 21:33:06 +11:00
Lea Anthony	3e5c406c95	Merge branch 'develop' of https://github.com/wailsapp/wails into develop	2020-10-28 21:21:13 +11:00
Lea Anthony	be6bebebe4	v1.8.1-pre7	2020-10-28 21:21:10 +11:00
Lea Anthony	5b33ed28fd	Initial support for firebug (#543 ) * Initial support for firebug * Remove windows message	2020-10-28 21:20:47 +11:00