jekyll-dice-tray 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e3b5e6ffc89df4600f4c4a25d765e3bc5efcd96d3671817cfc19c0edf540e7f
-  data.tar.gz: eeb98f0a9a72e5caac9dfa0608f402cfefb90c914c0ecacf2dc170d6484decd8
+  metadata.gz: d9bd0677666a51acbbbb3ca6bf5b67d1f5bb1ef638fa4ba2fc86a3ea5a0f4cc9
+  data.tar.gz: 8832cb5174a2d58f10f7aa8534a91b8865b296323d81a097e6d476422b2b1e31
 SHA512:
-  metadata.gz: 76359d77b57187df74358db7c49116928b201ce19ffa3130e3af0584087cce008c220baacbea6185f2e5a39686c27b4c78c6010702a9d2576f258158a9df36b7
-  data.tar.gz: 0b6e4439a8265f518ee925cb7f497fe5c3daa6c2dfd180d67ba8e7dcbefab68495f25bb50805b4d594d2cf777b3f32ed4a9172c5564c512de072db5d80db1ccd
+  metadata.gz: 558222307d26787647131df280b6e35055d644a9dfe2c97b9f2ce752e5ff179a56b21b96467dcea47633b4fb6a3128536931b2a0600a2b935dabdb5946867ba7
+  data.tar.gz: 5e69d92fe00836cef6d4aa013a3f4e320cbed50e4a082a7826f8085ef4ec68b6f9a4b4d96829e4348ff95aa7ce5706e03c336fd8dd81924366343b21dd73dd1b

data/README.md

@@ -4,7 +4,7 @@ A Jekyll plugin gem that:
 
 - Adds an overlay dice tray that accepts dice rolling input
 - Recognizes dice expressions in rendered pages like `d4`, `1d6`, `1d20+1` and turns them into clickable links that roll in the tray
-- Clicking a lookup-table die (any `dN`) rolls and shows the matching entry — supports any number of side-by-side key/value column groups, ranges like `3–12`, and tables with or without headers. One die in the header searches the whole table; multiple dice each search their own column group
+- Clicking a lookup-table die (any `dN`) rolls and shows the matching entry — supports any number of side-by-side key/value column groups, ranges like `3–12`, and tables with or without headers. Header dice always search the whole table (side-by-side column groups included)
 - Persists input history, result history, minimize status
 
 https://github.com/user-attachments/assets/6ef8d788-a1ee-49d4-ab26-f63899bb4a10

data/assets/jekyll-dice-tray/dice_tray.js

@@ -179,14 +179,6 @@
       return Array.prototype.slice.call(row.querySelectorAll("td, th"));
     }
 
-    function cellColumnIndex(row, cell) {
-      var cells = rowCells(row);
-      for (var i = 0; i < cells.length; i++) {
-        if (cells[i] === cell) return i;
-      }
-      return -1;
-    }
-
     function rowLooksLikeHeader(row) {
       if (!row) return false;
       if (row.querySelector("th")) return true;
@@ -269,13 +261,11 @@
       return max;
     }
 
-    function collectRowEntriesForGroups(row, groups, allowedKeyIndices) {
+    function collectRowEntriesForGroups(row, groups) {
       var cells = rowCells(row);
       var entries = [];
-      var allowAll = !allowedKeyIndices || !allowedKeyIndices.length;
       for (var g = 0; g < groups.length; g++) {
         var group = groups[g];
-        if (!allowAll && allowedKeyIndices.indexOf(group.keyIndex) === -1) continue;
         var keyCell = cells[group.keyIndex];
         if (!keyCell) continue;
         var key = parseKeyEntry(normalizeCellText(keyCell));
@@ -302,16 +292,17 @@
       if (!table || !groups || !groups.length) return false;
       var matches = 0;
       eachDataRow(table, headerRow, function (row) {
-        matches += collectRowEntriesForGroups(row, groups, null).length;
+        matches += collectRowEntriesForGroups(row, groups).length;
       });
       return matches >= 2;
     }
 
-    function findLookupMatch(table, headerRow, groups, rollTotal, allowedKeyIndices) {
+    // Header dice (one or many side-by-side) always search every key column in the table.
+    function findLookupMatch(table, headerRow, groups, rollTotal) {
       var exact = null;
       var range = null;
       eachDataRow(table, headerRow, function (row) {
-        var entries = collectRowEntriesForGroups(row, groups, allowedKeyIndices);
+        var entries = collectRowEntriesForGroups(row, groups);
         for (var e = 0; e < entries.length; e++) {
           var entry = entries[e];
           if (entry.key.kind === "exact" && entry.key.value === rollTotal) {
@@ -329,45 +320,18 @@
       return exact || range;
     }
 
-    function headerDiceCount(headerRow) {
-      if (!headerRow) return 0;
-      return headerRow.querySelectorAll('a[data-dice]').length;
-    }
-
-    function groupForColumn(groups, columnIndex) {
-      for (var g = 0; g < groups.length; g++) {
-        var group = groups[g];
-        if (columnIndex === group.keyIndex) return group;
-        if (group.valueIndices.indexOf(columnIndex) !== -1) return group;
-      }
-      return null;
-    }
-
-    // One die in the header (e.g. d100 over many pairs) => search every group.
-    // Several dice (e.g. d10 | Weather | d10 | Terrain | d6 | Mood) => only the clicked group.
-    function allowedKeyIndicesForClick(headerRow, clickCell, groups) {
-      if (!headerRow || !clickCell || !groups.length) return null;
-      if (headerDiceCount(headerRow) <= 1) return null;
-      var col = cellColumnIndex(headerRow, clickCell);
-      if (col < 0) return null;
-      var group = groupForColumn(groups, col);
-      return group ? [group.keyIndex] : null;
-    }
-
     function getLookupTableContext(anchor, rollTotal) {
       if (!anchor || !anchor.closest || rollTotal == null) return null;
 
       var cell = null;
       var table = null;
       var headerRow = null;
-      var allowedKeys = null;
       var sourceTable = anchor._jdtSourceTable;
 
       if (sourceTable && sourceTable.querySelector) {
         // Re-roll from a previous table result in the tray.
         table = sourceTable;
         headerRow = findTableHeaderRow(table);
-        allowedKeys = anchor._jdtAllowedKeyIndices || null;
       } else {
         cell = anchor.closest("td, th");
         if (!cell) return null;
@@ -384,10 +348,7 @@
       var groups = buildColumnGroups(keyColumns, tableColumnCount(table, headerRow));
       if (!isLookupTable(table, headerRow, groups)) return null;
 
-      if (allowedKeys == null && cell && headerRow) {
-        allowedKeys = allowedKeyIndicesForClick(headerRow, cell, groups);
-      }
-      var matched = findLookupMatch(table, headerRow, groups, rollTotal, allowedKeys);
+      var matched = findLookupMatch(table, headerRow, groups, rollTotal);
       if (!matched) return null;
 
       var headerCells = headerRow ? rowCells(headerRow) : [];
@@ -420,9 +381,7 @@
         });
       }
 
-      return columns.length
-        ? { columns: columns, _sourceTable: table, _allowedKeyIndices: allowedKeys }
-        : null;
+      return columns.length ? { columns: columns, _sourceTable: table } : null;
     }
 
     function serializableTableContext(tableContext) {
@@ -459,9 +418,6 @@
             if (tableContext._sourceTable && tableContext._sourceTable.querySelector) {
               reroll._jdtSourceTable = tableContext._sourceTable;
             }
-            if (tableContext._allowedKeyIndices) {
-              reroll._jdtAllowedKeyIndices = tableContext._allowedKeyIndices;
-            }
             headerSpan.appendChild(reroll);
           } else if (col.header_html) {
             headerSpan.innerHTML = col.header_html;

data/lib/jekyll/dice_tray/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module DiceTray
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-dice-tray
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - directsun