mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-02-02 04:09:09 +00:00
Code Issues Releases Wiki Activity

Update actionsetfield widget to allow timestamp to be preserved

Browse Source
This commit is contained in:
Jermolene 2015-08-06 18:17:06 +01:00
parent 821617058d
commit e5cd8313a0
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ SetFieldWidget.prototype.execute = function() {
this.actionField = this.getAttribute("$field"); this.actionField = this.getAttribute("$field");
this.actionIndex = this.getAttribute("$index"); this.actionIndex = this.getAttribute("$index");
this.actionValue = this.getAttribute("$value"); this.actionValue = this.getAttribute("$value");
this.actionTimestamp = this.getAttribute("$timestamp","yes") === "yes";
}; };
/* /*
@ -57,13 +58,15 @@ SetFieldWidget.prototype.refresh = function(changedTiddlers) {
Invoke the action associated with this widget 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.timestamp = this.actionTimestamp;
if(typeof this.actionValue === "string") { if(typeof this.actionValue === "string") {
this.wiki.setText(this.actionTiddler,this.actionField,this.actionIndex,this.actionValue); 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); self.wiki.setText(self.actionTiddler,name,undefined,attribute,options);
} }
}); });
return true; // Action was invoked return true; // Action was invoked

9
core/modules/wiki.js
View File

@ -58,17 +58,20 @@ exports.setTextReference = function(textRef,value,currTiddlerTitle) {
this.setText(title,tr.field,tr.index,value); this.setText(title,tr.field,tr.index,value);
}; };
exports.setText = function(title,field,index,value) { exports.setText = function(title,field,index,value,options) {
options = options || {};
var creationFields = options.timestamp ? this.getCreationFields() : {},
modificationFields = options.timestamp ? this.getModificationFields() : {};
// Check if it is a reference to a tiddler field // Check if it is a reference to a tiddler field
if(index) { if(index) {
var data = this.getTiddlerData(title,Object.create(null)); var data = this.getTiddlerData(title,Object.create(null));
data[index] = value; data[index] = value;
this.setTiddlerData(title,data,this.getModificationFields()); this.setTiddlerData(title,data,modificationFields);
} else { } else {
var tiddler = this.getTiddler(title), var tiddler = this.getTiddler(title),
fields = {title: title}; fields = {title: title};
fields[field || "text"] = value; fields[field || "text"] = value;
this.addTiddler(new $tw.Tiddler(tiddler,fields,this.getModificationFields())); this.addTiddler(new $tw.Tiddler(creationFields,tiddler,fields,modificationFields));
} }
}; };

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

@ -1,6 +1,6 @@
caption: action-setfield caption: action-setfield
created: 20141025120850184 created: 20141025120850184
modified: 20150220162114000 modified: 20150806171403798
tags: Widgets ActionWidgets tags: Widgets ActionWidgets
title: ActionSetFieldWidget title: ActionSetFieldWidget
type: text/vnd.tiddlywiki type: text/vnd.tiddlywiki
@ -18,6 +18,7 @@ The ''action-setfield'' widget is invisible. Any content within it is ignored.
|$field |Optional name of a field to be assigned the $value attribute | |$field |Optional name of a field to be assigned the $value attribute |
|$index |Optional index of a property in a [[data tiddler|DataTiddlers]] to be assigned the $value attribute| |$index |Optional index of a property in a [[data tiddler|DataTiddlers]] to be assigned the $value attribute|
|$value |The value to be assigned to the field or index identified by the $field or $index attribute. If neither is specified then the value is assigned to the text field | |$value |The value to be assigned to the field or index identified by the $field or $index attribute. If neither is specified then the value is assigned to the text field |
|$timestamp |Specifies whether the timestamp(s) of the target tiddler will be updated (''modified'' and ''modifier'', plus ''created'' and ''creator'' for newly created tiddlers). Can be "yes" (the default) or "no" |
|//{any attributes not starting with $}// |Each attribute name specifies a field to be modified with the attribute value providing the value to assign to the field | |//{any attributes not starting with $}// |Each attribute name specifies a field to be modified with the attribute value providing the value to assign to the field |
! Examples ! Examples