- {%- if config.extra.social %}
- {{- social_macros::social_links(social_config=config.extra.social, config=config) }}
- {%- endif %}
+ {{- social_macros::social_links(config=config) }}
{#- Copyright START #}
{%- set copyright_start_year=config.extra.copyright_start_year | default(value="") %}
{%- if copyright_start_year %}{%- set copyright_start_year=copyright_start_year ~ "-" %}{%- endif %}
{%- set copyright_end_year=config.extra.copyright_end_year | default(value=now() | date(format="%Y")) %}
-
diff --git a/templates/categories/list.html b/templates/categories/list.html
index 1ded228..a237591 100644
--- a/templates/categories/list.html
+++ b/templates/categories/list.html
@@ -18,7 +18,7 @@
{%- block content %}
-
Recent Posts
+
{%- if lang != config.default_language %}{{ trans(key="Recent_Posts" | safe, lang=lang) }}{% else %}Recent Posts{% endif %}
{%- set recent_items=config.extra.recent_items | default(value=9) -%}
{%- for page in section_item.pages | slice(end=recent_items) %}
{{- page_macros::page_listing(page=page, config=config) }}
diff --git a/templates/macros/head.html b/templates/macros/head.html
index 8da09cb..0690bc1 100644
--- a/templates/macros/head.html
+++ b/templates/macros/head.html
@@ -103,7 +103,7 @@
{%- set js_email=config.extra.js_email | default(value="email.js") -%}
{%- if js_email %}
- {%- if config.extra.social.mail_encode | default(value=true) %}
+ {%- if config.extra.mail_encode | default(value=true) %}
{%- endif %}
{%- endif %}
@@ -120,12 +120,15 @@
{%- else %}
- {%- endif %}
-
-{%- endif %}
+ {%- if lang != "en" %}
+
+
+ {%- endif %}
+ {%- endif %}
+{%- endif %}
{#- https://katex.org/docs/autorender.html #}
@@ -344,9 +347,9 @@
{%- endif %}
-{%- if config.extra.social.twitter %}
-
-
+{%- if config.extra.twitter_meta %}
+
+
{%- endif %}
diff --git a/templates/macros/macros.html b/templates/macros/macros.html
index 95c922c..e909b06 100644
--- a/templates/macros/macros.html
+++ b/templates/macros/macros.html
@@ -36,16 +36,24 @@
{%- if config.extra.meta_post.divider %}
{{ config.extra.meta_post.divider | safe }}{%- else %} {%- endif %}{%- endif %}{%- endif %}
{#- Date #}
- {%- if config.extra.meta_post.date %} {%- if config.extra.icon_date %} {% endif %} {{ page.date | date(format="%B %d, %Y") }}
+ {%- if config.extra.meta_post.date %} {%- if config.extra.icon_date %} {% endif %}
+ {%- if config.extra.date_locale %}
+ {%- if lang != config.default_language -%}
+ {%- set lang_locale = trans(key="date_locale" | safe, lang=lang) -%}
+ {%- else -%}
+ {%- set lang_locale = config.extra.date_locale -%}
+ {%- endif -%}
+ {{ page.date | date(format="%B %d, %Y", locale=lang_locale) }}
+ {%- else %} {{ page.date | date(format="%B %d, %Y") }} {%- endif %}
{#- divider #}
{%- if config.extra.meta_post.categories_tags %}
{%- if config.extra.meta_post.divider %}
{{ config.extra.meta_post.divider | safe }}{%- else %} {%- endif %}{%- endif %}{% endif %}
{#- Categories #}
- {%- if page.taxonomies.categories %} {%- if config.extra.icon_info %} {% endif %} [{% for cat in page.taxonomies.categories %}
{{ cat }}{% endfor %}]{% endif %}
+ {%- if page.taxonomies.categories %} {%- if config.extra.icon_info %} {% endif %} [{% for cat in page.taxonomies.categories %}
{{ cat }}{% endfor %}]{% endif %}
{#- Tags #}
- {%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #
{{ tag }} {% endfor -%}{%- endif %}
+ {%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #
{{ tag }} {% endfor -%}{%- endif %}
{%- endmacro meta_post %}
{%- macro title_index(page, config) %}
@@ -60,7 +68,7 @@
{%- if page.taxonomies.authors and config.taxonomies %}
{%- for author in page.taxonomies.authors %}
{%- if author_flag %}, {% endif %}
-
{{ author }}
+
{{ author }}
{%- set_global author_flag = true %}
{%- endfor %}
{%- elif page.extra.authors and config.extra.meta_index.author %}
@@ -87,16 +95,24 @@
{%- if config.extra.meta_index.divider %}
{{ config.extra.meta_index.divider | safe }}{%- else %} {%- endif %}{%- endif %}{%- endif %}
{#- Date #}
- {%- if config.extra.meta_index.date %} {%- if config.extra.icon_date %} {% endif %} {{ page.date | date(format="%B %d, %Y") }}
+ {%- if config.extra.meta_index.date %} {%- if config.extra.icon_date %} {% endif %}
+ {%- if config.extra.date_locale %}
+ {%- if lang != config.default_language -%}
+ {%- set lang_locale = trans(key="date_locale" | safe, lang=lang) -%}
+ {%- else -%}
+ {%- set lang_locale = config.extra.date_locale -%}
+ {%- endif -%}
+ {{ page.date | date(format="%B %d, %Y", locale=lang_locale) }}
+ {%- else %} {{ page.date | date(format="%B %d, %Y") }} {%- endif %}
{#- divider #}
{%- if config.extra.meta_index.categories_tags %}
{%- if config.extra.meta_index.divider %}
{{ config.extra.meta_index.divider | safe }}{%- else %} {%- endif %}{%- endif %}{% endif %}
{#- Categories #}
- {%- if page.taxonomies.categories %} {%- if config.extra.icon_info %} {% endif %} [{% for cat in page.taxonomies.categories %}
{{ cat }}{% endfor %}]{% endif %}
+ {%- if page.taxonomies.categories %} {%- if config.extra.icon_info %} {% endif %} [{% for cat in page.taxonomies.categories %}
{{ cat }}{% endfor %}]{% endif %}
{#- Tags #}
- {%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #
{{ tag }} {% endfor -%}{%- endif %}
+ {%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #
{{ tag }} {% endfor -%}{%- endif %}
{%- endmacro meta_index %}
diff --git a/templates/macros/social.html b/templates/macros/social.html
index 67e05a3..1c4b3fd 100644
--- a/templates/macros/social.html
+++ b/templates/macros/social.html
@@ -1,59 +1,58 @@
-{%- macro social_links(social_config, config) %}
+{%- macro social_links(config) %}
{%- endmacro %}
diff --git a/templates/page.html b/templates/page.html
index da4fdd6..6d5188d 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -57,7 +57,7 @@
{%- if toc %}
-
Index
+
{%- if lang != config.default_language %}{{ trans(key="Index" | safe, lang=lang) }}{% else %}Index{% endif %}
{%- for h in toc %}
{{ h.title }}
diff --git a/templates/posts.html b/templates/posts.html
index d4fc9e4..a353d15 100644
--- a/templates/posts.html
+++ b/templates/posts.html
@@ -18,7 +18,11 @@
{%- endblock seo %}
{%- block content %}
-{%- set section_item = get_section(path="_index.md") %}
+ {%- if lang == config.default_language %}
+ {%- set section_item = get_section(path="_index.md") %}
+ {%- else %}
+ {%- set section_item = get_section(path="_index." ~ lang ~ ".md") %}
+ {%- endif %}
{%- for year, posts in section_item.pages | group_by(attribute="year") %}
{{ year }}
diff --git a/templates/tags/list.html b/templates/tags/list.html
index 545bf34..2184cba 100644
--- a/templates/tags/list.html
+++ b/templates/tags/list.html
@@ -18,7 +18,7 @@
{%- block content %}
-
{{ terms | length }} Tags
+
{{ terms | length }} {%- if lang != config.default_language %} {{ trans(key="Tags" | safe, lang=lang) }} {% else %} Tags {% endif %}
{% for term in terms %} #{{ term.name }} {% endfor %}
{%- for term in terms %}
--
cgit v1.3.1
From d9fb3248650404ad6d078eba39b8b91381b1ebed Mon Sep 17 00:00:00 2001
From: Jieiku
Date: Mon, 22 May 2023 23:07:56 -0700
Subject: Fixes for uglyurls
---
config.toml | 5 ++--
content/overview-code-blocks.fr.md | 51 +++++++++++++++++++++++++++++---------
content/overview-code-blocks.md | 51 +++++++++++++++++++++++++++++---------
sass/_font-extend-COPY-ME.sass | 8 +++---
sass/_font-extend.sass | 16 ++++++------
sass/_imports.scss | 20 +++++++--------
sass/function/_font.sass | 4 +--
sass/include/_embedded.scss | 4 +--
sass/include/_hr.scss | 2 +-
sass/include/_icons.scss | 2 +-
sass/include/_nav.scss | 2 +-
sass/include/_sectioning.scss | 4 +--
sass/include/_typography.scss | 2 +-
sass/include/_zola.scss | 4 +--
static/search.js | 8 +++++-
templates/base.html | 12 ++++-----
templates/categories/list.html | 4 +--
templates/categories/single.html | 2 +-
templates/page.html | 4 +--
templates/posts.html | 2 +-
templates/tags/list.html | 4 +--
templates/tags/single.html | 2 +-
22 files changed, 136 insertions(+), 77 deletions(-)
(limited to 'static')
diff --git a/config.toml b/config.toml
index c2f6e26..8e53830 100644
--- a/config.toml
+++ b/config.toml
@@ -1,6 +1,6 @@
-# do NOT include a trailing slash on the base URL for web urls
+# do NOT include a trailing slash on the base URL
base_url = "https://abridge.netlify.app"
-#base_url = "/home/jieiku/.dev/abridge/public/" # Usable site directly from disk, also set in [extra] uglyurls = true
+#base_url = "/home/jieiku/.dev/abridge/public" # Usable site directly from disk, also set in [extra] uglyurls = true, and integrity = false
default_language = "en"
compile_sass = true
minify_html = false
@@ -79,6 +79,7 @@ uglyurls = false # if set to true then links are generated with the full path. e
### https://tera.netlify.app/docs#date
###############################################################################
date_locale = "en_US"
+language_code = "en-US"
flag.en = "🇬🇧"
flag.fr = "🇫🇷"
#flag.es = "🇪🇸"
diff --git a/content/overview-code-blocks.fr.md b/content/overview-code-blocks.fr.md
index e527251..c8fbdf2 100644
--- a/content/overview-code-blocks.fr.md
+++ b/content/overview-code-blocks.fr.md
@@ -25,19 +25,46 @@ Voir [les docs](https://www.getzola.org/documentation/content/syntax-highlightin
Si nous voulons, nous pouvons aussi `spécifier le code en ligne` ce qui est utile pour `les petites choses`.
### rust
-```rust,linenos,hl_lines=3
-//! jelly-actix-web-starter - Un modèle de démarrage pour les projets actix-web qui ressemble beaucoup à Django. Évitez les trucs ennuyeux et avancez plus vite.
-
-use jelly::actix_web;
-use mainlib;
-use std::io;
-
-#[actix_web::main]
-async fn main() -> io::Result<()> {
- mainlib::main().await
+```rust
+fn main() {
+ let greetings = ["Hello", "Hola", "Bonjour",
+ "Ciao", "こんにちは", "안녕하세요",
+ "Cześć", "Olá", "Здравствуйте",
+ "Chào bạn", "您好", "Hallo",
+ "Hej", "Ahoj", "سلام",
+ "Hej", "Hallo", "Hei",
+ "Helló", "Hallo", "Buna ziua",
+ "Merhaba"];
+
+ for (num, greeting) in greetings.iter().enumerate() {
+ print!("{} : ", greeting);
+ match num {
+ 0 => println!("This code is editable and runnable!"),//en English
+ 1 => println!("¡Este código es editable y ejecutable!"),//es Spanish
+ 2 => println!("Ce code est modifiable et exécutable !"),//fr French
+ 3 => println!("Questo codice è modificabile ed eseguibile!"),//it Italian
+ 4 => println!("このコードは編集して実行出来ます！"),//jp Japanese
+ 5 => println!("여기에서 코드를 수정하고 실행할 수 있습니다!"),//ko Korean
+ 6 => println!("Ten kod można edytować oraz uruchomić!"),//pl Polish
+ 7 => println!("Este código é editável e executável!"),//pt Portuguese
+ 8 => println!("Этот код можно отредактировать и запустить!"),//ru Russian
+ 9 => println!("Bạn có thể edit và run code trực tiếp!"),//vi Vietnamese
+ 10 => println!("这段代码是可以编辑并且能够运行的！"),//zh Chinese
+ 11 => println!("Dieser Code kann bearbeitet und ausgeführt werden!"),//de German
+ 12 => println!("Den här koden kan redigeras och köras!"),//sv Swedish
+ 13 => println!("Tento kód můžete upravit a spustit"),//cs Czech
+ 14 => println!("این کد قابلیت ویرایش و اجرا دارد!"),//fa Persian
+ 15 => println!("Denne kode kan redigeres og køres!"),//da Danish
+ 16 => println!("Deze code is bewerkbaar en uitvoerbaar!"),//du Dutch
+ 17 => println!("Tämä koodi on muokattavissa ja ajettavissa!"),//fi Finnish
+ 18 => println!("Ez a kód szerkeszthető és futtatható!"),//hu Hungarian
+ 19 => println!("Denne koden er redigerbar og kjørbar!"),//no Norwegian
+ 20 => println!("Acest cod este editabil și rulabil!"),//ro Romanian
+ 21 => println!("Bu kod düzenlenebilir ve çalıştırılabilir!"),//tr Turkish
+ _ => {},
+ }
+ }
}
-
-let context = Context::new();
```
### TOML
diff --git a/content/overview-code-blocks.md b/content/overview-code-blocks.md
index 7c09e5b..d38ac9e 100644
--- a/content/overview-code-blocks.md
+++ b/content/overview-code-blocks.md
@@ -25,19 +25,46 @@ See [the docs](https://www.getzola.org/documentation/content/syntax-highlighting
If we want, we can also `specify inline code` which is useful for `the small stuff`.
### rust
-```rust,linenos,hl_lines=3
-//! jelly-actix-web-starter - A starter template for actix-web projects that feels very Django-esque. Avoid the boring stuff and move faster.
-
-use jelly::actix_web;
-use mainlib;
-use std::io;
-
-#[actix_web::main]
-async fn main() -> io::Result<()> {
- mainlib::main().await
+```rust
+fn main() {
+ let greetings = ["Hello", "Hola", "Bonjour",
+ "Ciao", "こんにちは", "안녕하세요",
+ "Cześć", "Olá", "Здравствуйте",
+ "Chào bạn", "您好", "Hallo",
+ "Hej", "Ahoj", "سلام",
+ "Hej", "Hallo", "Hei",
+ "Helló", "Hallo", "Buna ziua",
+ "Merhaba"];
+
+ for (num, greeting) in greetings.iter().enumerate() {
+ print!("{} : ", greeting);
+ match num {
+ 0 => println!("This code is editable and runnable!"),//en English
+ 1 => println!("¡Este código es editable y ejecutable!"),//es Spanish
+ 2 => println!("Ce code est modifiable et exécutable !"),//fr French
+ 3 => println!("Questo codice è modificabile ed eseguibile!"),//it Italian
+ 4 => println!("このコードは編集して実行出来ます！"),//jp Japanese
+ 5 => println!("여기에서 코드를 수정하고 실행할 수 있습니다!"),//ko Korean
+ 6 => println!("Ten kod można edytować oraz uruchomić!"),//pl Polish
+ 7 => println!("Este código é editável e executável!"),//pt Portuguese
+ 8 => println!("Этот код можно отредактировать и запустить!"),//ru Russian
+ 9 => println!("Bạn có thể edit và run code trực tiếp!"),//vi Vietnamese
+ 10 => println!("这段代码是可以编辑并且能够运行的！"),//zh Chinese
+ 11 => println!("Dieser Code kann bearbeitet und ausgeführt werden!"),//de German
+ 12 => println!("Den här koden kan redigeras och köras!"),//sv Swedish
+ 13 => println!("Tento kód můžete upravit a spustit"),//cs Czech
+ 14 => println!("این کد قابلیت ویرایش و اجرا دارد!"),//fa Persian
+ 15 => println!("Denne kode kan redigeres og køres!"),//da Danish
+ 16 => println!("Deze code is bewerkbaar en uitvoerbaar!"),//du Dutch
+ 17 => println!("Tämä koodi on muokattavissa ja ajettavissa!"),//fi Finnish
+ 18 => println!("Ez a kód szerkeszthető és futtatható!"),//hu Hungarian
+ 19 => println!("Denne koden er redigerbar og kjørbar!"),//no Norwegian
+ 20 => println!("Acest cod este editabil și rulabil!"),//ro Romanian
+ 21 => println!("Bu kod düzenlenebilir ve çalıştırılabilir!"),//tr Turkish
+ _ => {},
+ }
+ }
}
-
-let context = Context::new();
```
### TOML
diff --git a/sass/_font-extend-COPY-ME.sass b/sass/_font-extend-COPY-ME.sass
index 658ebbd..148f883 100644
--- a/sass/_font-extend-COPY-ME.sass
+++ b/sass/_font-extend-COPY-ME.sass
@@ -6,10 +6,10 @@
// or : import it with '@use "_font-extend-COPY-ME"' in whatever existing sass file you already load
// delete the following two lines if you want to prepend your fonts...
-$findFont-Main : "Segoe UI" // ← append custom MAIN font(s) AFTER this (full list @ '_variables.scss')
-$findFont-Code : "Segoe UI Mono" // ← append custom CODE font(s) AFTER this
-$fontExt-Main : ("MAIN FONT 1", "MAIN FONT 2") // list of custom MAIN font(s) to append
-$fontExt-Code : ("CODE FONT 1", "CODE FONT 2") // list of custom CODE font(s) to append
+$findFont-Main : "Segoe UI" // ← append custom MAIN font(s) AFTER this (full list @ '_variables.scss')
+$findFont-Code : "Segoe UI Mono" // ← append custom CODE font(s) AFTER this
+$fontExt-Main : ("MAIN FONT 1", "MAIN FONT 2") // list of custom MAIN font(s) to append
+$fontExt-Code : ("CODE FONT 1", "CODE FONT 2") // list of custom CODE font(s) to append
// ...and delete the corresponding variables ↓
@use "../themes/abridge/sass/font-extend" with($findFont-Main:$findFont-Main, $findFont-Code:$findFont-Code,$fontExt-Main:$fontExt-Main,$fontExt-Code:$fontExt-Code)
diff --git a/sass/_font-extend.sass b/sass/_font-extend.sass
index 35f7a50..9c612c4 100644
--- a/sass/_font-extend.sass
+++ b/sass/_font-extend.sass
@@ -1,14 +1,14 @@
@use "sass:meta"
-@use "variables" as var
-@use "function/font" as f
+@use "variables" as var
+@use "function/font" as f
-$findFont-Main : null !default
-$findFont-Code : null !default
-$fontExt-Main : null !default
-$fontExt-Code : null !default
+$findFont-Main : null !default
+$findFont-Code : null !default
+$fontExt-Main : null !default
+$fontExt-Code : null !default
-$typeMain : meta.type-of($fontExt-Main)
-$typeCode : meta.type-of($fontExt-Code)
+$typeMain : meta.type-of($fontExt-Main)
+$typeCode : meta.type-of($fontExt-Code)
@if ($typeMain == 'string') or ($typeMain == 'list')
@if ($findFont-Main == null) // prepend
diff --git a/sass/_imports.scss b/sass/_imports.scss
index b615533..95a58e3 100644
--- a/sass/_imports.scss
+++ b/sass/_imports.scss
@@ -15,6 +15,16 @@
// Config
@forward "variables" as var-*;
+@forward "colors/orange" as colors-*;
+//@forward "colors/blue" as colors-*;
+//@forward "colors/blueshade" as colors-*;
+
+//@use "fonts/Roboto";
+//@use "fonts/Roboto-Mono"; // Monospaced
+//@use "fonts/Arimo";
+//@use "fonts/FiraCode"; // Monospaced
+//@use "fonts/Abridge"; // Icon Font (don't recommend, CSS only icons are in my opinion better.)
+
// Includes - Sorted by importance/category (includes at top are needed most frequently)
@use "include/document"; // html
@use "include/typography"; // a, headings, p, ul, blockquote, ...
@@ -40,13 +50,3 @@
//@use "include/grid"; // section infinite grid -- test/rework this similar to hnav and milligram in that it should collapse to a single column as the page becomes narrow
//@use "include/misc"; // template, [hidden], dialog, canvas
-
-//@use "fonts/Roboto";
-//@use "fonts/Roboto-Mono"; // Monospaced
-//@use "fonts/Arimo";
-//@use "fonts/FiraCode"; // Monospaced
-//@use "fonts/Abridge"; // Icon Font (don't recommend, CSS only icons are in my opinion better.)
-
-@forward "colors/orange" as colors-*;
-//@forward "colors/blue" as colors-*;
-//@forward "colors/blueshade" as colors-*;
diff --git a/sass/function/_font.sass b/sass/function/_font.sass
index 95704c9..45f8fc3 100644
--- a/sass/function/_font.sass
+++ b/sass/function/_font.sass
@@ -2,8 +2,8 @@
@use "sass:list"
@function font-append($base, $ext, $font-sep)
- $base-pre : ()
- $base-pos : ()
+ $base-pre : ()
+ $base-pos : ()
$iFontSep : index($base, $font-sep)
@if not $iFontSep // didn't find the font separator, return
@debug "⚠ Failed to find '#{$font-sep}' in the list of '#{$base}'"
diff --git a/sass/include/_embedded.scss b/sass/include/_embedded.scss
index cff161e..bd1dbb8 100644
--- a/sass/include/_embedded.scss
+++ b/sass/include/_embedded.scss
@@ -4,13 +4,13 @@
.yvi {//youtube and vimeo iframe
position: absolute;
top: 0;
- left: 0
+ left: 0;
}
.yv {//youtube and vimeo div
position: relative;
padding-bottom: 56.25%;
height: 0;
- overflow: hidden
+ overflow: hidden;
}
img,
video,
diff --git a/sass/include/_hr.scss b/sass/include/_hr.scss
index d6215dc..501bdf0 100644
--- a/sass/include/_hr.scss
+++ b/sass/include/_hr.scss
@@ -10,6 +10,6 @@ hr {
height: 0; // 1
overflow: visible; // 2
border: none;
- border-top: 1px solid var(--f1)
+ border-top: 1px solid var(--f1);
}
header hr, footer hr {border-top: 1px solid var(--c4)}
diff --git a/sass/include/_icons.scss b/sass/include/_icons.scss
index 511905d..907bcda 100644
--- a/sass/include/_icons.scss
+++ b/sass/include/_icons.scss
@@ -117,7 +117,7 @@
display: inline-block;
//overflow: hidden;
text-align: center;
- vertical-align: middle
+ vertical-align: middle;
}
.svgs {
width: var(--fs);
diff --git a/sass/include/_nav.scss b/sass/include/_nav.scss
index efad0ec..537f23d 100644
--- a/sass/include/_nav.scss
+++ b/sass/include/_nav.scss
@@ -128,7 +128,7 @@ footer nav {
margin: var(--s2) 0 var(--s1);
}
div {
- margin: auto // keeps top menu/search centered in mobile view
+ margin: auto; // keeps top menu/search centered in mobile view
}
}
}
diff --git a/sass/include/_sectioning.scss b/sass/include/_sectioning.scss
index 36b0a8e..a84842d 100644
--- a/sass/include/_sectioning.scss
+++ b/sass/include/_sectioning.scss
@@ -77,12 +77,12 @@ header, main {
padding-bottom: 0;
margin-bottom: 0;
hr {
- margin:0.1rem 0
+ margin:0.1rem 0;
}
}
footer{
line-height: var(--lhh);
hr, p {
- margin: 0.1rem 0 .3rem
+ margin: 0.1rem 0 .3rem;
}
}
diff --git a/sass/include/_typography.scss b/sass/include/_typography.scss
index 8eaa7f9..7ed6096 100644
--- a/sass/include/_typography.scss
+++ b/sass/include/_typography.scss
@@ -46,7 +46,7 @@ a:hover {
}
h1 a, h2 a, main nav a {
color: var(--f2);
- text-decoration:none;
+ text-decoration: none;
&:hover {
color: var(--a3);
text-decoration: none;
diff --git a/sass/include/_zola.scss b/sass/include/_zola.scss
index 2dd0b70..2b29a58 100644
--- a/sass/include/_zola.scss
+++ b/sass/include/_zola.scss
@@ -10,9 +10,7 @@
.s70 {font-size: .70em}
.hpad {padding: 0 .2rem}
.rpad {padding-right: .2rem}
-.si {
- font-size: 1.5em
-}
+.si {font-size: 1.5em}
pre code[data-lang]::before {
color: var(--f1);
text-transform: uppercase;
diff --git a/static/search.js b/static/search.js
index 6aa7019..544ca07 100644
--- a/static/search.js
+++ b/static/search.js
@@ -166,6 +166,12 @@ Source:
*/
(function(){
var lang = document.documentElement.getAttribute("lang");
+ var langOnly = lang.substring(0, 2);
+ var baseUrl = document.querySelector("meta[name='base']").getAttribute("content");
+ if (baseUrl.slice(-1) == "/") {
+ baseUrl = baseUrl.slice(0, -1);
+ }
+
var index;
searchinput.addEventListener('input', show_results, true);
suggestions.addEventListener('click', accept_suggestion, true);
@@ -173,7 +179,7 @@ Source:
async function show_results(){
var initIndex = async function () {
if (index === undefined) {
- index = fetch("/search_index." + lang + ".json")
+ index = fetch(baseUrl + '/search_index.' + langOnly + '.json')
.then(
async function(response) {
return await elasticlunr.Index.load(await response.json());
diff --git a/templates/base.html b/templates/base.html
index 6a6927a..c29fe6e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -3,7 +3,7 @@
{%- import "macros/page.html" as page_macros %}
{%- import "macros/macros.html" as macros %}
-
+
{{- macros_head::theme(config=config) }}
{{- macros_head::stylesheets(config=config) }}
@@ -37,16 +37,16 @@
diff --git a/templates/categories/single.html b/templates/categories/single.html
index 1f5e48c..9e667b4 100644
--- a/templates/categories/single.html
+++ b/templates/categories/single.html
@@ -21,7 +21,7 @@
{%- for year, posts in term.pages | group_by(attribute="year") %}
{{ year }}
{%- for page in posts %}
-
{{ page.title }} -
+
{{ page.title }} -
{%- endfor %}
{%- endfor %}
diff --git a/templates/page.html b/templates/page.html
index 6d5188d..ba2b451 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -60,12 +60,12 @@
{%- if lang != config.default_language %}{{ trans(key="Index" | safe, lang=lang) }}{% else %}Index{% endif %}
{%- for h in toc %}
{%- if h.children %}
{%- for h2 in h.children %}
{%- endfor %}
{%- endif %}
diff --git a/templates/posts.html b/templates/posts.html
index a353d15..92c07dc 100644
--- a/templates/posts.html
+++ b/templates/posts.html
@@ -27,7 +27,7 @@
{%- for year, posts in section_item.pages | group_by(attribute="year") %}
{{ year }}
{%- for post in posts %}
-
{{ post.title }} -
+
{{ post.title }} -
{%- endfor %}
{%- endfor %}
diff --git a/templates/tags/list.html b/templates/tags/list.html
index c703761..a24ef09 100644
--- a/templates/tags/list.html
+++ b/templates/tags/list.html
@@ -22,9 +22,9 @@
{% for term in terms %} #{{ term.name }}{{ term.pages | length }} {% endfor %}
{%- for term in terms %}
-
+
{%- for page in term.pages %}
-
{{ page.title }} -
+
{{ page.title }} -
{%- endfor %}
{%- endfor %}
diff --git a/templates/tags/single.html b/templates/tags/single.html
index ad8caeb..8984219 100644
--- a/templates/tags/single.html
+++ b/templates/tags/single.html
@@ -21,7 +21,7 @@
{%- for year, posts in term.pages | group_by(attribute="year") %}
{{ year }}
{%- for page in posts %}
-
{{ page.title }} -
+
{{ page.title }} -
{%- endfor %}
{%- endfor %}
--
cgit v1.3.1
From 3ca36cc469e838cee7d3fdcdc6ff39b35313a293 Mon Sep 17 00:00:00 2001
From: Jieiku
Date: Mon, 22 May 2023 23:13:34 -0700
Subject: js resilience
---
config.toml | 20 +--
package.json | 8 +-
static/abridge.min.js | 2 +-
static/search.js | 380 ++++++++++++++++++++-------------------
static/search_elasticlunr.min.js | 2 +-
static/theme_button.js | 10 +-
templates/base.html | 4 +-
7 files changed, 217 insertions(+), 209 deletions(-)
(limited to 'static')
diff --git a/config.toml b/config.toml
index 8e53830..29b1ba9 100644
--- a/config.toml
+++ b/config.toml
@@ -1,6 +1,9 @@
# do NOT include a trailing slash on the base URL
base_url = "https://abridge.netlify.app"
-#base_url = "/home/jieiku/.dev/abridge/public" # Usable site directly from disk, also set in [extra] uglyurls = true, and integrity = false
+
+#base_url = "/home/jieiku/.dev/abridge/public" # Usable site directly from disk
+# Also set index_format = "elasticlunr_javascript", and in [extra] uglyurls = true, integrity = false
+
default_language = "en"
compile_sass = true
minify_html = false
@@ -71,8 +74,6 @@ external_links_no_referrer = false # rel="noreferrer"
smart_punctuation = false # `...` to `…`, `"quote"` to `“curly”` etc
[extra]
-uglyurls = false # if set to true then links are generated with the full path. eg https://abridge.netlify.app/index.html
-
###############################################################################
### Language
### https://www.w3schools.com/tags/ref_country_codes.asp
@@ -182,8 +183,10 @@ researchgate = "your-profile-id"
### search_library: library to use, valid values: false, "elasticlunr", "tinysearch", "stork"
###############################################################################
+uglyurls = false # if set to true then links are generated with the full path. eg https://abridge.netlify.app/index.html
integrity = true # increases site security, should normally be true. (setting to false is useful during js development)
-js_bundle = false # multiple javascript files combined into a single file (setting to false is useful during js development)
+
+js_bundle = true # multiple javascript files combined into a single file (setting to false is useful during js development)
js_switcher = true # The button that allows manually changing between light/dark mode.
js_copycode = true # The copy button on code blocks that allows you to copy them to the clipboard.
@@ -196,14 +199,7 @@ search_library = 'elasticlunr'
#js_codecopy = "codecopy.js"# Bundleable - copy code block to clipboard button
#js_email = "email.js"# Bundleable - obfuscates email address in footer
-########## Switcher ########## (comment this block out if NOT using switcher):
-stylesheets = [ "abridge.css" ] # Automatic Dark/Light Theme based on browser/system preference with switcher
-
-########## No Switcher ##########
-#stylesheets = [ "abridge-auto.css" ] # Automatic Dark/Light Theme based on browser/system preference
-#stylesheets = [ "abridge-dark.css" ] # Dark Theme
-#stylesheets = [ "abridge-light.css" ] # Light Theme
-
+stylesheets = [ "abridge.css" ]
###############################################################################
### Favicons, comment out a line to disable loading some or all of these if needed.
diff --git a/package.json b/package.json
index 6a08be8..694a050 100644
--- a/package.json
+++ b/package.json
@@ -12,12 +12,14 @@
"search-stork": "uglifyjs static/stork.js static/stork_config.js -c -m -o static/search_stork.min.js",
"search-tinysearch": "uglifyjs static/tinysearch.js -c -m -o static/search_tinysearch.min.js",
"all": "npm run theme && npm run katex-bundle && npm run search-elasticlunr && npm run search-stork && npm run search-tinysearch",
+ "abridge-bundle-nosearch": "npm run all && uglifyjs static/prestyle.js static/theme_button.js static/email.js static/codecopy.js -c -m -o static/abridge.min.js",
"abridge-bundle-elasticlunr": "npm run all && uglifyjs static/prestyle.js static/theme_button.js static/search_elasticlunr.min.js static/email.js static/codecopy.js -c -m -o static/abridge.min.js",
"abridge-bundle-tinysearch": "npm run all && uglifyjs static/prestyle.js static/theme_button.js static/search_tinysearch.min.js static/email.js static/codecopy.js -c -m -o static/abridge.min.js",
"abridge-bundle-stork": "npm run all && uglifyjs static/prestyle.js static/theme_button.js static/search_stork.min.js static/email.js static/codecopy.js -c -m -o static/abridge.min.js",
- "elasticlunr": "npm run abridge-bundle-elasticlunr && sed -i \"s|^search_library.*|search_library = 'elasticlunr'|\" 'config.toml' && sed -i \"s|^draft.*|draft = true|\" 'content/static/tinysearch_json.md' && sed -i \"s|^draft.*|draft = true|\" 'content/static/stork_toml.md' && zola build",
- "tinysearch": "npm run abridge-bundle-tinysearch && sed -i \"s|^search_library.*|search_library = 'tinysearch'|\" 'config.toml' && sed -i \"s|^draft.*|draft = false|\" 'content/static/tinysearch_json.md' && sed -i \"s|^draft.*|draft = true|\" 'content/static/stork_toml.md' && zola build && mkdir -p tmp && tinysearch --optimize --path tmp public/data_tinysearch/index.html && rsync -avz tmp/*.wasm static/ && rm -rf tmp",
- "stork": "npm run abridge-bundle-stork && sed -i \"s|^search_library.*|search_library = 'stork'|\" 'config.toml' && sed -i \"s|^draft.*|draft = true|\" 'content/static/tinysearch_json.md' && sed -i \"s|^draft.*|draft = false|\" 'content/static/stork_toml.md' && zola build && stork build --input public/data_stork/index.html --output static/stork.st"
+ "nosearch": "npm run abridge-bundle-nosearch && sed -i \"s|^build_search_index.*|build_search_index = false|\" 'config.toml' && sed -i \"s|^search_library.*|search_library = false|\" 'config.toml' && sed -i \"s|^draft.*|draft = true|\" 'content/static/tinysearch_json.md' && sed -i \"s|^draft.*|draft = true|\" 'content/static/stork_toml.md' && zola build",
+ "elasticlunr": "npm run abridge-bundle-elasticlunr && sed -i \"s|^build_search_index.*|build_search_index = true|\" 'config.toml' && sed -i \"s|^search_library.*|search_library = 'elasticlunr'|\" 'config.toml' && sed -i \"s|^draft.*|draft = true|\" 'content/static/tinysearch_json.md' && sed -i \"s|^draft.*|draft = true|\" 'content/static/stork_toml.md' && zola build",
+ "tinysearch": "npm run abridge-bundle-tinysearch && sed -i \"s|^build_search_index.*|build_search_index = true|\" 'config.toml' && sed -i \"s|^search_library.*|search_library = 'tinysearch'|\" 'config.toml' && sed -i \"s|^draft.*|draft = false|\" 'content/static/tinysearch_json.md' && sed -i \"s|^draft.*|draft = true|\" 'content/static/stork_toml.md' && zola build && mkdir -p tmp && tinysearch --optimize --path tmp public/data_tinysearch/index.html && rsync -avz tmp/*.wasm static/ && rm -rf tmp",
+ "stork": "npm run abridge-bundle-stork && sed -i \"s|^build_search_index.*|build_search_index = true|\" 'config.toml' && sed -i \"s|^search_library.*|search_library = 'stork'|\" 'config.toml' && sed -i \"s|^draft.*|draft = true|\" 'content/static/tinysearch_json.md' && sed -i \"s|^draft.*|draft = false|\" 'content/static/stork_toml.md' && zola build && stork build --input public/data_stork/index.html --output static/stork.st"
},
"dependencies": {
"uglify-js": "^3.15.4"
diff --git a/static/abridge.min.js b/static/abridge.min.js
index 907a86e..bd23e27 100644
--- a/static/abridge.min.js
+++ b/static/abridge.min.js
@@ -1 +1 @@
-const items=document.querySelectorAll(".preStyle");function closeSearchNow(){document.querySelector("main").innerHTML=window.main}function goSearchNow(){var e=document.querySelector("main"),t=(window.main||(window.main=e.innerHTML),document.getElementById("suggestions")),n=t.cloneNode(!0),o=(n.id="results",document.createElement("div")),i='
");return o.innerHTML=i,n.insertBefore(o,n.firstChild),e.innerHTML=n.outerHTML,t.innerHTML="",document.getElementById("searchinput").value="",document.body.contains(document.closeSearch)&&(document.closeSearch.onsubmit=function(){closeSearchNow()}),!1}items.forEach(e=>{e.rel="stylesheet"}),document.getElementById("mode").addEventListener("click",()=>{document.documentElement.classList.toggle("light"),localStorage.setItem("theme",document.documentElement.classList.contains("light")?"light":"dark")}),function(){function m(e){var t=new m.Index;return t.pipeline.add(m.trimmer,m.stopWordFilter,m.stemmer),e&&e.call(t,t),t}var l,c,e,t,d,h,f,p,g,y,v,S,x,w,b,E,I,C,D,F,N,L,k,_,n;m.version="0.9.5",((lunr=m).utils={}).warn=(n=this,function(e){n.console&&console.warn&&console.warn(e)}),m.utils.toString=function(e){return null==e?"":e.toString()},(m.EventEmitter=function(){this.events={}}).prototype.addListener=function(){var e=Array.prototype.slice.call(arguments),t=e.pop();if("function"!=typeof t)throw new TypeError("last argument must be a function");e.forEach(function(e){this.hasHandler(e)||(this.events[e]=[]),this.events[e].push(t)},this)},m.EventEmitter.prototype.removeListener=function(e,t){this.hasHandler(e)&&-1!==(t=this.events[e].indexOf(t))&&(this.events[e].splice(t,1),0==this.events[e].length)&&delete this.events[e]},m.EventEmitter.prototype.emit=function(e){var t;this.hasHandler(e)&&(t=Array.prototype.slice.call(arguments,1),this.events[e].forEach(function(e){e.apply(void 0,t)},this))},m.EventEmitter.prototype.hasHandler=function(e){return e in this.events},(m.tokenizer=function(e){var t,n;return arguments.length&&null!=e?Array.isArray(e)?(t=(t=e.filter(function(e){return null!=e})).map(function(e){return m.utils.toString(e).toLowerCase()}),n=[],t.forEach(function(e){e=e.split(m.tokenizer.seperator),n=n.concat(e)},this),n):e.toString().trim().toLowerCase().split(m.tokenizer.seperator):[]}).defaultSeperator=/[\s\-]+/,m.tokenizer.seperator=m.tokenizer.defaultSeperator,m.tokenizer.setSeperator=function(e){null!=e&&"object"==typeof e&&(m.tokenizer.seperator=e)},m.tokenizer.resetSeperator=function(){m.tokenizer.seperator=m.tokenizer.defaultSeperator},m.tokenizer.getSeperator=function(){return m.tokenizer.seperator},(m.Pipeline=function(){this._queue=[]}).registeredFunctions={},m.Pipeline.registerFunction=function(e,t){t in m.Pipeline.registeredFunctions&&m.utils.warn("Overwriting existing registered function: "+t),e.label=t,m.Pipeline.registeredFunctions[t]=e},m.Pipeline.getRegisteredFunction=function(e){return e in m.Pipeline.registeredFunctions!=1?null:m.Pipeline.registeredFunctions[e]},m.Pipeline.warnIfFunctionNotRegistered=function(e){e.label&&e.label in this.registeredFunctions||m.utils.warn("Function is not registered with pipeline. This may cause problems when serialising the index.\n",e)},m.Pipeline.load=function(e){var n=new m.Pipeline;return e.forEach(function(e){var t=m.Pipeline.getRegisteredFunction(e);if(!t)throw new Error("Cannot load un-registered function: "+e);n.add(t)}),n},m.Pipeline.prototype.add=function(){Array.prototype.slice.call(arguments).forEach(function(e){m.Pipeline.warnIfFunctionNotRegistered(e),this._queue.push(e)},this)},m.Pipeline.prototype.after=function(e,t){if(m.Pipeline.warnIfFunctionNotRegistered(t),-1===(e=this._queue.indexOf(e)))throw new Error("Cannot find existingFn");this._queue.splice(e+1,0,t)},m.Pipeline.prototype.before=function(e,t){if(m.Pipeline.warnIfFunctionNotRegistered(t),-1===(e=this._queue.indexOf(e)))throw new Error("Cannot find existingFn");this._queue.splice(e,0,t)},m.Pipeline.prototype.remove=function(e){-1!==(e=this._queue.indexOf(e))&&this._queue.splice(e,1)},m.Pipeline.prototype.run=function(e){for(var t=[],n=e.length,o=this._queue.length,i=0;i
u[o]&&o++:(t.add(s[n]),n++,o++);return t},lunr.SortedSet.prototype.clone=function(){var e=new lunr.SortedSet;return e.elements=this.toArray(),e.length=e.elements.length,e},lunr.SortedSet.prototype.union=function(e){for(var t,e=this.length>=e.length?(t=this,e):(t=e,this),n=t.clone(),o=0,i=e.toArray();o",a=n.querySelector("a"),t=n.querySelector("span:first-child"),d=n.querySelector("span:nth-child(2)"),a.href=e.ref,t.textContent=e.doc.title,d.innerHTML=function(e){var t=x.map(function(e){return elasticlunr.stemmer(e.toLowerCase())}),n=!1,o=0,i=[],r=e.toLowerCase().split(". ");for(f in r){var s,u=r[f].split(/[\s\n]/),a=8;for(s in u){if(0<(m=u[s]).length){for(var l in t)elasticlunr.stemmer(m).startsWith(t[l])&&(a=40,n=!0);i.push([m,a,o]),a=2}o=o+m.length+1}o+=1}if(0===i.length)return void 0!==e.length&&300"),S=m[2]+m[0].length,40!==m[1]&&12<=m[0].length&&!/^[\x00-\xff]+$/.test(m[0])?(y=substringByByte(e.substring(m[2],S),12),v.push(y)):v.push(e.substring(m[2],S)),40===m[1]&&v.push("");return v.push("…"),v.join("")}(e.doc.body),suggestions.appendChild(n))});i.length>r;)suggestions.removeChild(i[0])},!0),suggestions.addEventListener("click",function(){for(;suggestions.lastChild;)suggestions.removeChild(suggestions.lastChild);return!1},!0),document.body.contains(document.goSearch)&&(document.goSearch.onsubmit=function(){return goSearchNow()})}(),function(){for(var e=document.getElementsByClassName("m-protected"),t=0;tasync function(e,t){var n=t.querySelectorAll("table")["length"];let o="";0 tr > td:last-child").forEach(e=>{o+=e.innerText}):o=t.querySelector(":last-child > code").innerText;try{"granted"==(result=await navigator.permissions.query({name:"clipboard-write"})).state||"prompt"==result.state?await navigator.clipboard.writeText(o):i(o,t)}catch(e){i(o,t)}finally{e.innerHTML="Copied",setTimeout(function(){e.innerHTML="Copy"},2e3)}}(t,e));var n=document.createElement("div");n.className="ccw",n.appendChild(t),e.parentNode.insertBefore(n,e),n.appendChild(e)}function i(e,t){var n=document.createElement("textArea"),e=(n.contentEditable="true",n.readOnly="false",n.className="copyable-text-area",n.value=e,t.insertBefore(n,t.firstChild),document.createRange()),o=(e.selectNodeContents(n),window.getSelection());o.removeAllRanges(),o.addRange(e),n.setSelectionRange(0,999999),document.execCommand("copy"),t.removeChild(n)}document.querySelectorAll("pre").forEach(e=>t(e))}();
\ No newline at end of file
+const items=document.querySelectorAll(".preStyle");function closeSearchNow(){document.querySelector("main").innerHTML=window.main}function goSearchNow(){var e=document.querySelector("main"),t=(window.main||(window.main=e.innerHTML),document.getElementById("suggestions")),n=t.cloneNode(!0),o=(n.id="results",document.createElement("div")),i='");return o.innerHTML=i,n.insertBefore(o,n.firstChild),e.innerHTML=n.outerHTML,t.innerHTML="",document.getElementById("searchinput").value="",document.body.contains(document.closeSearch)&&(document.closeSearch.onsubmit=function(){closeSearchNow()}),!1}function closeAllLists(e){for(var t=document.getElementById("suggestions");t.firstChild;)t.removeChild(t.firstChild)}function inputFocus(t){191===t.keyCode&&"INPUT"!==document.activeElement.tagName&&"TEXTAREA"!==document.activeElement.tagName&&(t.preventDefault(),searchinput.focus(),suggestions.classList.remove("d-none")),27===t.keyCode&&(searchinput.blur(),suggestions.classList.add("d-none"),closeAllLists());var n=suggestions.querySelectorAll("a");if(!suggestions.classList.contains("d-none")&&0!==n.length){var o=[...n],i=o.indexOf(document.activeElement);let e=0;38===t.keyCode?(t.preventDefault(),n[e=0{e.rel="stylesheet"}),document.getElementById("mode")&&document.getElementById("mode").addEventListener("click",()=>{document.documentElement.classList.toggle("light"),localStorage.setItem("theme",document.documentElement.classList.contains("light")?"light":"dark")}),function(){function g(e){var t=new g.Index;return t.pipeline.add(g.trimmer,g.stopWordFilter,g.stemmer),e&&e.call(t,t),t}var a,c,e,t,d,h,f,p,m,y,v,S,x,w,b,E,I,C,D,F,N,L,k,_,n;g.version="0.9.5",((lunr=g).utils={}).warn=(n=this,function(e){n.console&&console.warn&&console.warn(e)}),g.utils.toString=function(e){return null==e?"":e.toString()},(g.EventEmitter=function(){this.events={}}).prototype.addListener=function(){var e=Array.prototype.slice.call(arguments),t=e.pop();if("function"!=typeof t)throw new TypeError("last argument must be a function");e.forEach(function(e){this.hasHandler(e)||(this.events[e]=[]),this.events[e].push(t)},this)},g.EventEmitter.prototype.removeListener=function(e,t){this.hasHandler(e)&&-1!==(t=this.events[e].indexOf(t))&&(this.events[e].splice(t,1),0==this.events[e].length)&&delete this.events[e]},g.EventEmitter.prototype.emit=function(e){var t;this.hasHandler(e)&&(t=Array.prototype.slice.call(arguments,1),this.events[e].forEach(function(e){e.apply(void 0,t)},this))},g.EventEmitter.prototype.hasHandler=function(e){return e in this.events},(g.tokenizer=function(e){var t,n;return arguments.length&&null!=e?Array.isArray(e)?(t=(t=e.filter(function(e){return null!=e})).map(function(e){return g.utils.toString(e).toLowerCase()}),n=[],t.forEach(function(e){e=e.split(g.tokenizer.seperator),n=n.concat(e)},this),n):e.toString().trim().toLowerCase().split(g.tokenizer.seperator):[]}).defaultSeperator=/[\s\-]+/,g.tokenizer.seperator=g.tokenizer.defaultSeperator,g.tokenizer.setSeperator=function(e){null!=e&&"object"==typeof e&&(g.tokenizer.seperator=e)},g.tokenizer.resetSeperator=function(){g.tokenizer.seperator=g.tokenizer.defaultSeperator},g.tokenizer.getSeperator=function(){return g.tokenizer.seperator},(g.Pipeline=function(){this._queue=[]}).registeredFunctions={},g.Pipeline.registerFunction=function(e,t){t in g.Pipeline.registeredFunctions&&g.utils.warn("Overwriting existing registered function: "+t),e.label=t,g.Pipeline.registeredFunctions[t]=e},g.Pipeline.getRegisteredFunction=function(e){return e in g.Pipeline.registeredFunctions!=1?null:g.Pipeline.registeredFunctions[e]},g.Pipeline.warnIfFunctionNotRegistered=function(e){e.label&&e.label in this.registeredFunctions||g.utils.warn("Function is not registered with pipeline. This may cause problems when serialising the index.\n",e)},g.Pipeline.load=function(e){var n=new g.Pipeline;return e.forEach(function(e){var t=g.Pipeline.getRegisteredFunction(e);if(!t)throw new Error("Cannot load un-registered function: "+e);n.add(t)}),n},g.Pipeline.prototype.add=function(){Array.prototype.slice.call(arguments).forEach(function(e){g.Pipeline.warnIfFunctionNotRegistered(e),this._queue.push(e)},this)},g.Pipeline.prototype.after=function(e,t){if(g.Pipeline.warnIfFunctionNotRegistered(t),-1===(e=this._queue.indexOf(e)))throw new Error("Cannot find existingFn");this._queue.splice(e+1,0,t)},g.Pipeline.prototype.before=function(e,t){if(g.Pipeline.warnIfFunctionNotRegistered(t),-1===(e=this._queue.indexOf(e)))throw new Error("Cannot find existingFn");this._queue.splice(e,0,t)},g.Pipeline.prototype.remove=function(e){-1!==(e=this._queue.indexOf(e))&&this._queue.splice(e,1)},g.Pipeline.prototype.run=function(e){for(var t=[],n=e.length,o=this._queue.length,i=0;iu[o]&&o++:(t.add(s[n]),n++,o++);return t},lunr.SortedSet.prototype.clone=function(){var e=new lunr.SortedSet;return e.elements=this.toArray(),e.length=e.elements.length,e},lunr.SortedSet.prototype.union=function(e){for(var t,e=this.length>=e.length?(t=this,e):(t=e,this),n=t.clone(),o=0,i=e.toArray();o",a=n.querySelector("a"),t=n.querySelector("span:first-child"),d=n.querySelector("span:nth-child(2)"),a.href=e.ref,t.textContent=e.doc.title,d.innerHTML=function(e){var t=x.map(function(e){return elasticlunr.stemmer(e.toLowerCase())}),n=!1,o=0,i=[],r=e.toLowerCase().split(". ");for(f in r){var s,u=r[f].split(/[\s\n]/),l=8;for(s in u){if(0<(g=u[s]).length){for(var a in t)elasticlunr.stemmer(g).startsWith(t[a])&&(l=40,n=!0);i.push([g,l,o]),l=2}o=o+g.length+1}o+=1}if(0===i.length)return void 0!==e.length&&300"),S=g[2]+g[0].length,40!==g[1]&&12<=g[0].length&&!/^[\x00-\xff]+$/.test(g[0])?(y=substringByByte(e.substring(g[2],S),12),v.push(y)):v.push(e.substring(g[2],S)),40===g[1]&&v.push("");return v.push("…"),v.join("")}(e.doc.body),s.appendChild(n))});i.length>r;)s.removeChild(i[0])},!0),s.addEventListener("click",function(){for(;s.lastChild;)s.removeChild(s.lastChild);return!1},!0),document.goSearch.onsubmit=function(){return goSearchNow()})},function(){for(var e=document.getElementsByClassName("m-protected"),t=0;tasync function(e,t){var n=t.querySelectorAll("table")["length"];let o="";0 tr > td:last-child").forEach(e=>{o+=e.innerText}):o=t.querySelector(":last-child > code").innerText;try{"granted"==(result=await navigator.permissions.query({name:"clipboard-write"})).state||"prompt"==result.state?await navigator.clipboard.writeText(o):i(o,t)}catch(e){i(o,t)}finally{e.innerHTML="Copied",setTimeout(function(){e.innerHTML="Copy"},2e3)}}(t,e));var n=document.createElement("div");n.className="ccw",n.appendChild(t),e.parentNode.insertBefore(n,e),n.appendChild(e)}function i(e,t){var n=document.createElement("textArea"),e=(n.contentEditable="true",n.readOnly="false",n.className="copyable-text-area",n.value=e,t.insertBefore(n,t.firstChild),document.createRange()),o=(e.selectNodeContents(n),window.getSelection());o.removeAllRanges(),o.addRange(e),n.setSelectionRange(0,999999),document.execCommand("copy"),t.removeChild(n)}document.querySelectorAll("pre").forEach(e=>t(e))}();
\ No newline at end of file
diff --git a/static/search.js b/static/search.js
index 544ca07..da46986 100644
--- a/static/search.js
+++ b/static/search.js
@@ -3,6 +3,7 @@ function closeSearchNow() {
const main = document.querySelector("main");
main.innerHTML = window.main
}
+
function goSearchNow() {
const main = document.querySelector("main");
if (!window.main) {
@@ -27,13 +28,6 @@ function goSearchNow() {
document.body.contains(document.closeSearch) && (document.closeSearch.onsubmit = function() { closeSearchNow() })
return false
}
-window.onload = function() {
- document.body.contains(document.goSearch) && (document.goSearch.onsubmit = function() { return goSearchNow() })
-};
-
-// Everything Below this line For Suggestsions as you type in search box
-var suggestions = document.getElementById("suggestions");
-var searchinput = document.getElementById("searchinput");
/* Close search suggestion popup list */
function closeAllLists(elmnt) {
@@ -82,9 +76,6 @@ function inputFocus(e) {
}
-document.addEventListener("keydown", inputFocus);
-document.addEventListener("click", function(event) {suggestions.contains(event.target) || suggestions.classList.add("d-none")});
-
// Get substring by bytes
// If using JavaScript inline substring method, it will return error codes
// Source: https://www.52pojie.cn/thread-1059814-1-1.html
@@ -156,208 +147,223 @@ function getByteByHex(hexCode) {
return getByteByBinary(parseInt(hexCode, 16).toString(2));
}
-/*
-Source:
- - https://github.com/nextapps-de/flexsearch#index-documents-field-search
- - https://raw.githack.com/nextapps-de/flexsearch/master/demo/autocomplete.html
- - http://elasticlunr.com/
- - https://github.com/getzola/zola/blob/master/docs/static/search.js
- - https://github.com/aaranxu/adidoks/blob/main/static/js/search.js
-*/
-(function(){
- var lang = document.documentElement.getAttribute("lang");
- var langOnly = lang.substring(0, 2);
- var baseUrl = document.querySelector("meta[name='base']").getAttribute("content");
- if (baseUrl.slice(-1) == "/") {
- baseUrl = baseUrl.slice(0, -1);
- }
+window.onload = function() {
+ if (document.body.contains(document.goSearch)) {
+ document.goSearch.onsubmit = function() { return goSearchNow() };
+ var suggestions = document.getElementById("suggestions");
+ var searchinput = document.getElementById("searchinput");
+ document.addEventListener("keydown", inputFocus);
+ document.addEventListener("click", function(event) {suggestions.contains(event.target) || suggestions.classList.add("d-none")});
+
+ /*
+ Source:
+ - https://github.com/nextapps-de/flexsearch#index-documents-field-search
+ - https://raw.githack.com/nextapps-de/flexsearch/master/demo/autocomplete.html
+ - http://elasticlunr.com/
+ - https://github.com/getzola/zola/blob/master/docs/static/search.js
+ - https://github.com/aaranxu/adidoks/blob/main/static/js/search.js
+ */
+ (function(){
+ var lang = document.documentElement.getAttribute("lang");
+ var langOnly = lang.substring(0, 2);
+ var baseUrl = document.querySelector("meta[name='base']").getAttribute("content");
+ if (baseUrl.slice(-1) == "/") {
+ baseUrl = baseUrl.slice(0, -1);
+ }
- var index;
- searchinput.addEventListener('input', show_results, true);
- suggestions.addEventListener('click', accept_suggestion, true);
-
- async function show_results(){
- var initIndex = async function () {
- if (index === undefined) {
- index = fetch(baseUrl + '/search_index.' + langOnly + '.json')
- .then(
- async function(response) {
- return await elasticlunr.Index.load(await response.json());
+ var index;
+ searchinput.addEventListener('input', show_results, true);
+ suggestions.addEventListener('click', accept_suggestion, true);
+
+ async function show_results(){
+ var initIndex = async function () {
+ if (index === undefined) {
+ index = fetch(baseUrl + '/search_index.' + langOnly + '.json')
+ .then(
+ async function(response) {
+ return await elasticlunr.Index.load(await response.json());
+ }
+ );
+ }
+ let res = await index;
+ return res;
}
- );
- }
- let res = await index;
- return res;
- }
- var value = this.value.trim();
- var options = {
- bool: "OR",
- fields: {
- title: {boost: 2},
- body: {boost: 1},
- }
- };
- //var results = index.search(value, options);
- var results = (await initIndex()).search(value, options);
+ var value = this.value.trim();
+ var options = {
+ bool: "OR",
+ fields: {
+ title: {boost: 2},
+ body: {boost: 1},
+ }
+ };
+ //var results = index.search(value, options);
+ var results = (await initIndex()).search(value, options);
- var entry, childs = suggestions.childNodes;
- var i = 0, len = results.length;
- var items = value.split(/\s+/);
- suggestions.classList.remove('d-none');
+ var entry, childs = suggestions.childNodes;
+ var i = 0, len = results.length;
+ var items = value.split(/\s+/);
+ suggestions.classList.remove('d-none');
- results.forEach(function(page) {
- if (page.doc.body !== '') {
- entry = document.createElement('div');
+ results.forEach(function(page) {
+ if (page.doc.body !== '') {
+ entry = document.createElement('div');
- entry.innerHTML = '';
+ entry.innerHTML = '';
- a = entry.querySelector('a'),
- t = entry.querySelector('span:first-child'),
- d = entry.querySelector('span:nth-child(2)');
- a.href = page.ref;
- t.textContent = page.doc.title;
- d.innerHTML = makeTeaser(page.doc.body, items);
+ a = entry.querySelector('a'),
+ t = entry.querySelector('span:first-child'),
+ d = entry.querySelector('span:nth-child(2)');
+ a.href = page.ref;
+ t.textContent = page.doc.title;
+ d.innerHTML = makeTeaser(page.doc.body, items);
- suggestions.appendChild(entry);
- }
- });
+ suggestions.appendChild(entry);
+ }
+ });
- while(childs.length > len){
- suggestions.removeChild(childs[i])
- }
+ while(childs.length > len){
+ suggestions.removeChild(childs[i])
+ }
- }
+ }
- function accept_suggestion(){
+ function accept_suggestion(){
- while(suggestions.lastChild){
+ while(suggestions.lastChild){
- suggestions.removeChild(suggestions.lastChild);
- }
+ suggestions.removeChild(suggestions.lastChild);
+ }
- return false;
- }
+ return false;
+ }
- // Taken from mdbook
- // The strategy is as follows:
- // First, assign a value to each word in the document:
- // Words that correspond to search terms (stemmer aware): 40
- // Normal words: 2
- // First word in a sentence: 8
- // Then use a sliding window with a constant number of words and count the
- // sum of the values of the words within the window. Then use the window that got the
- // maximum sum. If there are multiple maximas, then get the last one.
- // Enclose the terms in .
- function makeTeaser(body, terms) {
- var TERM_WEIGHT = 40;
- var NORMAL_WORD_WEIGHT = 2;
- var FIRST_WORD_WEIGHT = 8;
- var TEASER_MAX_WORDS = 30;
-
- var stemmedTerms = terms.map(function (w) {
- return elasticlunr.stemmer(w.toLowerCase());
- });
- var termFound = false;
- var index = 0;
- var weighted = []; // contains elements of ["word", weight, index_in_document]
-
- // split in sentences, then words
- var sentences = body.toLowerCase().split(". ");
- for (var i in sentences) {
- var words = sentences[i].split(/[\s\n]/);
- var value = FIRST_WORD_WEIGHT;
- for (var j in words) {
-
- var word = words[j];
-
- if (word.length > 0) {
- for (var k in stemmedTerms) {
- if (elasticlunr.stemmer(word).startsWith(stemmedTerms[k])) {
- value = TERM_WEIGHT;
- termFound = true;
+ /* Taken from mdbook
+ // The strategy is as follows:
+ // First, assign a value to each word in the document:
+ // Words that correspond to search terms (stemmer aware): 40
+ // Normal words: 2
+ // First word in a sentence: 8
+ // Then use a sliding window with a constant number of words and count the
+ // sum of the values of the words within the window. Then use the window that got the
+ // maximum sum. If there are multiple maximas, then get the last one.
+ // Enclose the terms in .
+ */
+ function makeTeaser(body, terms) {
+ var TERM_WEIGHT = 40;
+ var NORMAL_WORD_WEIGHT = 2;
+ var FIRST_WORD_WEIGHT = 8;
+ var TEASER_MAX_WORDS = 30;
+
+ var stemmedTerms = terms.map(function (w) {
+ return elasticlunr.stemmer(w.toLowerCase());
+ });
+ var termFound = false;
+ var index = 0;
+ var weighted = []; // contains elements of ["word", weight, index_in_document]
+
+ // split in sentences, then words
+ var sentences = body.toLowerCase().split(". ");
+ for (var i in sentences) {
+ var words = sentences[i].split(/[\s\n]/);
+ var value = FIRST_WORD_WEIGHT;
+ for (var j in words) {
+
+ var word = words[j];
+
+ if (word.length > 0) {
+ for (var k in stemmedTerms) {
+ if (elasticlunr.stemmer(word).startsWith(stemmedTerms[k])) {
+ value = TERM_WEIGHT;
+ termFound = true;
+ }
+ }
+ weighted.push([word, value, index]);
+ value = NORMAL_WORD_WEIGHT;
+ }
+
+ index += word.length;
+ index += 1; // ' ' or '.' if last word in sentence
}
+
+ index += 1; // because we split at a two-char boundary '. '
}
- weighted.push([word, value, index]);
- value = NORMAL_WORD_WEIGHT;
- }
- index += word.length;
- index += 1; // ' ' or '.' if last word in sentence
- }
+ if (weighted.length === 0) {
+ if (body.length !== undefined && body.length > TEASER_MAX_WORDS * 10) {
+ return body.substring(0, TEASER_MAX_WORDS * 10) + '...';
+ } else {
+ return body;
+ }
+ }
- index += 1; // because we split at a two-char boundary '. '
- }
+ var windowWeights = [];
+ var windowSize = Math.min(weighted.length, TEASER_MAX_WORDS);
+ // We add a window with all the weights first
+ var curSum = 0;
+ for (var i = 0; i < windowSize; i++) {
+ curSum += weighted[i][1];
+ }
+ windowWeights.push(curSum);
- if (weighted.length === 0) {
- if (body.length !== undefined && body.length > TEASER_MAX_WORDS * 10) {
- return body.substring(0, TEASER_MAX_WORDS * 10) + '...';
- } else {
- return body;
- }
- }
+ for (var i = 0; i < weighted.length - windowSize; i++) {
+ curSum -= weighted[i][1];
+ curSum += weighted[i + windowSize][1];
+ windowWeights.push(curSum);
+ }
- var windowWeights = [];
- var windowSize = Math.min(weighted.length, TEASER_MAX_WORDS);
- // We add a window with all the weights first
- var curSum = 0;
- for (var i = 0; i < windowSize; i++) {
- curSum += weighted[i][1];
- }
- windowWeights.push(curSum);
+ // If we didn't find the term, just pick the first window
+ var maxSumIndex = 0;
+ if (termFound) {
+ var maxFound = 0;
+ // backwards
+ for (var i = windowWeights.length - 1; i >= 0; i--) {
+ if (windowWeights[i] > maxFound) {
+ maxFound = windowWeights[i];
+ maxSumIndex = i;
+ }
+ }
+ }
- for (var i = 0; i < weighted.length - windowSize; i++) {
- curSum -= weighted[i][1];
- curSum += weighted[i + windowSize][1];
- windowWeights.push(curSum);
- }
+ var teaser = [];
+ var startIndex = weighted[maxSumIndex][2];
+ for (var i = maxSumIndex; i < maxSumIndex + windowSize; i++) {
+ var word = weighted[i];
+ if (startIndex < word[2]) {
+ // missing text from index to start of `word`
+ teaser.push(body.substring(startIndex, word[2]));
+ startIndex = word[2];
+ }
+
+ // add around search terms
+ if (word[1] === TERM_WEIGHT) {
+ teaser.push("");
+ }
+
+ startIndex = word[2] + word[0].length;
+ // Check the string is ascii characters or not
+ var re = /^[\x00-\xff]+$/
+ if (word[1] !== TERM_WEIGHT && word[0].length >= 12 && !re.test(word[0])) {
+ // If the string's length is too long, it maybe a Chinese/Japance/Korean article
+ // if using substring method directly, it may occur error codes on emoji chars
+ var strBefor = body.substring(word[2], startIndex);
+ var strAfter = substringByByte(strBefor, 12);
+ teaser.push(strAfter);
+ } else {
+ teaser.push(body.substring(word[2], startIndex));
+ }
- // If we didn't find the term, just pick the first window
- var maxSumIndex = 0;
- if (termFound) {
- var maxFound = 0;
- // backwards
- for (var i = windowWeights.length - 1; i >= 0; i--) {
- if (windowWeights[i] > maxFound) {
- maxFound = windowWeights[i];
- maxSumIndex = i;
+ if (word[1] === TERM_WEIGHT) {
+ teaser.push("");
+ }
+ }
+ teaser.push("…");
+ return teaser.join("");
}
- }
+ document.goSearch.onsubmit = function() { return goSearchNow() };
+ }());
}
+};
- var teaser = [];
- var startIndex = weighted[maxSumIndex][2];
- for (var i = maxSumIndex; i < maxSumIndex + windowSize; i++) {
- var word = weighted[i];
- if (startIndex < word[2]) {
- // missing text from index to start of `word`
- teaser.push(body.substring(startIndex, word[2]));
- startIndex = word[2];
- }
- // add around search terms
- if (word[1] === TERM_WEIGHT) {
- teaser.push("");
- }
- startIndex = word[2] + word[0].length;
- // Check the string is ascii characters or not
- var re = /^[\x00-\xff]+$/
- if (word[1] !== TERM_WEIGHT && word[0].length >= 12 && !re.test(word[0])) {
- // If the string's length is too long, it maybe a Chinese/Japance/Korean article
- // if using substring method directly, it may occur error codes on emoji chars
- var strBefor = body.substring(word[2], startIndex);
- var strAfter = substringByByte(strBefor, 12);
- teaser.push(strAfter);
- } else {
- teaser.push(body.substring(word[2], startIndex));
- }
- if (word[1] === TERM_WEIGHT) {
- teaser.push("");
- }
- }
- teaser.push("…");
- return teaser.join("");
- }
-document.body.contains(document.goSearch) && (document.goSearch.onsubmit = function() { return goSearchNow() })
-}());
diff --git a/static/search_elasticlunr.min.js b/static/search_elasticlunr.min.js
index 21a5acd..9493448 100644
--- a/static/search_elasticlunr.min.js
+++ b/static/search_elasticlunr.min.js
@@ -1 +1 @@
-function closeSearchNow(){document.querySelector("main").innerHTML=window.main}function goSearchNow(){var e=document.querySelector("main"),t=(window.main||(window.main=e.innerHTML),document.getElementById("suggestions")),n=t.cloneNode(!0),o=(n.id="results",document.createElement("div")),i='");return o.innerHTML=i,n.insertBefore(o,n.firstChild),e.innerHTML=n.outerHTML,t.innerHTML="",document.getElementById("searchinput").value="",document.body.contains(document.closeSearch)&&(document.closeSearch.onsubmit=function(){closeSearchNow()}),!1}!function(){function m(e){var t=new m.Index;return t.pipeline.add(m.trimmer,m.stopWordFilter,m.stemmer),e&&e.call(t,t),t}var l,c,e,t,d,h,f,p,g,y,v,S,x,w,b,I,E,D,F,C,_,k,N,L,n;m.version="0.9.5",((lunr=m).utils={}).warn=(n=this,function(e){n.console&&console.warn&&console.warn(e)}),m.utils.toString=function(e){return null==e?"":e.toString()},(m.EventEmitter=function(){this.events={}}).prototype.addListener=function(){var e=Array.prototype.slice.call(arguments),t=e.pop();if("function"!=typeof t)throw new TypeError("last argument must be a function");e.forEach(function(e){this.hasHandler(e)||(this.events[e]=[]),this.events[e].push(t)},this)},m.EventEmitter.prototype.removeListener=function(e,t){this.hasHandler(e)&&-1!==(t=this.events[e].indexOf(t))&&(this.events[e].splice(t,1),0==this.events[e].length)&&delete this.events[e]},m.EventEmitter.prototype.emit=function(e){var t;this.hasHandler(e)&&(t=Array.prototype.slice.call(arguments,1),this.events[e].forEach(function(e){e.apply(void 0,t)},this))},m.EventEmitter.prototype.hasHandler=function(e){return e in this.events},(m.tokenizer=function(e){var t,n;return arguments.length&&null!=e?Array.isArray(e)?(t=(t=e.filter(function(e){return null!=e})).map(function(e){return m.utils.toString(e).toLowerCase()}),n=[],t.forEach(function(e){e=e.split(m.tokenizer.seperator);n=n.concat(e)},this),n):e.toString().trim().toLowerCase().split(m.tokenizer.seperator):[]}).defaultSeperator=/[\s\-]+/,m.tokenizer.seperator=m.tokenizer.defaultSeperator,m.tokenizer.setSeperator=function(e){null!=e&&"object"==typeof e&&(m.tokenizer.seperator=e)},m.tokenizer.resetSeperator=function(){m.tokenizer.seperator=m.tokenizer.defaultSeperator},m.tokenizer.getSeperator=function(){return m.tokenizer.seperator},(m.Pipeline=function(){this._queue=[]}).registeredFunctions={},m.Pipeline.registerFunction=function(e,t){t in m.Pipeline.registeredFunctions&&m.utils.warn("Overwriting existing registered function: "+t),e.label=t,m.Pipeline.registeredFunctions[t]=e},m.Pipeline.getRegisteredFunction=function(e){return e in m.Pipeline.registeredFunctions!=1?null:m.Pipeline.registeredFunctions[e]},m.Pipeline.warnIfFunctionNotRegistered=function(e){e.label&&e.label in this.registeredFunctions||m.utils.warn("Function is not registered with pipeline. This may cause problems when serialising the index.\n",e)},m.Pipeline.load=function(e){var n=new m.Pipeline;return e.forEach(function(e){var t=m.Pipeline.getRegisteredFunction(e);if(!t)throw new Error("Cannot load un-registered function: "+e);n.add(t)}),n},m.Pipeline.prototype.add=function(){Array.prototype.slice.call(arguments).forEach(function(e){m.Pipeline.warnIfFunctionNotRegistered(e),this._queue.push(e)},this)},m.Pipeline.prototype.after=function(e,t){m.Pipeline.warnIfFunctionNotRegistered(t);e=this._queue.indexOf(e);if(-1===e)throw new Error("Cannot find existingFn");this._queue.splice(e+1,0,t)},m.Pipeline.prototype.before=function(e,t){m.Pipeline.warnIfFunctionNotRegistered(t);e=this._queue.indexOf(e);if(-1===e)throw new Error("Cannot find existingFn");this._queue.splice(e,0,t)},m.Pipeline.prototype.remove=function(e){e=this._queue.indexOf(e);-1!==e&&this._queue.splice(e,1)},m.Pipeline.prototype.run=function(e){for(var t=[],n=e.length,o=this._queue.length,i=0;iu[o]&&o++:(t.add(s[n]),n++,o++);return t},lunr.SortedSet.prototype.clone=function(){var e=new lunr.SortedSet;return e.elements=this.toArray(),e.length=e.elements.length,e},lunr.SortedSet.prototype.union=function(e){for(var t,e=this.length>=e.length?(t=this,e):(t=e,this),n=t.clone(),o=0,i=e.toArray();o",a=n.querySelector("a"),t=n.querySelector("span:first-child"),d=n.querySelector("span:nth-child(2)"),a.href=e.ref,t.textContent=e.doc.title,d.innerHTML=function(e,t){var n=t.map(function(e){return elasticlunr.stemmer(e.toLowerCase())}),o=!1,i=0,r=[],s=e.toLowerCase().split(". ");for(p in s){var u,a=s[p].split(/[\s\n]/),l=8;for(u in a){if(0<(S=a[u]).length){for(var c in n)elasticlunr.stemmer(S).startsWith(n[c])&&(l=40,o=!0);r.push([S,l,i]),l=2}i=i+S.length+1}i+=1}if(0===r.length)return void 0!==e.length&&300"),v=S[2]+S[0].length;40!==S[1]&&12<=S[0].length&&!/^[\x00-\xff]+$/.test(S[0])?(x=substringByByte(e.substring(S[2],v),12),y.push(x)):y.push(e.substring(S[2],v)),40===S[1]&&y.push("")}return y.push("…"),y.join("")}(e.doc.body,s),suggestions.appendChild(n))});for(;i.length>r;)suggestions.removeChild(i[0])},!0),suggestions.addEventListener("click",function(){for(;suggestions.lastChild;)suggestions.removeChild(suggestions.lastChild);return!1},!0),document.body.contains(document.goSearch)&&(document.goSearch.onsubmit=function(){return goSearchNow()})}();
\ No newline at end of file
+function closeSearchNow(){document.querySelector("main").innerHTML=window.main}function goSearchNow(){var e=document.querySelector("main"),t=(window.main||(window.main=e.innerHTML),document.getElementById("suggestions")),n=t.cloneNode(!0),o=(n.id="results",document.createElement("div")),i='");return o.innerHTML=i,n.insertBefore(o,n.firstChild),e.innerHTML=n.outerHTML,t.innerHTML="",document.getElementById("searchinput").value="",document.body.contains(document.closeSearch)&&(document.closeSearch.onsubmit=function(){closeSearchNow()}),!1}function closeAllLists(e){for(var t=document.getElementById("suggestions");t.firstChild;)t.removeChild(t.firstChild)}function inputFocus(t){191===t.keyCode&&"INPUT"!==document.activeElement.tagName&&"TEXTAREA"!==document.activeElement.tagName&&(t.preventDefault(),searchinput.focus(),suggestions.classList.remove("d-none")),27===t.keyCode&&(searchinput.blur(),suggestions.classList.add("d-none"),closeAllLists());var n=suggestions.querySelectorAll("a");if(!suggestions.classList.contains("d-none")&&0!==n.length){var o=[...n],i=o.indexOf(document.activeElement);let e=0;38===t.keyCode?(t.preventDefault(),n[e=0u[o]&&o++:(t.add(s[n]),n++,o++);return t},lunr.SortedSet.prototype.clone=function(){var e=new lunr.SortedSet;return e.elements=this.toArray(),e.length=e.elements.length,e},lunr.SortedSet.prototype.union=function(e){for(var t,e=this.length>=e.length?(t=this,e):(t=e,this),n=t.clone(),o=0,i=e.toArray();o",a=n.querySelector("a"),t=n.querySelector("span:first-child"),d=n.querySelector("span:nth-child(2)"),a.href=e.ref,t.textContent=e.doc.title,d.innerHTML=function(e,t){var n=t.map(function(e){return elasticlunr.stemmer(e.toLowerCase())}),o=!1,i=0,r=[],s=e.toLowerCase().split(". ");for(p in s){var u,a=s[p].split(/[\s\n]/),l=8;for(u in a){if(0<(S=a[u]).length){for(var c in n)elasticlunr.stemmer(S).startsWith(n[c])&&(l=40,o=!0);r.push([S,l,i]),l=2}i=i+S.length+1}i+=1}if(0===r.length)return void 0!==e.length&&300"),v=S[2]+S[0].length;40!==S[1]&&12<=S[0].length&&!/^[\x00-\xff]+$/.test(S[0])?(x=substringByByte(e.substring(S[2],v),12),y.push(x)):y.push(e.substring(S[2],v)),40===S[1]&&y.push("")}return y.push("…"),y.join("")}(e.doc.body,s),u.appendChild(n))});for(;i.length>r;)u.removeChild(i[0])},!0),u.addEventListener("click",function(){for(;u.lastChild;)u.removeChild(u.lastChild);return!1},!0),document.goSearch.onsubmit=function(){return goSearchNow()})};
\ No newline at end of file
diff --git a/static/theme_button.js b/static/theme_button.js
index d71c4fb..34d1d78 100644
--- a/static/theme_button.js
+++ b/static/theme_button.js
@@ -1,5 +1,7 @@
// Set lightmode
-document.getElementById('mode').addEventListener('click', () => {
- document.documentElement.classList.toggle('light');
- localStorage.setItem('theme', document.documentElement.classList.contains('light') ? 'light' : 'dark');
-});
+if (document.getElementById('mode')) {
+ document.getElementById('mode').addEventListener('click', () => {
+ document.documentElement.classList.toggle('light');
+ localStorage.setItem('theme', document.documentElement.classList.contains('light') ? 'light' : 'dark');
+ });
+}
diff --git a/templates/base.html b/templates/base.html
index c29fe6e..cb8d73f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -44,7 +44,9 @@
{%- if config.extra.logo.text -%}{{ config.extra.logo.text | safe }}{%- endif -%}
{%- elif config.extra.textlogo -%}
-
+
{%- elif config.title -%}
{%- endif -%}
--
cgit v1.3.1
From 3af6d9131f6dfc138856d718ec96626344095ec8 Mon Sep 17 00:00:00 2001
From: Jieiku
Date: Mon, 22 May 2023 23:24:44 -0700
Subject: Optimizations and Fixes
---
COPY-FILES-TO-ROOT-SITE-SASS/abridge.scss | 128 ----
COPY-TO-ROOT-SASS/abridge.scss | 175 +++++
config.toml | 32 +-
content/posts/_index.fr.md | 1 -
content/posts/_index.md | 1 -
netlify.toml | 2 +-
package.json | 18 +-
sass/_colors.scss | 50 --
sass/_syntax.scss | 39 --
sass/abridge.scss | 461 ++++++++-----
sass/colors-syntax/_abridge.scss | 61 ++
sass/colors/_blue.scss | 50 ++
sass/colors/_blueshade.scss | 50 ++
sass/colors/_orange.scss | 50 ++
screenshot.png | Bin 119673 -> 109213 bytes
static/abridge.min.js | 1 -
static/codecopy.js | 76 --
static/elasticlunr.min.js | 10 -
static/email.js | 16 -
static/js/abridge.min.js | 1 +
static/js/codecopy.js | 76 ++
static/js/elasticlunr.min.js | 10 +
static/js/email.js | 16 +
static/js/katex-auto-render.min.js | 1 +
static/js/katex.min.js | 1 +
static/js/katexbundle.min.js | 1 +
static/js/katexoptions.js | 3 +
static/js/lunr.da.js | 280 ++++++++
static/js/lunr.da.min.js | 1 +
static/js/lunr.de.js | 380 ++++++++++
static/js/lunr.de.min.js | 1 +
static/js/lunr.du.js | 444 ++++++++++++
static/js/lunr.du.min.js | 1 +
static/js/lunr.es.js | 595 ++++++++++++++++
static/js/lunr.es.min.js | 1 +
static/js/lunr.fi.js | 536 +++++++++++++++
static/js/lunr.fi.min.js | 1 +
static/js/lunr.fr.js | 698 +++++++++++++++++++
static/js/lunr.fr.min.js | 1 +
static/js/lunr.hu.js | 561 +++++++++++++++
static/js/lunr.hu.min.js | 1 +
static/js/lunr.it.js | 612 +++++++++++++++++
static/js/lunr.it.min.js | 1 +
static/js/lunr.jp.js | 118 ++++
static/js/lunr.jp.min.js | 1 +
static/js/lunr.no.js | 253 +++++++
static/js/lunr.no.min.js | 1 +
static/js/lunr.pt.js | 566 +++++++++++++++
static/js/lunr.pt.min.js | 1 +
static/js/lunr.ro.js | 554 +++++++++++++++
static/js/lunr.ro.min.js | 1 +
static/js/lunr.ru.js | 387 +++++++++++
static/js/lunr.ru.min.js | 1 +
static/js/lunr.stemmer.support.js | 295 ++++++++
static/js/lunr.stemmer.support.min.js | 1 +
static/js/lunr.sv.js | 252 +++++++
static/js/lunr.sv.min.js | 1 +
static/js/lunr.tr.js | 1070 +++++++++++++++++++++++++++++
static/js/lunr.tr.min.js | 1 +
static/js/lunr.zh.js | 156 +++++
static/js/lunr.zh.min.js | 1 +
static/js/mathtex-script-type.min.js | 1 +
static/js/prestyle.js | 4 +
static/js/search.js | 366 ++++++++++
static/js/search_elasticlunr.min.js | 1 +
static/js/search_stork.min.js | 1 +
static/js/search_tinysearch.min.js | 1 +
static/js/searchjava.js | 354 ++++++++++
static/js/searchjavaugly.js | 354 ++++++++++
static/js/stork.js | 2 +
static/js/stork_config.js | 25 +
static/js/theme.js | 4 +
static/js/theme.min.js | 1 +
static/js/theme_button.js | 7 +
static/js/tinysearch.js | 244 +++++++
static/katex-auto-render.min.js | 1 -
static/katex.min.js | 1 -
static/katexbundle.min.js | 1 -
static/katexoptions.js | 3 -
static/lunr.da.js | 280 --------
static/lunr.de.js | 380 ----------
static/lunr.du.js | 444 ------------
static/lunr.es.js | 595 ----------------
static/lunr.fi.js | 536 ---------------
static/lunr.fr.js | 698 -------------------
static/lunr.hu.js | 561 ---------------
static/lunr.it.js | 612 -----------------
static/lunr.jp.js | 118 ----
static/lunr.no.js | 253 -------
static/lunr.pt.js | 566 ---------------
static/lunr.ro.js | 554 ---------------
static/lunr.ru.js | 387 -----------
static/lunr.stemmer.support.js | 295 --------
static/lunr.sv.js | 252 -------
static/lunr.tr.js | 1070 -----------------------------
static/lunr.zh.js | 156 -----
static/mathtex-script-type.min.js | 1 -
static/prestyle.js | 4 -
static/search.js | 369 ----------
static/search_elasticlunr.min.js | 1 -
static/search_stork.min.js | 1 -
static/search_tinysearch.min.js | 1 -
static/stork.js | 2 -
static/stork_config.js | 25 -
static/theme.js | 4 -
static/theme.min.js | 1 -
static/theme_button.js | 7 -
static/tinysearch.js | 244 -------
templates/base.html | 10 +-
templates/index.html | 28 +-
templates/macros/head.html | 71 +-
templates/posts.html | 27 +-
theme.toml | 2 +-
113 files changed, 10035 insertions(+), 8995 deletions(-)
delete mode 100644 COPY-FILES-TO-ROOT-SITE-SASS/abridge.scss
create mode 100644 COPY-TO-ROOT-SASS/abridge.scss
delete mode 100644 sass/_colors.scss
delete mode 100644 sass/_syntax.scss
create mode 100644 sass/colors-syntax/_abridge.scss
create mode 100644 sass/colors/_blue.scss
create mode 100644 sass/colors/_blueshade.scss
create mode 100644 sass/colors/_orange.scss
delete mode 100644 static/abridge.min.js
delete mode 100644 static/codecopy.js
delete mode 100644 static/elasticlunr.min.js
delete mode 100644 static/email.js
create mode 100644 static/js/abridge.min.js
create mode 100644 static/js/codecopy.js
create mode 100644 static/js/elasticlunr.min.js
create mode 100644 static/js/email.js
create mode 100644 static/js/katex-auto-render.min.js
create mode 100644 static/js/katex.min.js
create mode 100644 static/js/katexbundle.min.js
create mode 100644 static/js/katexoptions.js
create mode 100644 static/js/lunr.da.js
create mode 100644 static/js/lunr.da.min.js
create mode 100644 static/js/lunr.de.js
create mode 100644 static/js/lunr.de.min.js
create mode 100644 static/js/lunr.du.js
create mode 100644 static/js/lunr.du.min.js
create mode 100644 static/js/lunr.es.js
create mode 100644 static/js/lunr.es.min.js
create mode 100644 static/js/lunr.fi.js
create mode 100644 static/js/lunr.fi.min.js
create mode 100644 static/js/lunr.fr.js
create mode 100644 static/js/lunr.fr.min.js
create mode 100644 static/js/lunr.hu.js
create mode 100644 static/js/lunr.hu.min.js
create mode 100644 static/js/lunr.it.js
create mode 100644 static/js/lunr.it.min.js
create mode 100644 static/js/lunr.jp.js
create mode 100644 static/js/lunr.jp.min.js
create mode 100644 static/js/lunr.no.js
create mode 100644 static/js/lunr.no.min.js
create mode 100644 static/js/lunr.pt.js
create mode 100644 static/js/lunr.pt.min.js
create mode 100644 static/js/lunr.ro.js
create mode 100644 static/js/lunr.ro.min.js
create mode 100644 static/js/lunr.ru.js
create mode 100644 static/js/lunr.ru.min.js
create mode 100644 static/js/lunr.stemmer.support.js
create mode 100644 static/js/lunr.stemmer.support.min.js
create mode 100644 static/js/lunr.sv.js
create mode 100644 static/js/lunr.sv.min.js
create mode 100644 static/js/lunr.tr.js
create mode 100644 static/js/lunr.tr.min.js
create mode 100644 static/js/lunr.zh.js
create mode 100644 static/js/lunr.zh.min.js
create mode 100644 static/js/mathtex-script-type.min.js
create mode 100644 static/js/prestyle.js
create mode 100644 static/js/search.js
create mode 100644 static/js/search_elasticlunr.min.js
create mode 100644 static/js/search_stork.min.js
create mode 100644 static/js/search_tinysearch.min.js
create mode 100644 static/js/searchjava.js
create mode 100644 static/js/searchjavaugly.js
create mode 100644 static/js/stork.js
create mode 100644 static/js/stork_config.js
create mode 100644 static/js/theme.js
create mode 100644 static/js/theme.min.js
create mode 100644 static/js/theme_button.js
create mode 100644 static/js/tinysearch.js
delete mode 100644 static/katex-auto-render.min.js
delete mode 100644 static/katex.min.js
delete mode 100644 static/katexbundle.min.js
delete mode 100644 static/katexoptions.js
delete mode 100644 static/lunr.da.js
delete mode 100644 static/lunr.de.js
delete mode 100644 static/lunr.du.js
delete mode 100644 static/lunr.es.js
delete mode 100644 static/lunr.fi.js
delete mode 100644 static/lunr.fr.js
delete mode 100644 static/lunr.hu.js
delete mode 100644 static/lunr.it.js
delete mode 100644 static/lunr.jp.js
delete mode 100644 static/lunr.no.js
delete mode 100644 static/lunr.pt.js
delete mode 100644 static/lunr.ro.js
delete mode 100644 static/lunr.ru.js
delete mode 100644 static/lunr.stemmer.support.js
delete mode 100644 static/lunr.sv.js
delete mode 100644 static/lunr.tr.js
delete mode 100644 static/lunr.zh.js
delete mode 100644 static/mathtex-script-type.min.js
delete mode 100644 static/prestyle.js
delete mode 100644 static/search.js
delete mode 100644 static/search_elasticlunr.min.js
delete mode 100644 static/search_stork.min.js
delete mode 100644 static/search_tinysearch.min.js
delete mode 100644 static/stork.js
delete mode 100644 static/stork_config.js
delete mode 100644 static/theme.js
delete mode 100644 static/theme.min.js
delete mode 100644 static/theme_button.js
delete mode 100644 static/tinysearch.js
(limited to 'static')
diff --git a/COPY-FILES-TO-ROOT-SITE-SASS/abridge.scss b/COPY-FILES-TO-ROOT-SITE-SASS/abridge.scss
deleted file mode 100644
index a552adc..0000000
--- a/COPY-FILES-TO-ROOT-SITE-SASS/abridge.scss
+++ /dev/null
@@ -1,128 +0,0 @@
-@use '../themes/abridge/sass/abridge' with (
- /// LINES HERE END WITH COMMA AFTER THE VALUE!
- $abridgeMode:"switcher",//valid values: switcher, auto, dark, light
-
- /// Enable a centered viewport for , ,