Added more docs around config

Update HTML escaping
Fix custom HTML
2026-04-04 14:12:40 -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
9 changed files with 27 additions and 40 deletions
--- a/cmd/cmd-mewn.go
+++ b/cmd/cmd-mewn.go
--- a/cmd/linux.go
+++ b/cmd/linux.go
@@ -65,8 +65,6 @@ const (
 	Solus
 	// Ctlos Linux distribution
 	Ctlos
-	// EndeavourOS linux distribution
-	EndeavourOS
 )

 // DistroInfo contains all the information relating to a linux distribution
@@ -134,7 +132,7 @@ func parseOsRelease(osRelease string) *DistroInfo {
 	case "archlabs":
 		result.Distribution = ArchLabs
 	case "ctlos":
-		result.Distribution = Ctlos
+		result.Distribution = Ctlos	
 	case "debian":
 		result.Distribution = Debian
 	case "ubuntu":
@@ -173,8 +171,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = PopOS
 	case "solus":
 		result.Distribution = Solus
-	case "endeavouros":
-		result.Distribution = EndeavourOS
 	default:
 		result.Distribution = Unknown
 	}
--- a/cmd/linuxdb.yaml
+++ b/cmd/linuxdb.yaml
@@ -202,16 +202,7 @@ distributions:
        name: Ctlos Linux
        gccversioncommand: *gccdumpversion
        programs: *archdefaultprograms
-        libraries: *archdefaultlibraries   
-  endeavouros:
-    id: endeavouros
-    releases:
-      default:
-        version: default
-        name: EndeavourOS
-        gccversioncommand: *gccdumpversion
-        programs: *archdefaultprograms
-        libraries: *archdefaultlibraries             
+        libraries: *archdefaultlibraries                
  manjaro:
    id: manjaro
    releases:
--- a/cmd/system.go
+++ b/cmd/system.go
@@ -276,7 +276,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		switch distroInfo.Distribution {
 		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS:
 			libraryChecker = DpkgInstalled
-		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS:
+		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM:
 			libraryChecker = PacmanInstalled
 		case CentOS, Fedora, Tumbleweed, Leap:
 			libraryChecker = RpmInstalled
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v1.10.1"
+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
--- a/config.go
+++ b/config.go
@@ -5,6 +5,7 @@ import (
 	"net/url"
 	"strings"

+	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails/runtime"
 )

@@ -98,10 +99,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
 	}
@@ -130,7 +127,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 {
@@ -146,17 +143,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/renderer/renderer-mewn.go
+++ b/lib/renderer/renderer-mewn.go
--- 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	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