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

Merge action-setfield and action-setfields widgets

Browse Source 
Less confusion, hopefully.
This commit is contained in:
Jermolene
2014-11-06 19:27:14 +00:00
parent 24956f036e
commit 12aec57086
5 changed files with 49 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/modules/widgets/action-setfield.js
+8 -1
View File
@@ -57,7 +57,14 @@ SetFieldWidget.prototype.refresh = function(changedTiddlers) {
Invoke the action associated with this widget
*/
SetFieldWidget.prototype.invokeAction = function(triggeringWidget,event) {
this.wiki.setText(this.actionTiddler,this.actionField,this.actionIndex,this.actionValue);
if(this.actionValue) {
this.wiki.setText(this.actionTiddler,this.actionField,this.actionIndex,this.actionValue);
}
$tw.utils.each(this.attributes,function(attribute,name) {
if(name.charAt(0) !== "$") {
self.wiki.setText(self.actionTiddler,name,undefined,attribute);
}
});
return true; // Action was invoked
};
core/modules/widgets/action-setfields.js
-68
View File
@@ -1,68 +0,0 @@
/*\
title: $:/core/modules/widgets/action-setfields.js
type: application/javascript
module-type: widget
Action widget to set multiple fields on a tiddler.
\*/
(function(){
/*jslint node: true, browser: true */
/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
var SetFieldsWidget = function(parseTreeNode,options) {
this.initialise(parseTreeNode,options);
};
/*
Inherit from the base widget class
*/
SetFieldsWidget.prototype = new Widget();
/*
Render this widget into the DOM
*/
SetFieldsWidget.prototype.render = function(parent,nextSibling) {
this.computeAttributes();
this.execute();
};
/*
Compute the internal state of the widget
*/
SetFieldsWidget.prototype.execute = function() {
this.actionTiddler = this.getAttribute("$tiddler",this.getVariable("currentTiddler"));
};
/*
Refresh the widget by ensuring our attributes are up to date
*/
SetFieldsWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
if(changedAttributes["$tiddler"]) {
this.refreshSelf();
return true;
}
return this.refreshChildren(changedTiddlers);
};
/*
Invoke the action associated with this widget
*/
SetFieldsWidget.prototype.invokeAction = function(triggeringWidget,event) {
var self = this;
$tw.utils.each(this.attributes,function(attribute,name) {
if(name.charAt(0) !== "$") {
self.wiki.setText(self.actionTiddler,name,undefined,attribute);
}
});
return true; // Action was invoked
};
exports["action-setfields"] = SetFieldsWidget;
})();