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

Stopped formatters generating empty attributes

Browse Source
This commit is contained in:
Jeremy Ruston 2011-12-05 13:15:06 +00:00
parent 9d37633f15
commit b829b1d28f
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/Formatter.js
View File

@ -56,6 +56,13 @@ Formatter.createElementAndWikify = function(w) {
w.subWikifyTerm(e.children,this.termRegExp);
};
Formatter.setAttr = function(e,attr,value) {
if(!"attributes" in e) {
e.attributes = {};
}
e.attributes[attr] = value;
}
Formatter.inlineCssHelper = function(w) {
var styles = [];
textPrimitives.cssLookaheadRegExp.lastIndex = w.nextMatch;
@ -254,7 +261,7 @@ Formatter.formatters = [
termRegExp: /(\n)/mg,
handler: function(w)
{
var e = {type: "h" + w.matchLength, attributes: {}, children: []};
var e = {type: "h" + w.matchLength, children: []};
w.output.push(e);
w.subWikifyTerm(e.children,this.termRegExp);
}
@ -295,7 +302,7 @@ Formatter.formatters = [
if(listLevel > currLevel) {
for(t=currLevel; t<listLevel; t++) {
var target = (currLevel === 0) ? stack[stack.length-1] : stack[stack.length-1].lastChild;
e = {type: listType, attributes: {}, children: []};
e = {type: listType, children: []};
target.push(e);
stack.push(e.children);
}
@ -307,13 +314,13 @@ Formatter.formatters = [
stack.pop();
} else if(listLevel == currLevel && listType != currType) {
stack.pop();
e = {type: listType, attributes: {}, children: []};
e = {type: listType, children: []};
stack[stack.length-1].push(e);
stack.push(e.children);
}
currLevel = listLevel;
currType = listType;
e = {type: itemType, attributes: {}, children: []};
e = {type: itemType, children: []};
stack[stack.length-1].push(e);
w.subWikifyTerm(e.children,this.termRegExp);
this.lookaheadRegExp.lastIndex = w.nextMatch;
@ -510,25 +517,25 @@ Formatter.formatters = [
if(lookaheadMatch[5]) {
var link = lookaheadMatch[5],t;
if(Formatter.isExternalLink(w,link)) {
t = {type: "a", href: link, attributes: {}, children: []};
t = {type: "a", href: link, children: []};
w.output.push(t);
e = t.children;
} else {
t = {type: "tiddlerLink", href: link, attributes: {}, children: []};
t = {type: "tiddlerLink", href: link, children: []};
w.output.push(t);
e = t.children;
}
t.attributes.className = "imageLink";
}
var img = {type: "img", attributes: {}};
var img = {type: "img"};
e.push(img);
if(lookaheadMatch[1])
img.attributes.align = "left";
Formatter.setAttr(img,"align","left");
else if(lookaheadMatch[2])
img.attributes.align = "right";
Formatter.setAttr(img,"align","right");
if(lookaheadMatch[3]) {
img.attributes.title = lookaheadMatch[3];
img.attributes.alt = lookaheadMatch[3];
Formatter.setAttr(img,"title",lookaheadMatch[3]);
Formatter.setAttr(img,"alt",lookaheadMatch[3]);
}
img.src = lookaheadMatch[4];
w.nextMatch = this.lookaheadRegExp.lastIndex;

9
wikitest.js
View File

@ -36,7 +36,7 @@ wikiTest({ tiddlers:
text: 'An explicit link [[Fourth Tiddler]] and [[a pretty link|Fourth Tiddler]]' },
{ title: 'Fourth Tiddler',
text: 'An image [img[Something.jpg]]' } ],
tests:
tests:
[ { tiddler: 'FirstTiddler',
output:
[ { type: 'text', value: 'This is the ' },
@ -51,22 +51,17 @@ wikiTest({ tiddlers:
{ tiddler: 'SecondTiddler',
output:
[ { type: 'h2',
attributes: {},
children: [ { type: 'text', value: 'Heading' } ] },
{ type: 'text',
value: 'This is the second tiddler. It has a list:' },
{ type: 'br' },
{ type: 'ul',
attributes: {},
children:
[ { type: 'li',
attributes: {},
children: [ { type: 'text', value: ' Item one' } ] },
{ type: 'li',
attributes: {},
children: [ { type: 'text', value: ' Item two' } ] },
{ type: 'li',
attributes: {},
children: [ { type: 'text', value: ' Item three' } ] } ] },
{ type: 'text', value: 'And a ' },
{ type: 'macro', name: 'macro', params: 'invocation' },
@ -84,5 +79,5 @@ wikiTest({ tiddlers:
{ tiddler: 'Fourth Tiddler',
output:
[ { type: 'text', value: 'An image ' },
{ type: 'img', attributes: {}, src: 'Something.jpg' } ] } ] }
{ type: 'img', src: 'Something.jpg' } ] } ] }
);