f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-12 00:12:56 +00:00
Code Wiki Activity

Lint

Browse Source
This commit is contained in:
Trevor Buckner
2021-08-06 16:49:53 -04:00
parent 20691f8ab5
commit f23b661a4b
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
shared/naturalcrit/markdown.js
View File

@@ -284,8 +284,6 @@ const spanTable = {
} }
} }
let prevRow;
// Get any remaining header rows // Get any remaining header rows
l = item.header.length; l = item.header.length;
for (i = 1; i < l; i++) { for (i = 1; i < l; i++) {
@@ -332,7 +330,7 @@ const spanTable = {
for (j = 0; j < row.length; j++) { for (j = 0; j < row.length; j++) {
cell = row[j]; cell = row[j];
text = this.parseInline(cell.tokens); text = this.parseInline(cell.tokens);
output += getTableCell(text, cell.colspan, cell.rowspan, 'th', token.align[col]); output += getTableCell(text, cell, 'th', token.align[col]);
col += cell.colspan; col += cell.colspan;
} }
output += `</tr>`; output += `</tr>`;
@@ -347,7 +345,7 @@ const spanTable = {
for (j = 0; j < row.length; j++) { for (j = 0; j < row.length; j++) {
cell = row[j]; cell = row[j];
text = this.parseInline(cell.tokens); text = this.parseInline(cell.tokens);
output += getTableCell(text, cell.colspan, cell.rowspan, 'td', token.align[col]); output += getTableCell(text, cell, 'td', token.align[col]);
col += cell.colspan; col += cell.colspan;
} }
output += `</tr>`; output += `</tr>`;
@@ -359,13 +357,13 @@ const spanTable = {
} }
}; };
const getTableCell = (text, colspan, rowspan, type, align)=>{ const getTableCell = (text, cell, type, align)=>{
if(!rowspan) { if(!cell.rowspan) {
return ''; return '';
} }
const tag = `<${type}` const tag = `<${type}`
+ `${colspan > 1 ? ` colspan=${colspan}` : ''}` + `${cell.colspan > 1 ? ` colspan=${cell.colspan}` : ''}`
+ `${rowspan > 1 ? ` rowspan=${rowspan}` : ''}` + `${cell.rowspan > 1 ? ` rowspan=${cell.rowspan}` : ''}`
+ `${align ? ` align=${align}` : ''}>`; + `${align ? ` align=${align}` : ''}>`;
return `${tag + text}</${type}>\n`; return `${tag + text}</${type}>\n`;
}; };
@@ -411,10 +409,10 @@ const splitCells = (tableRow, count, prevRow = [])=>{
let prevCols = 0; let prevCols = 0;
let j, prevCell; let j, prevCell;
for (j = 0; j < prevRow.length; j++) { for (j = 0; j < prevRow.length; j++) {
let prevCell = prevRow[j]; prevCell = prevRow[j];
if((prevCols == numCols) && (prevCell.colspan == cells[i].colspan)) { if((prevCols == numCols) && (prevCell.colspan == cells[i].colspan)) {
cells[i].rowSpanTarget = prevCell.rowSpanTarget ?? prevCell; cells[i].rowSpanTarget = prevCell.rowSpanTarget ?? prevCell;
cells[i].rowSpanTarget.text += ' ' + cells[i].text.slice(0, -1); cells[i].rowSpanTarget.text += ` ${cells[i].text.slice(0, -1)}`;
cells[i].rowSpanTarget.rowspan += 1; cells[i].rowSpanTarget.rowspan += 1;
cells[i].rowspan = 0; cells[i].rowspan = 0;
break; break;