v1.9.1

Fix firebug flag
Revert "Allow use of custom HTML (#545 )"
2026-04-05 06:32:42 -07:00 · 2020-10-31 16:24:35 +11:00 · 2020-10-31 16:23:23 +11:00 · 2020-10-31 16:15:29 +11:00
8 changed files with 34 additions and 32 deletions
--- a/cmd/cmd-mewn.go
+++ b/cmd/cmd-mewn.go
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v1.9.0"
+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,8 +1,7 @@
 package wails

 import (
-	b64 "encoding/base64"
-
+	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails/runtime"
 )

@@ -10,6 +9,7 @@ import (
 type AppConfig struct {
 	Width, Height    int
 	Title            string
+	defaultHTML      string
 	HTML             string
 	JS               string
 	CSS              string
@@ -33,9 +33,9 @@ func (a *AppConfig) GetTitle() string {
 	return a.Title
 }

-// GetHTML returns the HTML for the app
-func (a *AppConfig) GetHTML() string {
-	return "data:text/html;base64," + b64.URLEncoding.EncodeToString([]byte(a.HTML))
+// GetDefaultHTML returns the default HTML
+func (a *AppConfig) GetDefaultHTML() string {
+	return a.defaultHTML
 }

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

-	if in.HTML != "" {
-		a.HTML = in.HTML
-	}
-
 	if in.JS != "" {
 		a.JS = in.JS
 	}
@@ -103,7 +99,7 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		Resizable: true,
 		Title:     "My Wails App",
 		Colour:    "#FFF", // White by default
-		HTML:      defaultHTML,
+		HTML:      mewn.String("./runtime/assets/default.html"),
 	}

 	if userConfig != nil {
@@ -115,17 +111,3 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {

 	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>`
--- a/lib/interfaces/appconfig.go
+++ b/lib/interfaces/appconfig.go
@@ -6,9 +6,9 @@ type AppConfig interface {
 	GetHeight() int
 	GetTitle() string
 	GetResizable() bool
-	GetHTML() string
+	GetDefaultHTML() string
 	GetDisableInspector() bool
 	GetColour() string
 	GetCSS() string
 	GetJS() string
-}
+}
--- a/lib/renderer/renderer-mewn.go
+++ b/lib/renderer/renderer-mewn.go
--- 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.GetHTML(),
+		URL:       config.GetDefaultHTML(),
 		Debug:     !config.GetDisableInspector(),
 		ExternalInvokeCallback: func(_ wv.WebView, message string) {
 			w.ipc.Dispatch(message, w.callback)
--- a/runtime/assets/default.html
+++ b/runtime/assets/default.html
@@ -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>
Author	SHA1	Message	Date
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