diff --git a/core/modules/widgets/ubertransclude.js b/core/modules/widgets/ubertransclude.js index 73656f0b6..a21d1eabe 100644 --- a/core/modules/widgets/ubertransclude.js +++ b/core/modules/widgets/ubertransclude.js @@ -65,7 +65,7 @@ UberTranscludeWidget.prototype.execute = function() { }; searchParseTreeNodes(this.parseTreeNode.children); if(noValueWidgetsFound) { - this.slotValueParseTrees["missing"] = this.parseTreeNode.children; + this.slotValueParseTrees["ts-missing"] = this.parseTreeNode.children; } // Parse the text reference var parseAsInline = !this.parseTreeNode.isBlock; @@ -87,13 +87,13 @@ UberTranscludeWidget.prototype.execute = function() { 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.parserType = parser? parser.type : undefined; // Wrap the transcluded content if required - if(this.slotValueParseTrees["wrapper"]) { - this.slotValueParseTrees["wrapped"] = parseTreeNodes; - parseTreeNodes = this.slotValueParseTrees["wrapper"]; + if(this.slotValueParseTrees["ts-wrapper"]) { + this.slotValueParseTrees["ts-wrapped"] = parseTreeNodes; + parseTreeNodes = this.slotValueParseTrees["ts-wrapper"]; this.sourceTest = undefined; this.sourceType = undefined; } diff --git a/core/modules/widgets/widget.js b/core/modules/widgets/widget.js index b2dba2705..cb3d5c7a2 100755 --- a/core/modules/widgets/widget.js +++ b/core/modules/widgets/widget.js @@ -403,7 +403,7 @@ Widget.prototype.makeChildWidget = function(parseTreeNode,options) { type: "value", tag: "$value", attributes: { - "$name": {name: "$name", type: "string", value: "body"} + "$name": {name: "$name", type: "string", value: "ts-body"} }, children: parseTreeNode.children }, @@ -411,7 +411,7 @@ Widget.prototype.makeChildWidget = function(parseTreeNode,options) { type: "value", tag: "$value", attributes: { - "$name": {name: "$name", type: "string", value: "wrapper"} + "$name": {name: "$name", type: "string", value: "ts-wrapper"} }, children: [ { @@ -426,7 +426,7 @@ Widget.prototype.makeChildWidget = function(parseTreeNode,options) { type: "slot", tag: "$slot", attributes: { - "$name": {name: "$name", type: "string", value: "wrapped"} + "$name": {name: "$name", type: "string", value: "ts-wrapped"} } } ] diff --git a/editions/test/tiddlers/tests/data/ubertransclusion/CustomWidget-Simple.tid b/editions/test/tiddlers/tests/data/ubertransclusion/CustomWidget-Simple.tid index b370a5af8..7ec98e965 100644 --- a/editions/test/tiddlers/tests/data/ubertransclusion/CustomWidget-Simple.tid +++ b/editions/test/tiddlers/tests/data/ubertransclusion/CustomWidget-Simple.tid @@ -16,7 +16,7 @@ title: TiddlerOne <$set name="<$mywidget>" value="""\whitespace trim <$parameters one='Jaguar'> <$text text=<>/> - <$slot $name="body"> + <$slot $name="ts-body"> Whale """ diff --git a/editions/test/tiddlers/tests/data/ubertransclusion/CustomWidget-TextWidgetOverride.tid b/editions/test/tiddlers/tests/data/ubertransclusion/CustomWidget-TextWidgetOverride.tid index 18ba964c8..7223a88aa 100644 --- a/editions/test/tiddlers/tests/data/ubertransclusion/CustomWidget-TextWidgetOverride.tid +++ b/editions/test/tiddlers/tests/data/ubertransclusion/CustomWidget-TextWidgetOverride.tid @@ -16,7 +16,7 @@ title: TiddlerOne <$set name="<$text>" value="""\whitespace trim <$parameters text='Jaguar'> <$text text=<>/> - <$slot $name="body"> + <$slot $name="ts-body"> Whale """ diff --git a/editions/test/tiddlers/tests/data/ubertransclusion/CustomWidget-VariableAttribute.tid b/editions/test/tiddlers/tests/data/ubertransclusion/CustomWidget-VariableAttribute.tid index b7d6a4942..61a981f10 100644 --- a/editions/test/tiddlers/tests/data/ubertransclusion/CustomWidget-VariableAttribute.tid +++ b/editions/test/tiddlers/tests/data/ubertransclusion/CustomWidget-VariableAttribute.tid @@ -16,7 +16,7 @@ title: TiddlerOne <$set name="<$mywidget>" value="""\whitespace trim <$parameters $variable='Jaguar'> <$text text=<<$variable>>/> - <$slot $name="body"> + <$slot $name="ts-body"> Whale """ diff --git a/editions/test/tiddlers/tests/data/ubertransclusion/MissingTarget.tid b/editions/test/tiddlers/tests/data/ubertransclusion/MissingTarget.tid index 023384939..41743cf57 100644 --- a/editions/test/tiddlers/tests/data/ubertransclusion/MissingTarget.tid +++ b/editions/test/tiddlers/tests/data/ubertransclusion/MissingTarget.tid @@ -13,7 +13,7 @@ title: Output <$ubertransclude $tiddler='TiddlerOne' one='Ferret'> - <$value $name="missing"> + <$value $name="ts-missing"> <$parameters one='Ferret'> Badger <$text text=<>/> @@ -27,7 +27,7 @@ title: Output <$ubertransclude $tiddler='MissingTiddler' one='Ferret'> - <$value $name="missing"> + <$value $name="ts-missing"> <$parameters one='Ferret'> Badger <$text text=<>/>