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

Revert "Merge pull request #2166 from matabele/patch-5"

Browse Source 
This reverts commit 83c54f4bb5, reversing
changes made to 0cbe97615a.
This commit is contained in:
Jermolene 2016-01-06 09:38:39 +00:00
parent 3fa5ba52f9
commit b873df0ba2
1 changed files with 6 additions and 8 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,16 +59,14 @@ 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 (this.actionField) { if((typeof this.actionField == "string") || (typeof this.actionIndex == "string") || (typeof this.actionValue == "string")) {
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) !== "$") {
(name.search("!!") !== -1 || name.search("##") !== -1) ? self.wiki.setText(self.actionTiddler,name,undefined,attribute,options);
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