markdownr 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8c9a7eee19198ff1effccac6edfac5938353e964073a25abaf44d90f3fcf9ce
-  data.tar.gz: 85bc3bc0825aceef42b0fe6ecbb5f3b753a0b0b8b3facc084b6e8c25f042439a
+  metadata.gz: 6e04e007ceb9d03b7cadc1cfbb9b7d6d4df51f83d82fecba4fc22d52623b50fe
+  data.tar.gz: ed3c37ef77810c9cd2589314d9d3239fb77f48e0ac3e1ede670146db9ff2c1bc
 SHA512:
-  metadata.gz: b3d9654e8b565eb97ba6571fe742855dd5e7580402dc558526fa445e388b803872d6c23dbbb4e684e8ae7b9276dc8e96d4bebc824c7dfa5c07f99cde2ca6624e
-  data.tar.gz: e81586f4f208d925c453a915b1601b5ccad5a1353ad139e19af984f810a49071a0b952eaf548b74e53159c6d7e1302d6bb86f3ab0814fd9615c5b398b381068d
+  metadata.gz: dc882e485d1eadb2415443b5056dca89534fe1b561118d508060b126b53332a507ee2ef375faa648444cdc0ef394179de172acdee13981d30d8f89737dba6bed
+  data.tar.gz: 0feb715779946a7456559618e3493986520dcbbeeab7714caa7049e6d4d196a90471fbd90102e9b060ddee7c9f2028fbf6ab5215e9de85c0b793ec4d9776e18c

data/lib/markdown_server/app.rb

@@ -137,10 +137,12 @@ module MarkdownServer
             label = display || heading_text
             %(<a class="wiki-link" href="##{h(anchor)}">#{h(label)}</a>)
           else
-            resolved = resolve_wiki_link(target)
+            file_part, anchor_part = target.split("#", 2)
+            anchor_suffix = anchor_part ? "##{anchor_part.downcase.gsub(/\s+/, '-').gsub(/[^\w-]/, '')}" : ""
+            resolved = resolve_wiki_link(file_part)
             label = display || target
             if resolved
-              %(<a class="wiki-link" href="/browse/#{encode_path_component(resolved).gsub('%2F', '/')}">#{h(label)}</a>)
+              %(<a class="wiki-link" href="/browse/#{encode_path_component(resolved).gsub('%2F', '/')}#{anchor_suffix}">#{h(label)}</a>)
             else
               %(<span class="wiki-link broken">#{h(label)}</span>)
             end
@@ -227,6 +229,7 @@ module MarkdownServer
         str.scan(/\[\[([^\]]+)\]\]/) do |match|
           raw = match[0]
           m_start = $~.begin(0)
+          m_end = $~.end(0)
           result += h(str[last_end...m_start])
           target, display = raw.include?("|") ? raw.split("|", 2) : [raw, nil]
           label = display || target
@@ -234,14 +237,16 @@ module MarkdownServer
             anchor = target[1..].downcase.gsub(/\s+/, "-").gsub(/[^\w-]/, "")
             result += %(<a class="wiki-link" href="##{h(anchor)}">#{h(label)}</a>)
           else
-            resolved = resolve_wiki_link(target)
+            file_part, anchor_part = target.split("#", 2)
+            anchor_suffix = anchor_part ? "##{anchor_part.downcase.gsub(/\s+/, '-').gsub(/[^\w-]/, '')}" : ""
+            resolved = resolve_wiki_link(file_part)
             if resolved
-              result += %(<a class="wiki-link" href="/browse/#{encode_path_component(resolved).gsub('%2F', '/')}">#{h(label)}</a>)
+              result += %(<a class="wiki-link" href="/browse/#{encode_path_component(resolved).gsub('%2F', '/')}#{anchor_suffix}">#{h(label)}</a>)
             else
               result += %(<span class="wiki-link broken">#{h(label)}</span>)
             end
           end
-          last_end = $~.end(0)
+          last_end = m_end
         end
         result += h(str[last_end..])
         result
@@ -252,7 +257,7 @@ module MarkdownServer
         when Array
           value.map { |v|
             str = v.to_s
-            if str =~ /\A\[\[([^\]]+)\]\]\z/
+            if str.include?("[[")
               render_inline_wiki_links(str)
             else
               %(<span class="tag">#{h(str)}</span>)

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.5.4"
+  VERSION = "0.5.6"
 end

data/views/layout.erb

@@ -1704,6 +1704,26 @@
         historyStack = [];
       }
 
+      function applyPopupAnchor(hash) {
+        if (!hash || !popup) return;
+        var id = hash.replace(/^#/, '');
+        try {
+          var target = popup.querySelector('[id="' + id.replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"]');
+          if (!target) return;
+          // Scroll the popup container (which has overflow-y:auto) to the target,
+          // accounting for the sticky header so the heading lands just below it
+          var header = popup.querySelector('.link-ctx-popup-header');
+          var headerHeight = header ? header.offsetHeight : 0;
+          var targetTop = target.getBoundingClientRect().top;
+          var popupTop = popup.getBoundingClientRect().top;
+          popup.scrollTop += targetTop - popupTop - headerHeight - 8;
+          // Append section heading text to the popup title
+          if (/^H[1-6]$/.test(target.tagName)) {
+            var titleEl = popup.querySelector('.link-ctx-popup-title span');
+            if (titleEl) titleEl.textContent = titleEl.textContent + ' \u203a ' + target.textContent;
+          }
+        } catch(e) {}
+      }
 
       function handleLink(anchor, x, y, chained) {
         if (!chained) historyStack = [];
@@ -1712,12 +1732,14 @@
         var label = anchor.textContent.trim() || href;
         // For chained popup navigation keep the current link rect; for new popups measure the anchor
         var linkRect = chained ? currentPopupPos.linkRect : anchor.getBoundingClientRect();
+        var linkHash = (function() { try { return new URL(href, location.href).hash; } catch(e) { return ''; } })();
 
         if (isLocalMd(href)) {
           var path = previewPath(href);
           var cached = cache[path];
           if (cached && typeof cached === 'object') {
             showPopup(x, y, cached.title || label, cached.html, href, linkRect);
+            applyPopupAnchor(linkHash);
           } else if (cached === false) {
             showPopup(x, y, label,
               '<div class="link-ctx-popup-url">' + escHtml(href) + '</div>' +
@@ -1733,6 +1755,7 @@
                   var bodyHtml = data.html + (data.frontmatter_html || '');
                   cache[path] = { title: data.title, html: bodyHtml };
                   updatePopup(bodyHtml, data.title || label);
+                  applyPopupAnchor(linkHash);
                 })
                 .catch(function() {
                   cache[path] = false;
@@ -1786,7 +1809,7 @@
         if (!anchor) { hidePopup(); return; }
         var href = anchor.getAttribute('href');
         if (!href || isAnchorOnly(href)) { hidePopup(); return; }
-        if (!anchor.closest('.md-content')) { hidePopup(); return; }
+        if (!anchor.closest('.md-content') && !anchor.closest('.frontmatter')) { hidePopup(); return; }
         e.preventDefault();
         handleLink(anchor, e.clientX, e.clientY);
       });
@@ -1808,7 +1831,7 @@
         if (!anchor) { hidePopup(); return; }
         var href = anchor.getAttribute('href');
         if (!href || isAnchorOnly(href)) { hidePopup(); return; }
-        if (!anchor.closest('.md-content')) { hidePopup(); return; }
+        if (!anchor.closest('.md-content') && !anchor.closest('.frontmatter')) { hidePopup(); return; }
         e.preventDefault();
         var touch = e.changedTouches[0];
         handleLink(anchor, touch.clientX, touch.clientY);
@@ -1821,24 +1844,26 @@
     <% if settings.link_tooltips %>
       // Hover — same popup as click, triggered after a short delay when no popup is active
       (function() {
-        var content = document.querySelector('.md-content');
-        if (!content) return;
         var hoverTimer = null;
-        content.querySelectorAll('a').forEach(function(a) {
-          var href = a.getAttribute('href');
-          if (!href || isAnchorOnly(href)) return;
-          if (!isLocalMd(href) && !isExternal(href)) return;
-          a.addEventListener('mouseenter', function(e) {
-            clearTimeout(hoverTimer);
-            if (popup) return;
-            var x = e.clientX, y = e.clientY;
-            hoverTimer = setTimeout(function() {
-              if (!popup) handleLink(a, x, y, false);
-            }, 300);
-          });
-          a.addEventListener('mouseleave', function() {
-            clearTimeout(hoverTimer);
-            if (popup) mouseLeaveTimer = setTimeout(hidePopup, 150);
+        var containers = document.querySelectorAll('.md-content, .frontmatter');
+        if (!containers.length) return;
+        containers.forEach(function(container) {
+          container.querySelectorAll('a').forEach(function(a) {
+            var href = a.getAttribute('href');
+            if (!href || isAnchorOnly(href)) return;
+            if (!isLocalMd(href) && !isExternal(href)) return;
+            a.addEventListener('mouseenter', function(e) {
+              clearTimeout(hoverTimer);
+              if (popup) return;
+              var x = e.clientX, y = e.clientY;
+              hoverTimer = setTimeout(function() {
+                if (!popup) handleLink(a, x, y, false);
+              }, 300);
+            });
+            a.addEventListener('mouseleave', function() {
+              clearTimeout(hoverTimer);
+              if (popup) mouseLeaveTimer = setTimeout(hidePopup, 150);
+            });
           });
         });
       })();

metadata

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