tiddlywiki 5.3.5 → 5.3.7

package/core/modules/utils/csv.js

@@ -6,10 +6,7 @@ module-type: utils
 A barebones CSV parser
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var QUOTE = '"';
@@ -120,5 +117,3 @@ exports.parseCsvStringWithHeader = function(text,options) {
 	}
 	return csv;
 }
-
-})();

package/core/modules/utils/dom/animations/slide.js

@@ -6,10 +6,7 @@ module-type: animation
 A simple slide animation that varies the height of the element
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 function slideOpen(domNode,options) {
@@ -111,5 +108,3 @@ exports.slide = {
 	open: slideOpen,
 	close: slideClosed
 };
-
-})();

package/core/modules/utils/dom/animator.js

@@ -6,10 +6,7 @@ module-type: utils
 Orchestrates animations and transitions
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 function Animator() {
@@ -39,5 +36,3 @@ Animator.prototype.perform = function(type,domNode,options) {
 };
 
 exports.Animator = Animator;
-
-})();

package/core/modules/utils/dom/browser.js

@@ -6,10 +6,7 @@ module-type: utils
 Browser feature detection
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -160,5 +157,3 @@ exports.getFullScreenApis = function() {
 		return result;
 	}
 };
-
-})();

package/core/modules/utils/dom/dom.js

@@ -6,10 +6,7 @@ module-type: utils
 Various static DOM-related utility functions.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Popup = require("$:/core/modules/utils/dom/popup.js");
@@ -270,6 +267,7 @@ Copy plain text to the clipboard on browsers that support it
 */
 exports.copyToClipboard = function(text,options) {
 	options = options || {};
+	text = text || "";
 	var textArea = document.createElement("textarea");
 	textArea.style.position = "fixed";
 	textArea.style.top = 0;
@@ -289,7 +287,7 @@ exports.copyToClipboard = function(text,options) {
 	var succeeded = false;
 	try {
 		succeeded = document.execCommand("copy");
-	} catch (err) {
+	} catch(err) {
 	}
 	if(!options.doNotNotify) {
 		var successNotification = options.successNotification || "$:/language/Notifications/CopiedToClipboard/Succeeded",
@@ -326,7 +324,7 @@ exports.collectDOMVariables = function(selectedNode,domNode,event) {
 			variables["tv-popup-coords"] = Popup.buildCoordinates(Popup.coordinatePrefix.csOffsetParent,nodeRect);
 
 			var absRect = $tw.utils.extend({}, nodeRect);
-			for (var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) {
+			for(var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) {
 				absRect.left += currentNode.offsetLeft;
 				absRect.top += currentNode.offsetTop;
 			}
@@ -387,5 +385,3 @@ exports.querySelectorAllSafe = function(selector,baseElement) {
 		console.log("Invalid selector: ",selector);
 	}
 };
-
-})();

package/core/modules/utils/dom/dragndrop.js

@@ -6,10 +6,7 @@ module-type: utils
 Browser data transfer utilities, used with the clipboard and drag and drop
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -275,5 +272,3 @@ exports.dragEventContainsFiles = function(event) {
 };
 
 exports.dragEventContainsType = dragEventContainsType;
-
-})();

package/core/modules/utils/dom/http.js

@@ -6,10 +6,7 @@ module-type: utils
 HTTP support
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -104,6 +101,8 @@ basicAuthUsername: plain username for basic authentication
 basicAuthUsernameFromStore: name of password store entry containing username
 basicAuthPassword: plain password for basic authentication
 basicAuthPasswordFromStore: name of password store entry containing password
+bearerAuthToken: plain text token for bearer authentication
+bearerAuthTokenFromStore: name of password store entry contain bear authorization token
 */
 function HttpClientRequest(options) {
 	var self = this;
@@ -135,8 +134,11 @@ function HttpClientRequest(options) {
 	});
 	this.basicAuthUsername = options.basicAuthUsername || (options.basicAuthUsernameFromStore && $tw.utils.getPassword(options.basicAuthUsernameFromStore)) || "";
 	this.basicAuthPassword = options.basicAuthPassword || (options.basicAuthPasswordFromStore && $tw.utils.getPassword(options.basicAuthPasswordFromStore)) || "";
+	this.bearerAuthToken = options.bearerAuthToken || (options.bearerAuthTokenFromStore && $tw.utils.getPassword(options.bearerAuthTokenFromStore)) || "";
 	if(this.basicAuthUsername && this.basicAuthPassword) {
 		this.requestHeaders.Authorization = "Basic " + $tw.utils.base64Encode(this.basicAuthUsername + ":" + this.basicAuthPassword);
+	} else if(this.bearerAuthToken) {
+		this.requestHeaders.Authorization = "Bearer " + this.bearerAuthToken;
 	}
 }
 
@@ -211,11 +213,11 @@ HttpClientRequest.prototype.send = function(callback) {
 				if(lengthComputable) {
 					setBinding(self.bindProgress,"" + Math.floor((loaded/total) * 100))
 				}
-				self.wiki.invokeActionString(self.progressActions,undefined,{
+				self.wiki.invokeActionString(self.progressActions,undefined,$tw.utils.extend({},self.variables,{
 					lengthComputable: lengthComputable ? "yes" : "no",
 					loaded: loaded,
 					total: total
-				},{parentWidget: $tw.rootWidget});
+				}),{parentWidget: $tw.rootWidget});
 			}
 		});
 	}
@@ -348,5 +350,3 @@ exports.setQueryStringParameter = function(url,paramName,paramValue) {
 		return url;
 	}
 };
-
-})();

package/core/modules/utils/dom/keyboard.js

@@ -6,10 +6,7 @@ module-type: utils
 Keyboard utilities; now deprecated. Instead, use $tw.keyboardManager
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 ["parseKeyDescriptor","checkKeyDescriptor"].forEach(function(method) {
@@ -21,5 +18,3 @@ Keyboard utilities; now deprecated. Instead, use $tw.keyboardManager
 		}
 	};
 });
-
-})();

package/core/modules/utils/dom/modal.js

@@ -6,10 +6,7 @@ module-type: utils
 Modal message mechanism
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var widget = require("$:/core/modules/widgets/widget.js");
@@ -146,6 +143,7 @@ Modal.prototype.display = function(title,options) {
 		link.setAttribute("href",tiddler.fields.help);
 		link.setAttribute("target","_blank");
 		link.setAttribute("rel","noopener noreferrer");
+		link.setAttribute("class","tc-tiddlylink-external");
 		link.appendChild(this.srcDocument.createTextNode("Help"));
 		modalFooterHelp.appendChild(link);
 		modalFooterHelp.style.float = "left";
@@ -253,5 +251,3 @@ Modal.prototype.adjustPageClass = function() {
 };
 
 exports.Modal = Modal;
-
-})();

package/core/modules/utils/dom/notifier.js

@@ -6,10 +6,7 @@ module-type: utils
 Notifier mechanism
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var widget = require("$:/core/modules/widgets/widget.js");
@@ -88,5 +85,3 @@ Notifier.prototype.display = function(title,options) {
 };
 
 exports.Notifier = Notifier;
-
-})();

package/core/modules/utils/dom/popup.js

@@ -6,10 +6,7 @@ module-type: utils
 Module that creates a $tw.utils.Popup object prototype that manages popups in the browser
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -243,5 +240,3 @@ exports.buildCoordinates = function(prefix,position) {
 }
 
 exports.Popup = Popup;
-
-})();

package/core/modules/utils/dom/scroller.js

@@ -6,10 +6,7 @@ module-type: utils
 Module that creates a $tw.utils.Scroller object prototype that manages scrolling in the browser
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -135,5 +132,3 @@ PageScroller.prototype.scrollSelectorIntoView = function(baseElement,selector,ca
 };
 
 exports.PageScroller = PageScroller;
-
-})();

package/core/modules/utils/edition-info.js

@@ -6,10 +6,7 @@ module-type: utils-node
 Information about the available editions
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var fs = require("fs"),
@@ -29,10 +26,14 @@ exports.getEditionInfo = function() {
 			for(var entryIndex=0; entryIndex<entries.length; entryIndex++) {
 				var entry = entries[entryIndex];
 				// Check if directories have a valid tiddlywiki.info
-				if(!editionInfo[entry] && $tw.utils.isDirectory(path.resolve(editionPath,entry))) {
-					var info = $tw.utils.parseJSONSafe(fs.readFileSync(path.resolve(editionPath,entry,"tiddlywiki.info"),"utf8"),null);
-					if(info) {
-						editionInfo[entry] = info;
+				// Check if the entry is a hidden directory
+				if((entry.charAt(0) !== ".") && !editionInfo[entry] && $tw.utils.isDirectory(path.resolve(editionPath,entry))) {
+					var file=path.resolve(editionPath,entry,"tiddlywiki.info");
+					if(fs.existsSync(file)) {
+						var info = $tw.utils.parseJSONSafe(fs.readFileSync(file,"utf8"),null);
+						if(info) {
+							editionInfo[entry] = info;
+						}
 					}
 				}
 			}
@@ -40,5 +41,3 @@ exports.getEditionInfo = function() {
 	}
 	return editionInfo;
 };
-
-})();

package/core/modules/utils/errors.js

@@ -6,8 +6,6 @@ module-type: utils
 Custom errors for TiddlyWiki.
 
 \*/
-(function(){
-
 function TranscludeRecursionError() {
 	Error.apply(this,arguments);
 	this.signatures = Object.create(null);
@@ -19,5 +17,3 @@ TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH = 1000;
 TranscludeRecursionError.prototype = Object.create(Error);
 
 exports.TranscludeRecursionError = TranscludeRecursionError;
-
-})();

package/core/modules/utils/escapecss.js

@@ -6,12 +6,10 @@ module-type: utils
 Provides CSS.escape() functionality.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false, window: false */
 "use strict";
 
+// TODO -- resolve this construction
 exports.escapeCSS = (function() {
 	// use browser's native CSS.escape() function if available
 	if ($tw.browser && window.CSS && window.CSS.escape) {
@@ -100,5 +98,3 @@ exports.escapeCSS = (function() {
 		return result;
 	};
 })();
-
-})();

package/core/modules/utils/fakedom.js

@@ -6,10 +6,7 @@ module-type: global
 A barebones implementation of DOM interfaces needed by the rendering mechanism.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Sequence number used to enable us to track objects for testing
@@ -56,36 +53,64 @@ Object.defineProperty(TW_TextNode.prototype, "formattedTextContent", {
 	}
 });
 
-var TW_Element = function(tag,namespace) {
+var TW_Style = function(el) {
+	// Define the internal style object
+	var styleObject = {
+		// Method to get the entire style object
+		get: function() {
+			return el._style;
+		},
+		// 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(":"),
+					name = $tw.utils.trim(parts[0]),
+					value = $tw.utils.trim(parts[1]);
+				if(name && value) {
+					el._style[$tw.utils.convertStyleNameToPropertyName(name)] = value;
+				}
+			});
+		},
+		// Method to set a specific property without transforming the property name, such as a custom property
+		setProperty: function(name, value) {
+			el._style[name] = value;
+		}
+	};
+
+	// Return a Proxy to handle direct access to individual style properties
+	return new Proxy(styleObject, {
+		get: function(target, property) {
+			// If the property exists on styleObject, return it (get, set, setProperty methods)
+			if (property in target) {
+				return target[property];
+			}
+			// Otherwise, return the corresponding property from _style
+			return el._style[$tw.utils.convertStyleNameToPropertyName(property)] || "";
+		},
+		set: function(target, property, value) {
+			// Set the property in _style
+			el._style[$tw.utils.convertStyleNameToPropertyName(property)] = value;
+			return true;
+		}
+	});
+};
+
+var TW_Element = function(tag, namespace) {
 	bumpSequenceNumber(this);
 	this.isTiddlyWikiFakeDom = true;
 	this.tag = tag;
 	this.attributes = {};
 	this.isRaw = false;
 	this.children = [];
-	this._style = {};
+	this._style = {}; // Internal style object
+	this.style = new TW_Style(this); // Proxy for style management
 	this.namespaceURI = namespace || "http://www.w3.org/1999/xhtml";
 };
 
-Object.setPrototypeOf(TW_Element.prototype,TW_Node.prototype);
 
-Object.defineProperty(TW_Element.prototype, "style", {
-	get: function() {
-		return this._style;
-	},
-	set: function(str) {
-		var self = this;
-		str = str || "";
-		$tw.utils.each(str.split(";"),function(declaration) {
-			var parts = declaration.split(":"),
-				name = $tw.utils.trim(parts[0]),
-				value = $tw.utils.trim(parts[1]);
-			if(name && value) {
-				self._style[$tw.utils.convertStyleNameToPropertyName(name)] = value;
-			}
-		});
-	}
-});
+Object.setPrototypeOf(TW_Element.prototype,TW_Node.prototype);
 
 Object.defineProperty(TW_Element.prototype, "nodeType", {
 	get: function() {
@@ -105,7 +130,7 @@ TW_Element.prototype.setAttribute = function(name,value) {
 		throw "Cannot setAttribute on a raw TW_Element";
 	}
 	if(name === "style") {
-		this.style = value;
+		this.style.set(value);
 	} else {
 		this.attributes[name] = value + "";
 	}
@@ -325,5 +350,3 @@ var document = {
 };
 
 exports.fakeDocument = document;
-
-})();

package/core/modules/utils/filesystem.js

@@ -6,10 +6,7 @@ module-type: utils-node
 File system utilities
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var fs = require("fs"),
@@ -238,7 +235,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
 	} else {
 		// Save as a .tid or a text/binary file plus a .meta file
 		var tiddlerType = tiddler.fields.type || "text/vnd.tiddlywiki";
-		if(tiddlerType === "text/vnd.tiddlywiki" || tiddler.hasField("_canonical_uri")) {
+		if(tiddlerType === "text/vnd.tiddlywiki" || tiddlerType === "text/vnd.tiddlywiki-multiple" || tiddler.hasField("_canonical_uri")) {
 			// Save as a .tid file
 			fileInfo.type = "application/x-tiddler";
 			fileInfo.hasMetaFile = false;
@@ -543,5 +540,3 @@ exports.cleanupTiddlerFiles = function(options,callback) {
 		return callback(null,bootInfo);
 	}
 };
-
-})();

package/core/modules/utils/linked-list.js

@@ -7,7 +7,8 @@ This is a doubly-linked indexed list intended for manipulation, particularly
 pushTop, which it does with significantly better performance than an array.
 
 \*/
-(function(){
+
+"use strict";
 
 function LinkedList() {
 	this.clear();
@@ -204,5 +205,3 @@ LLMap.prototype = {
 };
 
 exports.LinkedList = LinkedList;
-
-})();

package/core/modules/utils/logger.js

@@ -6,10 +6,7 @@ module-type: utils
 A basic logging implementation
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var ALERT_TAG = "$:/tags/Alert";
@@ -134,5 +131,3 @@ Logger.prototype.clearAlerts = function() {
 };
 
 exports.Logger = Logger;
-
-})();

package/core/modules/utils/parsetree.js

@@ -6,10 +6,7 @@ module-type: utils
 Parse tree utility functions.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -122,5 +119,3 @@ exports.getParseTreeText = function getParseTreeText(tree) {
 	}
 	return output.join("");
 };
-
-})();

package/core/modules/utils/performance.js

@@ -6,10 +6,7 @@ module-type: global
 Performance measurement.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 function Performance(enabled) {
@@ -87,5 +84,3 @@ Performance.prototype.measure = function(name,fn) {
 };
 
 exports.Performance = Performance;
-
-})();

package/core/modules/utils/pluginmaker.js

@@ -6,10 +6,7 @@ module-type: utils
 A quick and dirty way to pack up plugins within the browser.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -75,5 +72,3 @@ exports.repackPlugin = function(title,additionalTiddlers,excludeTiddlers) {
 	// Return a heartwarming confirmation
 	return "Plugin " + title + " successfully saved";
 };
-
-})();

package/core/modules/utils/repository.js

@@ -6,10 +6,6 @@ module-type: utils
 Utilities for working with the TiddlyWiki repository file structure
 
 \*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -48,5 +44,3 @@ exports.getAllPlugins = function(options) {
 	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.languagesPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.languagesEnvVar),collectPlugins);
 	return tiddlers;
 };
-
-})();

package/core/modules/utils/transliterate.js

@@ -6,10 +6,7 @@ module-type: utils
 Transliteration static utility functions.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -924,9 +921,7 @@ exports.transliterate = function(str) {
 };
 
 exports.transliterateToSafeASCII = function(str) {
-	return str.replace(/[^\x00-\x7F]/g,function(ch) {
+	return str.replace(/[^\x20-\x7F]/g,function(ch) {
 		return exports.transliterationPairs[ch] || ""
 	});
 };
-
-})();

package/core/modules/utils/utils.js

@@ -6,10 +6,7 @@ module-type: utils
 Various static utility functions.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var base64utf8 = require("$:/core/modules/utils/base64-utf8/base64-utf8.module.js");
@@ -330,16 +327,18 @@ exports.formatTitleString = function(template,options) {
 			}]
 		];
 	while(t.length){
-		var matchString = "";
+		var matchString = "",
+			found = false;
 		$tw.utils.each(matches, function(m) {
 			var match = m[0].exec(t);
 			if(match) {
+				found = true;
 				matchString = m[1].call(null,match);
 				t = t.substr(match[0].length);
 				return false;
 			}
 		});
-		if(matchString) {
+		if(found) {
 			result += matchString;
 		} else {
 			result += t.charAt(0);
@@ -1036,5 +1035,3 @@ exports.makeCompareFunction = function(type,options) {
 		};
 	return (types[type] || types[options.defaultType] || types.number);
 };
-
-})();

package/core/modules/widgets/action-confirm.js

@@ -5,10 +5,7 @@ type: application/javascript
 module-type: widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -74,5 +71,3 @@ ConfirmWidget.prototype.allowActionPropagation = function() {
 };
 
 exports["action-confirm"] = ConfirmWidget;
-
-})();

package/core/modules/widgets/action-createtiddler.js

@@ -6,10 +6,7 @@ module-type: widget
 Action widget to create a new tiddler with a unique name and specified fields.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw:false, require:false, exports:false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -109,5 +106,3 @@ CreateTiddlerWidget.prototype.invokeAction = function(triggeringWidget,event) {
 };
 
 exports["action-createtiddler"] = CreateTiddlerWidget;
-
-})();