Another pesky function wrapper

Thanks @Leilei332

.github/workflows/pr-check-build-size.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
     - name: build-size-check
       id: get_sizes
-      uses: TiddlyWiki/cerebrus@v6
+      uses: TiddlyWiki/cerebrus@v7
       with:
         pr_number: ${{ github.event.pull_request.number }}
         repo: ${{ github.repository }}

.github/workflows/pr-comment-build-size.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
     - name: Build and check size
-      uses: TiddlyWiki/cerebrus@v6
+      uses: TiddlyWiki/cerebrus@v7
       with:
         pr_number: ${{ inputs.pr_number }}
         repo: ${{ github.repository }}

.github/workflows/pr-validation.yml

@@ -26,7 +26,7 @@ jobs:
     
     # Step 2: Validate change notes
     - name: Validate Change Notes
-      uses: TiddlyWiki/cerebrus@v6
+      uses: TiddlyWiki/cerebrus@v7
       with:
         pr_number: ${{ github.event.pull_request.number }}
         repo: ${{ github.repository }}

bin/optimise-svgs.js

@@ -15,40 +15,40 @@ var fs = require("fs"),
 	{ optimize } = require("svgo"),
 	config = {
 		plugins: [
-			'cleanupAttrs',
+			"cleanupAttrs",
-			'removeDoctype',
+			"removeDoctype",
-			'removeXMLProcInst',
+			"removeXMLProcInst",
-			'removeComments',
+			"removeComments",
-			'removeMetadata',
+			"removeMetadata",
-			'removeTitle',
+			"removeTitle",
-			'removeDesc',
+			"removeDesc",
-			'removeUselessDefs',
+			"removeUselessDefs",
-			'removeEditorsNSData',
+			"removeEditorsNSData",
-			'removeEmptyAttrs',
+			"removeEmptyAttrs",
-			'removeHiddenElems',
+			"removeHiddenElems",
-			'removeEmptyText',
+			"removeEmptyText",
-			'removeEmptyContainers',
+			"removeEmptyContainers",
 			// 'removeViewBox',
-			'cleanupEnableBackground',
+			"cleanupEnableBackground",
-			'convertStyleToAttrs',
+			"convertStyleToAttrs",
-			'convertColors',
+			"convertColors",
-			'convertPathData',
+			"convertPathData",
-			'convertTransform',
+			"convertTransform",
-			'removeUnknownsAndDefaults',
+			"removeUnknownsAndDefaults",
-			'removeNonInheritableGroupAttrs',
+			"removeNonInheritableGroupAttrs",
-			'removeUselessStrokeAndFill',
+			"removeUselessStrokeAndFill",
-			'removeUnusedNS',
+			"removeUnusedNS",
-			'cleanupIDs',
+			"cleanupIDs",
-			'cleanupNumericValues',
+			"cleanupNumericValues",
-			'moveElemsAttrsToGroup',
+			"moveElemsAttrsToGroup",
-			'moveGroupAttrsToElems',
+			"moveGroupAttrsToElems",
-			'collapseGroups',
+			"collapseGroups",
 			// 'removeRasterImages',
-			'mergePaths',
+			"mergePaths",
-			'convertShapeToPath',
+			"convertShapeToPath",
-			'sortAttrs',
+			"sortAttrs",
 			//'removeDimensions',
-			{name: 'removeAttrs', params: { attrs: '(stroke|fill)' } }
+			{name: "removeAttrs", params: { attrs: "(stroke|fill)" } }
 		]
 	};
 
@@ -72,7 +72,7 @@ files.forEach(function(filename) {
 			var newSVG = header.join("\n") + "\n\n" + result.data.replace("&lt;&lt;now &quot;DD&quot;&gt;&gt;","<<now \"DD\">>");
 			fs.writeFileSync(filepath,newSVG);
 		} else {
-			console.log("Error " + err + " with " + filename)
+			console.log("Error " + err + " with " + filename);
 			process.exit();
 		};
 	}

boot/boot.js

@@ -12,8 +12,6 @@ On the server this file is executed directly to boot TiddlyWiki. In the browser,
 
 var _boot = (function($tw) {
 
-/*jslint node: true, browser: true */
-/*global modules: false, $tw: false */
 "use strict";
 
 // Include bootprefix if we're not given module data
@@ -37,7 +35,7 @@ if($tw.node) {
 $tw.boot.log = function(str) {
 	$tw.boot.logMessages = $tw.boot.logMessages || [];
 	$tw.boot.logMessages.push(str);
-}
+};
 
 /*
 Check if an object has a property
@@ -47,7 +45,7 @@ $tw.utils.hop = function(object,property) {
 };
 
 /** @deprecated Use Array.isArray instead  */
-$tw.utils.isArray = value => Array.isArray(value);
+$tw.utils.isArray = (value) => Array.isArray(value);
 
 /*
 Check if an array is equal by value and by reference.
@@ -127,7 +125,7 @@ $tw.utils.pushTop = function(array,value) {
 };
 
 /** @deprecated Use instanceof Date instead */
-$tw.utils.isDate = value => value instanceof Date;
+$tw.utils.isDate = (value) => value instanceof Date;
 
 /** @deprecated Use array iterative methods instead */
 $tw.utils.each = function(object,callback) {
@@ -138,7 +136,7 @@ $tw.utils.each = function(object,callback) {
 				return next !== false;
 			});
 		} else {
-			Object.entries(object).every(entry => {
+			Object.entries(object).every((entry) => {
 				const next = callback(entry[1], entry[0], object);
 				return next !== false;
 			});
@@ -565,7 +563,7 @@ using a lowercase extension only.
 */
 $tw.utils.getFileExtensionInfo = function(ext) {
 	return ext ? $tw.config.fileExtensionInfo[ext.toLowerCase()] : null;
-}
+};
 
 /*
 Given an extension, get the correct encoding for that file.
@@ -588,7 +586,7 @@ var globalCheck =[
 	"    delete Object.prototype.__temp__;",
 	"  }",
 	"  delete Object.prototype.__temp__;",
-].join('\n');
+].join("\n");
 
 /*
 Run code globally with specified context variables in scope
@@ -616,7 +614,7 @@ $tw.utils.evalGlobal = function(code,context,filename,sandbox,allowGlobals) {
 		fn = Function("return " + code + "\n\n//# sourceURL=" + filename)(); // See https://github.com/TiddlyWiki/TiddlyWiki5/issues/6839
 	} else {
 		if(sandbox){
-			fn = vm.runInContext(code,sandbox,filename)
+			fn = vm.runInContext(code,sandbox,filename);
 		} else {
 			fn = vm.runInThisContext(code,filename);
 		}
@@ -727,7 +725,7 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) {
 	var self = this;
 	form.addEventListener("submit",function(event) {
 		// Collect the form data
-		var data = {},t;
+		var data = {};
 		$tw.utils.each(form.elements,function(element) {
 			if(element.name && element.value) {
 				data[element.name] = element.value;
@@ -773,7 +771,7 @@ $tw.utils.PasswordPrompt.prototype.removePrompt = function(promptInfo) {
 		promptInfo.form.parentNode.removeChild(promptInfo.form);
 		this.setWrapperDisplay();
 	}
-}
+};
 
 /*
 Crypto helper object for encrypted content. It maintains the password text in a closure, and provides methods to change
@@ -812,7 +810,7 @@ $tw.utils.Crypto = function() {
 	};
 	this.hasPassword = function() {
 		return !!currentPassword;
-	}
+	};
 	this.encrypt = function(text,password) {
 		// set default ks:256 -- see: http://bitwiseshiftleft.github.io/sjcl/doc/convenience.js.html
 		return callSjcl("encrypt",text,password,{v:1,iter:10000,ks:256,ts:64,mode:"ccm",adata:"",cipher:"aes"});
@@ -830,7 +828,7 @@ Execute the module named 'moduleName'. The name can optionally be relative to th
 $tw.modules.execute = function(moduleName,moduleRoot) {
 	var name = moduleName;
 	if(moduleName.charAt(0) === ".") {
-		name = $tw.utils.resolvePath(moduleName,moduleRoot)
+		name = $tw.utils.resolvePath(moduleName,moduleRoot);
 	}
 	if(!$tw.modules.titles[name]) {
 		if($tw.modules.titles[name + ".js"]) {
@@ -891,7 +889,6 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 	if(!moduleInfo) {
 		// We could not find the module on this path
 		// Try to defer to browserify etc, or node
-		var deferredModule;
 		if($tw.browser) {
 			if(window.require) {
 				try {
@@ -1146,8 +1143,7 @@ enableIndexers - Array of indexer names to enable, or null to use all available
 */
 $tw.Wiki = function(options) {
 	options = options || {};
-	var self = this,
+	var tiddlers = Object.create(null), // Hashmap of tiddlers
-		tiddlers = Object.create(null), // Hashmap of tiddlers
 		tiddlerTitles = null, // Array of tiddler titles
 		getTiddlerTitles = function() {
 			if(!tiddlerTitles) {
@@ -1201,7 +1197,7 @@ $tw.Wiki = function(options) {
 						shadow: this.isShadowTiddler(title),
 						exists: this.tiddlerExists(title)
 					}
-				}
+				};
 				// Save the new tiddler
 				tiddlers[title] = tiddler;
 				// Check we've got the title
@@ -1211,7 +1207,7 @@ $tw.Wiki = function(options) {
 					tiddler: tiddler,
 					shadow: this.isShadowTiddler(title),
 					exists: this.tiddlerExists(title)
-				}
+				};
 				// Update indexes
 				this.clearCache(title);
 				this.clearGlobalCache();
@@ -1236,7 +1232,7 @@ $tw.Wiki = function(options) {
 					shadow: this.isShadowTiddler(title),
 					exists: this.tiddlerExists(title)
 				}
-			}
+			};
 			// Delete the tiddler
 			delete tiddlers[title];
 			// Delete it from the list of titles
@@ -1251,7 +1247,7 @@ $tw.Wiki = function(options) {
 				tiddler: this.getTiddler(title),
 				shadow: this.isShadowTiddler(title),
 				exists: this.tiddlerExists(title)
-			}
+			};
 			// Update indexes
 			this.clearCache(title);
 			this.clearGlobalCache();
@@ -1439,8 +1435,7 @@ $tw.Wiki = function(options) {
 
 	// Unregister the plugin tiddlers of a particular type, or null/undefined for any type, optionally restricting unregistering to an array of tiddler titles. Returns an array of the titles affected
 	this.unregisterPluginTiddlers = function(pluginType,titles) {
-		var self = this,
+		var unregisteredTitles = [];
-			unregisteredTitles = [];
 		// Remove any previous registered plugins of this type
 		for(var t=pluginTiddlers.length-1; t>=0; t--) {
 			var tiddler = pluginTiddlers[t];
@@ -1454,7 +1449,6 @@ $tw.Wiki = function(options) {
 
 	// Unpack the currently registered plugins, creating shadow tiddlers for their constituent tiddlers
 	this.unpackPluginTiddlers = function() {
-		var self = this;
 		// Sort the plugin titles by the `plugin-priority` field, if this field is missing, default to 1
 		pluginTiddlers.sort(function(a, b) {
 			var priorityA = "plugin-priority" in a.fields ? a.fields["plugin-priority"] : 1;
@@ -1570,7 +1564,7 @@ $tw.Wiki.prototype.processSafeMode = function() {
 	// Assemble a report tiddler
 	var titleReportTiddler = "TiddlyWiki Safe Mode",
 		report = [];
-	report.push("TiddlyWiki has been started in [[safe mode|https://tiddlywiki.com/static/SafeMode.html]]. All plugins are temporarily disabled. Most customisations have been disabled by renaming the following tiddlers:")
+	report.push("TiddlyWiki has been started in [[safe mode|https://tiddlywiki.com/static/SafeMode.html]]. All plugins are temporarily disabled. Most customisations have been disabled by renaming the following tiddlers:");
 	// Delete the overrides
 	overrides.forEach(function(title) {
 		var tiddler = self.getTiddler(title),
@@ -1579,7 +1573,7 @@ $tw.Wiki.prototype.processSafeMode = function() {
 		self.addTiddler(new $tw.Tiddler(tiddler, {title: newTitle}));
 		report.push("* [[" + title + "|" + newTitle + "]]");
 	});
-	report.push()
+	report.push();
 	this.addTiddler(new $tw.Tiddler({title: titleReportTiddler, text: report.join("\n\n")}));
 	// Set $:/DefaultTiddlers to point to our report
 	this.addTiddler(new $tw.Tiddler({title: "$:/DefaultTiddlers", text: "[[" + titleReportTiddler + "]]"}));
@@ -2013,7 +2007,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 							value = $tw.utils.stringifyList(path.relative(rootPath, filename).split(path.sep).slice(0, -1));
 							break;
 						case "filepath":
-							value = path.relative(rootPath, filename).split(path.sep).join('/');
+							value = path.relative(rootPath, filename).split(path.sep).join("/");
 							break;
 						case "filename":
 							value = path.basename(filename);
@@ -2066,7 +2060,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 			}
 		});
 		return arrayOfFiles;
-	}
+	};
 	// Process the listed tiddlers
 	$tw.utils.each(filesInfo.tiddlers,function(tidInfo) {
 		if(tidInfo.prefix && tidInfo.suffix) {
@@ -2175,7 +2169,7 @@ Returns the path of the plugin folder
 $tw.findLibraryItem = function(name,paths) {
 	var pathIndex = 0;
 	do {
-		var pluginPath = path.resolve(paths[pathIndex],"./" + name)
+		var pluginPath = path.resolve(paths[pathIndex],"./" + name);
 		if(fs.existsSync(pluginPath) && fs.statSync(pluginPath).isDirectory()) {
 			return pluginPath;
 		}
@@ -2534,7 +2528,7 @@ $tw.boot.initStartup = function(options) {
 				}
 			});
 			return result;
-		}
+		};
 	}
 };
 $tw.boot.loadStartup = function(options){
@@ -2551,7 +2545,7 @@ $tw.boot.loadStartup = function(options){
 	}
 	// Give hooks a chance to modify the store
 	$tw.hooks.invokeHook("th-boot-tiddlers-loaded");
-}
+};
 $tw.boot.execStartup = function(options){
 	// Unpack plugin tiddlers
 	$tw.wiki.readPluginInfo();
@@ -2581,7 +2575,7 @@ $tw.boot.execStartup = function(options){
 	$tw.boot.disabledStartupModules = $tw.boot.disabledStartupModules || [];
 	// Repeatedly execute the next eligible task
 	$tw.boot.executeNextStartupTask(options.callback);
-}
+};
 /*
 Startup TiddlyWiki
 */
@@ -2600,7 +2594,7 @@ $tw.addUnloadTask = function(task) {
 	if($tw.unloadTasks.indexOf(task) === -1) {
 		$tw.unloadTasks.push(task);
 	}
-}
+};
 
 /*
 Execute the remaining eligible startup tasks
@@ -2647,7 +2641,7 @@ $tw.boot.executeNextStartupTask = function(callback) {
 		}
 		taskIndex++;
 	}
-	if(typeof callback === 'function') {
+	if(typeof callback === "function") {
 		callback();
 	}
 	return false;

core-server/commander.js

@@ -103,7 +103,7 @@ Commander.prototype.executeNextCommand = function() {
 					c = new command.Command(params,this);
 					err = c.execute();
 					if(err && typeof err.then === "function") {
-						err.then(e => { e ? this.callback(e) : this.executeNextCommand(); });
+						err.then((e) => { e ? this.callback(e) : this.executeNextCommand(); });
 					} else if(err) {
 						this.callback(err);
 					} else {
@@ -120,7 +120,7 @@ Commander.prototype.executeNextCommand = function() {
 					});
 					err = c.execute();
 					if(err && typeof err.then === "function") {
-						err.then(e => { if(e) this.callback(e); });
+						err.then((e) => { if(e) this.callback(e); });
 					} else if(err) {
 						this.callback(err);
 					}

core-server/commands/commands.js

@@ -25,7 +25,7 @@ Command.prototype.execute = function() {
 	if(!filter) {
 		return "No filter specified";
 	}
-	var commands = this.commander.wiki.filterTiddlers(filter)
+	var commands = this.commander.wiki.filterTiddlers(filter);
 	if(commands.length === 0) {
 		return "No tiddlers found for filter '" + filter + "'";
 	}

core-server/commands/deletetiddlers.js

@@ -24,8 +24,7 @@ Command.prototype.execute = function() {
 	if(this.params.length < 1) {
 		return "Missing filter";
 	}
-	var self = this,
+	var wiki = this.commander.wiki,
-		wiki = this.commander.wiki,
 		filter = this.params[0],
 		tiddlers = wiki.filterTiddlers(filter);
 	$tw.utils.each(tiddlers,function(title) {

core-server/commands/fetch.js

@@ -66,7 +66,7 @@ Command.prototype.fetchFiles = function(options) {
 	// Get the list of URLs
 	var urls;
 	if(options.url) {
-		urls = [options.url]
+		urls = [options.url];
 	} else if(options.urlFilter) {
 		urls = this.commander.wiki.filterTiddlers(options.urlFilter);
 	} else {
@@ -112,7 +112,7 @@ Command.prototype.fetchFile = function(url,options,callback,redirectCount) {
 				if(response.statusCode === 302 || response.statusCode === 303 || response.statusCode === 307) {
 					return self.fetchFile(response.headers.location,options,callback,redirectCount + 1);
 				} else {
-		        	return callback("Error " + response.statusCode + " retrieving " + url)
+					return callback("Error " + response.statusCode + " retrieving " + url);
 				}
 			}
 		});
@@ -153,18 +153,18 @@ Command.prototype.processBody = function(body,type,options,url) {
 			if(options.transformFilter) {
 				var transformedTitle = (incomingWiki.filterTiddlers(options.transformFilter,null,self.commander.wiki.makeTiddlerIterator([title])) || [""])[0];
 				if(transformedTitle) {
-					self.commander.log("Importing " + title + " as " + transformedTitle)
+					self.commander.log("Importing " + title + " as " + transformedTitle);
 					newTiddler = new $tw.Tiddler(tiddler,{title: transformedTitle});
 				}
 			} else {
-				self.commander.log("Importing " + title)
+				self.commander.log("Importing " + title);
 				newTiddler = tiddler;
 			}
 			self.commander.wiki.importTiddler(newTiddler);
 			count++;
 		}
 	});
-	self.commander.log("Imported " + count + " tiddlers")
+	self.commander.log("Imported " + count + " tiddlers");
 };
 
 exports.Command = Command;

core-server/commands/import.js

@@ -22,8 +22,7 @@ var Command = function(params,commander,callback) {
 
 Command.prototype.execute = function() {
 	var self = this,
-		fs = require("fs"),
+		fs = require("fs");
-		path = require("path");
 	if(this.params.length < 2) {
 		return "Missing parameters";
 	}

core-server/commands/init.js

@@ -20,8 +20,7 @@ var Command = function(params,commander) {
 };
 
 Command.prototype.execute = function() {
-	var fs = require("fs"),
+	var fs = require("fs");
-		path = require("path");
 	// Check that we don't already have a valid wiki folder
 	if($tw.boot.wikiTiddlersPath || ($tw.utils.isDirectory($tw.boot.wikiPath) && !$tw.utils.isDirectoryEmpty($tw.boot.wikiPath))) {
 		return "Wiki folder is not empty";

core-server/commands/listen.js

@@ -19,7 +19,6 @@ exports.info = {
 };
 
 var Command = function(params,commander,callback) {
-	var self = this;
 	this.params = params;
 	this.commander = commander;
 	this.callback = callback;

core-server/commands/load.js

@@ -21,9 +21,7 @@ var Command = function(params,commander,callback) {
 };
 
 Command.prototype.execute = function() {
-	var self = this,
+	var self = this;
-		fs = require("fs"),
-		path = require("path");
 	if(this.params.length < 1) {
 		return "Missing filename";
 	}

core-server/commands/output.js

@@ -21,8 +21,7 @@ var Command = function(params,commander,callback) {
 };
 
 Command.prototype.execute = function() {
-	var fs = require("fs"),
+	var path = require("path");
-		path = require("path");
 	if(this.params.length < 1) {
 		return "Missing output path";
 	}

core-server/commands/render.js

@@ -9,8 +9,6 @@ Render individual tiddlers and save the results to the specified files
 
 "use strict";
 	
-	var widget = require("$:/core/modules/widgets/widget.js");
-	
 exports.info = {
 	name: "render",
 	synchronous: true

core-server/commands/rendertiddlers.js

@@ -9,8 +9,6 @@ Command to render several tiddlers to a folder of files
 
 "use strict";
 
-var widget = require("$:/core/modules/widgets/widget.js");
-
 exports.info = {
 	name: "rendertiddlers",
 	synchronous: true

core-server/commands/save.js

@@ -25,7 +25,6 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
 		return "Missing filename filter";
 	}
 	var self = this,
-			fs = require("fs"),
 		path = require("path"),
 		result = null,
 		wiki = this.commander.wiki,

core-server/commands/savetiddlers.js

@@ -9,8 +9,6 @@ Command to save several tiddlers to a folder of files
 
 "use strict";
 
-var widget = require("$:/core/modules/widgets/widget.js");
-
 exports.info = {
 	name: "savetiddlers",
 	synchronous: true

core-server/commands/savewikifolder.js

@@ -183,7 +183,7 @@ WikiFolderMaker.prototype.saveCustomPlugin = function(pluginTiddler) {
 };
 
 WikiFolderMaker.prototype.saveTiddler = function(directory,tiddler) {
-	var title = tiddler.fields.title, fileInfo, pathFilters, extFilters;
+	var fileInfo, pathFilters, extFilters;
 	if(this.wiki.tiddlerExists("$:/config/FileSystemPaths")) {
 		pathFilters = this.wiki.getTiddlerText("$:/config/FileSystemPaths","").split("\n");
 	}

core-server/commands/server.js

@@ -17,7 +17,6 @@ exports.info = {
 };
 
 var Command = function(params,commander,callback) {
-	var self = this;
 	this.params = params;
 	this.commander = commander;
 	this.callback = callback;

core-server/commands/setfield.js

@@ -9,8 +9,6 @@ Command to modify selected tiddlers to set a field to the text of a template tid
 
 "use strict";
 
-var widget = require("$:/core/modules/widgets/widget.js");
-
 exports.info = {
 	name: "setfield",
 	synchronous: true
@@ -26,8 +24,7 @@ Command.prototype.execute = function() {
 	if(this.params.length < 4) {
 		return "Missing parameters";
 	}
-	var self = this,
+	var wiki = this.commander.wiki,
-		wiki = this.commander.wiki,
 		filter = this.params[0],
 		fieldname = this.params[1] || "text",
 		templatetitle = this.params[2],

core-server/filesystem.js

@@ -26,7 +26,7 @@ exports.getSubdirectories = function(dirPath) {
 		}
 	});
 	return subdirs;
-}
+};
 
 /*
 Recursively (and synchronously) copy a directory and all its content
@@ -46,8 +46,7 @@ exports.copyDirectory = function(srcPath,dstPath) {
 	}
 	// Function to copy a folder full of files
 	var copy = function(srcPath,dstPath) {
-		var srcStats = fs.lstatSync(srcPath),
+		var srcStats = fs.lstatSync(srcPath);
-			dstExists = fs.existsSync(dstPath);
 		if(srcStats.isFile()) {
 			$tw.utils.copyFile(srcPath,dstPath);
 		} else if(srcStats.isDirectory()) {
@@ -345,18 +344,18 @@ exports.generateTiddlerFilepath = function(title,options) {
 	// Replace any Windows control codes
 	filepath = filepath.replace(/^(con|prn|aux|nul|com[0-9]|lpt[0-9])$/i,"_$1_");
 	// Replace any leading spaces with the same number of underscores
-	filepath = filepath.replace(/^ +/,function (u) { return u.replace(/ /g, "_")});
+	filepath = filepath.replace(/^ +/,function (u) { return u.replace(/ /g, "_");});
 	//If the path does not start with "." or ".." && a path seperator, then
 	if(!/^\.{1,2}[/\\]/g.test(filepath)) {
 		// Don't let the filename start with any dots because such files are invisible on *nix
-		filepath = filepath.replace(/^\.+/g,function (u) { return u.replace(/\./g, "_")});
+		filepath = filepath.replace(/^\.+/g,function (u) { return u.replace(/\./g, "_");});
 	}
 	// Replace any Unicode control codes
 	filepath = filepath.replace(/[\x00-\x1f\x80-\x9f]/g,"_");
 	// Replace any characters that can't be used in cross-platform filenames
 	filepath = $tw.utils.transliterate(filepath.replace(/<|>|~|\:|\"|\||\?|\*|\^/g,"_"));
 	// Replace any dots or spaces at the end of the extension with the same number of underscores
-	extension = extension.replace(/[\. ]+$/, function (u) { return u.replace(/[\. ]/g, "_")});
+	extension = extension.replace(/[\. ]+$/, function (u) { return u.replace(/[\. ]/g, "_");});
 	// Truncate the extension if it is too long
 	if(extension.length > 32) {
 		extension = extension.substr(0,32);

core-server/server/authenticators/basic.js

@@ -10,9 +10,7 @@ Authenticator for WWW basic authentication
 "use strict";
 
 if($tw.node) {
-	var util = require("util"),
+	var fs = require("fs"),
-		fs = require("fs"),
-		url = require("url"),
 		path = require("path");
 }
 

core-server/server/server.js

@@ -9,8 +9,9 @@ Serve tiddlers over http
 
 "use strict";
 
+let fs, url, path, querystring, crypto, zlib;
+
 if($tw.node) {
-	var util = require("util"),
 	fs = require("fs"),
 	url = require("url"),
 	path = require("path"),
@@ -41,7 +42,7 @@ function Server(options) {
 		}
 	}
 	// Setup the default required plugins
-	this.requiredPlugins = this.get("required-plugins").split(',');
+	this.requiredPlugins = this.get("required-plugins").split(",");
 	// Initialise CORS
 	this.corsEnable = this.get("cors-enable") === "yes";
 	// Initialise CSRF
@@ -62,9 +63,9 @@ function Server(options) {
 	this.authorizationPrincipals = {
 		readers: (this.get("readers") || authorizedUserName).split(",").map($tw.utils.trim),
 		writers: (this.get("writers") || authorizedUserName).split(",").map($tw.utils.trim)
-	}
+	};
 	if(this.get("admin") || authorizedUserName !== "(anon)") {
-		this.authorizationPrincipals["admin"] = (this.get("admin") || authorizedUserName).split(',').map($tw.utils.trim)
+		this.authorizationPrincipals["admin"] = (this.get("admin") || authorizedUserName).split(",").map($tw.utils.trim);
 	}
 	// Load and initialise authenticators
 	$tw.modules.forEachModuleOfType("authenticator", function(title,authenticatorDefinition) {
@@ -91,7 +92,7 @@ function Server(options) {
 		this.listenOptions = {
 			key: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsKeyFilepath),"utf8"),
 			cert: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsCertFilepath),"utf8"),
-			passphrase: tlsPassphrase || ''
+			passphrase: tlsPassphrase || ""
 		};
 		this.protocol = "https";
 	}
@@ -116,7 +117,7 @@ encoding: the encoding of the data to send (passed to the end method of the resp
 */
 function sendResponse(request,response,statusCode,headers,data,encoding) {
 	if(this.enableBrowserCache && (statusCode == 200)) {
-		var hash = crypto.createHash('md5');
+		var hash = crypto.createHash("md5");
 		// Put everything into the hash that could change and invalidate the data that
 		// the browser already stored. The headers the data and the encoding.
 		hash.update(data);
@@ -211,7 +212,6 @@ Server.prototype.addAuthenticator = function(AuthenticatorClass) {
 Server.prototype.findMatchingRoute = function(request,state) {
 	for(var t=0; t<this.routes.length; t++) {
 		var potentialRoute = this.routes[t],
-			pathRegExp = potentialRoute.path,
 			pathname = state.urlInfo.pathname,
 			match;
 		if(state.pathPrefix) {
@@ -250,7 +250,7 @@ Check whether a given user is authorized for the specified authorizationType ("r
 Server.prototype.isAuthorized = function(authorizationType,username) {
 	var principals = this.authorizationPrincipals[authorizationType] || [];
 	return principals.indexOf("(anon)") !== -1 || (username && (principals.indexOf("(authenticated)") !== -1 || principals.indexOf(username) !== -1));
-}
+};
 
 Server.prototype.requestHandler = function(request,response,options) {
 	options = options || {};
@@ -337,7 +337,7 @@ Server.prototype.requestHandler = function(request,response,options) {
 		request.on("end",function() {
 			state.data = Buffer.concat(data);
 			route.handler(request,response,state);
-		})
+		});
 	} else {
 		response.writeHead(400,"Invalid bodyFormat " + route.bodyFormat + " in route " + route.method + " " + route.path.source);
 		response.end();

core-server/utils/base64.js

@@ -11,20 +11,20 @@ Base64 UTF-8 utlity functions.
 
 const { TextEncoder, TextDecoder } = require("node:util");
 
-exports.btoa = binstr => Buffer.from(binstr, "binary").toString("base64");
+exports.btoa = (binstr) => Buffer.from(binstr, "binary").toString("base64");
 
-exports.atob = b64 => Buffer.from(b64, "base64").toString("binary");
+exports.atob = (b64) => Buffer.from(b64, "base64").toString("binary");
 
 function base64ToBytes(base64) {
 	const binString = exports.atob(base64);
-	return Uint8Array.from(binString, m => m.codePointAt(0));
+	return Uint8Array.from(binString, (m) => m.codePointAt(0));
 };
 
 function bytesToBase64(bytes) {
-	const binString = Array.from(bytes, byte => String.fromCodePoint(byte)).join("");
+	const binString = Array.from(bytes, (byte) => String.fromCodePoint(byte)).join("");
 	return exports.btoa(binString);
 };
 
-exports.base64EncodeUtf8 = str => bytesToBase64(new TextEncoder().encode(str));
+exports.base64EncodeUtf8 = (str) => bytesToBase64(new TextEncoder().encode(str));
 
-exports.base64DecodeUtf8 = str => new TextDecoder().decode(base64ToBytes(str));
+exports.base64DecodeUtf8 = (str) => new TextDecoder().decode(base64ToBytes(str));

core-server/utils/repository.js

@@ -16,8 +16,7 @@ ignoreEnvironmentVariables: defaults to false
 */
 exports.getAllPlugins = function(options) {
 	options = options || {};
-	var fs = require("fs"),
+	var path = require("path"),
-		path = require("path"),
 		tiddlers = {};
 	// Collect up the library plugins
 	var collectPlugins = function(folder) {

core/language/en-GB/Import.multids

@@ -15,6 +15,8 @@ Listing/Preview/TextRaw: Text (Raw)
 Listing/Preview/Fields: Fields
 Listing/Preview/Diff: Diff
 Listing/Preview/DiffFields: Diff (Fields)
+Listing/ImportOptions/Caption: Import options
+Listing/ImportOptions/NoMatch: No import options apply to these files.
 Listing/Rename/Tooltip: Rename tiddler before importing
 Listing/Rename/Prompt: Rename to:
 Listing/Rename/ConfirmRename: Rename tiddler

core/modules/background-actions.js

@@ -18,13 +18,13 @@ class BackgroundActionDispatcher {
 		// Track the filter for the background actions
 		this.filterTracker.track({
 			filterString: "[all[tiddlers+shadows]tag[$:/tags/BackgroundAction]!is[draft]]",
-			fnEnter: title => this.trackFilter(title),
+			fnEnter: (title) => this.trackFilter(title),
 			fnLeave: (title, enterValue) => this.untrackFilter(enterValue),
 			fnChange: (title, enterValue) => {
 				this.untrackFilter(enterValue);
 				return this.trackFilter(title);
 			},
-			fnProcess: changes => this.process(changes)
+			fnProcess: (changes) => this.process(changes)
 		});
 	}
 
@@ -75,7 +75,7 @@ class BackgroundActionTracker {
 			filterString: this.trackFilter,
 			fnEnter: () => { this.hasChanged = true; },
 			fnLeave: () => { this.hasChanged = true; },
-			fnProcess: changes => {
+			fnProcess: (changes) => {
 				if(this.hasChanged) {
 					this.hasChanged = false;
 					console.log("Processing background action", this.title);

core/modules/editor/operations/text/excise.js

@@ -10,7 +10,7 @@ Text editor operation to excise the selection to a new tiddler
 "use strict";
 
 function isMarkdown(mediaType) {
-	return mediaType === 'text/markdown' || mediaType === 'text/x-markdown';
+	return mediaType === "text/markdown" || mediaType === "text/x-markdown";
 }
 
 exports["excise"] = function(event,operation) {

core/modules/editor/operations/text/wrap-selection.js

@@ -44,7 +44,7 @@ exports["wrap-selection"] = function(event,operation) {
 				break;
 		}
 		return result;
-	}
+	};
 
 	function togglePrefixSuffix() {
 		if(o.text.substring(o.selStart - prefix.length, o.selStart + suffix.length) === prefix + suffix) {

core/modules/filter-tracker.js

@@ -69,17 +69,17 @@ class FilterTracker {
 		if(!tracker) return;
 		const results = [];
 		// Evaluate the filter and remove duplicate results
-		$tw.utils.each(this.wiki.filterTiddlers(tracker.filterString), title => {
+		$tw.utils.each(this.wiki.filterTiddlers(tracker.filterString), (title) => {
 			$tw.utils.pushTop(results, title);
 		});
 		// Process the newly entered results
-		results.forEach(title => {
+		results.forEach((title) => {
 			if(!tracker.previousResults.includes(title) && !tracker.resultValues[title] && tracker.fnEnter) {
 				tracker.resultValues[title] = tracker.fnEnter(title) || true;
 			}
 		});
 		// Process the results that have just left
-		tracker.previousResults.forEach(title => {
+		tracker.previousResults.forEach((title) => {
 			if(!results.includes(title) && tracker.resultValues[title] && tracker.fnLeave) {
 				tracker.fnLeave(title, tracker.resultValues[title]);
 				delete tracker.resultValues[title];
@@ -91,7 +91,7 @@ class FilterTracker {
 
 	processChanges(changes) {
 		for(const tracker of this.trackers.values()) {
-			Object.keys(changes).forEach(title => {
+			Object.keys(changes).forEach((title) => {
 				if(title && tracker.previousResults.includes(title) && tracker.fnChange) {
 					tracker.resultValues[title] = tracker.fnChange(title, tracker.resultValues[title]) || tracker.resultValues[title];
 				}

core/modules/filterrunprefixes/cascade.js

@@ -24,7 +24,7 @@ exports.cascade = function(operationSubFunction,options) {
 					}
 					var output = filterFnList[index](options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 						"currentTiddler": "" + title,
-						"..currentTiddler": widget.getVariable("currentTiddler","")
+						"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""})
 					}));
 					if(output.length !== 0) {
 						result = output[0];
@@ -34,5 +34,5 @@ exports.cascade = function(operationSubFunction,options) {
 				results.push(result);
 			});
 		}
-	}
+	};
 };

core/modules/filterrunprefixes/filter.js

@@ -18,7 +18,7 @@ exports.filter = function(operationSubFunction,options) {
 			results.each(function(title) {
 				var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 					"currentTiddler": "" + title,
-					"..currentTiddler": widget.getVariable("currentTiddler",""),
+					"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""}),
 					"index": "" + index,
 					"revIndex": "" +  (results.length - 1 - index),
 					"length": "" + results.length
@@ -30,5 +30,5 @@ exports.filter = function(operationSubFunction,options) {
 			});
 			results.remove(resultsToRemove);
 		}
-	}
+	};
 };

core/modules/filterrunprefixes/let.js

@@ -7,8 +7,6 @@ Assign a value to a variable
 
 \*/
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*

core/modules/filterrunprefixes/map.js

@@ -20,7 +20,7 @@ exports.map = function(operationSubFunction,options) {
 			$tw.utils.each(inputTitles,function(title) {
 				var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 					"currentTiddler": "" + title,
-					"..currentTiddler": widget.getVariable("currentTiddler",""),
+					"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""}),
 					"index": "" + index,
 					"revIndex": "" +  (inputTitles.length - 1 - index),
 					"length": "" + inputTitles.length
@@ -28,12 +28,12 @@ exports.map = function(operationSubFunction,options) {
 				if(filtered.length && flatten) {
 					$tw.utils.each(filtered,function(value) {
 						results.push(value);
-					})
+					});
 				} else {
 					results.push(filtered[0]||"");
 				}
 				++index;
 			});
 		}
-	}
+	};
 };

core/modules/filterrunprefixes/reduce.js

@@ -17,7 +17,7 @@ exports.reduce = function(operationSubFunction,options) {
 			results.each(function(title) {
 				var list = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 					"currentTiddler": "" + title,
-					"..currentTiddler": widget.getVariable("currentTiddler"),
+					"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""}),
 					"index": "" + index,
 					"revIndex": "" +  (results.length - 1 - index),
 					"length": "" + results.length,
@@ -31,5 +31,5 @@ exports.reduce = function(operationSubFunction,options) {
 			results.clear();
 			results.push(accumulator);
 		}
-	}
+	};
 };

core/modules/filterrunprefixes/sort.js

@@ -24,7 +24,7 @@ exports.sort = function(operationSubFunction,options) {
 			results.each(function(title) {
 				var key = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 					"currentTiddler": "" + title,
-					"..currentTiddler": widget.getVariable("currentTiddler")
+					"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""})
 				}));
 				sortKeys.push(key[0] || "");
 			});
@@ -43,5 +43,5 @@ exports.sort = function(operationSubFunction,options) {
 				results.push(inputTitles[index]);
 			});
 		}
-	}
+	};
 };

core/modules/filters.js

@@ -43,7 +43,7 @@ function parseFilterOperation(operators,filterString,p) {
 		var bracket = filterString.charAt(nextBracketPos);
 		operator.operator = filterString.substring(p,nextBracketPos);
 		// Any suffix?
-		var colon = operator.operator.indexOf(':');
+		var colon = operator.operator.indexOf(":");
 		if(colon > -1) {
 			// The raw suffix for older filters
 			operator.suffix = operator.operator.substring(colon + 1);
@@ -108,7 +108,7 @@ function parseFilterOperation(operators,filterString,p) {
 			}
 			operator.operands.push(operand);
 			p = nextBracketPos + 1;
-		}
+		};
 
 		p = nextBracketPos + 1;
 		parseOperand(bracket);
@@ -228,7 +228,7 @@ exports.getFilterRunPrefixes = function() {
 		$tw.modules.applyMethods("filterrunprefix",this.filterRunPrefixes);
 	}
 	return this.filterRunPrefixes;
-}
+};
 
 exports.filterTiddlers = function(filterString,widget,source) {
 	var fn = this.compileFilter(filterString);

core/modules/filters/compare.js

@@ -32,4 +32,4 @@ var modes = {
 	"gt": function(value) {return value > 0;},
 	"lteq": function(value) {return value <= 0;},
 	"lt": function(value) {return value < 0;}
-}
+};

core/modules/filters/deserialize.js

@@ -31,4 +31,4 @@ exports["deserialize"] = function(source,operator,options) {
 		return [$tw.language.getString("Error/DeserializeOperator/MissingOperand")];
 	}
 	return results;
-}
+};

core/modules/filters/field.js

@@ -53,7 +53,7 @@ exports.field = function(source,operator,options) {
 			if(source.byField && operator.operand) {
 				indexedResults = source.byField(fieldname,operator.operand);
 				if(indexedResults) {
-					return indexedResults
+					return indexedResults;
 				}
 			}
 			source(function(tiddler,title) {

core/modules/filters/filter.js

@@ -19,7 +19,7 @@ exports.filter = function(source,operator,options) {
 	source(function(tiddler,title) {
 		var list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),options.widget.makeFakeWidgetWithVariables({
 			"currentTiddler": "" + title,
-			"..currentTiddler": options.widget.getVariable("currentTiddler","")
+			"..currentTiddler": options.widget.getVariable("currentTiddler",{defaultValue:""})
 		}));
 		if((list.length > 0) === target) {
 			results.push(title);

core/modules/filters/getindex.js

@@ -13,7 +13,7 @@ returns the value at a given index of datatiddlers
 Export our filter function
 */
 exports.getindex = function(source,operator,options) {
-	var data,title,results = [];
+	var data,results = [];
 	if(operator.operand){
 		source(function(tiddler,title) {
 			title = tiddler ? tiddler.fields.title : title;

core/modules/filters/json-ops.js

@@ -157,13 +157,13 @@ function convertDataItemValueToStrings(item) {
 	if(item === undefined) {
 		return undefined;
 	} else if(item === null) {
-		return ["null"]
+		return ["null"];
 	} else if(typeof item === "object") {
 		var results = [],i,t;
 		if(Array.isArray(item)) {
 			// Return all the items in arrays recursively
 			for(i=0; i<item.length; i++) {
-				t = convertDataItemValueToStrings(item[i])
+				t = convertDataItemValueToStrings(item[i]);
 				if(t !== undefined) {
 					results.push.apply(results,t);
 				}
@@ -231,7 +231,7 @@ function getItemAtIndex(item,index) {
 		return item[index];
 	} else if(Array.isArray(item)) {
 		index = $tw.utils.parseInt(index);
-		if(index < 0) { index = index + item.length };
+		if(index < 0) { index = index + item.length; };
 		return item[index]; // Will be undefined if index was out-of-bounds
 	} else {
 		return undefined;
@@ -289,7 +289,7 @@ function setDataItem(data,indexes,value) {
 	var lastIndex = indexes[indexes.length - 1];
 	if(Array.isArray(current)) {
 		lastIndex = $tw.utils.parseInt(lastIndex);
-		if(lastIndex < 0) { lastIndex = lastIndex + current.length };
+		if(lastIndex < 0) { lastIndex = lastIndex + current.length; };
 	}
 	// Only set indexes on objects and arrays
 	if(typeof current === "object") {
@@ -316,7 +316,7 @@ function deleteDataItem(data,indexes) {
 	var lastIndex = indexes[indexes.length - 1];
 	if(Array.isArray(current) && current !== null) {
 		lastIndex = $tw.utils.parseInt(lastIndex);
-		if(lastIndex < 0) { lastIndex = lastIndex + current.length };
+		if(lastIndex < 0) { lastIndex = lastIndex + current.length; };
 		// Check if index is valid before splicing
 		if(lastIndex >= 0 && lastIndex < current.length) {
 			current.splice(lastIndex,1);

core/modules/filters/lookup.js

@@ -25,7 +25,7 @@ exports.lookup = function(source,operator,options) {
 		indexSuffix = (suffixes[1] && suffixes[1][0] === "index") ? true : false,
 		target;
 	if(operator.operands.length == 2) {
-		target = operator.operands[1]
+		target = operator.operands[1];
 	} else {
 		target = indexSuffix ? "0": "text";
 	}

core/modules/filters/math.js

@@ -17,35 +17,35 @@ Note that strings are converted to numbers automatically. Trailing non-digits ar
 "use strict";
 
 exports.negate = makeNumericBinaryOperator(
-	function(a) {return -a}
+	function(a) {return -a;}
 );
 
 exports.abs = makeNumericBinaryOperator(
-	function(a) {return Math.abs(a)}
+	function(a) {return Math.abs(a);}
 );
 
 exports.ceil = makeNumericBinaryOperator(
-	function(a) {return Math.ceil(a)}
+	function(a) {return Math.ceil(a);}
 );
 
 exports.floor = makeNumericBinaryOperator(
-	function(a) {return Math.floor(a)}
+	function(a) {return Math.floor(a);}
 );
 
 exports.round = makeNumericBinaryOperator(
-	function(a) {return Math.round(a)}
+	function(a) {return Math.round(a);}
 );
 
 exports.trunc = makeNumericBinaryOperator(
-	function(a) {return Math.trunc(a)}
+	function(a) {return Math.trunc(a);}
 );
 
 exports.untrunc = makeNumericBinaryOperator(
-	function(a) {return Math.ceil(Math.abs(a)) * Math.sign(a)}
+	function(a) {return Math.ceil(Math.abs(a)) * Math.sign(a);}
 );
 
 exports.sign = makeNumericBinaryOperator(
-	function(a) {return Math.sign(a)}
+	function(a) {return Math.sign(a);}
 );
 
 exports.add = makeNumericBinaryOperator(
@@ -103,29 +103,29 @@ exports.log = makeNumericBinaryOperator(
 );
 
 exports.sum = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator + value},
+	function(accumulator,value) {return accumulator + value;},
 	0 // Initial value
 );
 
 exports.product = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator * value},
+	function(accumulator,value) {return accumulator * value;},
 	1 // Initial value
 );
 
 exports.maxall = makeNumericReducingOperator(
-	function(accumulator,value) {return Math.max(accumulator,value)},
+	function(accumulator,value) {return Math.max(accumulator,value);},
 	-Infinity // Initial value
 );
 
 exports.minall = makeNumericReducingOperator(
-	function(accumulator,value) {return Math.min(accumulator,value)},
+	function(accumulator,value) {return Math.min(accumulator,value);},
 	Infinity // Initial value
 );
 
 exports.median = makeNumericArrayOperator(
 	function(values) {
 		var len = values.length, median;
-		values.sort(function(a,b) {return a-b});
+		values.sort(function(a,b) {return a-b;});
 		if(len % 2) { 
 			// Odd, return the middle number
 			median = values[(len - 1) / 2];
@@ -138,7 +138,7 @@ exports.median = makeNumericArrayOperator(
 );
 
 exports.average = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator + value},
+	function(accumulator,value) {return accumulator + value;},
 	0, // Initial value
 	function(finalValue,numberOfValues) {
 		return finalValue/numberOfValues;
@@ -146,7 +146,7 @@ exports.average = makeNumericReducingOperator(
 );
 
 exports.variance = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator + value},
+	function(accumulator,value) {return accumulator + value;},
 	0,
 	function(finalValue,numberOfValues,originalValues) {
 		return getVarianceFromArray(originalValues,finalValue/numberOfValues);
@@ -154,7 +154,7 @@ exports.variance = makeNumericReducingOperator(
 );
 
 exports["standard-deviation"] = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator + value},
+	function(accumulator,value) {return accumulator + value;},
 	0,
 	function(finalValue,numberOfValues,originalValues) {
 		var variance = getVarianceFromArray(originalValues,finalValue/numberOfValues);
@@ -164,31 +164,31 @@ exports["standard-deviation"] = makeNumericReducingOperator(
 
 //trigonometry
 exports.cos = makeNumericBinaryOperator(
-	function(a) {return Math.cos(a)}
+	function(a) {return Math.cos(a);}
 );
 
 exports.sin = makeNumericBinaryOperator(
-	function(a) {return Math.sin(a)}
+	function(a) {return Math.sin(a);}
 );
 
 exports.tan = makeNumericBinaryOperator(
-	function(a) {return Math.tan(a)}
+	function(a) {return Math.tan(a);}
 );
 
 exports.acos = makeNumericBinaryOperator(
-	function(a) {return Math.acos(a)}
+	function(a) {return Math.acos(a);}
 );
 
 exports.asin = makeNumericBinaryOperator(
-	function(a) {return Math.asin(a)}
+	function(a) {return Math.asin(a);}
 );
 
 exports.atan = makeNumericBinaryOperator(
-	function(a) {return Math.atan(a)}
+	function(a) {return Math.atan(a);}
 );
 
 exports.atan2 = makeNumericBinaryOperator(
-	function(a,b) {return Math.atan2(a,b)}
+	function(a,b) {return Math.atan2(a,b);}
 );
 
 //Calculate the variance of a population of numbers in an array given its mean

core/modules/filters/wikify.js

@@ -0,0 +1,34 @@
+/*\
+title: $:/core/modules/filters/wikify.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator wikifying each string in the input list and returning the result as a list of strings
+
+\*/
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.wikify = function(source,operator,options) {
+	var output = operator.operands[0],
+		mode = operator.operands[1],
+		type = operator.operands[2],
+		results = [];
+	source(function(tiddler,title) {
+		var wikifier = new $tw.utils.Wikifier({
+			wiki: options.wiki,
+			widget: options.widget,
+			text: title,
+			type: type,
+			mode: mode,
+			output: output
+		});
+		results.push(wikifier.getResult());
+	});
+	return results;
+};

core/modules/filters/x-listops.js

@@ -209,14 +209,14 @@ Extended filter operators to manipulate the current list.
 		results.push(operands[0]);
 	}
 	return results;
-	}
+};
 
 /*
 	Toggles an item in the current list.
 	*/
 exports.toggle = function(source,operator) {
 	return cycleValueInArray(prepare_results(source),operator.operands);
-	}
+};
 
 exports.cycle = function(source,operator) {
 	var results = prepare_results(source),
@@ -227,4 +227,4 @@ Extended filter operators to manipulate the current list.
 		step = Math.abs(step);
 	}
 	return cycleValueInArray(results,operands,step);
-	}
+};

core/modules/indexers/back-indexer.js

@@ -46,7 +46,7 @@ function BackSubIndexer(indexer,extractor) {
 BackSubIndexer.prototype.init = function() {
 	// lazy init until first lookup
 	this.index = null;
-}
+};
 
 BackSubIndexer.prototype._init = function() {
 	this.index = Object.create(null);
@@ -60,11 +60,11 @@ BackSubIndexer.prototype._init = function() {
 			self.index[target][sourceTitle] = true;
 		});
 	});
-}
+};
 
 BackSubIndexer.prototype.rebuild = function() {
 	this.index = null;
-}
+};
 
 /*
 * Get things that is being referenced in the text, e.g. tiddler names in the link syntax.
@@ -78,7 +78,7 @@ BackSubIndexer.prototype._getTarget = function(tiddler) {
 		return this.wiki[this.extractor](parser.tree, tiddler.fields.title);
 	}
 	return [];
-}
+};
 
 BackSubIndexer.prototype.update = function(updateDescriptor) {
 	// lazy init/update until first lookup
@@ -106,7 +106,7 @@ BackSubIndexer.prototype.update = function(updateDescriptor) {
 		}
 		self.index[target][updateDescriptor.new.tiddler.fields.title] = true;
 	});
-}
+};
 
 BackSubIndexer.prototype.lookup = function(title) {
 	if(!this.index) {
@@ -117,6 +117,6 @@ BackSubIndexer.prototype.lookup = function(title) {
 	} else {
 		return [];
 	}
-}
+};
 
 exports.BackIndexer = BackIndexer;

core/modules/indexers/field-indexer.js

@@ -19,7 +19,7 @@ FieldIndexer.prototype.init = function() {
 	this.index = null;
 	this.maxIndexedValueLength = DEFAULT_MAXIMUM_INDEXED_VALUE_LENGTH;
 	this.addIndexMethods();
-}
+};
 
 // Provided for testing
 FieldIndexer.prototype.setMaxIndexedValueLength = function(length) {
@@ -33,14 +33,14 @@ FieldIndexer.prototype.addIndexMethods = function() {
 	this.wiki.each.byField = function(name,value) {
 		var lookup = self.lookup(name,value);
 		return lookup && lookup.filter(function(title) {
-			return self.wiki.tiddlerExists(title)
+			return self.wiki.tiddlerExists(title);
 		});
 	};
 	// get shadow tiddlers, including shadow tiddlers that is overwritten
 	this.wiki.eachShadow.byField = function(name,value) {
 		var lookup = self.lookup(name,value);
 		return lookup && lookup.filter(function(title) {
-			return self.wiki.isShadowTiddler(title)
+			return self.wiki.isShadowTiddler(title);
 		});
 	};
 	this.wiki.eachTiddlerPlusShadows.byField = function(name,value) {

core/modules/info/dimensions.js

@@ -14,12 +14,12 @@ exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
 			this.updateCallback = updateCallback;
 			this.resizeHandlers = new Map();
 			this.dimensionsInfo = [
-				["outer/width", win => win.outerWidth],
+				["outer/width", (win) => win.outerWidth],
-				["outer/height", win => win.outerHeight],
+				["outer/height", (win) => win.outerHeight],
-				["inner/width", win => win.innerWidth],
+				["inner/width", (win) => win.innerWidth],
-				["inner/height", win => win.innerHeight],
+				["inner/height", (win) => win.innerHeight],
-				["client/width", win => win.document.documentElement.clientWidth],
+				["client/width", (win) => win.document.documentElement.clientWidth],
-				["client/height", win => win.document.documentElement.clientHeight]
+				["client/height", (win) => win.document.documentElement.clientHeight]
 			];
 		}
 

core/modules/keyboard.js

@@ -140,7 +140,7 @@ function KeyboardManager(options) {
 	this.shortcutParsedList = []; // Stores the parsed key descriptors
 	this.shortcutPriorityList = []; // Stores the parsed shortcut priority
 	this.lookupNames = ["shortcuts"];
-	this.lookupNames.push($tw.platform.isMac ? "shortcuts-mac" : "shortcuts-not-mac")
+	this.lookupNames.push($tw.platform.isMac ? "shortcuts-mac" : "shortcuts-not-mac");
 	this.lookupNames.push($tw.platform.isWindows ? "shortcuts-windows" : "shortcuts-not-windows");
 	this.lookupNames.push($tw.platform.isLinux ? "shortcuts-linux" : "shortcuts-not-linux");
 	this.updateShortcutLists(this.getShortcutTiddlerList());
@@ -161,7 +161,7 @@ KeyboardManager.prototype.getModifierKeys = function() {
 		91, // Meta (left)
 		93, // Meta (right)
 		224 // Meta (Firefox)
-	]
+	];
 };
 
 /*
@@ -187,8 +187,7 @@ KeyboardManager.prototype.parseKeyDescriptor = function(keyDescriptor,options) {
 			metaKey: false
 		};
 	for(var t=0; t<components.length; t++) {
-		var s = components[t].toLowerCase(),
+		var s = components[t].toLowerCase();
-			c = s.charCodeAt(0);
 		// Look for modifier keys
 		if(s === "ctrl") {
 			info.ctrlKey = true;
@@ -266,7 +265,7 @@ KeyboardManager.prototype.getPrintableShortcuts = function(keyInfoArray) {
 		}
 	});
 	return result;
-}
+};
 
 KeyboardManager.prototype.checkKeyDescriptor = function(event,keyInfo) {
 	return keyInfo &&

core/modules/macros/csvtiddlers.js

@@ -24,8 +24,7 @@ exports.params = [
 Run the macro
 */
 exports.run = function(filter,format) {
-	var self = this,
+	var tiddlers = this.wiki.filterTiddlers(filter),
-		tiddlers = this.wiki.filterTiddlers(filter),
 		tiddler,
 		fields = [],
 		t,f;
@@ -46,13 +45,13 @@ exports.run = function(filter,format) {
 		var p = fields.indexOf(value);
 		if(p !== -1) {
 			fields.splice(p,1);
-			fields.unshift(value)
+			fields.unshift(value);
 		}
 	});
 	// Output the column headings
 	var output = [], row = [];
 	fields.forEach(function(value) {
-		row.push(quoteAndEscape(value))
+		row.push(quoteAndEscape(value));
 	});
 	output.push(row.join(","));
 	// Output each tiddler

core/modules/macros/displayshortcuts.js

@@ -32,7 +32,7 @@ exports.run = function(shortcuts,prefix,separator,suffix) {
 	if(shortcutArray.length > 0) {
 		shortcutArray.sort(function(a,b) {
 			return a.toLowerCase().localeCompare(b.toLowerCase());
-		})
+		});
 		return prefix + shortcutArray.join(separator) + suffix;
 	} else {
 		return "";

core/modules/parsers/audioparser.js

@@ -7,8 +7,6 @@ The audio parser parses an audio tiddler into an embeddable HTML element
 
 \*/
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var AudioParser = function(type,text,options) {

core/modules/parsers/binaryparser.js

@@ -59,7 +59,7 @@ var BinaryParser = function(type,text,options) {
 			class: {type: "string", value: "tc-binary-warning"}
 		},
 		children: [warn, link]
-	}
+	};
 	this.tree = [element];
 	this.source = text;
 	this.type = type;

core/modules/parsers/csvparser.js

@@ -45,7 +45,7 @@ var CsvParser = function(type,text,options) {
 			row.children.push({
 				"type": "element", "tag": tag, "children": [{
 					"type": "text",
-					"text": columns[column] || ''
+					"text": columns[column] || ""
 				}]
 			});
 		}

core/modules/parsers/parseutils.js

@@ -45,7 +45,7 @@ exports.parseWhiteSpace = function(source,pos) {
 			type: "whitespace",
 			start: pos,
 			end: p
-		}
+		};
 	}
 };
 
@@ -170,7 +170,7 @@ exports.parseMacroParameters = function(node,source,pos) {
 	}
 	node.end = pos;
 	return node;
-}
+};
 
 /*
 Look for a macro invocation parameter. Returns null if not found, or {type: "macro-parameter", name:, value:, start:, end:}

core/modules/parsers/pdfparser.js

@@ -14,8 +14,7 @@ var ImageParser = function(type,text,options) {
 		type: "element",
 		tag: "iframe",
 		attributes: {}
-		},
+	};
-		src;
 	if(options._canonical_uri) {
 		element.attributes.src = {type: "string", value: options._canonical_uri};
 	} else if(text) {

core/modules/parsers/videoparser.js

@@ -17,8 +17,7 @@ var VideoParser = function(type,text,options) {
 			controls: {type: "string", value: "controls"},
 			style: {type: "string", value: "width: 100%; object-fit: contain"}
 		}
-		},
+	};
-		src;
 	if(options._canonical_uri) {
 		element.attributes.src = {type: "string", value: options._canonical_uri};
 	} else if(text) {

core/modules/parsers/wikiparser/rules/entity.js

@@ -26,8 +26,6 @@ exports.init = function(parser) {
 Parse the most recent match
 */
 exports.parse = function() {
-	// Get all the details of the match
-	var entityString = this.match[1];
 	// Move past the macro call
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Return the entity

core/modules/parsers/wikiparser/rules/import.js

@@ -29,7 +29,6 @@ exports.init = function(parser) {
 Parse the most recent match
 */
 exports.parse = function() {
-	var self = this;
 	// Move past the pragma invocation
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Parse the filter terminated by a line break

core/modules/parsers/wikiparser/rules/prettyextlink.js

@@ -93,7 +93,7 @@ exports.parseLink = function(source,pos) {
 		splitPos = null;
 	}
 	// Pull out the tooltip and URL
-	var tooltip, URL, urlStart;
+	var URL, urlStart;
 	textNode.start = pos;
 	if(splitPos) {
 		urlStart = splitPos + 1;

core/modules/parsers/wikiparser/rules/styleblock.js

@@ -67,5 +67,5 @@ exports.parse = function() {
 	return [{
 		type: "void",
 		children: tree
-	}]
+	}];
 };

core/modules/parsers/wikiparser/rules/transcludeblock.js

@@ -42,7 +42,7 @@ exports.parse = function() {
 			name: name,
 			type: "string",
 			value: paramValue
-		}
+		};
 	});
 	// Prepare the tiddler widget
 	var tr, targetTitle, targetField, targetIndex, tiddlerNode;

core/modules/parsers/wikiparser/rules/transcludeinline.js

@@ -41,7 +41,7 @@ exports.parse = function() {
 			name: name,
 			type: "string",
 			value: paramValue
-		}
+		};
 	});
 	// Prepare the tiddler widget
 	var tr, targetTitle, targetField, targetIndex, tiddlerNode;

core/modules/parsers/wikiparser/rules/typedblock.js

@@ -25,8 +25,6 @@ $$$
 
 "use strict";
 
-var widget = require("$:/core/modules/widgets/widget.js");
-
 exports.name = "typedblock";
 exports.types = {block: true};
 

core/modules/pluginswitcher.js

@@ -49,8 +49,7 @@ PluginSwitcher.prototype.switchPlugins = function() {
 			var tiddler = self.wiki.getTiddler(title);
 			if(tiddler && tiddler.isPlugin() && plugins.indexOf(title) === -1) {
 				plugins.push(title);
-				var pluginInfo = $tw.utils.parseJSONSafe(self.wiki.getTiddlerText(title)),
+				var dependents = $tw.utils.parseStringArray(tiddler.fields.dependents || "");
-					dependents = $tw.utils.parseStringArray(tiddler.fields.dependents || "");
 				$tw.utils.each(dependents,function(title) {
 					accumulatePlugin(title);
 				});
@@ -58,11 +57,11 @@ PluginSwitcher.prototype.switchPlugins = function() {
 		};
 	accumulatePlugin(selectedPluginTitle);
 	// Read the plugin info for the incoming plugins
-	var changes = $tw.wiki.readPluginInfo(plugins);
+	$tw.wiki.readPluginInfo(plugins);
 	// Unregister any existing theme tiddlers
-	var unregisteredTiddlers = $tw.wiki.unregisterPluginTiddlers(this.pluginType);
+	$tw.wiki.unregisterPluginTiddlers(this.pluginType);
 	// Register any new theme tiddlers
-	var registeredTiddlers = $tw.wiki.registerPluginTiddlers(this.pluginType,plugins);
+	$tw.wiki.registerPluginTiddlers(this.pluginType,plugins);
 	// Unpack the current theme tiddlers
 	$tw.wiki.unpackPluginTiddlers();
 	// Call the switch handler

core/modules/savers/custom.js

@@ -22,7 +22,7 @@ var findSaver = function(window) {
 		console.log({ msg: "custom saver is disabled", reason: err });
 		return null;
 	}
-}
+};
 var saver = findSaver(window) || findSaver(window.parent) || {};
 
 var CustomSaver = function(wiki) {

core/modules/savers/gitea.js

@@ -101,7 +101,6 @@ GiteaSaver.prototype.upload = function(uri,method,headers,data,callback) {
 			if(err) {
 				return callback(err);
 			}
-			var putResponseData = $tw.utils.parseJSONSafe(putResponseDataJson);
 			callback(null);
 		}
 	});

core/modules/savers/github.js

@@ -17,8 +17,7 @@ var GitHubSaver = function(wiki) {
 };
 
 GitHubSaver.prototype.save = function(text,method,callback) {
-	var self = this,
+	var username = this.wiki.getTiddlerText("$:/GitHub/Username"),
-		username = this.wiki.getTiddlerText("$:/GitHub/Username"),
 		password = $tw.utils.getPassword("github"),
 		repo = this.wiki.getTiddlerText("$:/GitHub/Repo"),
 		path = this.wiki.getTiddlerText("$:/GitHub/Path",""),
@@ -81,7 +80,6 @@ GitHubSaver.prototype.save = function(text,method,callback) {
 					if(err) {
 						return callback(err);
 					}
-					var putResponseData = $tw.utils.parseJSONSafe(putResponseDataJson);
 					callback(null);
 				}
 			});

core/modules/savers/gitlab.js

@@ -18,8 +18,7 @@ var GitLabSaver = function(wiki) {
 
 GitLabSaver.prototype.save = function(text,method,callback) {
 	/* See https://docs.gitlab.com/ee/api/repository_files.html */
-	var self = this,
+	var username = this.wiki.getTiddlerText("$:/GitLab/Username"),
-		username = this.wiki.getTiddlerText("$:/GitLab/Username"),
 		password = $tw.utils.getPassword("gitlab"),
 		repo = this.wiki.getTiddlerText("$:/GitLab/Repo"),
 		path = this.wiki.getTiddlerText("$:/GitLab/Path",""),
@@ -45,7 +44,7 @@ GitLabSaver.prototype.save = function(text,method,callback) {
 	var uri = endpoint + "/projects/" + encodeURIComponent(repo) + "/repository/";
 	// Perform a get request to get the details (inc shas) of files in the same path as our file
 	$tw.utils.httpRequest({
-		url: uri + "tree/?path=" + encodeURIComponent(path.replace(/^\/+|\/$/g, '')) + "&branch=" + encodeURIComponent(branch.replace(/^\/+|\/$/g, '')),
+		url: uri + "tree/?path=" + encodeURIComponent(path.replace(/^\/+|\/$/g, "")) + "&branch=" + encodeURIComponent(branch.replace(/^\/+|\/$/g, "")),
 		type: "GET",
 		headers: headers,
 		callback: function(err,getResponseDataJson,xhr) {
@@ -71,7 +70,7 @@ GitLabSaver.prototype.save = function(text,method,callback) {
 			};
 			// Perform a request to save the file
 			$tw.utils.httpRequest({
-				url: uri + "files/" + encodeURIComponent(path.replace(/^\/+/, '') + filename),
+				url: uri + "files/" + encodeURIComponent(path.replace(/^\/+/, "") + filename),
 				type: requestType,
 				headers: headers,
 				data: JSON.stringify(data),
@@ -79,7 +78,6 @@ GitLabSaver.prototype.save = function(text,method,callback) {
 					if(err) {
 						return callback(err);
 					}
-					var putResponseData = $tw.utils.parseJSONSafe(putResponseDataJson);
 					callback(null);
 				}
 			});

core/modules/savers/upload.js

@@ -48,7 +48,6 @@ UploadSaver.prototype.save = function(text,method,callback) {
 	}
 	// Assemble the header
 	var boundary = "---------------------------" + "AaB03x";
-	var uploadFormName = "UploadPlugin";
 	var head = [];
 	head.push("--" + boundary + "\r\nContent-disposition: form-data; name=\"UploadPlugin\"\r\n");
 	head.push("backupDir=" + backupDir + ";user=" + username + ";password=" + password + ";uploaddir=" + uploadDir + ";;"); 

core/modules/startup/browser-messaging.js

@@ -59,7 +59,7 @@ function loadIFrame(url,callback) {
 Unload library iframe for given url
 */
 function unloadIFrame(url){
-	var iframes = document.getElementsByTagName('iframe');
+	var iframes = document.getElementsByTagName("iframe");
 	for(var t=iframes.length-1; t--; t>=0) {
 		var iframe = iframes[t];
 		if(iframe.getAttribute("library") === "true" &&

core/modules/startup/eventbus.js

@@ -40,7 +40,7 @@ $tw.eventBus = {
 	emit(event,data) {
 		const listeners = this.listenersMap.get(event);
 		if(listeners) {
-			listeners.forEach(fn => fn(data));
+			listeners.forEach((fn) => fn(data));
 		}
 	}
 };

core/modules/startup/favicon.js

@@ -27,7 +27,7 @@ exports.startup = function() {
 			faviconLink.setAttribute("href",dataURI);
 			$tw.faviconPublisher.send({verb: "FAVICON",body: dataURI});
 		}
-	}
+	};
 	$tw.faviconPublisher = new $tw.utils.BrowserMessagingPublisher({type: "FAVICON", onsubscribe: setFavicon});
 	// Set up the favicon
 	setFavicon();

core/modules/startup/plugins.js

@@ -31,7 +31,6 @@ exports.startup = function() {
 			if(requiresReload) {
 				requireReloadDueToPluginChange = true;
 			} else if(tiddler) {
-				var pluginType = tiddler.fields["plugin-type"];
 				if($tw.wiki.getTiddlerText(PREFIX_CONFIG_REGISTER_PLUGIN_TYPE + (tiddler.fields["plugin-type"] || ""),"no") === "yes") {
 					changesToProcess.push(title);
 				}

core/modules/startup/startup.js

@@ -113,7 +113,7 @@ exports.startup = function() {
 		$tw.syncer = new $tw.Syncer({
 			wiki: $tw.wiki,
 			syncadaptor: $tw.syncadaptor,
-			logging: $tw.wiki.getTiddlerText('$:/config/SyncLogging', "yes") === "yes"
+			logging: $tw.wiki.getTiddlerText("$:/config/SyncLogging", "yes") === "yes"
 		});
 	}
 	// Setup the saver handler

core/modules/startup/windows.js

@@ -104,7 +104,7 @@ exports.startup = function() {
 		$tw.utils.each($tw.windows,function(win) {
 			win.close();
 		});
-	}
+	};
 	$tw.rootWidget.addEventListener("tm-close-all-windows",closeAllWindows);
 	// Close open windows when unloading main window
 	$tw.addUnloadTask(closeAllWindows);

core/modules/storyviews/classic.js

@@ -16,7 +16,6 @@ var ClassicStoryView = function(listWidget) {
 };
 
 ClassicStoryView.prototype.navigateTo = function(historyInfo) {
-	var duration = $tw.utils.getAnimationDuration()
 	var listElementIndex = this.listWidget.findListItem(0,historyInfo.title);
 	if(listElementIndex === undefined) {
 		return;

core/modules/storyviews/pop.js

@@ -62,7 +62,7 @@ PopStoryView.prototype.insert = function(widget) {
 	]);
 	setTimeout(function() {
 		$tw.utils.removeStyles(targetElement, ["transition", "transform", "opactity"]);
-	}, duration)
+	}, duration);
 };
 
 PopStoryView.prototype.remove = function(widget) {

core/modules/storyviews/zoomin.js

@@ -16,7 +16,7 @@ var ZoominListView = function(listWidget) {
 	this.listWidget = listWidget;
 	this.textNodeLogger = new $tw.utils.Logger("zoomin story river view", {
 		enable: true,
-		colour: 'red'
+		colour: "red"
 	});
 	// Get the index of the tiddler that is at the top of the history
 	var history = this.listWidget.wiki.getTiddlerDataCached(this.listWidget.historyTitle,[]),
@@ -212,8 +212,8 @@ ZoominListView.prototype.remove = function(widget) {
 	]);
 	setTimeout(function() {
 		$tw.utils.removeStyles(toWidgetDomNode, ["transformOrigin", "transform", "transition", "opacity", "zIndex"]);
+		removeElement();
 	}, duration);	
-	setTimeout(removeElement,duration);
 	// Now the tiddler we're going back to
 	if(toWidgetDomNode) {
 		$tw.utils.setStyle(toWidgetDomNode,[

core/modules/syncer.js

@@ -89,7 +89,7 @@ function Syncer(options) {
 			self.processTaskQueue();
 		} else {
 			// Look for deletions of tiddlers we're already syncing	
-			var outstandingDeletion = false
+			var outstandingDeletion = false;
 			$tw.utils.each(changes,function(change,title,object) {
 				if(change.deleted && $tw.utils.hop(self.tiddlerInfo,title)) {
 					outstandingDeletion = true;
@@ -304,7 +304,7 @@ Syncer.prototype.syncFromServer = function() {
 
 Syncer.prototype.canSyncFromServer = function() {
 	return !!this.syncadaptor.getUpdatedTiddlers || !!this.syncadaptor.getSkinnyTiddlers;
-}
+};
 
 /*
 Force load a tiddler from the server
@@ -355,7 +355,7 @@ Dispay a password prompt
 */
 Syncer.prototype.displayLoginPrompt = function() {
 	var self = this;
-	var promptInfo = $tw.passwordPrompt.createPrompt({
+	$tw.passwordPrompt.createPrompt({
 		serviceName: $tw.language.getString("LoginToTiddlySpace"),
 		callback: function(data) {
 			self.login(data.username,data.password,function(err,isLoggedIn) {
@@ -530,7 +530,7 @@ function SaveTiddlerTask(syncer,title) {
 
 SaveTiddlerTask.prototype.toString = function() {
 	return "SAVE " + this.title;
-}
+};
 
 SaveTiddlerTask.prototype.run = function(callback) {
 	var self = this,
@@ -568,7 +568,7 @@ function DeleteTiddlerTask(syncer,title) {
 
 DeleteTiddlerTask.prototype.toString = function() {
 	return "DELETE " + this.title;
-}
+};
 
 DeleteTiddlerTask.prototype.run = function(callback) {
 	var self = this;
@@ -595,7 +595,7 @@ function LoadTiddlerTask(syncer,title) {
 
 LoadTiddlerTask.prototype.toString = function() {
 	return "LOAD " + this.title;
-}
+};
 
 LoadTiddlerTask.prototype.run = function(callback) {
 	var self = this;
@@ -621,7 +621,7 @@ function SyncFromServerTask(syncer) {
 
 SyncFromServerTask.prototype.toString = function() {
 	return "SYNCFROMSERVER";
-}
+};
 
 SyncFromServerTask.prototype.run = function(callback) {
 	var self = this;

core/modules/upgraders/plugins.js

@@ -21,8 +21,7 @@ var BLOCKED_PLUGINS = {
 };
 
 exports.upgrade = function(wiki,titles,tiddlers) {
-	var self = this,
+	var messages = {},
-		messages = {},
 		upgradeLibrary,
 		getLibraryTiddler = function(title) {
 			if(!upgradeLibrary) {

core/modules/upgraders/system.js

@@ -14,8 +14,7 @@ var DONT_IMPORT_LIST = ["$:/Import", "$:/build"],
 	WARN_IMPORT_PREFIX_LIST = ["$:/core/modules/"];
 
 exports.upgrade = function(wiki,titles,tiddlers) {
-	var self = this,
+	var messages = {},
-		messages = {},
 		showAlert = false;
 	// Check for tiddlers on our list
 	$tw.utils.each(titles,function(title) {

core/modules/upgraders/themetweaks.js

@@ -34,8 +34,7 @@ var MAPPINGS = {
 };
 
 exports.upgrade = function(wiki,titles,tiddlers) {
-	var self = this,
+	var messages = {};
-		messages = {};
 	// Check for tiddlers on our list
 	$tw.utils.each(titles,function(title) {
 		var mapping = MAPPINGS[title];

core/modules/utils/base64.js

@@ -13,19 +13,19 @@ Base64 utility functions
 Base64 utility functions that work in either browser or Node.js
 */
 
-exports.btoa = binstr => window.btoa(binstr);
+exports.btoa = (binstr) => window.btoa(binstr);
-exports.atob = b64 => window.atob(b64);
+exports.atob = (b64) => window.atob(b64);
 
 function base64ToBytes(base64) {
 	const binString = exports.atob(base64);
-	return Uint8Array.from(binString, m => m.codePointAt(0));
+	return Uint8Array.from(binString, (m) => m.codePointAt(0));
 };
 
 function bytesToBase64(bytes) {
-	const binString = Array.from(bytes, byte => String.fromCodePoint(byte)).join("");
+	const binString = Array.from(bytes, (byte) => String.fromCodePoint(byte)).join("");
 	return exports.btoa(binString);
 };
 
-exports.base64EncodeUtf8 = str => bytesToBase64(new TextEncoder().encode(str));
+exports.base64EncodeUtf8 = (str) => bytesToBase64(new TextEncoder().encode(str));
 
-exports.base64DecodeUtf8 = str => new TextDecoder().decode(base64ToBytes(str));
+exports.base64DecodeUtf8 = (str) => new TextDecoder().decode(base64ToBytes(str));

core/modules/utils/csv.js

@@ -30,7 +30,7 @@ var getCellInfo = function(text, start, length, SEPARATOR) {
 			return [cellStart, i, false];
 			
 		} else if(cellCharacter === QUOTE && isCellQuoted) {
-			var nextCharacter = i + 1 < length ? text.charAt(i + 1) : '';
+			var nextCharacter = i + 1 < length ? text.charAt(i + 1) : "";
 			if(nextCharacter !== QUOTE) {
 				return [cellStart, i, true];
 			} else {
@@ -40,7 +40,7 @@ var getCellInfo = function(text, start, length, SEPARATOR) {
 	}
 	
 	return [cellStart, i, isCellQuoted];
-}
+};
 	
 exports.parseCsvString = function(text, options) {
 	if(!text) {
@@ -65,18 +65,18 @@ exports.parseCsvString = function(text, options) {
 		i = cellInfo[1];
 		
 		var character = text.charAt(i);
-		var nextCharacter = i + 1 < length ? text.charAt(i + 1) : '';
+		var nextCharacter = i + 1 < length ? text.charAt(i + 1) : "";
 		
 		if(character === "\r" || character === "\n") {
 			// Edge case for empty rows
-			if (nextRow.length === 1 && nextRow[0] === '') {
+			if(nextRow.length === 1 && nextRow[0] === "") {
 				nextRow.length = 0;
 			}
 			rows.push(nextRow);
 			nextRow = [];
 			
 			if(character === "\r") {
-				var nextCharacter = i + 1 < length ? text.charAt(i + 1) : '';
+				var nextCharacter = i + 1 < length ? text.charAt(i + 1) : "";
 				
 				if(nextCharacter === "\n") {
 					i++;
@@ -93,7 +93,7 @@ exports.parseCsvString = function(text, options) {
 	rows.push(nextRow);
 	
 	return rows;
-}
+};
 
 /*
 Parse a CSV string with a header row and return an array of hashmaps.
@@ -116,4 +116,4 @@ exports.parseCsvStringWithHeader = function(text,options) {
 		csv[i] = rowObject;
 	}
 	return csv;
-}
+};

core/modules/utils/deprecated.js

@@ -7,7 +7,7 @@ Deprecated util functions
 
 \*/
 
-exports.logTable = data => console.table(data);
+exports.logTable = (data) => console.table(data);
 
 exports.repeat = (str,count) => str.repeat(count);
 
@@ -23,13 +23,13 @@ exports.trim = function(str) {
 	}
 };
 
-exports.hopArray = (object,array) => array.some(element => $tw.utils.hop(object,element));
+exports.hopArray = (object,array) => array.some((element) => $tw.utils.hop(object,element));
 
 exports.sign = Math.sign;
 
 exports.strEndsWith = (str,ending,position) => str.endsWith(ending,position);
 
-exports.stringifyNumber = num => num.toString();
+exports.stringifyNumber = (num) => num.toString();
 
 exports.tagToCssSelector = function(tagName) {
 	return "tc-tagged-" + encodeURIComponent(tagName).replace(/[!"#$%&'()*+,\-./:;<=>?@[\\\]^`{\|}~,]/mg,function(c) {

core/modules/utils/dom/browser.js

@@ -30,10 +30,12 @@ Remove style properties of an element
 	styleProperties: ordered array of string property names
 */
 exports.removeStyles = function(element, styleProperties) {
+	if(element) {
 		for(var i=0; i<styleProperties.length; i++) {
 			element.style.removeProperty($tw.utils.convertStyleNameToPropertyName(styleProperties[i]));
 		}
 	}
+};
 
 /*
 Remove single style property of an element
@@ -41,8 +43,8 @@ Remove single style property of an element
 	styleProperty: string property name
 */
 exports.removeStyle = function(element, styleProperty) {
-	$tw.utils.removeStyles(element, [styleProperty])
+	$tw.utils.removeStyles(element, [styleProperty]);
-}
+};
 
 /*
 Converts a standard CSS property name into the local browser-specific equivalent. For example:

core/modules/utils/dom/dom.js

@@ -144,7 +144,7 @@ exports.getPassword = function(name) {
 Force layout of a dom node and its descendents
 */
 exports.forceLayout = function(element) {
-	var dummy = element.offsetWidth;
+	void element.offsetWidth;
 };
 
 /*
@@ -246,7 +246,7 @@ exports.copyToClipboard = function(text,options) {
 	}
 	if(!options.doNotNotify) {
 		var successNotification = options.successNotification || "$:/language/Notifications/CopiedToClipboard/Succeeded",
-			failureNotification = options.failureNotification || "$:/language/Notifications/CopiedToClipboard/Failed"
+			failureNotification = options.failureNotification || "$:/language/Notifications/CopiedToClipboard/Failed";
 		$tw.notifier.display(succeeded ? successNotification : failureNotification);
 	}
 	document.body.removeChild(textArea);

core/modules/utils/dom/dragndrop.js

@@ -38,8 +38,7 @@ exports.makeDraggable = function(options) {
 				dragFilter = options.dragFilterFn && options.dragFilterFn(),
 				titles = dragTiddler ? [dragTiddler] : [],
 				startActions = options.startActions,
-				variables,
+				variables;
-				domNodeRect;
 			if(dragFilter) {
 				titles.push.apply(titles,options.widget.wiki.filterTiddlers(dragFilter,options.widget));
 			}
@@ -151,7 +150,7 @@ exports.importDataTransfer = function(dataTransfer,fallbackTitle,callback) {
 	if($tw.log.IMPORT) {
 		console.log("Available data types:");
 		for(var type=0; type<dataTransfer.types.length; type++) {
-			console.log("type",dataTransfer.types[type],dataTransfer.getData(dataTransfer.types[type]))
+			console.log("type",dataTransfer.types[type],dataTransfer.getData(dataTransfer.types[type]));
 		}
 	}
 	for(var t=0; t<importDataTypes.length; t++) {
@@ -162,7 +161,7 @@ exports.importDataTransfer = function(dataTransfer,fallbackTitle,callback) {
 			// Import the tiddlers in the data
 			if(data !== "" && data !== null) {
 				if($tw.log.IMPORT) {
-					console.log("Importing data type '" + dataType.type + "', data: '" + data + "'")
+					console.log("Importing data type '" + dataType.type + "', data: '" + data + "'");
 				}
 				var tiddlerFields = dataType.toTiddlerFieldsArray(data,fallbackTitle);
 				callback(tiddlerFields);
@@ -181,7 +180,7 @@ exports.importPaste = function(item,fallbackTitle,callback) {
 
 			item.getAsString(function(data){
 				if($tw.log.IMPORT) {
-					console.log("Importing data type '" + dataType.type + "', data: '" + data + "'")
+					console.log("Importing data type '" + dataType.type + "', data: '" + data + "'");
 				}
 				var tiddlerFields = dataType.toTiddlerFieldsArray(data,fallbackTitle);
 				callback(tiddlerFields);
@@ -200,7 +199,7 @@ exports.itemHasValidDataType = function(item) {
 		}
 	}
 	return false;
-}
+};
 
 var importDataTypes = [
 	{type: "text/vnd.tiddler", IECompatible: false, toTiddlerFieldsArray: function(data,fallbackTitle) {

core/modules/utils/dom/http.js

@@ -61,7 +61,6 @@ HttpClient.prototype.initiateHttpRequest = function(options) {
 };
 
 HttpClient.prototype.cancelAllHttpRequests = function() {
-	var self = this;
 	if(this.requests.length > 0) {
 		for(var t=this.requests.length - 1; t--; t>=0) {
 			var requestInfo = this.requests[t];
@@ -106,7 +105,7 @@ bearerAuthTokenFromStore: name of password store entry contain bear authorizatio
 */
 function HttpClientRequest(options) {
 	var self = this;
-	console.log("Initiating an HTTP request",options)
+	console.log("Initiating an HTTP request",options);
 	this.wiki = options.wiki;
 	this.completionActions = options.oncompletion;
 	this.progressActions = options.onprogress;
@@ -211,7 +210,7 @@ HttpClientRequest.prototype.send = function(callback) {
 			},
 			progress: function(lengthComputable,loaded,total) {
 				if(lengthComputable) {
-					setBinding(self.bindProgress,"" + Math.floor((loaded/total) * 100))
+					setBinding(self.bindProgress,"" + Math.floor((loaded/total) * 100));
 				}
 				self.wiki.invokeActionString(self.progressActions,undefined,$tw.utils.extend({},self.variables,{
 					lengthComputable: lengthComputable ? "yes" : "no",
@@ -276,7 +275,7 @@ exports.httpRequest = function(options) {
 		returnProp = options.returnProp || "responseText",
 		request = new XMLHttpRequest(),
 		data = "",
-		f,results;
+		results;
 	// Massage the data hashmap into a string
 	if(options.data) {
 		if(typeof options.data === "string") { // Already a string
@@ -309,7 +308,7 @@ exports.httpRequest = function(options) {
 	// Handle progress
 	if(options.progress) {
 		request.onprogress = function(event) {
-			console.log("Progress event",event)
+			console.log("Progress event",event);
 			options.progress(event.lengthComputable,event.loaded,event.total);
 		};
 	}

core/modules/utils/dom/keyboard.js

@@ -14,7 +14,7 @@ Keyboard utilities; now deprecated. Instead, use $tw.keyboardManager
 		if($tw.keyboardManager) {
 			return $tw.keyboardManager[method].apply($tw.keyboardManager,Array.prototype.slice.call(arguments,0));
 		} else {
-			return null
+			return null;
 		}
 	};
 });

core/modules/utils/dom/modal.js

@@ -9,7 +9,6 @@ Modal message mechanism
 
 "use strict";
 
-var widget = require("$:/core/modules/widgets/widget.js");
 var navigator = require("$:/core/modules/widgets/navigator.js");
 
 var Modal = function(wiki) {

core/modules/utils/dom/notifier.js

@@ -9,8 +9,6 @@ Notifier mechanism
 
 "use strict";
 
-var widget = require("$:/core/modules/widgets/widget.js");
-
 var Notifier = function(wiki) {
 	this.wiki = wiki;
 };

core/modules/utils/dom/popup.js

@@ -23,14 +23,14 @@ var Popup = function(options) {
 Global regular expression for parsing the location of a popup.
 This is also used by the Reveal widget.
 */
-exports.popupLocationRegExp = /^(@?)\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/
+exports.popupLocationRegExp = /^(@?)\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/;
 
 /*
 Objekt containing the available prefixes for coordinates build with the `buildCoordinates` function:
  - csOffsetParent: Uses a coordinate system based on the offset parent (no prefix).
  - csAbsolute: Use an absolute coordinate system (prefix "@").
 */
-exports.coordinatePrefix = { csOffsetParent: "", csAbsolute: "@" }
+exports.coordinatePrefix = { csOffsetParent: "", csAbsolute: "@" };
 
 /*
 Trigger a popup open or closed. Parameters are in a hashmap:
@@ -220,7 +220,7 @@ exports.parseCoordinates = function(coordinates) {
 	} else {
 		return false;
 	}
-}
+};
 
 /*
 Builds a coordinate string from a coordinate system identifier and an object
@@ -237,6 +237,6 @@ exports.buildCoordinates = function(prefix,position) {
 	} else {
 		return "(0,0,0,0)";
 	}
-}
+};
 
 exports.Popup = Popup;

core/modules/utils/dom/scroller.js

@@ -32,7 +32,7 @@ var PageScroller = function() {
 
 PageScroller.prototype.isScrolling = function() {
 	return this.idRequestFrame !== null;
-}
+};
 
 PageScroller.prototype.cancelScroll = function(srcWindow) {
 	if(this.idRequestFrame) {
@@ -78,7 +78,7 @@ PageScroller.prototype.scrollIntoView = function(element,callback,options) {
 	}
 	// Get the client bounds of the element and adjust by the scroll position
 	var getBounds = function() {
-			var clientBounds = typeof callback === 'function' ? callback() : element.getBoundingClientRect(),
+			var clientBounds = typeof callback === "function" ? callback() : element.getBoundingClientRect(),
 				scrollPosition = $tw.utils.getScrollPosition(srcWindow);
 			return {
 				left: clientBounds.left + scrollPosition.x,

core/modules/utils/fakedom.js

@@ -22,13 +22,13 @@ var TW_Node = function (){
 	throw TypeError("Illegal constructor");
 };
 
-Object.defineProperty(TW_Node.prototype, 'ELEMENT_NODE', {
+Object.defineProperty(TW_Node.prototype, "ELEMENT_NODE", {
 	get: function() {
 		return 1;
 	}
 });
 
-Object.defineProperty(TW_Node.prototype, 'TEXT_NODE', {
+Object.defineProperty(TW_Node.prototype, "TEXT_NODE", {
 	get: function() {
 		return 3;
 	}
@@ -63,7 +63,6 @@ var TW_Style = function(el) {
 		},
 		// Method to set styles using a string (e.g. "color:red; background-color:blue;")
 		set: function(str) {
-			var self = this;
 			str = str || "";
 			$tw.utils.each(str.split(";"),function(declaration) {
 				var parts = declaration.split(":"),

core/modules/utils/performance.js

@@ -54,10 +54,10 @@ Performance.prototype.log = function() {
 	$tw.utils.each(orderedMeasures,function(name) {
 		totalTime += self.measures[name].time;
 	});
-	var results = []
+	var results = [];
 	$tw.utils.each(orderedMeasures,function(name) {
 		var measure = self.measures[name];
-		results.push({name: name,invocations: measure.invocations, avgTime: measure.time / measure.invocations, totalTime: measure.time, percentTime: (measure.time / totalTime) * 100})
+		results.push({name: name,invocations: measure.invocations, avgTime: measure.time / measure.invocations, totalTime: measure.time, percentTime: (measure.time / totalTime) * 100});
 	});
 	self.logger.table(results);
 };