tiddlywiki 5.3.7 → 5.4.0

package/plugins/tiddlywiki/markdown-legacy/wrapper.js

@@ -12,8 +12,7 @@ Wraps up the remarkable parser for use as a Parser in TiddlyWiki
 var r = require("$:/plugins/tiddlywiki/markdown-legacy/remarkable.js");
 
 var Remarkable = r.Remarkable,
-	linkify = r.linkify,
-	utils = r.utils;
+	linkify = r.linkify;
 
 ///// Set up configuration options /////
 function parseAsBoolean(tiddlerName) {
@@ -51,7 +50,7 @@ if(parseAsBoolean("$:/config/markdown/linkify")) {
 }
 
 function findTagWithType(nodes, startPoint, type, level) {
-	for (var i = startPoint; i < nodes.length; i++) {
+	for(var i = startPoint; i < nodes.length; i++) {
 		if(nodes[i].type === type && nodes[i].level === level) {
 			return i;
 		}
@@ -75,7 +74,7 @@ function findTagWithType(nodes, startPoint, type, level) {
  */
 function convertNodes(remarkableTree, isStartOfInline) {
 	let out = [];
-	var accumulatedText = '';
+	var accumulatedText = "";
 	function withChildren(currentIndex, currentLevel, closingType, nodes, callback) {
 		var j = findTagWithType(nodes, currentIndex + 1, closingType, currentLevel);
 		if(j === false) {
@@ -97,175 +96,175 @@ function convertNodes(remarkableTree, isStartOfInline) {
 		});
 	}
 
-	for (var i = 0; i < remarkableTree.length; i++) {
+	for(var i = 0; i < remarkableTree.length; i++) {
 		var currentNode = remarkableTree[i];
-		switch (currentNode.type) {
-		case "paragraph_open":
+		switch(currentNode.type) {
+			case "paragraph_open":
 			// If the paragraph is a "tight" layout paragraph, don't wrap children in a <p> tag.
-			if(currentNode.tight) {
-				i = withChildren(i, currentNode.level, "paragraph_close", remarkableTree, function(children) {
-					Array.prototype.push.apply(out, children);
-				});
-			} else {
-				i = wrappedElement("p", i, currentNode.level, "paragraph_close", remarkableTree);
-			}
-			break;
+				if(currentNode.tight) {
+					i = withChildren(i, currentNode.level, "paragraph_close", remarkableTree, function(children) {
+						Array.prototype.push.apply(out, children);
+					});
+				} else {
+					i = wrappedElement("p", i, currentNode.level, "paragraph_close", remarkableTree);
+				}
+				break;
 
-		case "heading_open":
-			i = wrappedElement("h" + currentNode.hLevel, i, currentNode.level, "heading_close", remarkableTree);
-			break;
+			case "heading_open":
+				i = wrappedElement("h" + currentNode.hLevel, i, currentNode.level, "heading_close", remarkableTree);
+				break;
 
-		case "bullet_list_open":
-			i = wrappedElement("ul", i, currentNode.level, "bullet_list_close", remarkableTree);
-			break;
+			case "bullet_list_open":
+				i = wrappedElement("ul", i, currentNode.level, "bullet_list_close", remarkableTree);
+				break;
 
-		case "ordered_list_open":
-			i = wrappedElement('ol', i, currentNode.level,'ordered_list_close', remarkableTree);
-			break;
+			case "ordered_list_open":
+				i = wrappedElement("ol", i, currentNode.level,"ordered_list_close", remarkableTree);
+				break;
 
-		case "list_item_open":
-			i = wrappedElement("li", i, currentNode.level, "list_item_close", remarkableTree);
-			break;
+			case "list_item_open":
+				i = wrappedElement("li", i, currentNode.level, "list_item_close", remarkableTree);
+				break;
 
-		case "link_open":
-			i = withChildren(i, currentNode.level, "link_close", remarkableTree, function(children) {
-				if(currentNode.href[0] !== "#") {
+			case "link_open":
+				i = withChildren(i, currentNode.level, "link_close", remarkableTree, function(children) {
+					if(currentNode.href[0] !== "#") {
 					// External link
-					var attributes = {
-						class: { type: "string", value: "tc-tiddlylink-external" },
-						href: { type: "string", value: currentNode.href },
-						rel: { type: "string", value: "noopener noreferrer" }
-					};
-					if(pluginOpts.linkNewWindow) {
-						attributes.target = { type: "string", value: "_blank" };
+						var attributes = {
+							class: { type: "string", value: "tc-tiddlylink-external" },
+							href: { type: "string", value: currentNode.href },
+							rel: { type: "string", value: "noopener noreferrer" }
+						};
+						if(pluginOpts.linkNewWindow) {
+							attributes.target = { type: "string", value: "_blank" };
+						}
+						out.push({
+							type: "element",
+							tag: "a",
+							attributes: attributes,
+							children: children
+						});
+					} else {
+					// Internal link
+						out.push({
+							type: "link",
+							attributes: {
+								to: { type: "string", value: $tw.utils.decodeURISafe(currentNode.href.substr(1)) }
+							},
+							children: children
+						});
+					}
+				});
+				break;
+
+			case "code":
+				out.push({
+					type: "element",
+					tag: currentNode.block ? "pre" : "code",
+					children: [{ type: "text", text: currentNode.content }]
+				});
+				break;
+
+			case "fence":
+				out.push({
+					type: "codeblock",
+					attributes: {
+						language: { type: "string", value: currentNode.params },
+						code: { type: "string", value: currentNode.content }
+					}
+				});
+				break;
+
+			case "image":
+				out.push({
+					type: "image",
+					attributes: {
+						tooltip: { type: "string", value: currentNode.alt },
+						source: { type: "string", value: $tw.utils.decodeURIComponentSafe(currentNode.src) }
 					}
+				});
+				break;
+
+			case "softbreak":
+				if(remarkableOpts.breaks) {
 					out.push({
 						type: "element",
-						tag: "a",
-						attributes: attributes,
-						children: children
+						tag: "br",
 					});
 				} else {
-					// Internal link
-					out.push({
-						type: "link",
-						attributes: {
-							to: { type: "string", value: $tw.utils.decodeURISafe(currentNode.href.substr(1)) }
-						},
-						children: children
-					});
-				}
-			});
-			break;
-
-		case "code":
-			out.push({
-				type: "element",
-				tag: currentNode.block ? "pre" : "code",
-				children: [{ type: "text", text: currentNode.content }]
-			});
-			break;
-
-		case "fence":
-			out.push({
-				type: "codeblock",
-				attributes: {
-					language: { type: "string", value: currentNode.params },
-					code: { type: "string", value: currentNode.content }
-				}
-			});
-			break;
-
-		case "image":
-			out.push({
-				type: "image",
-				attributes: {
-					tooltip: { type: "string", value: currentNode.alt },
-					source: { type: "string", value: $tw.utils.decodeURIComponentSafe(currentNode.src) }
+					accumulatedText = accumulatedText + "\n";
 				}
-			});
-			break;
+				break;
 
-		case "softbreak":
-			if(remarkableOpts.breaks) {
+			case "hardbreak":
 				out.push({
 					type: "element",
 					tag: "br",
 				});
-			} else {
-				accumulatedText = accumulatedText + '\n';
-			}
-			break;
+				break;
+
+			case "th_open":
+			case "td_open":
+				var elementTag = currentNode.type.slice(0, 2);
+				i = withChildren(i, currentNode.level, elementTag + "_close", remarkableTree, function(children) {
+					var attributes = {};
+					if(currentNode.align) {
+						attributes.style = { type: "string", value: "text-align:" + currentNode.align };
+					}
+					out.push({
+						type: "element",
+						tag: elementTag,
+						attributes: attributes,
+						children: children
+					});
+				});
+				break;
 
-		case "hardbreak":
-			out.push({
-				type: "element",
-				tag: "br",
-			});
-			break;
-
-		case "th_open":
-		case "td_open":
-			var elementTag = currentNode.type.slice(0, 2);
-			i = withChildren(i, currentNode.level, elementTag + "_close", remarkableTree, function(children) {
-				var attributes = {};
-				if(currentNode.align) {
-					attributes.style = { type: "string", value: "text-align:" + currentNode.align };
-				}
+			case "hr":
 				out.push({
 					type: "element",
-					tag: elementTag,
-					attributes: attributes,
-					children: children
+					tag: "hr",
 				});
-			});
-			break;
-
-		case "hr":
-			out.push({
-				type: 'element',
-				tag: 'hr',
-			});
-			break;
+				break;
 
-		case "inline":
-			out = out.concat(convertNodes(currentNode.children, true));
-			break;
+			case "inline":
+				out = out.concat(convertNodes(currentNode.children, true));
+				break;
 
-		case "text":
+			case "text":
 			// We need to merge this text block with the upcoming text block and parse it all together.
-			accumulatedText = accumulatedText + currentNode.content;
-			break;
+				accumulatedText = accumulatedText + currentNode.content;
+				break;
 
-		case "katex":
+			case "katex":
 			// If rendering WikiText, convert the katex node back to text for parsing by the WikiText LaTeX parser.
-			if(pluginOpts.renderWikiText) {
+				if(pluginOpts.renderWikiText) {
 				// If this is a block, add a newline to trigger the KaTeX plugins block detection.
-				var displayModeSuffix = currentNode.block ? "\n" : "";
-				accumulatedText = accumulatedText + "$$" + currentNode.content + displayModeSuffix + "$$";
-			} else {
-				out.push({
-					type: "latex",
-					attributes: {
-						text: { type: "text", value: currentNode.content },
-						displayMode: { type: "text", value: currentNode.block ? "true" : "false" }
-					}
-				});
-			}
-			break;
+					var displayModeSuffix = currentNode.block ? "\n" : "";
+					accumulatedText = accumulatedText + "$$" + currentNode.content + displayModeSuffix + "$$";
+				} else {
+					out.push({
+						type: "latex",
+						attributes: {
+							text: { type: "text", value: currentNode.content },
+							displayMode: { type: "text", value: currentNode.block ? "true" : "false" }
+						}
+					});
+				}
+				break;
 
-		default:
-			if(currentNode.type.substr(currentNode.type.length - 5) === "_open") {
-				var tagName = currentNode.type.substr(0, currentNode.type.length - 5);
-				i = wrappedElement(tagName, i, currentNode.level, tagName + "_close", remarkableTree);
-			} else {
-				console.error("Unknown node type: " + currentNode.type, currentNode);
-				out.push({
-					type: "text",
-					text: currentNode.content
-				});
-			}
-			break;
+			default:
+				if(currentNode.type.substr(currentNode.type.length - 5) === "_open") {
+					var tagName = currentNode.type.substr(0, currentNode.type.length - 5);
+					i = wrappedElement(tagName, i, currentNode.level, tagName + "_close", remarkableTree);
+				} else {
+					console.error("Unknown node type: " + currentNode.type, currentNode);
+					out.push({
+						type: "text",
+						text: currentNode.content
+					});
+				}
+				break;
 		}
 		// We test to see if we process the block now, or if there's
 		// more to accumulate first.
@@ -317,7 +316,7 @@ function convertNodes(remarkableTree, isStartOfInline) {
 				}
 				out = out.concat(rs);
 			}
-			accumulatedText = '';
+			accumulatedText = "";
 		}
 	}
 	return out;

package/plugins/tiddlywiki/qrcode/makeqr.js

@@ -16,7 +16,7 @@ Information about this macro
 var qrcode = require("$:/plugins/tiddlywiki/qrcode/qrcode/qrcode.js");
 
 var QRCODE_GENERATION_ERROR_PREFIX = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><text x="0" y="30" fill="red" font-family="Helvetica, sans-serif" font-size="18">',
-	QRCODE_GENERATION_ERROR_SUFFIX = '</text></svg>';
+	QRCODE_GENERATION_ERROR_SUFFIX = "</text></svg>";
 
 exports.name = "makeqr";
 

package/plugins/tiddlywiki/railroad/components.js

@@ -34,18 +34,18 @@ Component.prototype.initialiseWithChildren = function(type,content) {
 	this.type = type;
 	// Force the content to be an array
 	this.children = $tw.utils.isArray(content) ? content : [content];
-}
+};
 
 // Return an array of the SVG strings of an array of children
 Component.prototype.getSvgOfChildren = function() {
 	return this.children.map(function(child) {
 		return child.toSvg();
 	});
-}
+};
 
 Component.prototype.toSvg = function() {
 	return "";
-}
+};
 
 Component.prototype.debug = function(output,indent) {
 	output.push(indent);
@@ -75,7 +75,7 @@ Component.prototype.debug = function(output,indent) {
 	if(this.children) {
 		this.debugArray(this.children,output,contentIndent);
 	}
-  	// Add the separator if there is one
+	// Add the separator if there is one
 	if(this.separator) {
 		output.push(indent);
 		output.push("(separator)\n");
@@ -97,7 +97,7 @@ Component.prototype.debugArray = function(array,output,indent) {
 			item.debug(output,indent);
 		}
 	}
-}
+};
 
 var toSingleChild = function(content) {
 	if($tw.utils.isArray(content)) {
@@ -106,9 +106,9 @@ var toSingleChild = function(content) {
 			return content[0];
 		} else {
 			// Never allow an empty sequence
-		  	if(content.length === 0) {
-  				content.push(new Dummy());
-		  	}
+			if(content.length === 0) {
+				content.push(new Dummy());
+			}
 			// Wrap multiple children into a single sequence component
 			return new Sequence(content);
 		}
@@ -116,7 +116,7 @@ var toSingleChild = function(content) {
 		// Already single
 		return content;
 	}
-}
+};
 
 /////////////////////////// Leaf components
 
@@ -128,7 +128,7 @@ Comment.prototype = new Component();
 
 Comment.prototype.toSvg = function() {
 	return railroad.Comment(this.text);
-}
+};
 
 var Dummy = function() {
 	this.initialiseLeaf("Dummy");
@@ -138,7 +138,7 @@ Dummy.prototype = new Component();
 
 Dummy.prototype.toSvg = function() {
 	return railroad.Skip();
-}
+};
 
 var Nonterminal = function(text) {
 	this.initialiseLeaf("Nonterminal",text);
@@ -148,7 +148,7 @@ Nonterminal.prototype = new Component();
 
 Nonterminal.prototype.toSvg = function() {
 	return railroad.NonTerminal(this.text);
-}
+};
 
 var Terminal = function(text) {
 	this.initialiseLeaf("Terminal",text);
@@ -158,7 +158,7 @@ Terminal.prototype = new Component();
 
 Terminal.prototype.toSvg = function() {
 	return railroad.Terminal(this.text);
-}
+};
 
 /////////////////////////// Components with one child
 
@@ -172,7 +172,7 @@ Optional.prototype = new Component();
 Optional.prototype.toSvg = function() {
 	// Call Optional(component,"skip")
 	return railroad.Optional(this.child.toSvg(), this.normal ? undefined : "skip");
-}
+};
 
 var OptionalRepeated = function(content,separator,normal,wantArrow) {
 	this.initialiseWithChild("OptionalRepeated",content);
@@ -188,7 +188,7 @@ OptionalRepeated.prototype.toSvg = function() {
 	var separatorSvg = this.separator ? this.separator.toSvg() : null;
 	var skip = this.normal ? undefined : "skip";
 	return railroad.ZeroOrMore(this.child.toSvg(),separatorSvg,skip,this.wantArrow);
-}
+};
 
 var Repeated = function(content,separator,wantArrow) {
 	this.initialiseWithChild("Repeated",content);
@@ -202,7 +202,7 @@ Repeated.prototype.toSvg = function() {
 	// Call OneOrMore(component,separator)
 	var separatorSvg = this.separator ? this.separator.toSvg() : null;
 	return railroad.OneOrMore(this.child.toSvg(),separatorSvg,this.wantArrow);
-}
+};
 
 var Link = function(content,options) {
 	this.initialiseWithChild("Link",content);
@@ -213,7 +213,7 @@ Link.prototype = new Component();
 
 Link.prototype.toSvg = function() {
 	return railroad.Link(this.child.toSvg(),this.options);
-}
+};
 
 var Transclusion = function(content) {
 	this.initialiseWithChild("Transclusion",content);
@@ -223,7 +223,7 @@ Transclusion.prototype = new Component();
 
 Transclusion.prototype.toSvg = function() {
 	return this.child.toSvg();
-}
+};
 
 /////////////////////////// Components with an array of children
 
@@ -238,7 +238,7 @@ Root.prototype.toSvg = function(options) {
 	args.unshift(options);
 	// Call Diagram(options,component1,component2,...)
 	return railroad.Diagram.apply(null,args);
-}
+};
 
 var Sequence = function(content) {
 	this.initialiseWithChildren("Sequence",content);
@@ -249,7 +249,7 @@ Sequence.prototype = new Component();
 Sequence.prototype.toSvg = function() {
 	// Call Sequence(component1,component2,...)
 	return railroad.Sequence.apply(null,this.getSvgOfChildren());
-}
+};
 
 var Choice = function(content,normal) {
 	this.initialiseWithChildren("Choice",content.map(toSingleChild));
@@ -266,7 +266,7 @@ Choice.prototype.toSvg = function() {
 	var args = this.getSvgOfChildren();
 	args.unshift(this.normal);
 	return railroad.Choice.apply(null,args);
-}
+};
 
 /////////////////////////// Exports
 

package/plugins/tiddlywiki/railroad/parser.js

@@ -246,7 +246,7 @@ Parser.prototype.parseTerminal = function() {
 	var component = new components.Terminal(this.token.value);
 	// Consume the string literal
 	this.advance();
-    return component;
+	return component;
 };
 
 Parser.prototype.parseTransclusion = function() {
@@ -289,18 +289,18 @@ Parser.prototype.parsePragma = function() {
 
 Parser.prototype.parseYesNo = function(pragma) {
 	return this.parseSetting(["yes","no"],pragma) === "yes";
-}
+};
 
 Parser.prototype.parseTerminusStyle = function(pragma) {
 	return this.parseSetting(["single","double","none"],pragma);
-}
+};
 
 Parser.prototype.parseSetting = function(options,pragma) {
 	if(this.at("name") && options.indexOf(this.token.value) !== -1) {
 		return this.tokenValueEaten();		
 	}
 	throw options.join(" or ") + " expected after \\" + pragma;
-}
+};
 
 /////////////////////////// Token manipulation
 

package/plugins/tiddlywiki/railroad/typed-parser.js

@@ -11,12 +11,12 @@ This parser wraps unadorned railroad syntax into a railroad widget
 
 var RailroadParser = function(type,text,options) {
 	var element = {
-			type: "railroad",
-			tag: "$railroad",
-			text: text
-		};
+		type: "railroad",
+		tag: "$railroad",
+		text: text
+	};
 	this.tree = [element];
-console.log(text);
+	console.log(text);
 };
 
 exports["text/vnd.tiddlywiki.railroad"] = RailroadParser;

package/plugins/tiddlywiki/railroad/wrapper.js

@@ -101,7 +101,7 @@ RailroadWidget.prototype.patchLinks = function(node) {
 							child.onclick = function(event) {
 								self.dispatchLink(myTarget,event);
 								return false;
-							}
+							};
 						})(target);
 						target = "#" + target;
 					}

package/plugins/tiddlywiki/stacked-view/stacked.js

@@ -12,7 +12,6 @@ Keeps tiddlers in a stack
 var easing = "cubic-bezier(0.645, 0.045, 0.355, 1)"; // From http://easings.net/#easeInOutCubic
 
 var StackedListView = function(listWidget) {
-	var self = this;
 	this.listWidget = listWidget;
 	this.fanHeightConfigTitle = listWidget.getVariable("tv-stacked-storyview-fan-height-config-title");
 	this.placeTiddlers();

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

@@ -9,8 +9,7 @@ Command to slice a specified tiddler
 
 "use strict";
 
-var widget = require("$:/core/modules/widgets/widget.js"),
-	textSlicer = require("$:/plugins/tiddlywiki/text-slicer/modules/slicer.js");
+var textSlicer = require("$:/plugins/tiddlywiki/text-slicer/modules/slicer.js");
 
 exports.info = {
 	name: "slice",
@@ -32,21 +31,21 @@ Command.prototype.execute = function() {
 		sourceTitle = this.params[0],
 		destTitle = this.params[1],
 		slicerRules = this.params[2],
-		outputMode = this.params[3],
-		slicer = new textSlicer.Slicer({
-			sourceTiddlerTitle: sourceTitle,
-			baseTiddlerTitle: destTitle,
-			slicerRules: slicerRules,
-			outputMode: outputMode,
-			wiki: wiki,
-			callback: function(err,tiddlers) {
-				if(err) {
-					return self.callback(err);
-				}
-				wiki.addTiddlers(tiddlers);
-				self.callback();	
+		outputMode = this.params[3];
+	new textSlicer.Slicer({
+		sourceTiddlerTitle: sourceTitle,
+		baseTiddlerTitle: destTitle,
+		slicerRules: slicerRules,
+		outputMode: outputMode,
+		wiki: wiki,
+		callback: function(err,tiddlers) {
+			if(err) {
+				return self.callback(err);
 			}
-		});
+			wiki.addTiddlers(tiddlers);
+			self.callback();	
+		}
+	});
 	return null;
 };