tiddlywiki 5.3.6 → 5.3.7

package/core/modules/filters/x-listops.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Extended filter operators to manipulate the current list.
 
 \*/
-(function () {
 
-	/*jslint node: true, browser: true */
-	/*global $tw: false */
 	"use strict";
 
 	/*
@@ -231,5 +228,3 @@ Extended filter operators to manipulate the current list.
 		}
 		return cycleValueInArray(results,operands,step);
 	}
-
-})();

package/core/modules/filters.js

@@ -6,10 +6,7 @@ module-type: wikimethod
 Adds tiddler filtering methods to the $tw.Wiki object.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var widgetClass = require("$:/core/modules/widgets/widget.js").widget;
@@ -251,8 +248,7 @@ exports.compileFilter = function(filterString) {
 		// Create a function for the chain of operators in the operation
 		var operationSubFunction = function(source,widget) {
 			var accumulator = source,
-				results = [],
-				currTiddlerTitle = widget && widget.getVariable("currentTiddler");
+				results = [];
 			$tw.utils.each(operation.operators,function(operator) {
 				var operands = [],
 					operatorFunction;
@@ -268,6 +264,7 @@ exports.compileFilter = function(filterString) {
 				}
 				$tw.utils.each(operator.operands,function(operand) {
 					if(operand.indirect) {
+						var currTiddlerTitle = widget && widget.getVariable("currentTiddler");
 						operand.value = self.getTextReference(operand.text,"",currTiddlerTitle);
 					} else if(operand.variable) {
 						var varTree = $tw.utils.parseFilterVariable(operand.text);
@@ -367,5 +364,3 @@ exports.compileFilter = function(filterString) {
 	this.filterCacheCount++;
 	return fnMeasured;
 };
-
-})();

package/core/modules/indexers/field-indexer.js

@@ -6,10 +6,7 @@ module-type: indexer
 Indexes the tiddlers with each field value
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global modules: false */
 "use strict";
 
 var DEFAULT_MAXIMUM_INDEXED_VALUE_LENGTH = 128;
@@ -139,5 +136,3 @@ FieldIndexer.prototype.lookup = function(name,value) {
 };
 
 exports.FieldIndexer = FieldIndexer;
-
-})();

package/core/modules/indexers/tag-indexer.js

@@ -6,10 +6,7 @@ module-type: indexer
 Indexes the tiddlers with each tag
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global modules: false */
 "use strict";
 
 function TagIndexer(wiki) {
@@ -94,5 +91,3 @@ TagSubIndexer.prototype.lookup = function(tag) {
 
 
 exports.TagIndexer = TagIndexer;
-
-})();

package/core/modules/info/platform.js

@@ -6,10 +6,7 @@ module-type: info
 Initialise basic platform $:/info/ tiddlers
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
@@ -48,5 +45,3 @@ exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
 	}
 	return infoTiddlerFields;
 };
-
-})();

package/core/modules/keyboard.js

@@ -6,10 +6,7 @@ module-type: global
 Keyboard handling utilities
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var namedKeys = {
@@ -383,5 +380,3 @@ KeyboardManager.prototype.handleShortcutChanges = function(changedTiddlers) {
 };
 
 exports.KeyboardManager = KeyboardManager;
-
-})();

package/core/modules/language.js

@@ -6,10 +6,7 @@ module-type: global
 The $tw.Language() manages translateable strings
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -41,5 +38,3 @@ Language.prototype.getRawString = function(title) {
 };
 
 exports.Language = Language;
-
-})();

package/core/modules/macros/changecount.js

@@ -6,10 +6,7 @@ module-type: macro
 Macro to return the changecount for the current tiddler
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -26,5 +23,3 @@ Run the macro
 exports.run = function() {
 	return this.wiki.getChangeCount(this.getVariable("currentTiddler")) + "";
 };
-
-})();

package/core/modules/macros/contrastcolour.js

@@ -6,10 +6,7 @@ module-type: macro
 Macro to choose which of two colours has the highest contrast with a base colour
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -51,5 +48,3 @@ exports.run = function(target,fallbackTarget,colourA,colourB) {
 		brightnessB = rgbColourB[0] * 0.299 + rgbColourB[1] * 0.587 + rgbColourB[2] * 0.114;
 	return Math.abs(brightnessTarget - brightnessA) > Math.abs(brightnessTarget - brightnessB) ? colourA : colourB;
 };
-
-})();

package/core/modules/macros/csvtiddlers.js

@@ -6,10 +6,7 @@ module-type: macro
 Macro to output tiddlers matching a filter to CSV
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -75,5 +72,3 @@ exports.run = function(filter,format) {
 function quoteAndEscape(value) {
 	return "\"" + value.replace(/"/mg,"\"\"") + "\"";
 }
-
-})();

package/core/modules/macros/displayshortcuts.js

@@ -6,10 +6,7 @@ module-type: macro
 Macro to display a list of keyboard shortcuts in human readable form. Notably, it resolves named shortcuts like `((bold))` to the underlying keystrokes.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -41,5 +38,3 @@ exports.run = function(shortcuts,prefix,separator,suffix) {
 		return "";
 	}
 };
-
-})();

package/core/modules/macros/jsontiddler.js

@@ -6,10 +6,7 @@ module-type: macro
 Macro to output a single tiddler to JSON
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -37,4 +34,3 @@ exports.run = function(title) {
 	return JSON.stringify(fields,null,$tw.config.preferences.jsonSpaces);
 };
 
-})();

package/core/modules/macros/jsontiddlers.js

@@ -6,10 +6,7 @@ module-type: macro
 Macro to output tiddlers matching a filter to JSON
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -29,5 +26,3 @@ Run the macro
 exports.run = function(filter,spaces) {
 	return this.wiki.getTiddlersAsJson(filter,$tw.utils.parseInt(spaces));
 };
-
-})();

package/core/modules/macros/makedatauri.js

@@ -8,10 +8,7 @@ Macro to convert a string of text to a data URI
 <<makedatauri text:"Text to be converted" type:"text/vnd.tiddlywiki">>
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -32,5 +29,3 @@ Run the macro
 exports.run = function(text,type,_canonical_uri) {
 	return $tw.utils.makeDataUri(text,type,_canonical_uri);
 };
-
-})();

package/core/modules/macros/now.js

@@ -6,10 +6,7 @@ module-type: macro
 Macro to return a formatted version of the current time
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -28,5 +25,3 @@ Run the macro
 exports.run = function(format) {
 	return $tw.utils.formatDateString(new Date(),format || "0hh:0mm, DDth MMM YYYY");
 };
-
-})();

package/core/modules/macros/qualify.js

@@ -6,10 +6,7 @@ module-type: macro
 Macro to qualify a state tiddler title according
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -28,5 +25,3 @@ Run the macro
 exports.run = function(title) {
 	return title + "-" + this.getStateQualifier();
 };
-
-})();

package/core/modules/macros/resolvepath.js

@@ -6,10 +6,7 @@ module-type: macro
 Resolves a relative path for an absolute rootpath.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.name = "resolvepath";
@@ -25,5 +22,3 @@ Run the macro
 exports.run = function(source, root) {
 	return $tw.utils.resolvePath(source, root);
 };
-
-})();

package/core/modules/macros/unusedtitle.js

@@ -5,10 +5,7 @@ module-type: macro
 
 Macro to return a new title that is unused in the wiki. It can be given a name as a base.
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.name = "unusedtitle";
@@ -31,7 +28,5 @@ exports.run = function(baseName,separator,template,startCount) {
 	}
 	// $tw.wiki.generateNewTitle = function(baseTitle,options)
 	// options.prefix must be a string!
-	return this.wiki.generateNewTitle(baseName, {"prefix": separator, "template": template, "startCount": startCount});
+	return this.wiki.generateNewTitle(baseName, {"prefix": separator, "template": template, "startCount": startCount}).trim();
 };
-
-})();

package/core/modules/macros/version.js

@@ -6,10 +6,7 @@ module-type: macro
 Macro to return the TiddlyWiki core version number
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -26,5 +23,3 @@ Run the macro
 exports.run = function() {
 	return $tw.version;
 };
-
-})();

package/core/modules/parsers/audioparser.js

@@ -6,10 +6,7 @@ module-type: parser
 The audio parser parses an audio tiddler into an embeddable HTML element
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var AudioParser = function(type,text,options) {
@@ -36,6 +33,3 @@ exports["audio/ogg"] = AudioParser;
 exports["audio/mpeg"] = AudioParser;
 exports["audio/mp3"] = AudioParser;
 exports["audio/mp4"] = AudioParser;
-
-})();
-

package/core/modules/parsers/binaryparser.js

@@ -6,10 +6,7 @@ module-type: parser
 The binary parser parses a binary tiddler into a warning message and download link
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var BINARY_WARNING_MESSAGE = "$:/core/ui/BinaryWarning";
@@ -69,6 +66,3 @@ var BinaryParser = function(type,text,options) {
 };
 
 exports["application/octet-stream"] = BinaryParser;
-
-})();
-

package/core/modules/parsers/csvparser.js

@@ -6,10 +6,7 @@ module-type: parser
 The CSV text parser processes CSV files into a table wrapped in a scrollable widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var CsvParser = function(type,text,options) {
@@ -58,6 +55,3 @@ var CsvParser = function(type,text,options) {
 
 exports["text/csv"] = CsvParser;
 exports["text/tab-delimited-values"] = CsvParser;
-
-})();
-

package/core/modules/parsers/htmlparser.js

@@ -6,10 +6,7 @@ module-type: parser
 The HTML parser displays text as raw HTML
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var HtmlParser = function(type,text,options) {
@@ -34,6 +31,3 @@ var HtmlParser = function(type,text,options) {
 };
 
 exports["text/html"] = HtmlParser;
-
-})();
-

package/core/modules/parsers/imageparser.js

@@ -6,10 +6,7 @@ module-type: parser
 The image parser parses an image into an embeddable HTML element
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var ImageParser = function(type,text,options) {
@@ -40,8 +37,6 @@ exports["image/gif"] = ImageParser;
 exports["image/webp"] = ImageParser;
 exports["image/heic"] = ImageParser;
 exports["image/heif"] = ImageParser;
+exports["image/avif"] = ImageParser;
 exports["image/x-icon"] = ImageParser;
 exports["image/vnd.microsoft.icon"] = ImageParser;
-
-})();
-

package/core/modules/parsers/parseutils.js

@@ -22,10 +22,7 @@ Most functions have the following pattern:
 The exception is `skipWhiteSpace`, which just returns the position after the whitespace.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -384,5 +381,3 @@ exports.parseAttribute = function(source,pos) {
 	node.end = pos;
 	return node;
 };
-
-})();

package/core/modules/parsers/pdfparser.js

@@ -6,10 +6,7 @@ module-type: parser
 The PDF parser embeds a PDF viewer
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var ImageParser = function(type,text,options) {
@@ -30,6 +27,3 @@ var ImageParser = function(type,text,options) {
 };
 
 exports["application/pdf"] = ImageParser;
-
-})();
-

package/core/modules/parsers/textparser.js

@@ -6,10 +6,7 @@ module-type: parser
 The plain text parser processes blocks of source text into a degenerate parse tree consisting of a single text node
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var TextParser = function(type,text,options) {
@@ -32,5 +29,3 @@ exports["application/javascript"] = TextParser;
 exports["application/json"] = TextParser;
 exports["text/css"] = TextParser;
 exports["application/x-tiddler-dictionary"] = TextParser;
-
-})();

package/core/modules/parsers/videoparser.js

@@ -6,10 +6,7 @@ module-type: parser
 The video parser parses a video tiddler into an embeddable HTML element
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var VideoParser = function(type,text,options) {
@@ -36,5 +33,3 @@ exports["video/ogg"] = VideoParser;
 exports["video/webm"] = VideoParser;
 exports["video/mp4"] = VideoParser;
 exports["video/quicktime"] = VideoParser;
-
-})();

package/core/modules/parsers/wikiparser/rules/codeblock.js

@@ -12,10 +12,7 @@ Wiki text rule for code blocks. For example:
 ```
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.name = "codeblock";
@@ -56,5 +53,3 @@ exports.parse = function() {
 			}
 	}];
 };
-
-})();

package/core/modules/parsers/wikiparser/rules/codeinline.js

@@ -11,10 +11,7 @@ Wiki text inline rule for code runs. For example:
 ```
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.name = "codeinline";
@@ -54,5 +51,3 @@ exports.parse = function() {
 		}]
 	}];
 };
-
-})();

package/core/modules/parsers/wikiparser/rules/commentblock.js

@@ -18,10 +18,7 @@ xxxx
 Note that the syntax for comments is simplified to an opening "<!--" sequence and a closing "-->" sequence -- HTML itself implements a more complex format (see http://ostermiller.org/findhtmlcomment.html)
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.name = "commentblock";
@@ -52,5 +49,3 @@ exports.parse = function() {
 	// Don't return any elements
 	return [];
 };
-
-})();

package/core/modules/parsers/wikiparser/rules/commentinline.js

@@ -12,10 +12,7 @@ Wiki text inline rule for HTML comments. For example:
 Note that the syntax for comments is simplified to an opening "<!--" sequence and a closing "-->" sequence -- HTML itself implements a more complex format (see http://ostermiller.org/findhtmlcomment.html)
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.name = "commentinline";
@@ -46,5 +43,3 @@ exports.parse = function() {
 	// Don't return any elements
 	return [];
 };
-
-})();

package/core/modules/parsers/wikiparser/rules/conditional.js

@@ -10,10 +10,6 @@ This is a <%if [{something}] %>Elephant<%elseif [{else}] %>Pelican<%else%>Crocod
 ```
 
 \*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.name = "conditional";
@@ -116,5 +112,3 @@ exports.parseIfClause = function(filterCondition) {
 	// Return the parse tree node
 	return [listWidget];
 };
-
-})();

package/core/modules/parsers/wikiparser/rules/dash.js

@@ -12,10 +12,7 @@ This is an em-dash: ---
 ```
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.name = "dash";
@@ -36,5 +33,3 @@ exports.parse = function() {
 		entity: dash
 	}];
 };
-
-})();

package/core/modules/parsers/wikiparser/rules/emphasis/bold.js

@@ -17,10 +17,7 @@ This wikiparser can be modified using the rules eg:
 ```
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.name = "bold";
@@ -46,5 +43,3 @@ exports.parse = function() {
 		children: tree
 	}];
 };
-
-})();

package/core/modules/parsers/wikiparser/rules/emphasis/italic.js

@@ -17,10 +17,7 @@ This wikiparser can be modified using the rules eg:
 ```
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.name = "italic";
@@ -46,5 +43,3 @@ exports.parse = function() {
 		children: tree
 	}];
 };
-
-})();

package/core/modules/parsers/wikiparser/rules/emphasis/strikethrough.js

@@ -17,10 +17,7 @@ This wikiparser can be modified using the rules eg:
 ```
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.name = "strikethrough";
@@ -46,5 +43,3 @@ exports.parse = function() {
 		children: tree
 	}];
 };
-
-})();