mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-11-01 16:13:00 +00:00
Code Issues Releases Wiki Activity

Refactored macro mechanism

Browse Source 
Now there is now longer a dummy DOM element corresponding to the macro
itself. Instead, macros must create a single element child. This allows
us to more easily fit Bootstrap's requirements for HTML layout (eg,
that problem with links in navbars not being recognised). The
refactoring isn't complete, there are still a few bugs to chase down
This commit is contained in:
Jeremy Ruston
2012-06-09 18:36:32 +01:00
parent 121d491af2
commit 04e91245cb
22 changed files with 134 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/modules/macros/view.js
View File

@@ -52,7 +52,7 @@ exports.executeMacro = function() {
switch(this.params.format) {
case "link":
if(value === undefined) {
return [];
return $tw.Tree.Element("span",{},[]);
} else {
var link = $tw.Tree.Macro("link",{
srcParams: {to: value},
@@ -60,7 +60,7 @@ exports.executeMacro = function() {
wiki: this.wiki
});
link.execute(parents,this.tiddlerTitle);
return [link];
return $tw.Tree.Element("span",{},[link]);
}
break;
case "wikified":
@@ -81,13 +81,13 @@ exports.executeMacro = function() {
for(t=0; t<childrenClone.length; t++) {
childrenClone[t].execute(parents,this.tiddlerTitle);
}
return childrenClone;
return $tw.Tree.Element(this.isBlock ? "div" : "span",{},childrenClone);
case "date":
var template = this.params.template || "DD MMM YYYY";
if(value === undefined) {
return [];
return $tw.Tree.Element("span",{},[]);
} else {
return [$tw.Tree.Text($tw.utils.formatDateString(value,template))];
return $tw.Tree.Text($tw.utils.formatDateString(value,template));
}
break;
default: // "text"
@@ -96,12 +96,12 @@ exports.executeMacro = function() {
value = tiddler.getFieldString(field);
}
if(value === undefined || value === null) {
return [];
return $tw.Tree.Element("span",{},[]);
} else {
return [$tw.Tree.Text(value)];
return $tw.Tree.Text(value);
}
}
return [];
return $tw.Tree.Element("span",{},[]);
};
})();