]> OzVa Git service - ozva-cloud/commitdiff
projects / ozva-cloud / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9b3779b)
fix: typo __ASSERTS_PREFIX__ (#252)
authorsigoden <sigoden@gmail.com>
Sun, 13 Aug 2023 07:05:45 +0000 (15:05 +0800)
committerGitHub <noreply@github.com>
Sun, 13 Aug 2023 07:05:45 +0000 (15:05 +0800)
README.md patch | blob | history
assets/index.html patch | blob | history
src/server.rs patch | blob | history
tests/fixtures.rs patch | blob | history

diff --git a/README.md b/README.md
index c36358ac0bca77f377e13ce402d52126884d56e8..916f64098e199bfa7cac96e23ec76270756844ed 100644 (file)
--- a/README.md
+++ b/README.md
@@ -344,7 +344,7 @@ Your assets folder must contains a `index.html` file.
 `index.html` can use the following placeholder variables to retrieve internal data.
 
 - `__INDEX_DATA__`: directory listing data
-- `__ASSERTS_PREFIX__`: assets url prefix
+- `__ASSETS_PREFIX__`: assets url prefix
 
 </details>
 
diff --git a/assets/index.html b/assets/index.html
index 34a14b9d9c1d19ffb7b60310e57e9f537891d5da..17cd8a5dd1eb4d53dcd115b8af5901c56f7d617d 100644 (file)
--- a/assets/index.html
+++ b/assets/index.html
@@ -4,12 +4,12 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width" />
-  <link rel="icon" type="image/x-icon" href="__ASSERTS_PREFIX__favicon.ico">
-  <link rel="stylesheet" href="__ASSERTS_PREFIX__index.css">
+  <link rel="icon" type="image/x-icon" href="__ASSETS_PREFIX__favicon.ico">
+  <link rel="stylesheet" href="__ASSETS_PREFIX__index.css">
   <script>
     DATA = __INDEX_DATA__
   </script>
-  <script src="__ASSERTS_PREFIX__index.js"></script>
+  <script src="__ASSETS_PREFIX__index.js"></script>
 </head>
 
 <body>
diff --git a/src/server.rs b/src/server.rs
index 64b3acd363408f43bd2f9bcac7ccbc4e5d94c94e..f83ea4af4c842ecb83b7594e465abc880ae8c681 100644 (file)
--- a/src/server.rs
+++ b/src/server.rs
@@ -775,7 +775,7 @@ impl Server {
             .typed_insert(ContentType::from(mime_guess::mime::TEXT_HTML_UTF_8));
         let output = self
             .html
-            .replace("__ASSERTS_PREFIX__", &self.assets_prefix)
+            .replace("__ASSETS_PREFIX__", &self.assets_prefix)
             .replace("__INDEX_DATA__", &serde_json::to_string(&data)?);
         res.headers_mut()
             .typed_insert(ContentLength(output.as_bytes().len() as u64));
@@ -1009,7 +1009,7 @@ impl Server {
             res.headers_mut()
                 .typed_insert(ContentType::from(mime_guess::mime::TEXT_HTML_UTF_8));
             self.html
-                .replace("__ASSERTS_PREFIX__", &self.assets_prefix)
+                .replace("__ASSETS_PREFIX__", &self.assets_prefix)
                 .replace("__INDEX_DATA__", &serde_json::to_string(&data)?)
         };
         res.headers_mut()
diff --git a/tests/fixtures.rs b/tests/fixtures.rs
index f191bfbcf0a6a4d35ddf73ed46c64040ee61e912..a83722dac6c3f1708e22c8884217f8d02e523b89 100644 (file)
--- a/tests/fixtures.rs
+++ b/tests/fixtures.rs
@@ -58,7 +58,7 @@ pub fn tmpdir() -> TempDir {
         if *directory == DIR_ASSETS {
             tmpdir
                 .child(format!("{}{}", directory, "index.html"))
-                .write_str("__ASSERTS_PREFIX__index.js;DATA = __INDEX_DATA__")
+                .write_str("__ASSETS_PREFIX__index.js;DATA = __INDEX_DATA__")
                 .unwrap();
         } else {
             for file in FILES {
Unnamed repository; edit this file 'description' to name the repository.