mirrors
/
TiddlyWiki5
mirror of https://github.com/Jermolene/TiddlyWiki5
1
0
Fork 0
Code Issues Releases Wiki Activity

table parser add data attributes for easier styling

This commit is contained in:
pmario 2024-05-03 14:47:46 +02:00
parent 64f5dd942c
commit 0a2cd91be0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/modules/parsers/wikiparser/rules/table.js
View File

@ -21,11 +21,13 @@ exports.init = function(parser) {
this.matchRegExp = /^\|(?:[^\n]*)\|(?:[fhck]?)\r?(?:\n|$)/mg; this.matchRegExp = /^\|(?:[^\n]*)\|(?:[fhck]?)\r?(?:\n|$)/mg;
}; };
var processRow = function(prevColumns) { var processRow = function(prevColumns,options) {
options = options || {};
var cellRegExp = /(?:\|([^\n\|]*)\|)|(\|[fhck]?\r?(?:\n|$))/mg, var cellRegExp = /(?:\|([^\n\|]*)\|)|(\|[fhck]?\r?(?:\n|$))/mg,
cellTermRegExp = /((?:\x20*)\|)/mg, cellTermRegExp = /((?:\x20*)\|)/mg,
tree = [], tree = [],
col = 0, col = 0,
colCount,
colSpanCount = 1, colSpanCount = 1,
prevCell, prevCell,
vAlign; vAlign;
@ -103,9 +105,12 @@ var processRow = function(prevColumns) {
// Record information about this cell // Record information about this cell
prevCell = cell; prevCell = cell;
prevColumns[col] = {rowSpanCount:1,element:cell}; prevColumns[col] = {rowSpanCount:1,element:cell};
// column count is 1 based
colCount = col + 1;
// Check for a colspan // Check for a colspan
if(colSpanCount > 1) { if(colSpanCount > 1) {
$tw.utils.addAttributeToParseTreeNode(cell,"colspan",colSpanCount); $tw.utils.addAttributeToParseTreeNode(cell,"colspan",colSpanCount);
colCount = colCount - 1;
colSpanCount = 1; colSpanCount = 1;
} }
// Parse the cell // Parse the cell
@ -121,6 +126,9 @@ var processRow = function(prevColumns) {
} }
// Move back to the closing `|` // Move back to the closing `|`
this.parser.pos--; this.parser.pos--;
$tw.utils.addClassToParseTreeNode(cell,colCount%2 ? "oddCol" : "evenCol");
$tw.utils.addAttributeToParseTreeNode(cell,"data-col",colCount);
$tw.utils.addAttributeToParseTreeNode(cell,"data-addr",options.rowCount + "/" + colCount);
} }
col++; col++;
cellRegExp.lastIndex = this.parser.pos; cellRegExp.lastIndex = this.parser.pos;
@ -171,9 +179,10 @@ exports.parse = function() {
// Create the row // Create the row
var theRow = {type: "element", tag: "tr", children: []}; var theRow = {type: "element", tag: "tr", children: []};
$tw.utils.addClassToParseTreeNode(theRow,rowCount%2 ? "oddRow" : "evenRow"); $tw.utils.addClassToParseTreeNode(theRow,rowCount%2 ? "oddRow" : "evenRow");
$tw.utils.addAttributeToParseTreeNode(theRow,"data-row",rowCount);
rowContainer.children.push(theRow); rowContainer.children.push(theRow);
// Process the row // Process the row
theRow.children = processRow.call(this,prevColumns); theRow.children = processRow.call(this,prevColumns,{rowCount: rowCount});
this.parser.pos = rowMatch.index + rowMatch[0].length; this.parser.pos = rowMatch.index + rowMatch[0].length;
// Increment the row count // Increment the row count
rowCount++; rowCount++;