tiddlywiki 5.3.8 → 5.4.0

package/plugins/tiddlywiki/text-slicer/modules/slicer.js

@@ -127,85 +127,85 @@ Slicer.prototype.getMatchingSlicerRuleActions = function(name) {
 
 Slicer.prototype.testSlicerRuleMatching = function() {
 	var tests = [
-			{
-				test: this.searchSlicerRules("title",[
-						{selector: "title,head,body", rules: true},
-						{selector: "body", rules: true}
-					],[
-						{tag:"head"}
-					]),
-				result: "title,head,body"
-			},
-			{
-				test: this.searchSlicerRules("body",[
-						{selector: "title,head,body", rules: true},
-						{selector: "body", rules: true}
-					],[
-						{tag:"head"}
-					]),
-				result: "title,head,body"
-			},
-			{	
-				test: this.searchSlicerRules("title",[
-						{selector: "head > title", rules: true},
-						{selector: "title", rules: true}
-					],[
-						{tag:"head"}
-					]),
-				result: "head > title"
-			}
-		],
-		results = tests.forEach(function(test,index) {
-			if(test.test.selector !== test.result) {
-				throw "Failing test " + index + ", returns " + test.test.selector + " instead of " + test.result;
-			}
-		});
+		{
+			test: this.searchSlicerRules("title",[
+				{selector: "title,head,body", rules: true},
+				{selector: "body", rules: true}
+			],[
+				{tag:"head"}
+			]),
+			result: "title,head,body"
+		},
+		{
+			test: this.searchSlicerRules("body",[
+				{selector: "title,head,body", rules: true},
+				{selector: "body", rules: true}
+			],[
+				{tag:"head"}
+			]),
+			result: "title,head,body"
+		},
+		{	
+			test: this.searchSlicerRules("title",[
+				{selector: "head > title", rules: true},
+				{selector: "title", rules: true}
+			],[
+				{tag:"head"}
+			]),
+			result: "head > title"
+		}
+	];
+	tests.forEach(function(test,index) {
+		if(test.test.selector !== test.result) {
+			throw "Failing test " + index + ", returns " + test.test.selector + " instead of " + test.result;
+		}
+	});
 };
 
 Slicer.prototype.searchSlicerRules = function(name,rules,elementStack) {
 	return rules.find(function(rule) {
 		// Split and trim the selectors for this rule
 		return !!rule.selector.split(",").map(function(selector) {
-				return selector.trim();
+			return selector.trim();
 			// Find the first selector that matches, if any
-			}).find(function(selector) {
-				// Split and trim the parts of the selector
-				var parts = selector.split(" ").map(function(part) {
-					return part.trim();
-				});
+		}).find(function(selector) {
+			// Split and trim the parts of the selector
+			var parts = selector.split(" ").map(function(part) {
+				return part.trim();
+			});
 				// * matches any element
-				if(parts.length === 1 && parts[0] === "*") {
-					return true;
-				}
-				// Make a copy of the element stack so that we can be destructive
-				var elements = elementStack.slice(0).concat({tag: name}),
-					nextElementMustBeAtTopOfStack = true,
-					currentPart = parts.length - 1;
-				while(currentPart >= 0) {
-					if(parts[currentPart] === ">") {
-						nextElementMustBeAtTopOfStack = true;
-					} else {
-						if(!nextElementMustBeAtTopOfStack) {
-							while(elements.length > 0 && elements[elements.length - 1].tag !== parts[currentPart]) {
-								elements.pop();
-							}
-						}
-						if(elements.length === 0 || elements[elements.length - 1].tag !== parts[currentPart]) {
-							return false;
+			if(parts.length === 1 && parts[0] === "*") {
+				return true;
+			}
+			// Make a copy of the element stack so that we can be destructive
+			var elements = elementStack.slice(0).concat({tag: name}),
+				nextElementMustBeAtTopOfStack = true,
+				currentPart = parts.length - 1;
+			while(currentPart >= 0) {
+				if(parts[currentPart] === ">") {
+					nextElementMustBeAtTopOfStack = true;
+				} else {
+					if(!nextElementMustBeAtTopOfStack) {
+						while(elements.length > 0 && elements[elements.length - 1].tag !== parts[currentPart]) {
+							elements.pop();
 						}
-						elements.pop();
-						nextElementMustBeAtTopOfStack = false;
 					}
-					currentPart--;
+					if(elements.length === 0 || elements[elements.length - 1].tag !== parts[currentPart]) {
+						return false;
+					}
+					elements.pop();
+					nextElementMustBeAtTopOfStack = false;
 				}
-				return true;
-			});
+				currentPart--;
+			}
+			return true;
 		});
+	});
 };
 
 Slicer.prototype.getBaseTiddlerTitle = function(baseTiddlerTitle) {
 	if(baseTiddlerTitle) {
-		return baseTiddlerTitle		
+		return baseTiddlerTitle;		
 	} else {
 		if(this.sourceTiddlerTitle) {
 			return "Sliced up " + this.sourceTiddlerTitle + ":";
@@ -248,7 +248,7 @@ Slicer.prototype.getImmediateParent = function() {
 };
 
 Slicer.prototype.onError = function(e) {
-	console.error("Sax error: ", e)
+	console.error("Sax error: ", e);
 	// Try to resume after errors
 	this.sax.error = null;
 	this.sax.resume();
@@ -355,10 +355,10 @@ Slicer.prototype.onCloseTag = function(name) {
 		actions = e.actions,
 		selfClosing = e.isSelfClosing;
 	// Set the caption if required
-// TODO
-// 	if(actions.setCaption) {
-// 		this.chunks[this.currentChunk].caption = this.chunks[this.currentChunk].title;
-// 	}
+	// TODO
+	// 	if(actions.setCaption) {
+	// 		this.chunks[this.currentChunk].caption = this.chunks[this.currentChunk].title;
+	// 	}
 	// Render the tag
 	if(actions.isAnchor) {
 		this.onCloseAnchor(e);
@@ -383,7 +383,6 @@ Slicer.prototype.onCloseTag = function(name) {
 };
 
 Slicer.prototype.onText = function(text) {
-	var self = this;
 	// Discard the text if we're inside an element with actions.discard set true
 	if(this.elementStack.some(function(e) {return e.actions.discard;})) {
 		return;
@@ -436,7 +435,7 @@ Slicer.prototype.startNewChunk = function(fields) {
 
 Slicer.prototype.insertPrecedingChunk = function(fields) {
 	if(!fields.title) {
-		throw "Chunks need a title"
+		throw "Chunks need a title";
 	}
 	if(!this.currentChunk) {
 		this.startNewChunk(fields);

package/plugins/tiddlywiki/text-slicer/modules/startup/slicer-startup.js

@@ -27,7 +27,7 @@ exports.startup = function() {
 	}
 	// Add tm-slice-tiddler event handler
 	$tw.rootWidget.addEventListener("tm-slice-tiddler",function(event) {
-		var slicer = new textSlicer.Slicer({
+		new textSlicer.Slicer({
 			sourceTiddlerTitle: event.param,
 			slicerRules: event.paramObject && event.paramObject.slicerRules,
 			outputMode: event.paramObject && event.paramObject.outputMode,

package/plugins/tiddlywiki/tiddlyweb/config-tiddlers-filter.tid

@@ -1,2 +1,2 @@
-title: $:/config/Server/ExternalFilters/[all[tiddlers]] -[[$:/isEncrypted]] -[prefix[$:/temp/]] -[prefix[$:/status/]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/library/sjcl.js]] -[[$:/core]]
+title: $:/config/Server/ExternalFilters/[all[tiddlers]] -[[$:/isEncrypted]] -[prefix[$:/temp/]] -[prefix[$:/status/]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] -[[$:/library/sjcl.js]] -[[$:/core]]
 text: yes

package/plugins/tiddlywiki/tiddlyweb/save-offline.tid

@@ -2,6 +2,6 @@ title: $:/plugins/tiddlywiki/tiddlyweb/save/offline
 
 \import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
-[is[tiddler]] -[[$:/boot/boot.css]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[prefix[$:/temp/]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[[$:/boot/boot.css]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[prefix[$:/temp/]] +[sort[title]] $(publishFilter)$
 \end
 {{$:/core/templates/tiddlywiki5.html}}

package/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js

@@ -175,7 +175,7 @@ TiddlyWebAdaptor.prototype.getSkinnyTiddlers = function(callback) {
 	$tw.utils.httpRequest({
 		url: this.host + "recipes/" + this.recipe + "/tiddlers.json",
 		data: {
-			filter: "[all[tiddlers]] -[[$:/isEncrypted]] -[prefix[$:/temp/]] -[prefix[$:/status/]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/library/sjcl.js]] -[[$:/core]]"
+			filter: "[all[tiddlers]] -[[$:/isEncrypted]] -[prefix[$:/temp/]] -[prefix[$:/status/]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] -[[$:/library/sjcl.js]] -[[$:/core]]"
 		},
 		callback: function(err,data) {
 			// Check for errors
@@ -218,7 +218,7 @@ TiddlyWebAdaptor.prototype.saveTiddler = function(tiddler,callback,options) {
 			}
 			//If Browser-Storage plugin is present, remove tiddler from local storage after successful sync to the server
 			if($tw.browserStorage && $tw.browserStorage.isEnabled()) {
-				$tw.browserStorage.removeTiddlerFromLocalStorage(tiddler.fields.title)
+				$tw.browserStorage.removeTiddlerFromLocalStorage(tiddler.fields.title);
 			}
 			// Save the details of the new revision of the tiddler
 			var etag = request.getResponseHeader("Etag");
@@ -258,7 +258,6 @@ options include:
 tiddlerInfo: the syncer's tiddlerInfo for this tiddler
 */
 TiddlyWebAdaptor.prototype.deleteTiddler = function(title,callback,options) {
-	var self = this;
 	if(this.isReadOnly) {
 		return callback(null);
 	}
@@ -292,8 +291,8 @@ TiddlyWebAdaptor.prototype.convertTiddlerToTiddlyWebFormat = function(tiddler) {
 	if(tiddler) {
 		$tw.utils.each(tiddler.fields,function(fieldValue,fieldName) {
 			var fieldString = fieldName === "tags" ?
-								tiddler.fields.tags :
-								tiddler.getFieldString(fieldName); // Tags must be passed as an array, not a string
+				tiddler.fields.tags :
+				tiddler.getFieldString(fieldName); // Tags must be passed as an array, not a string
 
 			if(knownFields.indexOf(fieldName) !== -1) {
 				// If it's a known field, just copy it across
@@ -314,8 +313,7 @@ TiddlyWebAdaptor.prototype.convertTiddlerToTiddlyWebFormat = function(tiddler) {
 Convert a field set in TiddlyWeb format into ordinary TiddlyWiki5 format
 */
 TiddlyWebAdaptor.prototype.convertTiddlerFromTiddlyWebFormat = function(tiddlerFields) {
-	var self = this,
-		result = {};
+	var result = {};
 	// Transfer the fields, pulling down the `fields` hashmap
 	$tw.utils.each(tiddlerFields,function(element,title,object) {
 		if(title === "fields") {

package/plugins/tiddlywiki/translators/output-file-templates/Draft.multids.tid

@@ -0,0 +1,3 @@
+title: $:/plugins/tiddlywiki/translators/templates/Draft.multids
+
+{{$:/language/Draft/||$:/plugins/tiddlywiki/translators/templates/multids}}

package/plugins/tiddlywiki/translators/output-file-templates/Misc.multids.tid

@@ -4,6 +4,7 @@ title: $:/plugins/tiddlywiki/translators/templates/Misc.multids
 -[all[tiddlers]prefix[$:/language/Buttons/]]
 -[all[tiddlers]prefix[$:/language/ControlPanel/]]
 -[all[tiddlers]prefix[$:/language/Date/]]
+-[all[tiddlers]prefix[$:/language/Draft/]]
 -[all[tiddlers]prefix[$:/language/Docs/]]
 -[all[tiddlers]prefix[$:/language/EditTemplate/]]
 -[all[tiddlers]prefix[$:/language/Exporters/]]

package/plugins/tiddlywiki/translators/ui/group/Draft.tid

@@ -0,0 +1,28 @@
+title: $:/plugins/tiddlywiki/translators/ui/group/Draft
+caption: Draft
+tags: $:/tags/TranslationGroup
+
+\procedure translatableTiddlerTitles()
+[all[tiddlers+shadows]prefix[$:/language/Draft/]]
++[sort[title]]
+\end
+\procedure shortenTitle()
+[all[current]removeprefix[$:/language/Draft/]]
+\end
+
+! Draft
+
+Template for the title of draft tiddlers.
+
+Substitution result:
+
+<$let draft-title="Motovun Jack">
+<$wikify name="draft-with-attribution" text={{$:/language/Draft/Attribution}} output="text">
+<$wikify name="draft-without-attribution" text={{$:/language/Draft/Title}} output="text">
+<$codeblock code=<<draft-with-attribution>>/>
+<$codeblock code=<<draft-without-attribution>>/>
+</$wikify>
+</$wikify>
+</$let>
+
+<<translatableStringEditor>>

package/plugins/tiddlywiki/translators/ui/group/Miscellaneous.tid

@@ -6,6 +6,7 @@ tags: $:/tags/TranslationGroup
 [all[tiddlers+shadows]prefix[$:/language/]]
 -[all[tiddlers+shadows]prefix[$:/language/Buttons/]]
 -[all[tiddlers+shadows]prefix[$:/language/ControlPanel/]]
+-[all[tiddlers+shadows]prefix[$:/language/Draft/]]
 -[all[tiddlers+shadows]prefix[$:/language/Date/]]
 -[all[tiddlers+shadows]prefix[$:/language/Docs/]]
 -[all[tiddlers+shadows]prefix[$:/language/EditTemplate/]]

package/plugins/tiddlywiki/tw2parser/classictransclude.js

@@ -94,7 +94,7 @@ TranscludeWidget.prototype.execute = function() {
 	this.setVariable("transclusion",recursionMarker);
 	// Parse 
 	var text = this.wiki.getTiddlerText(this.transcludeTitle);
-	if (!!this.section||!!this.slice) {
+	if(!!this.section||!!this.slice) {
 		text =this.refineTiddlerText(text, this.section, this.slice);
 	}
 
@@ -151,8 +151,7 @@ TranscludeWidget.prototype.getTextSlice = function(text,sliceName)
 
 TranscludeWidget.prototype.refineTiddlerText = function(text,section,slice)
 {
-	var textsection = null;
-	if (slice) {
+	if(slice) {
 		var textslice = this.getTextSlice(text,slice);
 		if(textslice)
 			return textslice;
@@ -172,7 +171,7 @@ TranscludeWidget.prototype.refineTiddlerText = function(text,section,slice)
 		return t;
 	}
 	return "";
-}
+};
 
 /*
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering

package/plugins/tiddlywiki/tw2parser/entry.js

@@ -23,4 +23,4 @@ exports.run = function(key,map) {
 	} catch(e) {
 		return "";
 	}
-}
+};

package/plugins/tiddlywiki/tw2parser/parameteradapter.js

@@ -5,6 +5,7 @@ module-type: module
 \*/
 
 "use strict";
+/* eslint-disable */
 /*
 Information about this module:
 rename macros and
@@ -65,7 +66,7 @@ var parserparams = function(paramString) {
 		paramMatch = reParam.exec(paramString);
 	}
 	return params;
-}
+};
 var tabshandler = function(paramstring) {
 	var params = parserparams(paramstring);
 	var cookie = params[0].value;
@@ -73,7 +74,7 @@ var tabshandler = function(paramstring) {
 	var t;
 	var tabslist = "";
 	var labelarray = {};
-    var promptarray = {};
+	var promptarray = {};
 	for(t=0; t<numTabs; t++) {
 		var contentName = params[t*3+3].value;
 		tabslist = tabslist+" " + contentName;
@@ -84,10 +85,10 @@ var tabshandler = function(paramstring) {
 	//Use json to implement maps 
 	return '"""'+tabslist +'""" """'+JSON.stringify(promptarray)+'""" """'+JSON.stringify(labelarray)+'""" """'+cookie+'"""';
 };
-var namedapter = {tabs:'__system_tabs'};
+var namedapter = {tabs:"__system_tabs"};
 var paramadapter = {
 	tabs: tabshandler
-}
-exports.name = 'macroadapter';
+};
+exports.name = "macroadapter";
 exports.namedapter = namedapter;
 exports.paramadapter = paramadapter;