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

Fix problem with variables containing an empty string

Browse Source 
See
https://github.com/Jermolene/TiddlyWiki5/commit/e60fc9f81f2c8f0d115543d8
d330a1d68f9b890a#commitcomment-6301921
This commit is contained in:
Jermolene 2014-05-13 10:15:55 +01:00
parent e8c9d78079
commit 75fee26b58
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/modules/widgets/widget.js
View File

@ -94,7 +94,7 @@ Widget.prototype.getVariable = function(name,options) {
// Check for the variable defined in the parent widget (or an ancestor in the prototype chain) // Check for the variable defined in the parent widget (or an ancestor in the prototype chain)
if(parentWidget && name in parentWidget.variables) { if(parentWidget && name in parentWidget.variables) {
var variable = parentWidget.variables[name], var variable = parentWidget.variables[name],
value = variable.value || options.defaultValue; value = variable.value;
// Substitute any parameters specified in the definition // Substitute any parameters specified in the definition
value = this.substituteVariableParameters(value,variable.params,actualParams); value = this.substituteVariableParameters(value,variable.params,actualParams);
value = this.substituteVariableReferences(value); value = this.substituteVariableReferences(value);
@ -344,7 +344,7 @@ Add a list of event listeners from an array [{type:,handler:},...]
Widget.prototype.addEventListeners = function(listeners) { Widget.prototype.addEventListeners = function(listeners) {
var self = this; var self = this;
$tw.utils.each(listeners,function(listenerInfo) { $tw.utils.each(listeners,function(listenerInfo) {
self.addEventListener(listenerInfo.type,listenerInfo.handler); self.addEventListener(listenerInfo.type,listenerInfo.handler);
}); });
}; };
@ -460,7 +460,7 @@ Widget.prototype.findFirstDomNode = function() {
Remove any DOM nodes created by this widget or its children Remove any DOM nodes created by this widget or its children
*/ */
Widget.prototype.removeChildDomNodes = function() { Widget.prototype.removeChildDomNodes = function() {
// If this widget has directly created DOM nodes, delete them and exit. This assumes that any child widgets are contained within the created DOM nodes, which would normally be the case // If this widget has directly created DOM nodes, delete them and exit. This assumes that any child widgets are contained within the created DOM nodes, which would normally be the case
if(this.domNodes.length > 0) { if(this.domNodes.length > 0) {
$tw.utils.each(this.domNodes,function(domNode) { $tw.utils.each(this.domNodes,function(domNode) {
domNode.parentNode.removeChild(domNode); domNode.parentNode.removeChild(domNode);