markdownr 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 845f5eba9de7543ef7e3c386e54f127d8ecfaf48e368d5fb11de54ca5d96cc6c
-  data.tar.gz: 9b00fb58e4c3a4e9e3b5c8236f30b96577f7e8bd4d18a17d8576b6382d568380
+  metadata.gz: af0a41eadcbe996f7165b92a56174857657a21698308b515a35a67ec81a9a3e0
+  data.tar.gz: 12f87ff3043049997f895f4dc0bde07d6d7e41c0195286b1abe29c91eada81e2
 SHA512:
-  metadata.gz: 619d4b659c762122321ee3215e06b996c111d88f36bcc83a57b7613f2c9d241a9dea383bb2fbd86c9afa3a579085c7ae7b42519f597e795cb327f23426a5de7d
-  data.tar.gz: cf8bc3acf215f5fae8fbbafa137a231e8b37a1db8e73691f95cdc4f1f4acdd9631b19200cf4483b3dcad8df4c95d1a5ee6487cc34e7fb9de16c5c7d0d516b7d7
+  metadata.gz: cc617683848f464907a1f8d4e17986a80842e631b9e68dcd6d3eb340bb0b658d080a9849c8f1a6ec952f8ceaa23cb95fda4760e44dc02b36a6620a7b30dcbf53
+  data.tar.gz: 73bbfe99e65f7c50b4c4ffca35b4ab98d9a706f3c8367451b115e61919391ec95d987396cb75f5cbf7890822f4ec4b0456255a47a9872af5745b2dc90737e92b

data/lib/markdown_server/app.rb

@@ -750,7 +750,7 @@ module MarkdownServer
 
       def scrip_html(html)
         # Extract the passage content block
-        content = html[/<div\s+class="passage-text[^"]*"[^>]*>([\s\S]*?)<\/div>\s*(?:<nav|$)/im, 1] || ""
+        content = html[/<div\s+class="passage-text[^"]*"[^>]*>([\s\S]*?)<\/div>\s*(?:<nav|\z)/im, 1] || ""
         return page_html(html) if content.empty?
 
         # Add data-verse attributes to verse spans for popup scrolling.

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/views/layout.erb

@@ -2024,10 +2024,19 @@
       }
 
       function findVerseSpans(root, verseNum) {
-        var span = root.querySelector('[data-verse="' + verseNum + '"]');
-        if (span) return [span];
-        var spans = root.querySelectorAll('[data-verse$=":' + verseNum + '"]');
-        return spans.length ? Array.prototype.slice.call(spans) : [];
+        var num = String(verseNum);
+        // Prefer .verse spans (full verse text) with exact verse number match
+        var all = root.querySelectorAll('.verse[data-verse]');
+        var matches = [];
+        for (var i = 0; i < all.length; i++) {
+          var dv = all[i].getAttribute('data-verse');
+          var after = dv.split(':').pop();
+          if (after === num) matches.push(all[i]);
+        }
+        if (matches.length) return matches;
+        // Fallback: bare data-verse="N" (e.g. sup elements from scrip_html)
+        var span = root.querySelector('[data-verse="' + num + '"]');
+        return span ? [span] : [];
       }
 
       function applyPopupAnchor(hash) {

data/views/popup_assets.erb

@@ -596,10 +596,19 @@
     }
 
     function findVerseSpans(root, verseNum) {
-      var span = root.querySelector('[data-verse="' + verseNum + '"]');
-      if (span) return [span];
-      var spans = root.querySelectorAll('[data-verse$=":' + verseNum + '"]');
-      return spans.length ? Array.prototype.slice.call(spans) : [];
+      var num = String(verseNum);
+      // Prefer .verse spans (full verse text) with exact verse number match
+      var all = root.querySelectorAll('.verse[data-verse]');
+      var matches = [];
+      for (var i = 0; i < all.length; i++) {
+        var dv = all[i].getAttribute('data-verse');
+        var after = dv.split(':').pop();
+        if (after === num) matches.push(all[i]);
+      }
+      if (matches.length) return matches;
+      // Fallback: bare data-verse="N" (e.g. sup elements from scrip_html)
+      var span = root.querySelector('[data-verse="' + num + '"]');
+      return span ? [span] : [];
     }
 
     function applyPopupAnchor(hash) {
@@ -881,14 +890,26 @@
     if (!m) return;
     var start = parseInt(m[1], 10);
     var end = m[2] ? parseInt(m[2], 10) : start;
+    var bookMeta = document.querySelector('meta[name="book"]');
+    var chMeta = document.querySelector('meta[name="chapter"]');
+    var book = bookMeta && bookMeta.content;
+    var ch = chMeta && chMeta.content;
     var first = null;
     for (var v = start; v <= end; v++) {
-      var sel = '[data-verse$=":' + v + '"]';
-      var spans = document.querySelectorAll(sel);
-      if (!spans.length) spans = document.querySelectorAll('[data-verse="' + v + '"]');
-      for (var i = 0; i < spans.length; i++) {
-        spans[i].classList.add('verse-selected');
-        if (!first) first = spans[i];
+      var spans;
+      if (book && ch) {
+        spans = document.querySelectorAll('.verse[data-verse="' + book + ' ' + ch + ':' + v + '"]');
+      } else {
+        // No meta tags — filter all .verse spans by exact verse number
+        var all = document.querySelectorAll('.verse[data-verse]');
+        spans = [];
+        for (var i = 0; i < all.length; i++) {
+          if (all[i].getAttribute('data-verse').split(':').pop() === String(v)) spans.push(all[i]);
+        }
+      }
+      for (var j = 0; j < spans.length; j++) {
+        spans[j].classList.add('verse-selected');
+        if (!first) first = spans[j];
       }
     }
     if (!first) return;

metadata

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