Fix loading label init (#760)

* initialize loading label to 0 when server rendering * update github doc
maxence-charriere · Aug 22, 2022 · 441050b · 441050b
1 parent 11f7e24
commit 441050b
Show file tree

Hide file tree

Showing 27 changed files with 2,077 additions and 2,074 deletions.
diff --git a/docs/actions.html b/docs/actions.html
diff --git a/docs/app-worker.js b/docs/app-worker.js
@@ -1,8 +1,8 @@
-const cacheName = "app-" + "99744976a78f1c0e6202f9856d65e47589cb83ca";
+const cacheName = "app-" + "14a2a162a0ac80801aa21f83ff5b57d0a9226b3a";
 const resourcesToCache = ["/","/app.css","/app.js","/manifest.webmanifest","/wasm_exec.js","/web/app.wasm","/web/css/docs.css","/web/css/prism.css","/web/documents/home-next.md","/web/documents/home.md","/web/documents/updates.md","/web/documents/what-is-go-app.md","/web/js/prism.js","https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500\u0026display=swap","https://storage.googleapis.com/murlok-github/icon-192.png","https://storage.googleapis.com/murlok-github/icon-512.png"];
 
 self.addEventListener("install", (event) => {
-  console.log("installing app worker 99744976a78f1c0e6202f9856d65e47589cb83ca");
+  console.log("installing app worker 14a2a162a0ac80801aa21f83ff5b57d0a9226b3a");
 
   event.waitUntil(
     caches
@@ -28,7 +28,7 @@ self.addEventListener("activate", (event) => {
       );
     })
   );
-  console.log("app worker 99744976a78f1c0e6202f9856d65e47589cb83ca is activated");
+  console.log("app worker 14a2a162a0ac80801aa21f83ff5b57d0a9226b3a is activated");
 });
 
 self.addEventListener("fetch", (event) => {

diff --git a/docs/app.js b/docs/app.js
@@ -5,7 +5,8 @@ var goappNav = function () {};
 var goappOnUpdate = function () {};
 var goappOnAppInstallChange = function () {};
 
-const goappEnv = {"GOAPP_INTERNAL_URLS":"null","GOAPP_ROOT_PREFIX":"","GOAPP_STATIC_RESOURCES_URL":"","GOAPP_VERSION":"99744976a78f1c0e6202f9856d65e47589cb83ca"};
+const goappEnv = {"GOAPP_INTERNAL_URLS":"null","GOAPP_ROOT_PREFIX":"","GOAPP_STATIC_RESOURCES_URL":"","GOAPP_VERSION":"14a2a162a0ac80801aa21f83ff5b57d0a9226b3a"};
+const goappLoadingLabel = "go-app documentation {progress}%";
 const goappWasmContentLengthHeader = "";
 
 let goappServiceWorkerRegistration;
@@ -207,9 +208,8 @@ async function goappInitWebAssembly() {
     loaderIcon.className = "goapp-logo";
 
     const loaderLabel = document.getElementById("app-wasm-loader-label");
-    const loadingLabel = loaderLabel.innerText;
     const showProgress = (progress) => {
-      loaderLabel.innerText = loadingLabel.replace("{progress}", progress);
+      loaderLabel.innerText = goappLoadingLabel.replace("{progress}", progress);
     };
     showProgress(0);
 
@@ -247,7 +247,7 @@ async function fetchWithProgress(url, progess) {
   if (!goappWasmContentLengthHeader || !contentLength) {
     contentLength = response.headers.get("Content-Length");
   }
-  
+
   const total = parseInt(contentLength, 10);
   let loaded = 0;
 

diff --git a/docs/architecture.html b/docs/architecture.html
diff --git a/docs/components.html b/docs/components.html
diff --git a/docs/concurrency.html b/docs/concurrency.html
diff --git a/docs/declarative-syntax.html b/docs/declarative-syntax.html
diff --git a/docs/getting-started.html b/docs/getting-started.html
diff --git a/docs/github-deploy.html b/docs/github-deploy.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/install.html b/docs/install.html
diff --git a/docs/js.html b/docs/js.html
diff --git a/docs/lifecycle.html b/docs/lifecycle.html
diff --git a/docs/migrate.html b/docs/migrate.html
diff --git a/docs/notifications.html b/docs/notifications.html
diff --git a/docs/privacy-policy.html b/docs/privacy-policy.html
diff --git a/docs/reference.html b/docs/reference.html
diff --git a/docs/routing.html b/docs/routing.html
diff --git a/docs/seo.html b/docs/seo.html
diff --git a/docs/states.html b/docs/states.html
diff --git a/docs/static-resources.html b/docs/static-resources.html
diff --git a/docs/testing.html b/docs/testing.html
diff --git a/docs/web/app.wasm b/docs/web/app.wasm
diff --git a/docs/web/documents/reference.html b/docs/web/documents/reference.html
@@ -2913,7 +2913,7 @@ <h2 id="Dispatcher">type <a href="/src/github.com/maxence-charriere/go-app/v9/pk
 
 
 
-			<h2 id="Environment">type <a href="/src/github.com/maxence-charriere/go-app/v9/pkg/app/http.go?s=20315:20349#L830">Environment</a>
+			<h2 id="Environment">type <a href="/src/github.com/maxence-charriere/go-app/v9/pkg/app/http.go?s=20433:20467#L833">Environment</a>
 				<a class="permalink" href="#Environment">&#xb6;</a>
 
 
@@ -25123,7 +25123,7 @@ <h2 id="Handler">type <a href="/src/github.com/maxence-charriere/go-app/v9/pkg/a
 
 
 
-				<h3 id="Handler.ServeHTTP">func (*Handler) <a href="/src/github.com/maxence-charriere/go-app/v9/pkg/app/http.go?s=12755:12822#L511">ServeHTTP</a>
+				<h3 id="Handler.ServeHTTP">func (*Handler) <a href="/src/github.com/maxence-charriere/go-app/v9/pkg/app/http.go?s=12834:12901#L514">ServeHTTP</a>
 					<a class="permalink" href="#Handler.ServeHTTP">&#xb6;</a>
 
 
@@ -25137,7 +25137,7 @@ <h3 id="Handler.ServeHTTP">func (*Handler) <a href="/src/github.com/maxence-char
 
 
 
-			<h2 id="Icon">type <a href="/src/github.com/maxence-charriere/go-app/v9/pkg/app/http.go?s=19686:20223#L807">Icon</a>
+			<h2 id="Icon">type <a href="/src/github.com/maxence-charriere/go-app/v9/pkg/app/http.go?s=19804:20341#L810">Icon</a>
 				<a class="permalink" href="#Icon">&#xb6;</a>
 
 

diff --git a/pkg/app/gen/app.js b/pkg/app/gen/app.js
@@ -6,6 +6,7 @@ var goappOnUpdate = function () {};
 var goappOnAppInstallChange = function () {};
 
 const goappEnv = {{.Env}};
+const goappLoadingLabel = "{{.LoadingLabel}}";
 const goappWasmContentLengthHeader = "{{.WasmContentLengthHeader}}";
 
 let goappServiceWorkerRegistration;
@@ -207,9 +208,8 @@ async function goappInitWebAssembly() {
     loaderIcon.className = "goapp-logo";
 
     const loaderLabel = document.getElementById("app-wasm-loader-label");
-    const loadingLabel = loaderLabel.innerText;
     const showProgress = (progress) => {
-      loaderLabel.innerText = loadingLabel.replace("{progress}", progress);
+      loaderLabel.innerText = goappLoadingLabel.replace("{progress}", progress);
     };
     showProgress(0);
 
@@ -247,7 +247,7 @@ async function fetchWithProgress(url, progess) {
   if (!goappWasmContentLengthHeader || !contentLength) {
     contentLength = response.headers.get("Content-Length");
   }
-  
+
   const total = parseInt(contentLength, 10);
   let loaded = 0;
 

diff --git a/pkg/app/http.go b/pkg/app/http.go
@@ -302,6 +302,7 @@ func (h *Handler) initPageContent() {
 	if h.Body == nil {
 		h.Body = Body
 	}
+
 }
 
 func (h *Handler) initPreRenderedResources() {
@@ -370,12 +371,14 @@ func (h *Handler) makeAppJS() []byte {
 		Must(template.New("app.js").Parse(appJS)).
 		Execute(&b, struct {
 			Env                     string
+			LoadingLabel            string
 			Wasm                    string
 			WasmContentLengthHeader string
 			WorkerJS                string
 			AutoUpdateInterval      int64
 		}{
 			Env:                     jsonString(h.Env),
+			LoadingLabel:            h.LoadingLabel,
 			Wasm:                    h.Resources.AppWASM(),
 			WasmContentLengthHeader: h.WasmContentLengthHeader,
 			WorkerJS:                h.resolvePackagePath("/app-worker.js"),
@@ -652,7 +655,7 @@ func (h *Handler) servePage(w http.ResponseWriter, r *http.Request) {
 	page.SetDescription(h.Description)
 	page.SetAuthor(h.Author)
 	page.SetKeywords(h.Keywords...)
-	page.SetLoadingLabel(h.LoadingLabel)
+	page.SetLoadingLabel(strings.ReplaceAll(h.LoadingLabel, "{progress}", "0"))
 	page.SetImage(h.Image)
 	page.url = &url
 

diff --git a/pkg/app/scripts.go b/pkg/app/scripts.go