markdownr 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18e8cbcc75e4fb58756514287b06b2824f56aafd336f9be4346d7846b8566b48
-  data.tar.gz: 2f1d715b1f94a943212a59da5ee992c7ef575c85e6059caa51579a4fd172eb69
+  metadata.gz: 22318ff27259abe3a66849439a50b48103e0a7d2bea077290fd9b8d4a6329716
+  data.tar.gz: ce38b5daf5f53c9cf56ae41e1f343bd1db39a1af25a7d04f3fdd1205538ac0bd
 SHA512:
-  metadata.gz: 736446de4daffd8c1babdd82c307b3b0e46c3fb0fa5a08cf419429d7c119dc0763c6c9a0e95a7913abba6e0b291a5a085f8bb46258e614db102f8ff5c225494e
-  data.tar.gz: 2eb655f06a7380c7f4477735ae28e84afd454c68354b18fdd6d572cc01d4c5daccd3986ae3f4b368564042542c6fbb0ef7167f15b18f13bf5d0b9caa80e8e98c
+  metadata.gz: 9996ded48092a440241e924b914a0ad12c054fd02b68e06debaf21cdfbfce6cd74f5f4f5e4657357aff00ae8f3824fc1eb8dc8fb62efdea9153c5ff55ac9b5e0
+  data.tar.gz: d9bca1a6f76dd9f578af6b135cfac6d0a12626a4a4720661ef2c46bfdd1c06b7228c73a1ee0f008b29f1ce32709e0ecdd5f060435044b17ee1c79c6f55a51044

data/lib/markdown_server/app.rb

@@ -159,12 +159,12 @@ module MarkdownServer
             %(<sup id="fnref:#{name}" role="doc-noteref"><a href="#fn:#{name}" class="footnote" rel="footnote">#{h(name)}</a></sup>)
           end
         end
-        html.gsub(%r{<li id="fn:([^"]+)"[^>]*role="doc-endnote"[^>]*>\s*<p>}m) do
+        html.gsub(%r{<li id="fn:([^"]+)"[^>]*>\s*<p>}m) do
           name = $1
           if name =~ /\A\d+\z/
             $&
           else
-            %(<li id="fn:#{name}" role="doc-endnote"><p><strong>#{h(name)}:</strong> )
+            %(<li id="fn:#{name}"><p><strong>#{h(name)}:</strong> )
           end
         end
       end
@@ -219,7 +219,7 @@ module MarkdownServer
       def extract_toc(html)
         headings = []
         html.scan(/<h([1-6])\s[^>]*id="([^"]*)"[^>]*>(.*?)<\/h\1>/mi) do |level, id, text|
-          clean_text = text.gsub(/<[^>]+>/, "").strip
+          clean_text = text.gsub(/<sup[^>]*id="fnref:[^"]*"[^>]*>.*?<\/sup>/i, "").gsub(/<[^>]+>/, "").strip
           headings << { level: level.to_i, id: id, text: clean_text }
         end
         headings

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

data/views/layout.erb

@@ -713,6 +713,9 @@
       padding: 2rem 0;
     }
 
+    /* Footnote list — hide numeric markers; labels are inline via <strong> */
+    .footnotes ol { list-style: none; padding-left: 1.2em; }
+
     /* Footnote tooltips */
     .footnote-tooltip {
       position: absolute;
@@ -728,15 +731,15 @@
       max-width: 350px;
       width: max-content;
       z-index: 150;
-      pointer-events: none;
       box-shadow: 0 2px 8px rgba(0,0,0,0.25);
       margin-bottom: 6px;
     }
+    .footnote-tooltip { cursor: pointer; }
     .footnote-tooltip::after {
       content: '';
       position: absolute;
       top: 100%;
-      left: 50%;
+      left: calc(50% + var(--arrow-offset, 0px));
       transform: translateX(-50%);
       border: 5px solid transparent;
       border-top-color: #2d2d2d;
@@ -1090,12 +1093,75 @@
         var tooltip = document.createElement('span');
         tooltip.className = 'footnote-tooltip';
         tooltip.innerHTML = html;
+        var fnHref = link.getAttribute('href');
 
-        sup.addEventListener('mouseenter', function() {
+        function showTooltip() {
           sup.appendChild(tooltip);
-        });
-        sup.addEventListener('mouseleave', function() {
+          // Reset any previous adjustment
+          tooltip.style.left = '50%';
+          tooltip.style.transform = 'translateX(-50%)';
+          tooltip.style.removeProperty('--arrow-offset');
+          // Clamp tooltip to viewport.
+          // document.documentElement.clientWidth is more reliable than window.innerWidth
+          // on Android browsers (e.g. EinkBro) which may return a pre-scaled layout
+          // viewport width for window.innerWidth rather than the CSS viewport width.
+          var viewportWidth = Math.min(window.innerWidth, document.documentElement.clientWidth);
+          var rect = tooltip.getBoundingClientRect();
+          var shift = 0;
+          if (rect.left < 8) {
+            shift = 8 - rect.left;
+          } else if (rect.right > viewportWidth - 8) {
+            shift = (viewportWidth - 8) - rect.right;
+          }
+          if (shift !== 0) {
+            tooltip.style.transform = 'translateX(calc(-50% + ' + shift + 'px))';
+            tooltip.style.setProperty('--arrow-offset', (-shift) + 'px');
+          }
+        }
+
+        function hideTooltip() {
           if (tooltip.parentNode === sup) sup.removeChild(tooltip);
+        }
+
+        // Hover devices: show/hide on mouseenter/mouseleave
+        sup.addEventListener('mouseenter', showTooltip);
+        sup.addEventListener('mouseleave', hideTooltip);
+
+        // Touch: first tap shows tooltip, second tap navigates
+        // Using touchend instead of click so no hover media query check is needed —
+        // touchend only fires on real touch, regardless of what (hover:none) reports.
+        var linkTouchMoved = false;
+        link.addEventListener('touchstart', function() { linkTouchMoved = false; }, { passive: true });
+        link.addEventListener('touchmove', function() { linkTouchMoved = true; }, { passive: true });
+        link.addEventListener('touchend', function(e) {
+          if (linkTouchMoved) return; // scroll, not a tap
+          if (tooltip.parentNode === sup) {
+            // Tooltip already showing — let the link navigate
+            return;
+          }
+          e.preventDefault();
+          // Dismiss any other open tooltip
+          document.querySelectorAll('.footnote-tooltip').forEach(function(t) {
+            if (t.parentNode) t.parentNode.removeChild(t);
+          });
+          showTooltip();
+        });
+
+        var tooltipTouchMoved = false;
+        tooltip.addEventListener('touchstart', function() { tooltipTouchMoved = false; }, { passive: true });
+        tooltip.addEventListener('touchmove', function() { tooltipTouchMoved = true; }, { passive: true });
+        tooltip.addEventListener('touchend', function(e) {
+          if (tooltipTouchMoved) return;
+          e.stopPropagation();
+          hideTooltip();
+          window.location.hash = fnHref;
+        });
+
+        // Dismiss tooltip when tapping elsewhere
+        document.addEventListener('click', function(e) {
+          if (tooltip.parentNode === sup && !sup.contains(e.target)) {
+            hideTooltip();
+          }
         });
       });
     })();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdownr
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Brian Dunn