mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-05-22 17:24:06 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2166 from matabele/patch-5

Browse Source 
Fix inadvertent clearing of text field (default) when `field` attribu…
This commit is contained in:
Jeremy Ruston 2016-01-05 19:10:26 +00:00
commit 83c54f4bb5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/modules/widgets/action-setfield.js
View File

@ -59,14 +59,16 @@ Invoke the action associated with this widget
*/ */
SetFieldWidget.prototype.invokeAction = function(triggeringWidget,event) { SetFieldWidget.prototype.invokeAction = function(triggeringWidget,event) {
var self = this, var self = this,
options = {}; options = {};
options.suppressTimestamp = !this.actionTimestamp; options.suppressTimestamp = !this.actionTimestamp;
if((typeof this.actionField == "string") || (typeof this.actionIndex == "string") || (typeof this.actionValue == "string")) { if (this.actionField) {
this.wiki.setText(this.actionTiddler,this.actionField,this.actionIndex,this.actionValue,options); this.wiki.setText(this.actionTiddler, this.actionField, this.actionIndex, this.actionValue, options);
} }
$tw.utils.each(this.attributes,function(attribute,name) { $tw.utils.each(this.attributes, function (attribute, name) {
if(name.charAt(0) !== "$") { if (name.charAt(0) !== "$") {
self.wiki.setText(self.actionTiddler,name,undefined,attribute,options); (name.search("!!") !== -1 || name.search("##") !== -1) ?
self.wiki.setTextReference(name, attribute, self.actionTiddler):
self.wiki.setText(self.actionTiddler, name, undefined, attribute, options);
} }
}); });
return true; // Action was invoked return true; // Action was invoked