hematite 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5428a81a66f2c162d5db506a782443ab49ec31a2a2b67a02dec1cab941828768
-  data.tar.gz: 4a54bb491b61987364791315c6b4024b6fc019a3ba42f5488f43fb7f9c9ff704
+  metadata.gz: e7d0e540229aa59560164e505b1f9c56bfc06410483f121f0f37de4b35f14648
+  data.tar.gz: e134ec448a27e0e1ab0b6c6fb058a71248d9a59c182956a6b873834c150eb120
 SHA512:
-  metadata.gz: '08188e55d1fc0e2f342a186ac1cc57c0226fe7b138cdb5e2f622716b29f4a5cf41768220f9dafb3971d2081dfef5cbee1cb8f485cd6e041589b6a3472a63204f'
-  data.tar.gz: 1ddbfb8aa3b14052e0befc9e5dc6b59f1486705dc5f82033337a08a085368e27b6b1a51601db7e26b9578af0fafe74c0b3951a0e3fcda496ff5de23b35ad4b88
+  metadata.gz: f0629528aa7d95d26b68b488a2b5110625471856310273f74db557a8b543db35ccb072af00ffed6195d61e7eef1ed50ac755f55b034fe4c6fa41c22c7e0d35df
+  data.tar.gz: 31c8354bfa13a6ce9fb8531835c367214a6419d20ddb5246092271f2caf81fded7e0aba03db2e52e0166b40500d1bb2a4b0f4d31856feb94375c840f095b4f79

data/_sass/_nav.scss

@@ -124,7 +124,6 @@ nav.sidebar {
     transform: scale(0, 1) translate(-30px, 0);
 
     color: var(--primary-text-color);
-    background-color: var(--primary-background-color);
     box-shadow: 0 0 2px var(--shadow-color-light);
     padding: $navbar-padding;
 
@@ -138,6 +137,15 @@ nav.sidebar {
     transform-origin: left;
     transition: opacity 0.5s ease, transform 0.5s ease, width 0.5s ease;
 
+    // Work around a rendering bug in Safari — apply the background color to both
+    // the results pane and the container.
+    //
+    // Without this, Safari may display elements of pinned-pages in the same
+    // location as the search results.
+    &, .search-results {
+        background-color: var(--primary-background-color);
+    }
+
 
     // Container with search box and button
     > .search-container {

data/assets/html/remark_presentation_frame.html

@@ -25,6 +25,7 @@ h1, h2, h3 {
 }
 
 body.mdSourceView {
+    padding-top: 50px;
     background: white;
     color: black;
 }

data/assets/js/EscapeHelper.mjs

@@ -0,0 +1,37 @@
+
+import { assertEq } from "./assertions.mjs";
+
+let htmlReplacements = [
+    [ /[&]/g, '&' ],
+    [ /[<]/g, '&lt;' ],
+    [ /[>]/g, '&gt;' ],
+];
+
+var EscapeHelper = {
+    escapeHTML(text) {
+        for (const item of htmlReplacements) {
+            text = text.replace(item[0], item[1]);
+        }
+
+        return text;
+    },
+    // Escape for usage within a regex expression
+    escapeRegex(text) {
+        return text.replace(/([\*\(\).\[\]\{\}\^\$\-\=\;\:\'\"\\])/g, '\\$1'); //'
+    },
+    // Escape text for usage within a replacement pattern
+    // E.g. "foobar".replaceAll("foo", text);
+    escapeReplacePattern(text) {
+        return text.replace(/\$/g, '$$$$');
+    }
+};
+
+assertEq("Test escape <", EscapeHelper.escapeHTML('<'), '&lt;');
+assertEq("Test escape multiple <", EscapeHelper.escapeHTML('<a></a>'), '&lt;a&gt;&lt;/a&gt;');
+assertEq("Test escape >", EscapeHelper.escapeHTML('>'), '&gt;');
+assertEq("Test escape identity", EscapeHelper.escapeHTML('Hello, world.'), 'Hello, world.');
+assertEq("Test regex escape simple", EscapeHelper.escapeRegex(".*"), "\\.\\*");
+assertEq("Test regex more complicated escape", EscapeHelper.escapeRegex("This, is a test... :)"), "This, is a test\\.\\.\\. \\:\\)");
+assertEq("Test replace pattern escape", EscapeHelper.escapeReplacePattern("0$ and 24 cents"), "0$$ and 24 cents");
+
+export default EscapeHelper;

data/assets/js/layout/post.mjs

@@ -37,6 +37,12 @@ function createTagLinks(page) {
     let label = document.querySelector("#post_tags > #tag_header_lbl");
     label.innerText = stringLookup(`tags`);
 
+    // Don't show the tag container if there aren't any tags
+    if (!page.tags || page.tags.length == 0) {
+        container.style.display = "none";
+        return;
+    }
+
     for (const tag of page.tags) {
         let tagElem = document.createElement("a");
         tagElem.style.display = "inline-block";
@@ -47,11 +53,6 @@ function createTagLinks(page) {
 
         container.appendChild(tagElem);
     }
-
-    // Don't show the tag container if there aren't any tags
-    if (page.tags.length == 0) {
-        container.style.display = "none";
-    }
 }
 
 function fillDate(page) {

data/assets/js/search.mjs

@@ -7,6 +7,7 @@ import { expandContainingDropdowns } from "./dropdownExpander.mjs";
 import AnimationUtil from "./AnimationUtil.mjs";
 import AsyncUtil from "./AsyncUtil.mjs";
 import UrlHelper from "./UrlHelper.mjs";
+import EscapeHelper from "./EscapeHelper.mjs";
 
 const PAGE_DATA_URL = `{{ "/assets/search_data.json" | relative_url }}`;
 const MATCHING_TITLE_PRIORITY_INCREMENT = 15;
@@ -177,6 +178,7 @@ class Searcher {
                 results.push({
                     index,
                     context,
+                    matchIndex: matchLoc,
                     pageData,
                 });
 
@@ -305,17 +307,35 @@ function handleSearch(searcher) {
 
         searchResults.replaceChildren(descriptionElem);
 
+        // Adds HTML to bold/italicize all results in [context].
+        // [context] is HTML-escaped before adding to the result.
+        const boldResults = (context) => {
+            let result = "";
+            let queryRegex = new RegExp(`(${EscapeHelper.escapeRegex(query)})`, `ig`);
+            let contextHTML = "";
+            let lastIdx = 0;
+            for (const match of context.matchAll(queryRegex)) {
+                result += EscapeHelper.escapeHTML(context.substring(lastIdx, match.index));
+                result += "<b><i>" + EscapeHelper.escapeHTML(match[0]) + "</i></b>";
+                lastIdx = match.index + match[0].length;
+            }
+            result += EscapeHelper.escapeHTML(context.substring(lastIdx));
+
+            return result;
+        };
+
         for (const result of results) {
             let link = document.createElement("a");
-            let context = document.createElement("div");
-            context.classList.add('context');
+            let contextElem = document.createElement("div");
+            contextElem.classList.add('context');
 
             link.innerText = result.pageData.title ?? stringLookup(`untitled`);
             link.href =
                 result.pageData.url + `?query=${escape(query)},index=${result.index}`;
-            context.innerText = result.context;
 
-            link.appendChild(context);
+            contextElem.innerHTML = boldResults(result.context);
+
+            link.appendChild(contextElem);
             searchResults.appendChild(link);
         }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hematite
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Henry Heino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-29 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -75,6 +75,7 @@ files:
 - assets/js/AnimationUtil.mjs
 - assets/js/AsyncUtil.mjs
 - assets/js/DateUtil.mjs
+- assets/js/EscapeHelper.mjs
 - assets/js/PageAlert.mjs
 - assets/js/Settings.mjs
 - assets/js/UrlHelper.mjs