mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-27 03:57:21 +00:00
Code Issues Releases Wiki Activity

Fixed problem with custom CSS classes

Browse Source
This commit is contained in:
Jeremy Ruston 2011-12-08 13:04:12 +00:00
parent a09c43d456
commit be52fbb5d1
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/WikiTextRules.js
View File

@ -636,7 +636,7 @@ WikiTextRules.rules = [
w.output.push(e); w.output.push(e);
var styles = WikiTextRules.inlineCssHelper(w); var styles = WikiTextRules.inlineCssHelper(w);
if(styles.length === 0) if(styles.length === 0)
e.className = "marked"; WikiTextRules.setAttr(e,"className","marked");
else else
WikiTextRules.applyCssHelper(e,styles); WikiTextRules.applyCssHelper(e,styles);
w.subWikifyTerm(e.children,/(@@)/mg); w.subWikifyTerm(e.children,/(@@)/mg);
@ -647,9 +647,8 @@ WikiTextRules.rules = [
var lookaheadMatch = lookaheadRegExp.exec(w.source); var lookaheadMatch = lookaheadRegExp.exec(w.source);
if(lookaheadMatch) { if(lookaheadMatch) {
w.nextMatch = lookaheadRegExp.lastIndex; w.nextMatch = lookaheadRegExp.lastIndex;
e = {type: lookaheadMatch[2] == "\n" ? "div" : "span", children: [ e = {type: lookaheadMatch[2] == "\n" ? "div" : "span", children: []};
{type: "text", value: lookaheadMatch[1]} WikiTextRules.setAttr(e,"className",lookaheadMatch[1]);
]};
w.output.push(e); w.output.push(e);
w.subWikifyTerm(e.children,/(\}\}\})/mg); w.subWikifyTerm(e.children,/(\}\}\})/mg);
} }

2
test/wikitests/SecondTiddler.html
View File

@ -1 +1 @@
<h2>Heading</h2>This is the second tiddler. It has a list:<br /><ul><li> Item one</li><li> Item two</li><li> Item three</li></ul>And a <macro></macro><br /> <h2>Heading</h2>This is the second tiddler. It has a list:<br /><ul><li> Item one</li><li> Item two</li><li> Item three</li></ul>And a <macro></macro> and a <span className="myClass">custom class</span><br />

2
test/wikitests/SecondTiddler.tid
View File

@ -5,4 +5,4 @@ This is the second tiddler. It has a list:
* Item one * Item one
* Item two * Item two
* Item three * Item three
And a <<macro invocation>> And a <<macro invocation>> and a {{myClass{custom class}}}

2
test/wikitests/SecondTiddler.txt
View File

@ -1 +1 @@
HeadingThis is the second tiddler. It has a list: Item one Item two Item threeAnd a HeadingThis is the second tiddler. It has a list: Item one Item two Item threeAnd a and a custom class