mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-23 18:17:20 +00:00
Code Issues Releases Wiki Activity

Merge pull request #307 from Skeeve/issue_94

Browse Source 
added fix for issue #94 for horizontal rules, tables and typed block
This commit is contained in:
Jeremy Ruston 2013-12-30 03:46:16 -08:00
commit de2e5adf15
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/parsers/wikiparser/rules/horizrule.js
View File

@ -22,7 +22,7 @@ exports.types = {block: true};
exports.init = function(parser) { exports.init = function(parser) {
this.parser = parser; this.parser = parser;
// Regexp to match // Regexp to match
this.matchRegExp = /-{3,}\r?\n/mg; this.matchRegExp = /-{3,}\r?(?:\n|$)/mg;
}; };
exports.parse = function() { exports.parse = function() {

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

@ -18,11 +18,11 @@ exports.types = {block: true};
exports.init = function(parser) { exports.init = function(parser) {
this.parser = parser; this.parser = parser;
// Regexp to match // Regexp to match
this.matchRegExp = /^\|(?:[^\n]*)\|(?:[fhck]?)\r?\n/mg; this.matchRegExp = /^\|(?:[^\n]*)\|(?:[fhck]?)\r?(?:\n|$)/mg;
}; };
var processRow = function(prevColumns) { var processRow = function(prevColumns) {
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,
@ -107,8 +107,8 @@ var processRow = function(prevColumns) {
exports.parse = function() { exports.parse = function() {
var rowContainerTypes = {"c":"caption", "h":"thead", "":"tbody", "f":"tfoot"}, var rowContainerTypes = {"c":"caption", "h":"thead", "":"tbody", "f":"tfoot"},
table = {type: "element", tag: "table", children: []}, table = {type: "element", tag: "table", children: []},
rowRegExp = /^\|([^\n]*)\|([fhck]?)\r?\n/mg, rowRegExp = /^\|([^\n]*)\|([fhck]?)\r?(?:\n|$)/mg,
rowTermRegExp = /(\|(?:[fhck]?)\r?\n)/mg, rowTermRegExp = /(\|(?:[fhck]?)\r?(?:\n|$))/mg,
prevColumns = [], prevColumns = [],
currRowType, currRowType,
rowContainer, rowContainer,

2
core/modules/parsers/wikiparser/rules/typedblock.js
View File

@ -40,7 +40,7 @@ exports.init = function(parser) {
}; };
exports.parse = function() { exports.parse = function() {
var reEnd = /\r?\n\$\$\$\r?\n/mg; var reEnd = /\r?\n\$\$\$\r?(?:\n|$)/mg;
// Save the type // Save the type
var parseType = this.match[1], var parseType = this.match[1],
renderType = this.match[2]; renderType = this.match[2];