mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2024-09-30 07:50:47 +00:00
Use ts- prefix for system slot names
This commit is contained in:
parent
fae038dcbc
commit
a401732995
@ -65,7 +65,7 @@ UberTranscludeWidget.prototype.execute = function() {
|
|||||||
};
|
};
|
||||||
searchParseTreeNodes(this.parseTreeNode.children);
|
searchParseTreeNodes(this.parseTreeNode.children);
|
||||||
if(noValueWidgetsFound) {
|
if(noValueWidgetsFound) {
|
||||||
this.slotValueParseTrees["missing"] = this.parseTreeNode.children;
|
this.slotValueParseTrees["ts-missing"] = this.parseTreeNode.children;
|
||||||
}
|
}
|
||||||
// Parse the text reference
|
// Parse the text reference
|
||||||
var parseAsInline = !this.parseTreeNode.isBlock;
|
var parseAsInline = !this.parseTreeNode.isBlock;
|
||||||
@ -87,13 +87,13 @@ UberTranscludeWidget.prototype.execute = function() {
|
|||||||
subTiddler: this.transcludeSubTiddler
|
subTiddler: this.transcludeSubTiddler
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
var parseTreeNodes = parser ? parser.tree : (this.slotValueParseTrees["missing"] || []);
|
var parseTreeNodes = parser ? parser.tree : (this.slotValueParseTrees["ts-missing"] || []);
|
||||||
this.sourceText = parser ? parser.source : undefined;
|
this.sourceText = parser ? parser.source : undefined;
|
||||||
this.parserType = parser? parser.type : undefined;
|
this.parserType = parser? parser.type : undefined;
|
||||||
// Wrap the transcluded content if required
|
// Wrap the transcluded content if required
|
||||||
if(this.slotValueParseTrees["wrapper"]) {
|
if(this.slotValueParseTrees["ts-wrapper"]) {
|
||||||
this.slotValueParseTrees["wrapped"] = parseTreeNodes;
|
this.slotValueParseTrees["ts-wrapped"] = parseTreeNodes;
|
||||||
parseTreeNodes = this.slotValueParseTrees["wrapper"];
|
parseTreeNodes = this.slotValueParseTrees["ts-wrapper"];
|
||||||
this.sourceTest = undefined;
|
this.sourceTest = undefined;
|
||||||
this.sourceType = undefined;
|
this.sourceType = undefined;
|
||||||
}
|
}
|
||||||
|
@ -403,7 +403,7 @@ Widget.prototype.makeChildWidget = function(parseTreeNode,options) {
|
|||||||
type: "value",
|
type: "value",
|
||||||
tag: "$value",
|
tag: "$value",
|
||||||
attributes: {
|
attributes: {
|
||||||
"$name": {name: "$name", type: "string", value: "body"}
|
"$name": {name: "$name", type: "string", value: "ts-body"}
|
||||||
},
|
},
|
||||||
children: parseTreeNode.children
|
children: parseTreeNode.children
|
||||||
},
|
},
|
||||||
@ -411,7 +411,7 @@ Widget.prototype.makeChildWidget = function(parseTreeNode,options) {
|
|||||||
type: "value",
|
type: "value",
|
||||||
tag: "$value",
|
tag: "$value",
|
||||||
attributes: {
|
attributes: {
|
||||||
"$name": {name: "$name", type: "string", value: "wrapper"}
|
"$name": {name: "$name", type: "string", value: "ts-wrapper"}
|
||||||
},
|
},
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
@ -426,7 +426,7 @@ Widget.prototype.makeChildWidget = function(parseTreeNode,options) {
|
|||||||
type: "slot",
|
type: "slot",
|
||||||
tag: "$slot",
|
tag: "$slot",
|
||||||
attributes: {
|
attributes: {
|
||||||
"$name": {name: "$name", type: "string", value: "wrapped"}
|
"$name": {name: "$name", type: "string", value: "ts-wrapped"}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -16,7 +16,7 @@ title: TiddlerOne
|
|||||||
<$set name="<$mywidget>" value="""\whitespace trim
|
<$set name="<$mywidget>" value="""\whitespace trim
|
||||||
<$parameters one='Jaguar'>
|
<$parameters one='Jaguar'>
|
||||||
<$text text=<<one>>/>
|
<$text text=<<one>>/>
|
||||||
<$slot $name="body">
|
<$slot $name="ts-body">
|
||||||
Whale
|
Whale
|
||||||
</$slot>
|
</$slot>
|
||||||
</$parameters>"""
|
</$parameters>"""
|
||||||
|
@ -16,7 +16,7 @@ title: TiddlerOne
|
|||||||
<$set name="<$text>" value="""\whitespace trim
|
<$set name="<$text>" value="""\whitespace trim
|
||||||
<$parameters text='Jaguar'>
|
<$parameters text='Jaguar'>
|
||||||
<$text text=<<text>>/>
|
<$text text=<<text>>/>
|
||||||
<$slot $name="body">
|
<$slot $name="ts-body">
|
||||||
Whale
|
Whale
|
||||||
</$slot>
|
</$slot>
|
||||||
</$parameters>"""
|
</$parameters>"""
|
||||||
|
@ -16,7 +16,7 @@ title: TiddlerOne
|
|||||||
<$set name="<$mywidget>" value="""\whitespace trim
|
<$set name="<$mywidget>" value="""\whitespace trim
|
||||||
<$parameters $variable='Jaguar'>
|
<$parameters $variable='Jaguar'>
|
||||||
<$text text=<<$variable>>/>
|
<$text text=<<$variable>>/>
|
||||||
<$slot $name="body">
|
<$slot $name="ts-body">
|
||||||
Whale
|
Whale
|
||||||
</$slot>
|
</$slot>
|
||||||
</$parameters>"""
|
</$parameters>"""
|
||||||
|
@ -13,7 +13,7 @@ title: Output
|
|||||||
</$parameters>
|
</$parameters>
|
||||||
</$ubertransclude>
|
</$ubertransclude>
|
||||||
<$ubertransclude $tiddler='TiddlerOne' one='Ferret'>
|
<$ubertransclude $tiddler='TiddlerOne' one='Ferret'>
|
||||||
<$value $name="missing">
|
<$value $name="ts-missing">
|
||||||
<$parameters one='Ferret'>
|
<$parameters one='Ferret'>
|
||||||
Badger
|
Badger
|
||||||
<$text text=<<one>>/>
|
<$text text=<<one>>/>
|
||||||
@ -27,7 +27,7 @@ title: Output
|
|||||||
</$parameters>
|
</$parameters>
|
||||||
</$ubertransclude>
|
</$ubertransclude>
|
||||||
<$ubertransclude $tiddler='MissingTiddler' one='Ferret'>
|
<$ubertransclude $tiddler='MissingTiddler' one='Ferret'>
|
||||||
<$value $name="missing">
|
<$value $name="ts-missing">
|
||||||
<$parameters one='Ferret'>
|
<$parameters one='Ferret'>
|
||||||
Badger
|
Badger
|
||||||
<$text text=<<one>>/>
|
<$text text=<<one>>/>
|
||||||
|
Loading…
Reference in New Issue
Block a user