mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-23 10:07:19 +00:00
Code Issues Releases Wiki Activity

Revert "Extend transclude widget to optionally set variables"

Browse Source 
Actually a partial reversion, because we're keeping the minor refactoring of makeChildWidget() in widget.js

This reverts commit 80ee5adb14.
This commit is contained in:
jeremy@jermolene.com 2021-04-02 09:47:38 +01:00
parent 54d3782167
commit 28521d82f3
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/modules/widgets/transclude.js
View File

@ -75,17 +75,8 @@ TranscludeWidget.prototype.execute = function() {
]}];
}
}
// Assign any variables set via attributes starting with $
var variables = Object.create(null);
$tw.utils.each(this.attributes,function(attribute,name) {
if(name.charAt(0) === "$") {
variables[name.substr(1)] = attribute;
}
});
// Construct the child widgets
this.makeChildWidgets(parseTreeNodes,{
variables: variables
});
this.makeChildWidgets(parseTreeNodes);
};
/*
@ -112,7 +103,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
*/
TranscludeWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
if($tw.utils.count(changedAttributes) || changedTiddlers[this.transcludeTitle]) {
if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedTiddlers[this.transcludeTitle]) {
this.refreshSelf();
return true;
} else {

3
editions/tw5.com/tiddlers/widgets/TranscludeWidget.tid
View File

@ -1,5 +1,5 @@
created: 20130824142500000
modified: 20210319150601867
modified: 20140717175900970
tags: Widgets
title: TranscludeWidget
type: text/vnd.tiddlywiki
@ -17,7 +17,6 @@ The TranscludeWidget dynamically imports content from another tiddler.
|index |The index of a property in a [[DataTiddler|DataTiddlers]] |
|subtiddler |Optional SubTiddler title when the target tiddler is a [[plugin|Plugins]] (see below) |
|mode |Override the default parsing mode for the transcluded text to "block" or "inline" |
|//(attributes starting with $)// |<<.from-version "5.1.24">> The $ is removed from each attribute name to specify a variable name that is assigned the specified value for the scope of the transclusion |
The TranscludeWidget treats any contained content as a fallback if the target of the transclusion is not defined (ie a missing tiddler or a missing field).