Merge pull request #3330 from Bluebugs/features/chrome-version-check

With Chrome 106 it is now possible to run fyne wasm output.
fyne-io · Oct 15, 2022 · 78f6dd9 · 78f6dd9
2 parents 2d7554e + d6d069e
commit 78f6dd9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/cmd/fyne/internal/templates/bundled.go b/cmd/fyne/internal/templates/bundled.go
diff --git a/cmd/fyne/internal/templates/data/index.html b/cmd/fyne/internal/templates/data/index.html
@@ -43,9 +43,17 @@
 		{{end}}
 		{{if .HasWasm}}
 			<script>
+				function getChromeVersion() {
+					var raw = navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./);
+
+					return raw ? parseInt(raw[2], 10) : 0;
+				}
+
 				var wasmBuild = true;
 				if (window.chrome) {
-					wasmBuild = false;
+					if (getChromeVersion() < 106) {
+						wasmBuild = false;
+					}
 				}
 			</script>
 		{{else}}
@@ -67,7 +75,7 @@
 			}
 
 			function webgl_support () {
-					try {
+				try {
 					var canvas = document.createElement('canvas');
 					return !!window.WebGLRenderingContext &&
 						(canvas.getContext('webgl') || canvas.getContext('experimental-webgl'));