tiddlywiki 5.3.5 → 5.3.7

package/core/modules/widgets/entity.js

@@ -6,10 +6,7 @@ module-type: widget
 HTML entity widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -56,5 +53,3 @@ EntityWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.entity = EntityWidget;
-
-})();

package/core/modules/widgets/error.js

@@ -6,10 +6,7 @@ module-type: widget
 Error widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -59,5 +56,3 @@ ErrorWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.error = ErrorWidget;
-
-})();

package/core/modules/widgets/eventcatcher.js

@@ -6,10 +6,7 @@ module-type: widget
 Event handler widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -155,5 +152,3 @@ EventWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.eventcatcher = EventWidget;
-
-})();

package/core/modules/widgets/fieldmangler.js

@@ -6,10 +6,7 @@ module-type: widget
 Field mangler widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -130,5 +127,3 @@ FieldManglerWidget.prototype.handleAddTagEvent = function(event) {
 };
 
 exports.fieldmangler = FieldManglerWidget;
-
-})();

package/core/modules/widgets/fields.js

@@ -6,10 +6,7 @@ module-type: widget
 Fields widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -110,5 +107,3 @@ FieldsWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.fields = FieldsWidget;
-
-})();

package/core/modules/widgets/fill.js

@@ -6,10 +6,7 @@ module-type: widget
 Sub-widget used by the transclude widget for specifying values for slots within transcluded content. It doesn't do anything by itself because the transclude widget only ever deals with the parse tree nodes, and doesn't instantiate the widget itself
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -24,7 +21,8 @@ Inherit from the base widget class
 */
 FillWidget.prototype = new Widget();
 
-exports.fill = FillWidget;
+FillWidget.prototype.execute = function() {
+	// Do nothing. Make no child widgets. $Fill widgets should be invisible when naturally encountered. Instead, their parseTreeNodes are made available to $slot widgets that want it.
+};
 
-})();
-	
+exports.fill = FillWidget;

package/core/modules/widgets/genesis.js

@@ -6,10 +6,7 @@ module-type: widget
 Genesis widget for dynamically creating widgets
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -23,15 +20,21 @@ Inherit from the base widget class
 */
 GenesisWidget.prototype = new Widget();
 
+GenesisWidget.prototype.computeAttributes = function(options) {
+	options = options || Object.create(null);
+	options.filterFn = function(name) {
+		// Only compute our own attributes which start with a single dollar
+		return name.charAt(0) === "$" && name.charAt(1) !== "$";
+	}
+	return Widget.prototype.computeAttributes.call(this,options);
+};
+
 /*
 Render this widget into the DOM
 */
 GenesisWidget.prototype.render = function(parent,nextSibling) {
 	this.parentDomNode = parent;
-	this.computeAttributes({filterFn: function(name) {
-		// Only compute our own attributes which start with a single dollar
-		return name.charAt(0) === "$" && name.charAt(1) !== "$";
-	}});
+	this.computeAttributes();
 	this.execute();
 	this.renderChildren(parent,nextSibling);
 };
@@ -65,6 +68,16 @@ GenesisWidget.prototype.execute = function() {
 		children: this.parseTreeNode.children || [],
 		isNotRemappable: !this.genesisRemappable
 	}];
+	// Apply attributes in $names/$values
+	this.attributeNames = [];
+	this.attributeValues = [];
+	if(this.genesisNames && this.genesisValues) {
+		this.attributeNames = this.wiki.filterTiddlers(self.genesisNames,this);
+		this.attributeValues = this.wiki.filterTiddlers(self.genesisValues,this);
+		$tw.utils.each(this.attributeNames,function(varname,index) {
+			$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],varname,self.attributeValues[index] || "");
+		});
+	}
 	// Apply explicit attributes
 	$tw.utils.each($tw.utils.getOrderedAttributesFromParseTreeNode(this.parseTreeNode),function(attribute) {
 		var name = attribute.name;
@@ -79,16 +92,6 @@ GenesisWidget.prototype.execute = function() {
 		}
 		$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],$tw.utils.extend({},attribute,{name: name}));
 	});
-	// Apply attributes in $names/$values
-	this.attributeNames = [];
-	this.attributeValues = [];
-	if(this.genesisNames && this.genesisValues) {
-		this.attributeNames = this.wiki.filterTiddlers(self.genesisNames,this);
-		this.attributeValues = this.wiki.filterTiddlers(self.genesisValues,this);
-		$tw.utils.each(this.attributeNames,function(varname,index) {
-			$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],varname,self.attributeValues[index] || "");
-		});
-	}
 	// Construct the child widgets
 	this.makeChildWidgets(parseTreeNodes);
 };
@@ -111,5 +114,3 @@ GenesisWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.genesis = GenesisWidget;
-
-})();

package/core/modules/widgets/image.js

@@ -22,10 +22,7 @@ Tiddlers that contain wikitext could be rendered to a DIV of the usual size of a
 The width and height attributes are interpreted as a number of pixels, and do not need to include the "px" suffix.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -162,5 +159,3 @@ ImageWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.image = ImageWidget;
-
-})();

package/core/modules/widgets/importvariables.js

@@ -6,10 +6,7 @@ module-type: widget
 Import variable definitions from other tiddlers
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -132,5 +129,3 @@ ImportVariablesWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.importvariables = ImportVariablesWidget;
-
-})();

package/core/modules/widgets/jsontiddler.js

@@ -6,10 +6,7 @@ module-type: widget
 Render a tiddler as JSON text
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -87,5 +84,3 @@ JSONTiddlerWidget.prototype.getTiddlerFields = function() {
 };
 
 exports.jsontiddler = JSONTiddlerWidget;
-
-})();

package/core/modules/widgets/keyboard.js

@@ -6,10 +6,7 @@ module-type: widget
 Keyboard shortcut widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -96,13 +93,15 @@ KeyboardWidget.prototype.execute = function() {
 	this.param = this.getAttribute("param","");
 	this.key = this.getAttribute("key","");
 	this.tag = this.getAttribute("tag","");
-	this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key);
-	if(this.key.substr(0,2) === "((" && this.key.substr(-2,2) === "))") {
-		this.shortcutTiddlers = [];
-		var name = this.key.substring(2,this.key.length -2);
-		$tw.utils.each($tw.keyboardManager.lookupNames,function(platformDescriptor) {
-			self.shortcutTiddlers.push("$:/config/" + platformDescriptor + "/" + name);
-		});
+	if($tw.keyboardManager) {
+		this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key);
+		if(this.key.substr(0,2) === "((" && this.key.substr(-2,2) === "))") {
+			this.shortcutTiddlers = [];
+			var name = this.key.substring(2,this.key.length -2);
+			$tw.utils.each($tw.keyboardManager.lookupNames,function(platformDescriptor) {
+				self.shortcutTiddlers.push("$:/config/" + platformDescriptor + "/" + name);
+			});
+		}	
 	}
 	// Make child widgets
 	this.makeChildWidgets();
@@ -126,12 +125,10 @@ KeyboardWidget.prototype.refresh = function(changedTiddlers) {
 		this.assignDomNodeClasses();
 	}
 	// Update the keyInfoArray if one of its shortcut-config-tiddlers has changed
-	if(this.shortcutTiddlers && $tw.utils.hopArray(changedTiddlers,this.shortcutTiddlers)) {
+	if(this.shortcutTiddlers && $tw.utils.hopArray(changedTiddlers,this.shortcutTiddlers) && $tw.keyboardManager) {
 		this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key);
 	}
 	return this.refreshChildren(changedTiddlers);
 };
 
 exports.keyboard = KeyboardWidget;
-
-})();

package/core/modules/widgets/let.js

@@ -14,10 +14,7 @@ the later variables to depend upon the earlier ones.
 ```
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -92,5 +89,3 @@ LetWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports["let"] = LetWidget;
-
-})();

package/core/modules/widgets/link.js

@@ -6,10 +6,7 @@ module-type: widget
 Link widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -225,6 +222,3 @@ LinkWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.link = LinkWidget;
-
-})();
-	

package/core/modules/widgets/linkcatcher.js

@@ -6,10 +6,7 @@ module-type: widget
 Linkcatcher widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -100,5 +97,3 @@ LinkCatcherWidget.prototype.handleNavigateEvent = function(event) {
 };
 
 exports.linkcatcher = LinkCatcherWidget;
-
-})();

package/core/modules/widgets/list.js

@@ -6,10 +6,7 @@ module-type: widget
 List and list item widgets
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -522,5 +519,3 @@ ListJoinWidget.prototype.render = function() {}
 ListJoinWidget.prototype.refresh = function() { return false; }
 
 exports["list-join"] = ListJoinWidget;
-
-})();

package/core/modules/widgets/log.js

@@ -6,10 +6,7 @@ module-type: widget-subclass
 Widget to log debug messages
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.baseClass = "action-log";
@@ -26,5 +23,3 @@ exports.prototype.render = function(event) {
 	Object.getPrototypeOf(Object.getPrototypeOf(this)).render.call(this,event);
 	Object.getPrototypeOf(Object.getPrototypeOf(this)).log.call(this);
 }
-
-})();

package/core/modules/widgets/macrocall.js

@@ -6,10 +6,7 @@ module-type: widget
 Macrocall widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -87,5 +84,3 @@ MacroCallWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.macrocall = MacroCallWidget;
-
-})();

package/core/modules/widgets/messagecatcher.js

@@ -6,10 +6,7 @@ module-type: widget
 Message catcher widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -106,5 +103,3 @@ MessageCatcherWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.messagecatcher = MessageCatcherWidget;
-
-})();

package/core/modules/widgets/navigator.js

@@ -6,10 +6,7 @@ module-type: widget
 Navigator widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var IMPORT_TITLE = "$:/Import";
@@ -184,7 +181,7 @@ NavigatorWidget.prototype.handleCloseOtherTiddlersEvent = function(event) {
 // Place a tiddler in edit mode
 NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) {
 	var editTiddler = $tw.hooks.invokeHook("th-editing-tiddler",event),
-	    win = event.event && event.event.view ? event.event.view : window;
+		win = event.event && event.event.view ? event.event.view : window;
 	if(!editTiddler) {
 		return false;
 	}
@@ -277,6 +274,8 @@ NavigatorWidget.prototype.makeDraftTiddler = function(targetTitle) {
 	}
 	// Get the current value of the tiddler we're editing
 	var tiddler = this.wiki.getTiddler(targetTitle);
+	var defaultType = this.wiki.getTiddlerText("$:/config/DefaultMissingType", "").trim();
+	var defaultFields = { type: defaultType };
 	// Save the initial value of the draft tiddler
 	draftTitle = this.generateDraftTitle(targetTitle);
 	var draftTiddler = new $tw.Tiddler({
@@ -288,7 +287,8 @@ NavigatorWidget.prototype.makeDraftTiddler = function(targetTitle) {
 				"draft.title": targetTitle,
 				"draft.of": targetTitle
 			},
-			this.wiki.getModificationFields()
+			this.wiki.getModificationFields(),
+			tiddler === null || tiddler === undefined ? defaultFields : {}
 		);
 	this.wiki.addTiddler(draftTiddler);
 	return draftTiddler;
@@ -306,7 +306,7 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
 	var title = event.param || event.tiddlerTitle,
 		tiddler = this.wiki.getTiddler(title),
 		storyList = this.getStoryList(),
-	    	win = event.event && event.event.view ? event.event.view : window;
+		win = event.event && event.event.view ? event.event.view : window;
 	// Replace the original tiddler with the draft
 	if(tiddler) {
 		var draftTitle = (tiddler.fields["draft.title"] || "").trim(),
@@ -412,7 +412,8 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 	event = $tw.hooks.invokeHook("th-new-tiddler", event);
 	// Get the story details
 	var storyList = this.getStoryList(),
-		templateTiddler, additionalFields, title, draftTitle, existingTiddler;
+		templateTiddler, additionalFields, title, draftTitle, existingTiddler,
+		templateHasTags = false;
 	// Get the template tiddler (if any)
 	if(typeof event.param === "string") {
 		// Get the template tiddler
@@ -457,8 +458,10 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 		// Merge tags
 		mergedTags = $tw.utils.pushTop(mergedTags,$tw.utils.parseStringArray(additionalFields.tags));
 	}
+	var additionalFieldsHasTags = !!(additionalFields && (additionalFields.tags === ""));
 	if(templateTiddler && templateTiddler.fields.tags) {
 		// Merge tags
+		templateHasTags = true;
 		mergedTags = $tw.utils.pushTop(mergedTags,templateTiddler.fields.tags);
 	}
 	// Save the draft tiddler
@@ -474,7 +477,8 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 		{
 			title: draftTitle,
 			"draft.of": title,
-			tags: mergedTags
+			// If template or additionalFields have "tags" even if empty a tags field will be created.
+			tags: ((mergedTags.length > 0) || templateHasTags || additionalFieldsHasTags) ? mergedTags : undefined
 		},this.wiki.getModificationFields());
 	this.wiki.addTiddler(draftTiddler);
 	// Update the story to insert the new draft at the top and remove any existing tiddler
@@ -526,7 +530,7 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 	var systemMessage = $tw.language.getString("Import/Upgrader/Tiddler/Unselected");
 	$tw.utils.each(messages,function(message,title) {
 		newFields["message-" + title] = message;
-		if (message.indexOf(systemMessage) !== -1) {
+		if(message.indexOf(systemMessage) !== -1) {
 			newFields["selection-" + title] = "unchecked";
 		}
 	});
@@ -632,5 +636,3 @@ NavigatorWidget.prototype.handleUnfoldAllTiddlersEvent = function(event) {
 };
 
 exports.navigator = NavigatorWidget;
-
-})();

package/core/modules/widgets/parameters.js

@@ -6,10 +6,7 @@ module-type: widget
 Widget for definition of transclusion parameters
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget,
@@ -104,5 +101,3 @@ ParametersWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.parameters = ParametersWidget;
-
-})();

package/core/modules/widgets/password.js

@@ -6,10 +6,7 @@ module-type: widget
 Password widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -78,5 +75,3 @@ PasswordWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.password = PasswordWidget;
-
-})();

package/core/modules/widgets/qualify.js

@@ -6,10 +6,7 @@ module-type: widget
 Qualify text to a variable 
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -62,5 +59,3 @@ QualifyWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.qualify = QualifyWidget;
-
-})();

package/core/modules/widgets/radio.js

@@ -6,10 +6,7 @@ module-type: widget
 Set a field or index at a given tiddler via radio buttons
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -47,6 +44,9 @@ RadioWidget.prototype.render = function(parent,nextSibling) {
 	if(isChecked) {
 		this.inputDomNode.checked = true;
 	}
+	if(this.tabIndex) {
+		this.inputDomNode.setAttribute("tabindex", this.tabIndex);
+	}
 	if(this.isDisabled === "yes") {
 		this.inputDomNode.setAttribute("disabled",true);
 	}
@@ -111,6 +111,7 @@ RadioWidget.prototype.execute = function() {
 	this.radioClass = this.getAttribute("class","");
 	this.radioDefault = this.getAttribute("default");
 	this.isDisabled = this.getAttribute("disabled","no");
+	this.tabIndex = this.getAttribute("tabindex");
 	this.radioActions = this.getAttribute("actions","");
 	// Make the child widgets
 	this.makeChildWidgets();
@@ -134,5 +135,3 @@ RadioWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.radio = RadioWidget;
-
-})();

package/core/modules/widgets/range.js

@@ -6,10 +6,7 @@ module-type: widget
 Range widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -46,6 +43,9 @@ RangeWidget.prototype.render = function(parent,nextSibling) {
 	if(this.increment){
 		this.inputDomNode.setAttribute("step", this.increment);
 	}
+	if(this.tabIndex) {
+		this.inputDomNode.setAttribute("tabindex", this.tabIndex);
+	}
 	if(this.isDisabled === "yes") {
 		this.inputDomNode.setAttribute("disabled",true);
 	}
@@ -164,6 +164,7 @@ RangeWidget.prototype.execute = function() {
 	this.defaultValue = this.getAttribute("default","");
 	this.elementClass = this.getAttribute("class","");
 	this.isDisabled = this.getAttribute("disabled","no");
+	this.tabIndex = this.getAttribute("tabindex");
 	// Actions since 5.1.23
 	// Next 2 only fire once!
 	this.actionsMouseDown = this.getAttribute("actionsStart","");
@@ -196,5 +197,3 @@ RangeWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.range = RangeWidget;
-
-})();

package/core/modules/widgets/raw.js

@@ -6,10 +6,7 @@ module-type: widget
 Raw widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -49,5 +46,3 @@ RawWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.raw = RawWidget;
-
-})();

package/core/modules/widgets/reveal.js

@@ -6,10 +6,7 @@ module-type: widget
 Reveal widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -275,5 +272,3 @@ RevealWidget.prototype.updateState = function() {
 };
 
 exports.reveal = RevealWidget;
-
-})();

package/core/modules/widgets/scrollable.js

@@ -6,10 +6,7 @@ module-type: widget
 Scrollable widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var DEBOUNCE_INTERVAL = 100; // Delay after last scroll event before updating the bound tiddler
@@ -262,5 +259,3 @@ ScrollableWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.scrollable = ScrollableWidget;
-
-})();