Add support for content type parameters and wikitext variants

.eslintignore

@@ -1,15 +0,0 @@
-# Known minified files
-/boot/sjcl.js
-/core/modules/utils/base64-utf8/base64-utf8.module.min.js
-/core/modules/utils/diff-match-patch/diff_match_patch.js
-/plugins/tiddlywiki/async/files/async.min.v1.5.0.js
-/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/anyword-hint.js
-/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/css-hint.js
-/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/html-hint.js
-/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/javascript-hint.js
-/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/show-hint.js
-/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/xml-hint.js
-/plugins/tiddlywiki/codemirror-closebrackets/files/addon/edit/closebrackets.js
-/plugins/tiddlywiki/codemirror-closebrackets/files/addon/edit/matchbrackets.js
-/plugins/tiddlywiki/codemirror-closetag/files/addon/edit/closetag.js
-/plugins/tiddlywiki/codemirror-closetag/files/addon/fold/xml-fold.js

.eslintrc.yml

@@ -1,267 +0,0 @@
-env:
-  browser: true
-  commonjs: true
-  es2021: true
-  node: true
-extends: 'eslint:recommended'
-globals:
-  "$tw": "writable" # temporary
-parserOptions:
-  ecmaVersion: 5
-rules:
-  array-bracket-newline: 'off'
-  array-bracket-spacing: 'off'
-  array-callback-return: 'off'
-  array-element-newline: 'off'
-  arrow-body-style: error
-  arrow-parens:
-    - error
-    - as-needed
-  arrow-spacing:
-    - error
-    - after: true
-      before: true
-  block-scoped-var: 'off'
-  block-spacing: 'off'
-  brace-style: 'off'
-  callback-return: 'off'
-  camelcase: 'off'
-  capitalized-comments: 'off'
-  class-methods-use-this: error
-  comma-dangle: 'off'
-  comma-spacing: 'off'
-  comma-style: 'off'
-  complexity: 'off'
-  computed-property-spacing: 'off'
-  consistent-return: 'off'
-  consistent-this: 'off'
-  curly: 'off'
-  default-case: 'off'
-  default-case-last: error
-  default-param-last: error
-  dot-location: 'off'
-  dot-notation: 'off'
-  eol-last: 'off'
-  eqeqeq: 'off'
-  func-call-spacing: 'off'
-  func-name-matching: 'off'
-  func-names: 'off'
-  func-style: 'off'
-  function-call-argument-newline: 'off'
-  function-paren-newline: 'off'
-  generator-star-spacing: error
-  global-require: 'off'
-  grouped-accessor-pairs: error
-  guard-for-in: 'off'
-  handle-callback-err: 'off'
-  id-blacklist: error
-  id-denylist: error
-  id-length: 'off'
-  id-match: error
-  implicit-arrow-linebreak: error
-  indent: 'off'
-  indent-legacy: 'off'
-  init-declarations: 'off'
-  jsx-quotes: error
-  key-spacing: 'off'
-  keyword-spacing: 'off'
-  line-comment-position: 'off'
-  linebreak-style: 'off'
-  lines-around-comment: 'off'
-  lines-around-directive: 'off'
-  lines-between-class-members: error
-  max-classes-per-file: error
-  max-depth: 'off'
-  max-len: 'off'
-  max-lines: 'off'
-  max-lines-per-function: 'off'
-  max-nested-callbacks: error
-  max-params: 'off'
-  max-statements: 'off'
-  max-statements-per-line: 'off'
-  multiline-comment-style: 'off'
-  multiline-ternary: 'off'
-  new-parens: 'off'
-  newline-after-var: 'off'
-  newline-before-return: 'off'
-  newline-per-chained-call: 'off'
-  no-alert: 'off'
-  no-array-constructor: 'off'
-  no-await-in-loop: error
-  no-bitwise: 'off'
-  no-buffer-constructor: 'off'
-  no-caller: error
-  no-catch-shadow: 'off'
-  no-confusing-arrow: error
-  no-console: 'off'
-  no-constant-condition:
-    - error
-    - checkLoops: false
-  no-constructor-return: error
-  no-continue: 'off'
-  no-div-regex: 'off'
-  no-duplicate-imports: error
-  no-else-return: 'off'
-  no-empty-function: 'off'
-  no-eq-null: 'off'
-  no-eval: 'off'
-  no-extend-native: 'off'
-  no-extra-bind: 'off'
-  no-extra-label: 'off'
-  no-extra-parens: 'off'
-  no-floating-decimal: 'off'
-  no-implicit-coercion:
-    - error
-    - boolean: false
-      number: false
-      string: false
-  no-implicit-globals: 'off'
-  no-implied-eval: error
-  no-inline-comments: 'off'
-  no-invalid-this: 'off'
-  no-iterator: error
-  no-label-var: 'off'
-  no-labels: 'off'
-  no-lone-blocks: 'off'
-  no-lonely-if: 'off'
-  no-loop-func: 'off'
-  no-loss-of-precision: error
-  no-magic-numbers: 'off'
-  no-mixed-operators: 'off'
-  no-mixed-requires: 'off'
-  no-multi-assign: 'off'
-  no-multi-spaces: 'off'
-  no-multi-str: error
-  no-multiple-empty-lines: 'off'
-  no-native-reassign: 'off'
-  no-negated-condition: 'off'
-  no-negated-in-lhs: error
-  no-nested-ternary: 'off'
-  no-new: 'off'
-  no-new-func: 'off'
-  no-new-object: 'off'
-  no-new-require: error
-  no-new-wrappers: error
-  no-octal-escape: error
-  no-param-reassign: 'off'
-  no-path-concat: error
-  no-plusplus: 'off'
-  no-process-env: 'off'
-  no-process-exit: 'off'
-  no-promise-executor-return: error
-  no-proto: 'off'
-  no-restricted-exports: error
-  no-restricted-globals: error
-  no-restricted-imports: error
-  no-restricted-modules: error
-  no-restricted-properties: error
-  no-restricted-syntax: error
-  no-return-assign: 'off'
-  no-return-await: error
-  no-script-url: 'off'
-  no-self-compare: 'off'
-  no-sequences: 'off'
-  no-shadow: 'off'
-  no-spaced-func: 'off'
-  no-sync: 'off'
-  no-tabs: 'off'
-  no-template-curly-in-string: error
-  no-ternary: 'off'
-  no-throw-literal: 'off'
-  no-trailing-spaces: 'off'
-  no-undef-init: 'off'
-  no-undefined: 'off'
-  no-underscore-dangle: 'off'
-  no-unmodified-loop-condition: 'off'
-  no-unneeded-ternary: 'off'
-  no-unreachable-loop: error
-  no-unused-expressions: 'off'
-  no-use-before-define: 'off'
-  no-useless-backreference: error
-  no-useless-call: 'off'
-  no-useless-computed-key: error
-  no-useless-concat: 'off'
-  no-useless-constructor: error
-  no-useless-rename: error
-  no-useless-return: 'off'
-  no-var: 'off'
-  no-void: 'off'
-  no-warning-comments: 'off'
-  no-whitespace-before-property: error
-  nonblock-statement-body-position:
-    - error
-    - any
-  object-curly-newline: 'off'
-  object-curly-spacing: 'off'
-  object-property-newline: 'off'
-  object-shorthand: 'off'
-  one-var: 'off'
-  one-var-declaration-per-line: 'off'
-  operator-assignment: 'off'
-  operator-linebreak: 'off'
-  padded-blocks: 'off'
-  padding-line-between-statements: error
-  prefer-arrow-callback: 'off'
-  prefer-const: 'off'
-  prefer-destructuring: 'off'
-  prefer-exponentiation-operator: 'off'
-  prefer-named-capture-group: 'off'
-  prefer-numeric-literals: error
-  prefer-object-spread: 'off'
-  prefer-promise-reject-errors: error
-  prefer-reflect: 'off'
-  prefer-regex-literals: 'off'
-  prefer-rest-params: 'off'
-  prefer-spread: 'off'
-  prefer-template: 'off'
-  quote-props: 'off'
-  quotes: 'off'
-  radix: 'off'
-  require-atomic-updates: error
-  require-await: error
-  require-jsdoc: 'off'
-  require-unicode-regexp: 'off'
-  rest-spread-spacing: error
-  semi: 'off'
-  semi-spacing: 'off'
-  semi-style: 'off'
-  sort-imports: error
-  sort-keys: 'off'
-  sort-vars: 'off'
-  space-before-blocks: 'off'
-  space-before-function-paren: 'off'
-  space-in-parens: 'off'
-  space-infix-ops: 'off'
-  space-unary-ops: 'off'
-  spaced-comment: 'off'
-  strict: 'off'
-  switch-colon-spacing: 'off'
-  symbol-description: error
-  template-curly-spacing: error
-  template-tag-spacing: error
-  unicode-bom:
-    - error
-    - never
-  valid-jsdoc: 'off'
-  valid-typeof:
-    - error
-    - requireStringLiterals: false
-  vars-on-top: 'off'
-  wrap-iife: 'off'
-  wrap-regex: 'off'
-  yield-star-spacing: error
-  yoda: 'off'
-
-  # temporary rules
-  no-useless-escape: 'off'
-  no-unused-vars: 'off'
-  no-empty: 'off'
-  no-extra-semi: 'off'
-  no-redeclare: 'off'
-  no-control-regex: "off"
-  no-mixed-spaces-and-tabs: "off"
-  no-extra-boolean-cast: "off"
-  no-prototype-builtins: "off"
-  no-undef: "off"
-  no-unreachable: "off"
-  no-self-assign: "off"

.github/workflows/ci.yml

@@ -39,9 +39,9 @@ jobs:
       - name: "Set dynamic environment variables"
         run: |
           TW5_BUILD_BRANCH=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
-          echo "TW5_BUILD_BRANCH=${TW5_BUILD_BRANCH}" >> $GITHUB_ENV
-          echo "TW5_BUILD_VERSION=$(./bin/get-plugin-library-version-number)" >> $GITHUB_ENV
-          echo "TW5_BUILD_DETAILS=Prerelease built from branch '$TW5_BUILD_BRANCH' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z')" >> $GITHUB_ENV
+          echo ::set-env name=TW5_BUILD_BRANCH::${TW5_BUILD_BRANCH}
+          echo ::set-env name=TW5_BUILD_VERSION::$(./bin/get-plugin-library-version-number)
+          echo ::set-env name=TW5_BUILD_DETAILS::Prerelease built from branch \'$TW5_BUILD_BRANCH\' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z')
       - run: "./bin/build-site.sh"
       - run: "./bin/ci-push.sh"
         env:
@@ -65,9 +65,9 @@ jobs:
       - name: "Set dynamic environment variables"
         run: |
           TW5_BUILD_BRANCH=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
-          echo "TW5_BUILD_BRANCH=${TW5_BUILD_BRANCH}" >> $GITHUB_ENV
-          echo "TW5_BUILD_VERSION=$(./bin/get-plugin-library-version-number)" >> $GITHUB_ENV
-          echo "TW5_BUILD_DETAILS=Built from branch '$TW5_BUILD_BRANCH' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z')" >> $GITHUB_ENV
+          echo ::set-env name=TW5_BUILD_BRANCH::${TW5_BUILD_BRANCH}
+          echo ::set-env name=TW5_BUILD_VERSION::$(./bin/get-plugin-library-version-number)
+          echo ::set-env name=TW5_BUILD_DETAILS::Built from branch \'$TW5_BUILD_BRANCH\' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z')
       - run: "./bin/build-site.sh"
       - run: "./bin/ci-push.sh"
         env:

bin/ci-push.sh

@@ -2,14 +2,19 @@
 
 # Push output back to GitHub
 
-# Exit script immediately if any command fails
-set -e
 
-cd output
-git config --global user.email "actions@github.com"
-git config --global user.name "GitHub Actions"
-git add -A .
-git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))"
-git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" &>/dev/null
-git push deploy master &>/dev/null
-cd ..
+cd output || exit 1
+
+git config --global user.email "actions@github.com" || exit 1
+
+git config --global user.name "GitHub Actions" || exit 1
+
+git add -A . || exit 1
+
+git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))" || exit 1
+
+git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" &>/dev/null || exit 1
+
+git push deploy master &>/dev/null || exit 1
+
+cd .. || exit 1

boot/boot.js

@@ -267,16 +267,8 @@ $tw.utils.htmlDecode = function(s) {
 Get the browser location.hash. We don't use location.hash because of the way that Firefox auto-urldecodes it (see http://stackoverflow.com/questions/1703552/encoding-of-window-location-hash)
 */
 $tw.utils.getLocationHash = function() {
-	var href = window.location.href;
-	var idx = href.indexOf('#');
-	if(idx === -1) {
-		return "#";
-	} else if(idx < href.length-1 && href[idx+1] === '#') {
-		// Special case: ignore location hash if it itself starts with a #
-		return "#";
-	} else {
-		return href.substring(idx);
-	}
+	var parts = window.location.href.split('#');
+	return "#" + (parts.length > 1 ? parts[1] : "");
 };
 
 /*
@@ -305,21 +297,13 @@ $tw.utils.stringifyDate = function(value) {
 // Parse a date from a UTC YYYYMMDDHHMMSSmmm format string
 $tw.utils.parseDate = function(value) {
 	if(typeof value === "string") {
-		var negative = 1;
-		if(value.charAt(0) === "-") {
-			negative = -1;
-			value = value.substr(1);
-		}
-		var year = parseInt(value.substr(0,4),10) * negative,
-			d = new Date(Date.UTC(year,
+		return new Date(Date.UTC(parseInt(value.substr(0,4),10),
 				parseInt(value.substr(4,2),10)-1,
 				parseInt(value.substr(6,2),10),
 				parseInt(value.substr(8,2)||"00",10),
 				parseInt(value.substr(10,2)||"00",10),
 				parseInt(value.substr(12,2)||"00",10),
 				parseInt(value.substr(14,3)||"000",10)));
-		  d.setUTCFullYear(year); // See https://stackoverflow.com/a/5870822
-		  return d;
 	} else if($tw.utils.isDate(value)) {
 		return value;
 	} else {
@@ -495,6 +479,31 @@ $tw.utils.registerFileType = function(type,encoding,extension,options) {
 	$tw.config.contentTypeInfo[type] = {encoding: encoding, extension: extension, flags: options.flags || [], deserializerType: options.deserializerType || type};
 };
 
+/*
+Parses a content type of the form "type/subtype; attribute=value", as per https://www.w3.org/Protocols/rfc1341/4_Content-Type.html
+Returns an array of [type/subtype,attribute,value], with the last two entries being optional
+*/
+$tw.utils.parseContentType = function(contentType) {
+	contentType = contentType || "";
+	var parts = contentType.split(";"),
+		results = [(parts[0] || "").trim()];
+	if(parts[1]) {
+		parts = parts[1].split("=");
+		if(parts[0]) {
+			results[1] = (parts[0] || "").trim();
+			results[2] = (parts[1] || "").trim();
+		}
+	}
+	return results;
+};
+
+/*
+Returns the contentTypeInfo for a type
+*/
+$tw.utils.getContentTypeInfo = function(contentType) {
+	return $tw.config.contentTypeInfo[$tw.utils.parseContentType(contentType)[0]] || null;
+};
+
 /*
 Given an extension, always access the $tw.config.fileExtensionInfo
 using a lowercase extension only.
@@ -668,13 +677,11 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) {
 	var promptInfo = {
 		serviceName: options.serviceName,
 		callback: options.callback,
-		form: form,
-		owner: this
+		form: form
 	};
 	this.passwordPrompts.push(promptInfo);
 	// Make sure the wrapper is displayed
 	this.setWrapperDisplay();
-	return promptInfo;
 };
 
 $tw.utils.PasswordPrompt.prototype.removePrompt = function(promptInfo) {
@@ -1288,7 +1295,7 @@ $tw.Wiki = function(options) {
 		$tw.utils.each(titles || getTiddlerTitles(),function(title) {
 			var tiddler = tiddlers[title];
 			if(tiddler) {
-				if(tiddler.fields.type === "application/json" && tiddler.hasField("plugin-type") && tiddler.fields.text) {
+				if(tiddler.fields.type === "application/json" && tiddler.hasField("plugin-type")) {
 					pluginInfo[tiddler.fields.title] = JSON.parse(tiddler.fields.text);
 					results.modifiedPlugins.push(tiddler.fields.title);
 				}
@@ -1481,6 +1488,7 @@ $tw.Wiki.prototype.processSafeMode = function() {
 Extracts tiddlers from a typed block of text, specifying default field values
 */
 $tw.Wiki.prototype.deserializeTiddlers = function(type,text,srcFields,options) {
+	type = $tw.utils.parseContentType(type)[0];
 	srcFields = srcFields || Object.create(null);
 	options = options || {};
 	var deserializer = $tw.Wiki.tiddlerDeserializerModules[options.deserializer],
@@ -1840,7 +1848,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 	// Read the specification
 	var filesInfo = JSON.parse(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"));
 	// Helper to process a file
-	var processFile = function(filename,isTiddlerFile,fields,isEditableFile) {
+	var processFile = function(filename,isTiddlerFile,fields) {
 		var extInfo = $tw.config.fileExtensionInfo[path.extname(filename)],
 			type = (extInfo || {}).type || fields.type || "text/plain",
 			typeInfo = $tw.config.contentTypeInfo[type] || {},
@@ -1893,11 +1901,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 				}
 			});
 		});
-		if(isEditableFile) {
-			tiddlers.push({filepath: pathname, hasMetaFile: !!metadata && !isTiddlerFile, isEditableFile: true, tiddlers: fileTiddlers});
-		} else {
-			tiddlers.push({tiddlers: fileTiddlers});
-		}
+		tiddlers.push({tiddlers: fileTiddlers});
 	};
 	// Process the listed tiddlers
 	$tw.utils.each(filesInfo.tiddlers,function(tidInfo) {
@@ -1920,21 +1924,15 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 			}
 		} else {
 			// Process directory specifier
-			var dirPath = path.resolve(filepath,dirSpec.path);
-			if(fs.existsSync(dirPath) && fs.statSync(dirPath).isDirectory()) {
-				var	files = fs.readdirSync(dirPath),
-					fileRegExp = new RegExp(dirSpec.filesRegExp || "^.*$"),
-					metaRegExp = /^.*\.meta$/;
-				for(var t=0; t<files.length; t++) {
-					var filename = files[t];
-					if(filename !== "tiddlywiki.files" && !metaRegExp.test(filename) && fileRegExp.test(filename)) {
-						processFile(dirPath + path.sep + filename,dirSpec.isTiddlerFile,dirSpec.fields,dirSpec.isEditableFile);
-					}
+			var dirPath = path.resolve(filepath,dirSpec.path),
+				files = fs.readdirSync(dirPath),
+				fileRegExp = new RegExp(dirSpec.filesRegExp || "^.*$"),
+				metaRegExp = /^.*\.meta$/;
+			for(var t=0; t<files.length; t++) {
+				var filename = files[t];
+				if(filename !== "tiddlywiki.files" && !metaRegExp.test(filename) && fileRegExp.test(filename)) {
+					processFile(dirPath + path.sep + filename,dirSpec.isTiddlerFile,dirSpec.fields);
 				}
-			} else {
-				console.log("Warning: a directory in a tiddlywiki.files file does not exist.");
-				console.log("dirPath: " + dirPath);	
-				console.log("tiddlywiki.files location: " + filepath);
 			}
 		}
 	});
@@ -2074,11 +2072,6 @@ $tw.loadWikiTiddlers = function(wikiPath,options) {
 	} else {
 		return null;
 	}
-	// Save the path to the tiddlers folder for the filesystemadaptor
-	var config = wikiInfo.config || {};
-	if($tw.boot.wikiPath == wikiPath) {
-		$tw.boot.wikiTiddlersPath = path.resolve($tw.boot.wikiPath,config["default-tiddler-location"] || $tw.config.wikiTiddlersSubDir);
-	}
 	// Load any parent wikis
 	if(wikiInfo.includeWikis) {
 		parentPaths = parentPaths.slice(0);
@@ -2112,30 +2105,27 @@ $tw.loadWikiTiddlers = function(wikiPath,options) {
 				$tw.boot.files[tiddler.title] = {
 					filepath: tiddlerFile.filepath,
 					type: tiddlerFile.type,
-					hasMetaFile: tiddlerFile.hasMetaFile,
-					isEditableFile: config["retain-original-tiddler-path"] || tiddlerFile.isEditableFile || tiddlerFile.filepath.indexOf($tw.boot.wikiTiddlersPath) !== 0
+					hasMetaFile: tiddlerFile.hasMetaFile
 				};
 			});
 		}
 		$tw.wiki.addTiddlers(tiddlerFile.tiddlers);
 	});
-	if ($tw.boot.wikiPath == wikiPath) {
-		// Save the original tiddler file locations if requested
-		var output = {}, relativePath, fileInfo;
+	// Save the original tiddler file locations if requested
+	var config = wikiInfo.config || {};
+	if(config["retain-original-tiddler-path"]) {
+		var output = {}, relativePath;
 		for(var title in $tw.boot.files) {
-			fileInfo = $tw.boot.files[title];
-			if(fileInfo.isEditableFile) {
-				relativePath = path.relative($tw.boot.wikiTiddlersPath,fileInfo.filepath);
-				output[title] =
-					path.sep === "/" ?
-					relativePath :
-					relativePath.split(path.sep).join("/");
-			}
-		}
-		if(Object.keys(output).length > 0){
-			$tw.wiki.addTiddler({title: "$:/config/OriginalTiddlerPaths", type: "application/json", text: JSON.stringify(output)});
+			relativePath = path.relative(resolvedWikiPath,$tw.boot.files[title].filepath);
+			output[title] =
+				path.sep === "/" ?
+				relativePath :
+				relativePath.split(path.sep).join("/");
 		}
+		$tw.wiki.addTiddler({title: "$:/config/OriginalTiddlerPaths", type: "application/json", text: JSON.stringify(output)});
 	}
+	// Save the path to the tiddlers folder for the filesystemadaptor
+	$tw.boot.wikiTiddlersPath = path.resolve($tw.boot.wikiPath,config["default-tiddler-location"] || $tw.config.wikiTiddlersSubDir);
 	// Load any plugins within the wiki folder
 	var wikiPluginsPath = path.resolve(wikiPath,$tw.config.wikiPluginsSubDir);
 	if(fs.existsSync(wikiPluginsPath)) {
@@ -2182,7 +2172,7 @@ $tw.loadTiddlersNode = function() {
 	// Load any extra plugins
 	$tw.utils.each($tw.boot.extraPlugins,function(name) {
 		if(name.charAt(0) === "+") { // Relative path to plugin
-			var pluginFields = $tw.loadPluginFolder(name.substring(1));
+			var pluginFields = $tw.loadPluginFolder(name.substring(1));;
 			if(pluginFields) {
 				$tw.wiki.addTiddler(pluginFields);
 			}
@@ -2294,7 +2284,6 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("application/zip","base64",".zip");
 	$tw.utils.registerFileType("application/x-zip-compressed","base64",".zip");
 	$tw.utils.registerFileType("image/jpeg","base64",[".jpg",".jpeg"],{flags:["image"]});
-	$tw.utils.registerFileType("image/jpg","base64",[".jpg",".jpeg"],{flags:["image"]});
 	$tw.utils.registerFileType("image/png","base64",".png",{flags:["image"]});
 	$tw.utils.registerFileType("image/gif","base64",".gif",{flags:["image"]});
 	$tw.utils.registerFileType("image/webp","base64",".webp",{flags:["image"]});

core/language/en-GB/ControlPanel.multids

@@ -17,8 +17,6 @@ Basics/NewJournal/Tags/Prompt: Tags for new journal tiddlers
 Basics/NewTiddler/Title/Prompt: Title of new tiddlers
 Basics/NewTiddler/Tags/Prompt: Tags for new tiddlers
 Basics/OverriddenShadowTiddlers/Prompt: Number of overridden shadow tiddlers
-Basics/RemoveTags: Update to current format
-Basics/RemoveTags/Hint: Update the tags configuration to the latest format
 Basics/ShadowTiddlers/Prompt: Number of shadow tiddlers
 Basics/Subtitle/Prompt: Subtitle
 Basics/SystemTiddlers/Prompt: Number of system tiddlers
@@ -46,7 +44,6 @@ KeyboardShortcuts/Platform/Linux: Linux platform only
 KeyboardShortcuts/Platform/NonLinux: Non-Linux platforms only
 KeyboardShortcuts/Platform/Windows: Windows platform only
 KeyboardShortcuts/Platform/NonWindows: Non-Windows platforms only
-LayoutSwitcher/Caption: Layout
 LoadedModules/Caption: Loaded Modules
 LoadedModules/Hint: These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process.
 Palette/Caption: Palette
@@ -128,7 +125,6 @@ Saving/TiddlySpot/Filename: Upload Filename
 Saving/TiddlySpot/Heading: ~TiddlySpot
 Saving/TiddlySpot/Hint: //The server URL defaults to `http://<wikiname>.tiddlyspot.com/store.cgi` and can be changed to use a custom server address, e.g. `http://example.com/store.php`.//
 Saving/TiddlySpot/Password: Password
-Saving/TiddlySpot/ReadOnly: The ~TiddlySpot service is currently only available in read-only form. Please see http://tiddlyspot.com/ for the latest details. The ~TiddlySpot saver can still be used to save to compatible servers.
 Saving/TiddlySpot/ServerURL: Server URL
 Saving/TiddlySpot/UploadDir: Upload Directory
 Saving/TiddlySpot/UserName: Wiki Name

core/language/en-GB/EditTemplate.multids

@@ -19,8 +19,6 @@ Shadow/OverriddenWarning: This is a modified shadow tiddler. You can revert to t
 Tags/Add/Button: add
 Tags/Add/Button/Hint: add tag
 Tags/Add/Placeholder: tag name
-Tags/ClearInput/Caption: clear input
-Tags/ClearInput/Hint: Clear tag input
 Tags/Dropdown/Caption: tag list
 Tags/Dropdown/Hint: Show tag list
 Title/BadCharacterWarning: Warning: avoid using any of the characters <<bad-chars>> in tiddler titles

core/language/en-GB/Import.multids

@@ -13,16 +13,11 @@ Listing/Preview/TextRaw: Text (Raw)
 Listing/Preview/Fields: Fields
 Listing/Preview/Diff: Diff
 Listing/Preview/DiffFields: Diff (Fields)
-Listing/Rename/Tooltip: Rename tiddler before importing
-Listing/Rename/Prompt: Rename to:
-Listing/Rename/ConfirmRename: Rename tiddler
-Listing/Rename/CancelRename: Cancel
-Listing/Rename/OverwriteWarning: A tiddler with this title already exists.
-Upgrader/Plugins/Suppressed/Incompatible: Blocked incompatible or obsolete plugin.
-Upgrader/Plugins/Suppressed/Version: Blocked plugin (due to incoming <<incoming>> not being newer than existing <<existing>>).
-Upgrader/Plugins/Upgraded: Upgraded plugin from <<incoming>> to <<upgraded>>.
-Upgrader/State/Suppressed: Blocked temporary state tiddler.
-Upgrader/System/Suppressed: Blocked system tiddler.
-Upgrader/System/Warning: Core module tiddler.
-Upgrader/System/Alert: You are about to import a tiddler that will overwrite a core module tiddler. This is not recommended as it may make the system unstable.
-Upgrader/ThemeTweaks/Created: Migrated theme tweak from <$text text=<<from>>/>.
+Upgrader/Plugins/Suppressed/Incompatible: Blocked incompatible or obsolete plugin
+Upgrader/Plugins/Suppressed/Version: Blocked plugin (due to incoming <<incoming>> being older than existing <<existing>>)
+Upgrader/Plugins/Upgraded: Upgraded plugin from <<incoming>> to <<upgraded>>
+Upgrader/State/Suppressed: Blocked temporary state tiddler
+Upgrader/System/Suppressed: Blocked system tiddler
+Upgrader/System/Warning: Core module tiddler
+Upgrader/System/Alert: You are about to import a tiddler that will overwrite a core module tiddler. This is not recommended as it may make the system unstable
+Upgrader/ThemeTweaks/Created: Migrated theme tweak from <$text text=<<from>>/>

core/language/en-GB/Misc.multids

@@ -10,7 +10,6 @@ ConfirmCancelTiddler: Do you wish to discard changes to the tiddler "<$text text
 ConfirmDeleteTiddler: Do you wish to delete the tiddler "<$text text=<<title>>/>"?
 ConfirmOverwriteTiddler: Do you wish to overwrite the tiddler "<$text text=<<title>>/>"?
 ConfirmEditShadowTiddler: You are about to edit a ShadowTiddler. Any changes will override the default system making future upgrades non-trivial. Are you sure you want to edit "<$text text=<<title>>/>"?
-ConfirmAction: Do you wish to proceed?
 Count: count
 DefaultNewTiddlerTitle: New Tiddler
 Diffs/CountMessage: <<diff-count>> differences
@@ -27,7 +26,6 @@ Error/Caption: Error
 Error/EditConflict: File changed on server
 Error/Filter: Filter error
 Error/FilterSyntax: Syntax error in filter expression
-Error/FilterRunPrefix: Filter Error: Unknown prefix for filter run
 Error/IsFilterOperator: Filter Error: Unknown operand for the 'is' filter operator
 Error/FormatFilterOperator: Filter Error: Unknown suffix for the 'format' filter operator
 Error/LoadingPluginLibrary: Error loading plugin library
@@ -40,7 +38,6 @@ Error/XMLHttpRequest: XMLHttpRequest error code
 InternalJavaScriptError/Title: Internal JavaScript Error
 InternalJavaScriptError/Hint: Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser
 InvalidFieldName: Illegal characters in field name "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`)
-LayoutSwitcher/Description: Open the layout switcher
 LazyLoadingWarning: <p>Trying to load external content from ''<$text text={{!!_canonical_uri}}/>''</p><p>If this message doesn't disappear, either the tiddler content type doesn't match the type of the external content, or you may be using a browser that doesn't support external content for wikis loaded as standalone files. See https://tiddlywiki.com/#ExternalText</p>
 LoginToTiddlySpace: Login to TiddlySpace
 Manager/Controls/FilterByTag/None: (none)
@@ -64,23 +61,13 @@ MissingTiddler/Hint: Missing tiddler "<$text text=<<currentTiddler>>/>" -- click
 No: No
 OfficialPluginLibrary: Official ~TiddlyWiki Plugin Library
 OfficialPluginLibrary/Hint: The official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
-PageTemplate/Description: the default ~TiddlyWiki layout
-PageTemplate/Name: Default ~PageTemplate
 PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$:/core/ui/Buttons/refresh}} to allow changes to ~JavaScript plugins to take effect
 RecentChanges/DateFormat: DDth MMM YYYY
-Shortcuts/Input/AdvancedSearch/Hint: Open the ~AdvancedSearch panel from within the sidebar search field
 Shortcuts/Input/Accept/Hint: Accept the selected item
 Shortcuts/Input/AcceptVariant/Hint: Accept the selected item (variant)
 Shortcuts/Input/Cancel/Hint: Clear the input field
 Shortcuts/Input/Down/Hint: Select the next item
-Shortcuts/Input/Tab-Left/Hint: Select the previous Tab
-Shortcuts/Input/Tab-Right/Hint: Select the next Tab
 Shortcuts/Input/Up/Hint: Select the previous item
-Shortcuts/SidebarLayout/Hint: Change the sidebar layout
-Switcher/Subtitle/theme: Switch Theme
-Switcher/Subtitle/layout: Switch Layout
-Switcher/Subtitle/language: Switch Language
-Switcher/Subtitle/palette: Switch Palette
 SystemTiddler/Tooltip: This is a system tiddler
 SystemTiddlers/Include/Prompt: Include system tiddlers
 TagManager/Colour/Heading: Colour

core/language/en-GB/TiddlerInfo.multids

@@ -14,7 +14,7 @@ List/Caption: List
 List/Empty: This tiddler does not have a list
 Listed/Caption: Listed
 Listed/Empty: This tiddler is not listed by any others
-References/Caption: Backlinks
+References/Caption: References
 References/Empty: No tiddlers link to this one
 Tagging/Caption: Tagging
 Tagging/Empty: No tiddlers are tagged with this one

core/modules/commands/fetch.js

@@ -132,7 +132,7 @@ Command.prototype.processBody = function(body,type,options,url) {
 	// Collect the tiddlers in a wiki
 	var incomingWiki = new $tw.Wiki();
 	if(options.raw) {
-		var typeInfo = type ? $tw.config.contentTypeInfo[type] : null,
+		var typeInfo = type ? $tw.utils.getContentTypeInfo(type) : null,
 			encoding = typeInfo ? typeInfo.encoding : "utf8";
 		incomingWiki.addTiddler(new $tw.Tiddler({
 			title: url,

core/modules/commands/save.js

@@ -37,7 +37,7 @@ Command.prototype.execute = function() {
 	$tw.utils.each(tiddlers,function(title) {
 		var tiddler = self.commander.wiki.getTiddler(title),
 			type = tiddler.fields.type || "text/vnd.tiddlywiki",
-			contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"},
+			contentTypeInfo = $tw.utils.getContentTypeInfo(type) || {encoding: "utf8"},
 			filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]);
 		if(self.commander.verbose) {
 			console.log("Saving \"" + title + "\" to \"" + filepath + "\"");

core/modules/commands/savetiddler.js

@@ -35,7 +35,7 @@ Command.prototype.execute = function() {
 		tiddler = this.commander.wiki.getTiddler(title);
 	if(tiddler) {
 		var type = tiddler.fields.type || "text/vnd.tiddlywiki",
-			contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"};
+			contentTypeInfo = $tw.utils.getContentTypeInfo(type) || {encoding: "utf8"};
 		$tw.utils.createFileDirectories(filename);
 		fs.writeFile(filename,tiddler.fields.text,contentTypeInfo.encoding,function(err) {
 			self.callback(err);

core/modules/commands/savetiddlers.js

@@ -44,7 +44,7 @@ Command.prototype.execute = function() {
 	$tw.utils.each(tiddlers,function(title) {
 		var tiddler = self.commander.wiki.getTiddler(title),
 			type = tiddler.fields.type || "text/vnd.tiddlywiki",
-			contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"},
+			contentTypeInfo = $tw.utils.getContentTypeInfo(type) || {encoding: "utf8"},
 			filename = path.resolve(pathname,encodeURIComponent(title));
 		fs.writeFileSync(filename,tiddler.fields.text,contentTypeInfo.encoding);
 	});

core/modules/editor/engines/framed.js

@@ -42,6 +42,7 @@ function FramedEngine(options) {
 	this.iframeNode.style.border = "none";
 	this.iframeNode.style.padding = "0";
 	this.iframeNode.style.resize = "none";
+	this.iframeNode.style["background-color"] = this.widget.wiki.extractTiddlerDataItem(this.widget.wiki.getTiddlerText("$:/palette"),"tiddler-editor-background");
 	this.iframeDoc.body.style.margin = "0";
 	this.iframeDoc.body.style.padding = "0";
 	this.widget.domNodes.push(this.iframeNode);
@@ -73,12 +74,6 @@ function FramedEngine(options) {
 	if(this.widget.editTabIndex) {
 		this.iframeNode.setAttribute("tabindex",this.widget.editTabIndex);
 	}
-	if(this.widget.editAutoComplete) {
-		this.domNode.setAttribute("autocomplete",this.widget.editAutoComplete);
-	}
-	if(this.widget.isDisabled === "yes") {
-		this.domNode.setAttribute("disabled",true);
-	}	
 	// Copy the styles from the dummy textarea
 	this.copyStyles();
 	// Add event listeners
@@ -102,6 +97,7 @@ FramedEngine.prototype.copyStyles = function() {
 	this.domNode.style.display = "block";
 	this.domNode.style.width = "100%";
 	this.domNode.style.margin = "0";
+	this.domNode.style["background-color"] = this.widget.wiki.extractTiddlerDataItem(this.widget.wiki.getTiddlerText("$:/palette"),"tiddler-editor-background");
 	// In Chrome setting -webkit-text-fill-color overrides the placeholder text colour
 	this.domNode.style["-webkit-text-fill-color"] = "currentcolor";
 };

core/modules/editor/engines/simple.js

@@ -52,12 +52,6 @@ function SimpleEngine(options) {
 	if(this.widget.editTabIndex) {
 		this.domNode.setAttribute("tabindex",this.widget.editTabIndex);
 	}
-	if(this.widget.editAutoComplete) {
-		this.domNode.setAttribute("autocomplete",this.widget.editAutoComplete);
-	}
-	if(this.widget.isDisabled === "yes") {
-		this.domNode.setAttribute("disabled",true);
-	}
 	// Add an input event handler
 	$tw.utils.addEventListeners(this.domNode,[
 		{name: "focus", handlerObject: this, handlerMethod: "handleFocusEvent"},

core/modules/editor/factory.js

@@ -180,8 +180,6 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 		this.editCancelPopups = this.getAttribute("cancelPopups","") === "yes";
 		this.editInputActions = this.getAttribute("inputActions");
 		this.editRefreshTitle = this.getAttribute("refreshTitle");
-		this.editAutoComplete = this.getAttribute("autocomplete");
-		this.isDisabled = this.getAttribute("disabled","no");
 		// Get the default editor element tag and type
 		var tag,type;
 		if(this.editField === "text") {
@@ -213,7 +211,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 	EditTextWidget.prototype.refresh = function(changedTiddlers) {
 		var changedAttributes = this.computeAttributes();
 		// Completely rerender if any of our attributes have changed
-		if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup ||  changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE] || changedAttributes.disabled) {
+		if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup ||  changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE]) {
 			this.refreshSelf();
 			return true;
 		} else if (changedTiddlers[this.editRefreshTitle]) {

core/modules/filterrunprefixes/all.js

@@ -1,25 +0,0 @@
-/*\
-title: $:/core/modules/filterrunprefixes/all.js
-type: application/javascript
-module-type: filterrunprefix
-
-Union of sets without de-duplication.
-Equivalent to = filter run prefix.
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Export our filter prefix function
-*/
-exports.all = function(operationSubFunction) {
-	return function(results,source,widget) {
-		results.push.apply(results, operationSubFunction(source,widget));
-	};
-};
-
-})();

core/modules/filterrunprefixes/and.js

@@ -1,28 +0,0 @@
-/*\
-title: $:/core/modules/filterrunprefixes/and.js
-type: application/javascript
-module-type: filterrunprefix
-
-Intersection of sets.
-Equivalent to + filter run prefix.
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Export our filter prefix function
-*/
-exports.and = function(operationSubFunction,options) {
-	return function(results,source,widget) {
-		// This replaces all the elements of the array, but keeps the actual array so that references to it are preserved
-		source = options.wiki.makeTiddlerIterator(results.toArray());
-		results.clear();
-		results.pushTop(operationSubFunction(source,widget));
-	};
-};
-
-})();

core/modules/filterrunprefixes/else.js

@@ -1,27 +0,0 @@
-/*\
-title: $:/core/modules/filterrunprefixes/else.js
-type: application/javascript
-module-type: filterrunprefix
-
-Equivalent to ~ filter run prefix.
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Export our filter prefix function
-*/
-exports.else = function(operationSubFunction) {
-	return function(results,source,widget) {
-		if(results.length === 0) {
-			// Main result so far is empty
-			results.pushTop(operationSubFunction(source,widget));
-		}
-	};
-};
-
-})();

core/modules/filterrunprefixes/except.js

@@ -1,25 +0,0 @@
-/*\
-title: $:/core/modules/filterrunprefixes/except.js
-type: application/javascript
-module-type: filterrunprefix
-
-Difference of sets.
-Equivalent to - filter run prefix.
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Export our filter prefix function
-*/
-exports.except = function(operationSubFunction) {
-	return function(results,source,widget) {
-		results.remove(operationSubFunction(source,widget));
-	};
-};
-
-})();

core/modules/filterrunprefixes/filter.js

@@ -1,31 +0,0 @@
-/*\
-title: $:/core/modules/filterrunprefixes/filter.js
-type: application/javascript
-module-type: filterrunprefix
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Export our filter function
-*/
-exports.filter = function(operationSubFunction,options) {
-	return function(results,source,widget) {
-		if(results.length > 0) {
-			var resultsToRemove = [];
-			results.each(function(result) {
-				var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([result]),widget);
-				if(filtered.length === 0) {
-					resultsToRemove.push(result);
-				}
-			});
-			results.remove(resultsToRemove);
-		}
-	}
-};
-
-})();

core/modules/filterrunprefixes/intersection.js

@@ -1,31 +0,0 @@
-/*\
-title: $:/core/modules/filterrunprefixes/intersection.js
-type: application/javascript
-module-type: filterrunprefix
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Export our filter prefix function
-*/
-exports.intersection = function(operationSubFunction) {
-	return function(results,source,widget) {
-		if(results.length !== 0) {
-			var secondRunResults = operationSubFunction(source,widget);
-			var firstRunResults = results.toArray();
-			results.clear();
-			$tw.utils.each(firstRunResults,function(title) {
-				if(secondRunResults.indexOf(title) !== -1) {
-					results.push(title);
-				}
-			});
-		}
-	};
-};
-
-})();

core/modules/filterrunprefixes/or.js

@@ -1,24 +0,0 @@
-/*\
-title: $:/core/modules/filterrunprefixes/or.js
-type: application/javascript
-module-type: filterrunprefix
-
-Equivalent to a filter run with no prefix.
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Export our filter prefix function
-*/
-exports.or = function(operationSubFunction) {
-	return function(results,source,widget) {
-		results.pushTop(operationSubFunction(source,widget));
-	};
-};
-
-})();

core/modules/filterrunprefixes/reduce.js

@@ -1,50 +0,0 @@
-/*\
-title: $:/core/modules/filterrunprefixes/reduce.js
-type: application/javascript
-module-type: filterrunprefix
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Export our filter prefix function
-*/
-exports.reduce = function(operationSubFunction,options) {
-	return function(results,source,widget) {
-		if(results.length > 0) {
-			var accumulator = "";
-			var index = 0;
-			results.each(function(title) {
-				var list = operationSubFunction(options.wiki.makeTiddlerIterator([title]),{
-						getVariable: function(name) {
-							switch(name) {
-								case "currentTiddler":
-									return "" + title;
-								case "accumulator":
-									return "" + accumulator;
-								case "index":
-									return "" + index;
-								case "revIndex":
-									return "" +  (results.length - 1 - index);
-								case "length":
-									return "" + results.length;
-								default:
-									return widget.getVariable(name);
-							}
-						}
-					});
-				if(list.length > 0) {
-					accumulator = "" + list[0];
-				}
-				++index;
-			});
-			results.clear();
-			results.push(accumulator);	
-		}
-	}
-};
-
-})();

core/modules/filters.js

@@ -62,61 +62,43 @@ function parseFilterOperation(operators,filterString,p) {
 		else if(operator.operator === "") {
 			operator.operator = "title";
 		}
-		operator.operands = [];
-		function parseOperand(bracketType) {
-			var operand = {};
-			switch (bracketType) {
-				case "{": // Curly brackets
-					operand.indirect = true;
-					nextBracketPos = filterString.indexOf("}",p);
-					break;
-				case "[": // Square brackets
-					nextBracketPos = filterString.indexOf("]",p);
-					break;
-				case "<": // Angle brackets
-					operand.variable = true;
-					nextBracketPos = filterString.indexOf(">",p);
-					break;
-				case "/": // regexp brackets
-					var rex = /^((?:[^\\\/]*|\\.)*)\/(?:\(([mygi]+)\))?/g,
-						rexMatch = rex.exec(filterString.substring(p));
-					if(rexMatch) {
-						operator.regexp = new RegExp(rexMatch[1], rexMatch[2]);
-	// DEPRECATION WARNING
-	console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand",operator.regexp);
-						nextBracketPos = p + rex.lastIndex - 1;
-					}
-					else {
-						throw "Unterminated regular expression in filter expression";
-					}
-					break;
-			}
 
-			if(nextBracketPos === -1) {
-				throw "Missing closing bracket in filter expression";
-			}
-			if(!operator.regexp) {
-				operand.text = filterString.substring(p,nextBracketPos);
-				operator.operands.push(operand);
-			}
-			p = nextBracketPos + 1;
-		}
-		
 		p = nextBracketPos + 1;
-		parseOperand(bracket);
-		
-		// Check for multiple operands
-		while(filterString.charAt(p) === ",") {
-			p++;
-			if(/^[\[\{<\/]/.test(filterString.substring(p))) {
-				nextBracketPos = p;
-				p++;
-				parseOperand(filterString.charAt(nextBracketPos));
-			} else {
-				throw "Missing [ in filter expression";
-			}
+		switch (bracket) {
+			case "{": // Curly brackets
+				operator.indirect = true;
+				nextBracketPos = filterString.indexOf("}",p);
+				break;
+			case "[": // Square brackets
+				nextBracketPos = filterString.indexOf("]",p);
+				break;
+			case "<": // Angle brackets
+				operator.variable = true;
+				nextBracketPos = filterString.indexOf(">",p);
+				break;
+			case "/": // regexp brackets
+				var rex = /^((?:[^\\\/]*|\\.)*)\/(?:\(([mygi]+)\))?/g,
+					rexMatch = rex.exec(filterString.substring(p));
+				if(rexMatch) {
+					operator.regexp = new RegExp(rexMatch[1], rexMatch[2]);
+// DEPRECATION WARNING
+console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand",operator.regexp);
+					nextBracketPos = p + rex.lastIndex - 1;
+				}
+				else {
+					throw "Unterminated regular expression in filter expression";
+				}
+				break;
 		}
-		
+
+		if(nextBracketPos === -1) {
+			throw "Missing closing bracket in filter expression";
+		}
+		if(!operator.regexp) {
+			operator.operand = filterString.substring(p,nextBracketPos);
+		}
+		p = nextBracketPos + 1;
+
 		// Push this operator
 		operators.push(operator);
 	} while(filterString.charAt(p) !== "]");
@@ -137,7 +119,7 @@ exports.parseFilter = function(filterString) {
 		p = 0, // Current position in the filter string
 		match;
 	var whitespaceRegExp = /(\s+)/mg,
-		operandRegExp = /((?:\+|\-|~|=|\:(\w+))?)(?:(\[)|(?:"([^"]*)")|(?:'([^']*)')|([^\s\[\]]+))/mg;
+		operandRegExp = /((?:\+|\-|~|=)?)(?:(\[)|(?:"([^"]*)")|(?:'([^']*)')|([^\s\[\]]+))/mg;
 	while(p < filterString.length) {
 		// Skip any whitespace
 		whitespaceRegExp.lastIndex = p;
@@ -158,19 +140,16 @@ exports.parseFilter = function(filterString) {
 			};
 			if(match[1]) {
 				operation.prefix = match[1];
-				p = p + operation.prefix.length;
-				if(match[2]) {
-					operation.namedPrefix = match[2];
-				}
+				p++;
 			}
-			if(match[3]) { // Opening square bracket
+			if(match[2]) { // Opening square bracket
 				p = parseFilterOperation(operation.operators,filterString,p);
 			} else {
 				p = match.index + match[0].length;
 			}
-			if(match[4] || match[5] || match[6]) { // Double quoted string, single quoted string or unquoted title
+			if(match[3] || match[4] || match[5]) { // Double quoted string, single quoted string or unquoted title
 				operation.operators.push(
-					{operator: "title", operands: [{text: match[4] || match[5] || match[6]}]}
+					{operator: "title", operand: match[3] || match[4] || match[5]}
 				);
 			}
 			results.push(operation);
@@ -187,14 +166,6 @@ exports.getFilterOperators = function() {
 	return this.filterOperators;
 };
 
-exports.getFilterRunPrefixes = function() {
-	if(!this.filterRunPrefixes) {
-		$tw.Wiki.prototype.filterRunPrefixes = {};
-		$tw.modules.applyMethods("filterrunprefix",this.filterRunPrefixes);
-	}
-	return this.filterRunPrefixes;
-}
-
 exports.filterTiddlers = function(filterString,widget,source) {
 	var fn = this.compileFilter(filterString);
 	return fn.call(this,source,widget);
@@ -227,7 +198,7 @@ exports.compileFilter = function(filterString) {
 				results = [],
 				currTiddlerTitle = widget && widget.getVariable("currentTiddler");
 			$tw.utils.each(operation.operators,function(operator) {
-				var operands = [],
+				var operand = operator.operand,
 					operatorFunction;
 				if(!operator.operator) {
 					operatorFunction = filterOperators.title;
@@ -236,23 +207,16 @@ exports.compileFilter = function(filterString) {
 				} else {
 					operatorFunction = filterOperators[operator.operator];
 				}
-				
-				$tw.utils.each(operator.operands,function(operand) {
-					if(operand.indirect) {
-						operand.value = self.getTextReference(operand.text,"",currTiddlerTitle);
-					} else if(operand.variable) {
-						operand.value = widget.getVariable(operand.text,{defaultValue: ""});
-					} else {
-						operand.value = operand.text;
-					}
-					operands.push(operand.value);
-				});
-
+				if(operator.indirect) {
+					operand = self.getTextReference(operator.operand,"",currTiddlerTitle);
+				}
+				if(operator.variable) {
+					operand = widget.getVariable(operator.operand,{defaultValue: ""});
+				}
 				// Invoke the appropriate filteroperator module
 				results = operatorFunction(accumulator,{
 							operator: operator.operator,
-							operand: operands.length > 0 ? operands[0] : undefined,
-							operands: operands,
+							operand: operand,
 							prefix: operator.prefix,
 							suffix: operator.suffix,
 							suffixes: operator.suffixes,
@@ -277,30 +241,35 @@ exports.compileFilter = function(filterString) {
 				return resultArray;
 			}
 		};
-		var filterRunPrefixes = self.getFilterRunPrefixes();
 		// Wrap the operator functions in a wrapper function that depends on the prefix
 		operationFunctions.push((function() {
-			var options = {wiki: self};
 			switch(operation.prefix || "") {
 				case "": // No prefix means that the operation is unioned into the result
-					return filterRunPrefixes["or"](operationSubFunction, options);
+					return function(results,source,widget) {
+						$tw.utils.pushTop(results,operationSubFunction(source,widget));
+					};
 				case "=": // The results of the operation are pushed into the result without deduplication
-					return filterRunPrefixes["all"](operationSubFunction, options);
+					return function(results,source,widget) {
+						Array.prototype.push.apply(results,operationSubFunction(source,widget));
+					};
 				case "-": // The results of this operation are removed from the main result
-					return filterRunPrefixes["except"](operationSubFunction, options);
+					return function(results,source,widget) {
+						$tw.utils.removeArrayEntries(results,operationSubFunction(source,widget));
+					};
 				case "+": // This operation is applied to the main results so far
-					return filterRunPrefixes["and"](operationSubFunction, options);
+					return function(results,source,widget) {
+						// This replaces all the elements of the array, but keeps the actual array so that references to it are preserved
+						source = self.makeTiddlerIterator(results);
+						results.splice(0,results.length);
+						$tw.utils.pushTop(results,operationSubFunction(source,widget));
+					};
 				case "~": // This operation is unioned into the result only if the main result so far is empty
-					return filterRunPrefixes["else"](operationSubFunction, options);
-				default: 
-					if(operation.namedPrefix && filterRunPrefixes[operation.namedPrefix]) {
-						return filterRunPrefixes[operation.namedPrefix](operationSubFunction, options);
-					} else {
-						return function(results,source,widget) {
-							results.clear();
-							results.push($tw.language.getString("Error/FilterRunPrefix"));
-						};
-					}
+					return function(results,source,widget) {
+						if(results.length === 0) {
+							// Main result so far is empty
+							$tw.utils.pushTop(results,operationSubFunction(source,widget));
+						}
+					};
 			}
 		})());
 	});
@@ -311,11 +280,11 @@ exports.compileFilter = function(filterString) {
 		} else if(typeof source === "object") { // Array or hashmap
 			source = self.makeTiddlerIterator(source);
 		}
-		var results = new $tw.utils.LinkedList();
+		var results = [];
 		$tw.utils.each(operationFunctions,function(operationFunction) {
 			operationFunction(results,source,widget);
 		});
-		return results.toArray();
+		return results;
 	});
 };
 

core/modules/filters/editiondescription.js

@@ -16,16 +16,14 @@ Filter operator for returning the descriptions of the specified edition names
 Export our filter function
 */
 exports.editiondescription = function(source,operator,options) {
-	var results = [];
-	if($tw.node) {
-		var editionInfo = $tw.utils.getEditionInfo();
-		if(editionInfo) {
-			source(function(tiddler,title) {
-				if($tw.utils.hop(editionInfo,title)) {
-					results.push(editionInfo[title].description || "");				
-				}
-			});
-		}
+	var results = [],
+		editionInfo = $tw.utils.getEditionInfo();
+	if(editionInfo) {
+		source(function(tiddler,title) {
+			if($tw.utils.hop(editionInfo,title)) {
+				results.push(editionInfo[title].description || "");				
+			}
+		});
 	}
 	return results;
 };

core/modules/filters/editions.js

@@ -16,16 +16,14 @@ Filter operator for returning the names of the available editions in this wiki
 Export our filter function
 */
 exports.editions = function(source,operator,options) {
-	var results = [];
-	if($tw.node) {
-		var editionInfo = $tw.utils.getEditionInfo();
-		if(editionInfo) {
-			$tw.utils.each(editionInfo,function(info,name) {
-				results.push(name);
-			});
-		}
-		results.sort();
+	var results = [],
+		editionInfo = $tw.utils.getEditionInfo();
+	if(editionInfo) {
+		$tw.utils.each(editionInfo,function(info,name) {
+			results.push(name);
+		});
 	}
+	results.sort();
 	return results;
 };
 

core/modules/filters/encodings.js

@@ -77,7 +77,7 @@ exports.encodehtml = function(source,operator,options) {
 exports.stringify = function(source,operator,options) {
 	var results = [];
 	source(function(tiddler,title) {
-		results.push($tw.utils.stringify(title,(operator.suffix === "rawunicode")));
+		results.push($tw.utils.stringify(title));
 	});
 	return results;
 };
@@ -85,7 +85,7 @@ exports.stringify = function(source,operator,options) {
 exports.jsonstringify = function(source,operator,options) {
 	var results = [];
 	source(function(tiddler,title) {
-		results.push($tw.utils.jsonStringify(title,(operator.suffix === "rawunicode")));
+		results.push($tw.utils.jsonStringify(title));
 	});
 	return results;
 };

core/modules/filters/is/draft.js

@@ -1,36 +0,0 @@
-/*\
-title: $:/core/modules/filters/is/draft.js
-type: application/javascript
-module-type: isfilteroperator
-
-Filter function for [is[draft]] analagous to [has[draft.of]]
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Export our filter function
-*/
-exports.draft = function(source,prefix,options) {
-	var results = [];
-	if(prefix === "!") {
-		source(function(tiddler,title) {
-			if(!tiddler || !$tw.utils.hop(tiddler.fields,"draft.of")) {
-				results.push(title);
-			}
-		});
-	} else {
-		source(function(tiddler,title) {
-			if(tiddler && $tw.utils.hop(tiddler.fields,"draft.of") && (tiddler.fields["draft.of"].length !== 0)) {
-				results.push(title);
-			}
-		});				
-	}
-	return results;
-};
-
-})();

core/modules/filters/lookup.js

@@ -22,7 +22,7 @@ Export our filter function
 exports.lookup = function(source,operator,options) {
 	var results = [];
 	source(function(tiddler,title) {
-		results.push(options.wiki.getTiddlerText(operator.operand + title) || operator.suffix);
+		results.push(options.wiki.getTiddlerText(operator.operand + title) || options.wiki.getTiddlerText(operator.operand + operator.suffix));
 	});
 	return results;
 };

core/modules/filters/math.js

@@ -91,20 +91,6 @@ exports.exponential = makeNumericBinaryOperator(
 	function(a,b) {return Number.prototype.toExponential.call(a,Math.min(Math.max(b,0),100));}
 );
 
-exports.power = makeNumericBinaryOperator(
-	function(a,b) {return Math.pow(a,b);}
-);
-
-exports.log = makeNumericBinaryOperator(
-	function(a,b) {
-		if(b) {
-			return Math.log(a)/Math.log(b);
-		} else {
-			return Math.log(a);
-		}
-	}
-);
-
 exports.sum = makeNumericReducingOperator(
 	function(accumulator,value) {return accumulator + value},
 	0 // Initial value

core/modules/filters/reduce.js

@@ -3,7 +3,7 @@ title: $:/core/modules/filters/reduce.js
 type: application/javascript
 module-type: filteroperator
 
-Filter operator evaluates a subfilter for each item, making the running total available in the variable `accumulator`, and the current index available in the variable `index`
+Filter operator evaluats a subfilter for each item, making the running total available in the variable `accumulator`, and the current index available in the variable `index`
 
 \*/
 (function(){
@@ -23,7 +23,7 @@ exports.reduce = function(source,operator,options) {
 	});
 	// Run the filter over each item
 	var filterFn = options.wiki.compileFilter(operator.operand),
-		accumulator = operator.operands[1] || "";
+		accumulator = operator.suffix || "";
 	for(var index=0; index<results.length; index++) {
 		var title = results[index],
 			list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),{
@@ -48,11 +48,7 @@ exports.reduce = function(source,operator,options) {
 			accumulator = "" +  list[0];
 		}
 	}
-	if(results.length > 0) {
-		return [accumulator];
-	} else {
-		return [];
-	}
+	return [accumulator];
 };
 
 })();

core/modules/filters/strings.js

@@ -56,14 +56,14 @@ exports.trim = function(source,operator,options) {
 	return result;
 };
 
+// makeStringBinaryOperator(
+// 	function(a) {return [$tw.utils.trim(a)];}
+// );
+
 exports.split = makeStringBinaryOperator(
 	function(a,b) {return ("" + a).split(b);}
 );
 
-exports["enlist-input"] = makeStringBinaryOperator(
-	function(a,o,s) {return $tw.utils.parseStringArray("" + a,(s === "raw"));}
-);
-
 exports.join = makeStringReducingOperator(
 	function(accumulator,value,operand) {
 		if(accumulator === null) {
@@ -78,7 +78,7 @@ function makeStringBinaryOperator(fnCalc) {
 	return function(source,operator,options) {
 		var result = [];
 		source(function(tiddler,title) {
-			Array.prototype.push.apply(result,fnCalc(title,operator.operand || "",operator.suffix || ""));
+			Array.prototype.push.apply(result,fnCalc(title,operator.operand || ""));
 		});
 		return result;
 	};
@@ -115,61 +115,4 @@ exports.splitregexp = function(source,operator,options) {
 	return result;
 };
 
-exports["search-replace"] = function(source,operator,options) {
-	var results = [],
-		suffixes = operator.suffixes || [],
-		flagSuffix = (suffixes[0] ? (suffixes[0][0] || "") : ""),
-		flags = (flagSuffix.indexOf("g") !== -1 ? "g" : "") + (flagSuffix.indexOf("i") !== -1 ? "i" : ""),
-		isRegExp = (suffixes[1] && suffixes[1][0] === "regexp") ? true : false,
-		searchTerm,
-		regExp;
-	
-	source(function(tiddler,title) {
-		if(title && (operator.operands.length > 1)) {
-			//Escape regexp characters if the operand is not a regular expression
-			searchTerm = isRegExp ? operator.operand : $tw.utils.escapeRegExp(operator.operand);
-			try {
-				regExp = new RegExp(searchTerm,flags);
-			} catch(ex) {
-				return ["RegExp error: " + ex];
-			}
-			results.push(
-				title.replace(regExp,operator.operands[1])
-			);
-		} else {
-			results.push(title);
-		}
-	});
-	return results;
-};
-
-exports.pad = function(source,operator,options) {
-	var results = [],
-		targetLength = operator.operand ? parseInt(operator.operand) : 0,
-		fill = operator.operands[1] || "0";
-
-	source(function(tiddler,title) {
-		if(title && title.length) {
-			if(title.length >= targetLength) {
-				results.push(title);
-			} else {
-				var padString = "",
-					padStringLength = targetLength - title.length;
-				while (padStringLength > padString.length) {
-					padString += fill;					
-				}
-				//make sure we do not exceed the specified length
-				padString = padString.slice(0,padStringLength);
-				if(operator.suffix && (operator.suffix === "suffix")) {
-					title = title + padString;
-				} else {
-					title = padString + title;
-				}
-				results.push(title);
-			}
-		}
-	});
-	return results;
-}
-
 })();

core/modules/filters/x-listops.js

@@ -8,228 +8,183 @@ Extended filter operators to manipulate the current list.
 \*/
 (function () {
 
-	/*jslint node: true, browser: true */
-	/*global $tw: false */
-	"use strict";
+    /*jslint node: true, browser: true */
+    /*global $tw: false */
+    "use strict";
 
-	/*
-	Fetch titles from the current list
-	*/
-	var prepare_results = function (source) {
-	var results = [];
-		source(function (tiddler, title) {
-			results.push(title);
-		});
-		return results;
-	};
+    /*
+    Fetch titles from the current list
+    */
+    var prepare_results = function (source) {
+    var results = [];
+        source(function (tiddler, title) {
+            results.push(title);
+        });
+        return results;
+    };
 
-	/*
-	Moves a number of items from the tail of the current list before the item named in the operand
-	*/
-	exports.putbefore = function (source, operator) {
-		var results = prepare_results(source),
-			index = results.indexOf(operator.operand),
-			count = $tw.utils.getInt(operator.suffix,1);
-		return (index === -1) ?
-			results.slice(0, -1) :
-			results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index, -count));
-	};
+    /*
+    Moves a number of items from the tail of the current list before the item named in the operand
+    */
+    exports.putbefore = function (source, operator) {
+        var results = prepare_results(source),
+            index = results.indexOf(operator.operand),
+            count = $tw.utils.getInt(operator.suffix,1);
+        return (index === -1) ?
+            results.slice(0, -1) :
+            results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index, -count));
+    };
 
-	/*
-	Moves a number of items from the tail of the current list after the item named in the operand
-	*/
-	exports.putafter = function (source, operator) {
-		var results = prepare_results(source),
-			index = results.indexOf(operator.operand),
-			count = $tw.utils.getInt(operator.suffix,1);
-		return (index === -1) ?
-			results.slice(0, -1) :
-			results.slice(0, index + 1).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
-	};
+    /*
+    Moves a number of items from the tail of the current list after the item named in the operand
+    */
+    exports.putafter = function (source, operator) {
+        var results = prepare_results(source),
+            index = results.indexOf(operator.operand),
+            count = $tw.utils.getInt(operator.suffix,1);
+        return (index === -1) ?
+            results.slice(0, -1) :
+            results.slice(0, index + 1).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
+    };
 
-	/*
-	Replaces the item named in the operand with a number of items from the tail of the current list
-	*/
-	exports.replace = function (source, operator) {
-		var results = prepare_results(source),
-			index = results.indexOf(operator.operand),
-			count = $tw.utils.getInt(operator.suffix,1);
-		return (index === -1) ?
-			results.slice(0, -count) :
-			results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
-	};
+    /*
+    Replaces the item named in the operand with a number of items from the tail of the current list
+    */
+    exports.replace = function (source, operator) {
+        var results = prepare_results(source),
+            index = results.indexOf(operator.operand),
+            count = $tw.utils.getInt(operator.suffix,1);
+        return (index === -1) ?
+            results.slice(0, -count) :
+            results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
+    };
 
-	/*
-	Moves a number of items from the tail of the current list to the head of the list
-	*/
-	exports.putfirst = function (source, operator) {
-		var results = prepare_results(source),
-			count = $tw.utils.getInt(operator.suffix,1);
-		return results.slice(-count).concat(results.slice(0, -count));
-	};
+    /*
+    Moves a number of items from the tail of the current list to the head of the list
+    */
+    exports.putfirst = function (source, operator) {
+        var results = prepare_results(source),
+            count = $tw.utils.getInt(operator.suffix,1);
+        return results.slice(-count).concat(results.slice(0, -count));
+    };
 
-	/*
-	Moves a number of items from the head of the current list to the tail of the list
-	*/
-	exports.putlast = function (source, operator) {
-		var results = prepare_results(source),
-			count = $tw.utils.getInt(operator.suffix,1);
-		return results.slice(count).concat(results.slice(0, count));
-	};
+    /*
+    Moves a number of items from the head of the current list to the tail of the list
+    */
+    exports.putlast = function (source, operator) {
+        var results = prepare_results(source),
+            count = $tw.utils.getInt(operator.suffix,1);
+        return results.slice(count).concat(results.slice(0, count));
+    };
 
-	/*
-	Moves the item named in the operand a number of places forward or backward in the list
-	*/
-	exports.move = function (source, operator) {
-		var results = prepare_results(source),
-			index = results.indexOf(operator.operand),
-			count = $tw.utils.getInt(operator.suffix,1),
-			marker = results.splice(index, 1),
-			offset =  (index + count) > 0 ? index + count : 0;
-		return results.slice(0, offset).concat(marker).concat(results.slice(offset));
-	};
+    /*
+    Moves the item named in the operand a number of places forward or backward in the list
+    */
+    exports.move = function (source, operator) {
+        var results = prepare_results(source),
+            index = results.indexOf(operator.operand),
+            count = $tw.utils.getInt(operator.suffix,1),
+            marker = results.splice(index, 1),
+            offset =  (index + count) > 0 ? index + count : 0;
+        return results.slice(0, offset).concat(marker).concat(results.slice(offset));
+    };
 
-	/*
-	Returns the items from the current list that are after the item named in the operand
-	*/
-	exports.allafter = function (source, operator) {
-		var results = prepare_results(source),
-			index = results.indexOf(operator.operand);
-		return (index === -1) ? [] :
-			(operator.suffix) ? results.slice(index) :
-			results.slice(index + 1);
-	};
+    /*
+    Returns the items from the current list that are after the item named in the operand
+    */
+    exports.allafter = function (source, operator) {
+        var results = prepare_results(source),
+            index = results.indexOf(operator.operand);
+        return (index === -1) ? [] :
+            (operator.suffix) ? results.slice(index) :
+            results.slice(index + 1);
+    };
 
-	/*
-	Returns the items from the current list that are before the item named in the operand
-	*/
-	exports.allbefore = function (source, operator) {
-		var results = prepare_results(source),
-			index = results.indexOf(operator.operand);
-		return (index === -1) ? [] :
-			(operator.suffix) ? results.slice(0, index + 1) :
-			results.slice(0, index);
-	};
+    /*
+    Returns the items from the current list that are before the item named in the operand
+    */
+    exports.allbefore = function (source, operator) {
+        var results = prepare_results(source),
+            index = results.indexOf(operator.operand);
+        return (index === -1) ? [] :
+            (operator.suffix) ? results.slice(0, index + 1) :
+            results.slice(0, index);
+    };
 
-	/*
-	Appends the items listed in the operand array to the tail of the current list
-	*/
-	exports.append = function (source, operator) {
-		var append = $tw.utils.parseStringArray(operator.operand, "true"),
-			results = prepare_results(source),
-			count = parseInt(operator.suffix) || append.length;
-		return (append.length === 0) ? results :
-			(operator.prefix) ? results.concat(append.slice(-count)) :
-			results.concat(append.slice(0, count));
-	};
+    /*
+    Appends the items listed in the operand array to the tail of the current list
+    */
+    exports.append = function (source, operator) {
+        var append = $tw.utils.parseStringArray(operator.operand, "true"),
+            results = prepare_results(source),
+            count = parseInt(operator.suffix) || append.length;
+        return (append.length === 0) ? results :
+            (operator.prefix) ? results.concat(append.slice(-count)) :
+            results.concat(append.slice(0, count));
+    };
 
-	/*
-	Prepends the items listed in the operand array to the head of the current list
-	*/
-	exports.prepend = function (source, operator) {
-		var prepend = $tw.utils.parseStringArray(operator.operand, "true"),
-			results = prepare_results(source),
-			count = $tw.utils.getInt(operator.suffix,prepend.length);
-		return (prepend.length === 0) ? results :
-			(operator.prefix) ? prepend.slice(-count).concat(results) :
-			prepend.slice(0, count).concat(results);
-	};
+    /*
+    Prepends the items listed in the operand array to the head of the current list
+    */
+    exports.prepend = function (source, operator) {
+        var prepend = $tw.utils.parseStringArray(operator.operand, "true"),
+            results = prepare_results(source),
+            count = $tw.utils.getInt(operator.suffix,prepend.length);
+        return (prepend.length === 0) ? results :
+            (operator.prefix) ? prepend.slice(-count).concat(results) :
+            prepend.slice(0, count).concat(results);
+    };
 
-	/*
-	Returns all items from the current list except the items listed in the operand array
-	*/
-	exports.remove = function (source, operator) {
-		var array = $tw.utils.parseStringArray(operator.operand, "true"),
-			results = prepare_results(source),
-			count = parseInt(operator.suffix) || array.length,
-			p,
-			len,
-			index;
-		len = array.length - 1;
-		for (p = 0; p < count; ++p) {
-			if (operator.prefix) {
-				index = results.indexOf(array[len - p]);
-			} else {
-				index = results.indexOf(array[p]);
-			}
-			if (index !== -1) {
-				results.splice(index, 1);
-			}
-		}
-		return results;
-	};
+    /*
+    Returns all items from the current list except the items listed in the operand array
+    */
+    exports.remove = function (source, operator) {
+        var array = $tw.utils.parseStringArray(operator.operand, "true"),
+            results = prepare_results(source),
+            count = parseInt(operator.suffix) || array.length,
+            p,
+            len,
+            index;
+        len = array.length - 1;
+        for (p = 0; p < count; ++p) {
+            if (operator.prefix) {
+                index = results.indexOf(array[len - p]);
+            } else {
+                index = results.indexOf(array[p]);
+            }
+            if (index !== -1) {
+                results.splice(index, 1);
+            }
+        }
+        return results;
+    };
 
-	/*
-	Returns all items from the current list sorted in the order of the items in the operand array
-	*/
-	exports.sortby = function (source, operator) {
-		var results = prepare_results(source);
-		if (!results || results.length < 2) {
-			return results;
-		}
-		var lookup = $tw.utils.parseStringArray(operator.operand, "true");
-		results.sort(function (a, b) {
-			return lookup.indexOf(a) - lookup.indexOf(b);
-		});
-		return results;
-	};
+    /*
+    Returns all items from the current list sorted in the order of the items in the operand array
+    */
+    exports.sortby = function (source, operator) {
+        var results = prepare_results(source);
+        if (!results || results.length < 2) {
+            return results;
+        }
+        var lookup = $tw.utils.parseStringArray(operator.operand, "true");
+        results.sort(function (a, b) {
+            return lookup.indexOf(a) - lookup.indexOf(b);
+        });
+        return results;
+    };
 
-	/*
-	Removes all duplicate items from the current list
-	*/
-	exports.unique = function (source, operator) {
-		var results = prepare_results(source);
-		var set = results.reduce(function (a, b) {
-			if (a.indexOf(b) < 0) {
-				a.push(b);
-			}
-			return a;
-		}, []);
-		return set;
-	};
-
-	var cycleValueInArray = function(results,operands,stepSize) {
-		var resultsIndex,
-			step = stepSize || 1,
-			i = 0,
-			opLength = operands.length,
-			nextOperandIndex;		
-		for(i; i < opLength; i++) {
-			resultsIndex = results.indexOf(operands[i]);
-			if(resultsIndex !== -1) {
-				break;
-			}
-		}
-		if(resultsIndex !== -1) {
-			i = i + step;
-			nextOperandIndex = (i < opLength ? i : i - opLength);
-			if(operands.length > 1) {
-				results.splice(resultsIndex,1,operands[nextOperandIndex]);
-			} else {
-				results.splice(resultsIndex,1);
-			}
-		} else {
-			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),
-			operands = (operator.operand.length ? $tw.utils.parseStringArray(operator.operand, "true") : [""]),
-			step = $tw.utils.getInt(operator.operands[1]||"",1);
-		if(step < 0) {
-			operands.reverse();
-			step = Math.abs(step);
-		}	
-		return cycleValueInArray(results,operands,step);
-	}
-	
+    /*
+    Removes all duplicate items from the current list
+    */
+    exports.unique = function (source, operator) {
+        var results = prepare_results(source);
+        var set = results.reduce(function (a, b) {
+            if (a.indexOf(b) < 0) {
+                a.push(b);
+            }
+            return a;
+        }, []);
+        return set;
+    };
 })();

core/modules/info/platform.js

@@ -12,7 +12,7 @@ Initialise basic platform $:/info/ tiddlers
 /*global $tw: false */
 "use strict";
 
-exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
+exports.getInfoTiddlerFields = function() {
 	var mapBoolean = function(value) {return value ? "yes" : "no";},
 		infoTiddlerFields = [];
 	// Basics
@@ -36,13 +36,6 @@ exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
 		// Screen size
 		infoTiddlerFields.push({title: "$:/info/browser/screen/width", text: window.screen.width.toString()});
 		infoTiddlerFields.push({title: "$:/info/browser/screen/height", text: window.screen.height.toString()});
- 		// Dark mode through event listener on MediaQueryList
- 		var mqList = window.matchMedia("(prefers-color-scheme: dark)"),
- 			getDarkModeTiddler = function() {return {title: "$:/info/darkmode", text: mqList.matches ? "yes" : "no"};};
- 		infoTiddlerFields.push(getDarkModeTiddler());
- 		mqList.addListener(function(event) {
- 			updateInfoTiddlersCallback([getDarkModeTiddler()]);
- 		});
 		// Language
 		infoTiddlerFields.push({title: "$:/info/browser/language", text: navigator.language || ""});
 	}

core/modules/keyboard.js

@@ -285,17 +285,13 @@ KeyboardManager.prototype.checkKeyDescriptors = function(event,keyInfoArray) {
 };
 
 KeyboardManager.prototype.getEventModifierKeyDescriptor = function(event) {
-	return event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey ? "ctrl" : 
-		event.shiftKey && !event.ctrlKey && !event.altKey && !event.metaKey ? "shift" : 
-		event.ctrlKey && event.shiftKey && !event.altKey && !event.metaKey ? "ctrl-shift" : 
-		event.altKey && !event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt" : 
-		event.altKey && event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt-shift" : 
-		event.altKey && event.ctrlKey && !event.shiftKey && !event.metaKey ? "ctrl-alt" : 
-		event.altKey && event.shiftKey && event.ctrlKey && !event.metaKey ? "ctrl-alt-shift" : 
-		event.metaKey && !event.ctrlKey && !event.shiftKey && !event.altKey ? "meta" : 
-		event.metaKey && event.ctrlKey && !event.shiftKey && !event.altKey ? "meta-ctrl" :
-		event.metaKey && event.ctrlKey && event.shiftKey && !event.altKey ? "meta-ctrl-shift" :
-		event.metaKey && event.ctrlKey & event.shiftKey && event.altKey ? "meta-ctrl-alt-shift" : "normal";
+	return event.ctrlKey && !event.shiftKey && !event.altKey ? "ctrl" : 
+		event.shiftKey && !event.ctrlKey && !event.altKey? "shift" : 
+		event.ctrlKey && event.shiftKey && !event.altKey ? "ctrl-shift" : 
+		event.altKey && !event.shiftKey && !event.ctrlKey ? "alt" : 
+		event.altKey && event.shiftKey && !event.ctrlKey ? "alt-shift" : 
+		event.altKey && event.ctrlKey && !event.shiftKey ? "ctrl-alt" : 
+		event.altKey && event.shiftKey && event.ctrlKey ? "ctrl-alt-shift" : "normal";
 };
 
 KeyboardManager.prototype.getShortcutTiddlerList = function() {

core/modules/parsers/htmlfragmentparser.js

@@ -0,0 +1,28 @@
+/*\
+title: $:/core/modules/parsers/htmlfragmentparser.js
+type: application/javascript
+module-type: parser
+
+Inherits from the base wikitext parser but is forced into inline mode
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var WikiParser = require("$:/core/modules/parsers/wikiparser/wikiparser.js")["text/vnd.tiddlywiki"];
+
+var PRAGMAS = "\\rules only html entity\n";
+
+var HtmlFragmentWikiParser = function(type,text,options) {
+	var parser = new WikiParser(type,PRAGMAS + text,$tw.utils.extend({},options,{parseAsInline: true}));
+	this.tree = parser.tree;
+	this.prototype = parser.prototype;
+};
+
+exports["text/html+fragment"] = HtmlFragmentWikiParser;
+
+})();
+

core/modules/parsers/wikiparser/wikiparser.js

@@ -48,6 +48,10 @@ var WikiParser = function(type,text,options) {
 	}
 	// Save the parse text
 	this.type = type || "text/vnd.tiddlywiki";
+	this.variant = null;
+	if(options.paramName === "variant" && options.paramValue) {
+		this.variant = options.paramValue;
+	}
 	this.source = text || "";
 	this.sourceLength = this.source.length;
 	// Flag for ignoring whitespace
@@ -59,6 +63,29 @@ var WikiParser = function(type,text,options) {
 	// Instantiate the parser block and inline rules
 	this.blockRules = this.instantiateRules(this.blockRuleClasses,"block",0);
 	this.inlineRules = this.instantiateRules(this.inlineRuleClasses,"inline",0);
+	// Setup the selected variant
+	if(this.variant) {
+		var variantData = this.wiki.getTiddlerDataCached("$:/config/WikiParserVariant/" + this.variant);
+		if(variantData) {
+			// Whitespace setting
+			switch(variantData.whitespace) {
+				case "notrim":
+					this.configTrimWhiteSpace = false;
+					break;
+				case "trim":
+					// Intentional fallthrough
+				default:
+					this.configTrimWhiteSpace = false;
+					break;
+			}
+			// Setup rules
+			if(variantData.rules && variantData.rules.only) {
+				this.amendRules("only",variantData.rules.only);
+			} else if(variantData.rules && variantData.rules.except) {
+				this.amendRules("except",variantData.rules.except);
+			}
+		}
+	}
 	// Parse any pragmas
 	this.tree = [];
 	var topBranch = this.parsePragmas();

core/modules/saver-handler.js

@@ -153,7 +153,7 @@ SaverHandler.prototype.saveWiki = function(options) {
 	var self = this,
 		method = options.method || "save";
 	// Ignore autosave if disabled
-	if(method === "autosave" && ($tw.config.disableAutoSave || this.wiki.getTiddlerText(this.titleAutoSave,"yes") !== "yes")) {
+	if(method === "autosave" && this.wiki.getTiddlerText(this.titleAutoSave,"yes") !== "yes") {
 		return false;
 	}
 	var	variables = options.variables || {},
@@ -197,12 +197,8 @@ SaverHandler.prototype.isDirty = function() {
 Update the document body with the class "tc-dirty" if the wiki has unsaved/unsynced changes
 */
 SaverHandler.prototype.updateDirtyStatus = function() {
-	var self = this;
 	if($tw.browser) {
 		$tw.utils.toggleClass(document.body,"tc-dirty",this.isDirty());
-		$tw.utils.each($tw.windows,function(win) {
-			$tw.utils.toggleClass(win.document.body,"tc-dirty",self.isDirty());
-		});
 	}
 };
 

core/modules/savers/custom.js

@@ -1,60 +0,0 @@
-/*\
-title: $:/core/modules/savers/custom.js
-type: application/javascript
-module-type: saver
-
-Looks for `window.$tw.customSaver` first on the current window, then
-on the parent window (of an iframe). If present, the saver must define
-	save: function(text,method,callback) { ... }
-and the saver may define
-	priority: number
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-var findSaver = function(window) {
-	try {
-		return window && window.$tw && window.$tw.customSaver;
-	} catch (err) {
-		// Catching the exception is the most reliable way to detect cross-origin iframe errors.
-		// For example, instead of saying that `window.parent.$tw` is undefined, Firefox will throw
-		//   Uncaught DOMException: Permission denied to access property "$tw" on cross-origin object
-		console.log({ msg: "custom saver is disabled", reason: err });
-		return null;
-	}
-}
-var saver = findSaver(window) || findSaver(window.parent) || {};
-
-var CustomSaver = function(wiki) {
-};
-
-CustomSaver.prototype.save = function(text,method,callback) {
-	return saver.save(text, method, callback);
-};
-
-/*
-Information about this saver
-*/
-CustomSaver.prototype.info = {
-	name: "custom",
-	priority: saver.priority || 4000,
-	capabilities: ["save","autosave"]
-};
-
-/*
-Static method that returns true if this saver is capable of working
-*/
-exports.canSave = function(wiki) {
-	return !!(saver.save);
-};
-
-/*
-Create an instance of this saver
-*/
-exports.create = function(wiki) {
-	return new CustomSaver(wiki);
-};
-})();

core/modules/savers/github.js

@@ -26,13 +26,12 @@ GitHubSaver.prototype.save = function(text,method,callback) {
 		repo = this.wiki.getTiddlerText("$:/GitHub/Repo"),
 		path = this.wiki.getTiddlerText("$:/GitHub/Path",""),
 		filename = this.wiki.getTiddlerText("$:/GitHub/Filename"),
-		branch = this.wiki.getTiddlerText("$:/GitHub/Branch") || "main",
+		branch = this.wiki.getTiddlerText("$:/GitHub/Branch") || "master",
 		endpoint = this.wiki.getTiddlerText("$:/GitHub/ServerURL") || "https://api.github.com",
 		headers = {
 			"Accept": "application/vnd.github.v3+json",
 			"Content-Type": "application/json;charset=UTF-8",
-			"Authorization": "Basic " + window.btoa(username + ":" + password),
-			"If-None-Match": ""
+			"Authorization": "Basic " + window.btoa(username + ":" + password)
 		};
 	// Bail if we don't have everything we need
 	if(!username || !password || !repo || !filename) {

core/modules/server/routes/get-tiddlers-json.js

@@ -28,9 +28,6 @@ exports.handler = function(request,response,state) {
 			return;
 		}
 	}
-	if(state.wiki.getTiddlerText("$:/config/SyncSystemTiddlersFromServer") === "no") {
-		filter += "+[!is[system]]";
-	}
 	var excludeFields = (state.queryParameters.exclude || "text").split(","),
 		titles = state.wiki.filterTiddlers(filter);
 	response.writeHead(200, {"Content-Type": "application/json"});

core/modules/startup/info.js

@@ -21,37 +21,29 @@ exports.synchronous = true;
 var TITLE_INFO_PLUGIN = "$:/temp/info-plugin";
 
 exports.startup = function() {
-	// Function to bake the info plugin with new tiddlers
-	var updateInfoPlugin = function(tiddlerFieldsArray) {
-		// Get the existing tiddlers
-		var json = $tw.wiki.getTiddlerData(TITLE_INFO_PLUGIN,{tiddlers: {}});
-		// Add the new ones
-		$tw.utils.each(tiddlerFieldsArray,function(fields) {
-			if(fields && fields.title) {
-				json.tiddlers[fields.title] = fields;
-			}
-		});
-		// Bake the info tiddlers into a plugin. We use the non-standard plugin-type "info" because ordinary plugins are only registered asynchronously after being loaded dynamically
-		var fields = {
-			title: TITLE_INFO_PLUGIN,
-			type: "application/json",
-			"plugin-type": "info",
-			text: JSON.stringify(json,null,$tw.config.preferences.jsonSpaces)
-		};
-		$tw.wiki.addTiddler(new $tw.Tiddler(fields));
-
-	};
 	// Collect up the info tiddlers
-	var tiddlerFieldsArray = [];
-	// Give each info module a chance to provide as many info tiddlers as they want as an array, and give them a callback for dynamically updating them
+	var infoTiddlerFields = {};
+	// Give each info module a chance to fill in as many info tiddlers as they want
 	$tw.modules.forEachModuleOfType("info",function(title,moduleExports) {
 		if(moduleExports && moduleExports.getInfoTiddlerFields) {
-			Array.prototype.push.apply(tiddlerFieldsArray,moduleExports.getInfoTiddlerFields(updateInfoPlugin));
+			var tiddlerFieldsArray = moduleExports.getInfoTiddlerFields(infoTiddlerFields);
+			$tw.utils.each(tiddlerFieldsArray,function(fields) {
+				if(fields) {
+					infoTiddlerFields[fields.title] = fields;
+				}
+			});
 		}
 	});
-	updateInfoPlugin(tiddlerFieldsArray);
-	var changes = $tw.wiki.readPluginInfo([TITLE_INFO_PLUGIN]);
-	$tw.wiki.registerPluginTiddlers("info",[TITLE_INFO_PLUGIN]);
+	// Bake the info tiddlers into a plugin. We use the non-standard plugin-type "info" because ordinary plugins are only registered asynchronously after being loaded dynamically
+	var fields = {
+		title: TITLE_INFO_PLUGIN,
+		type: "application/json",
+		"plugin-type": "info",
+		text: JSON.stringify({tiddlers: infoTiddlerFields},null,$tw.config.preferences.jsonSpaces)
+	};
+	$tw.wiki.addTiddler(new $tw.Tiddler(fields));
+	$tw.wiki.readPluginInfo([TITLE_INFO_PLUGIN]);
+	$tw.wiki.registerPluginTiddlers("info");
 	$tw.wiki.unpackPluginTiddlers();
 };
 

core/modules/startup/plugins.js

@@ -24,7 +24,6 @@ var PREFIX_CONFIG_REGISTER_PLUGIN_TYPE = "$:/config/RegisterPluginType/";
 exports.startup = function() {
 	$tw.wiki.addTiddler({title: TITLE_REQUIRE_RELOAD_DUE_TO_PLUGIN_CHANGE,text: "no"});
 	$tw.wiki.addEventListener("change",function(changes) {
-		// Work out which of the changed tiddlers are plugins that we need to reregister
 		var changesToProcess = [],
 			requireReloadDueToPluginChange = false;
 		$tw.utils.each(Object.keys(changes),function(title) {
@@ -39,7 +38,6 @@ exports.startup = function() {
 				}
 			}
 		});
-		// Issue warning if any of the tiddlers require a reload
 		if(requireReloadDueToPluginChange) {
 			$tw.wiki.addTiddler({title: TITLE_REQUIRE_RELOAD_DUE_TO_PLUGIN_CHANGE,text: "yes"});
 		}
@@ -47,35 +45,12 @@ exports.startup = function() {
 		if(changesToProcess.length > 0) {
 			var changes = $tw.wiki.readPluginInfo(changesToProcess);
 			if(changes.modifiedPlugins.length > 0 || changes.deletedPlugins.length > 0) {
-				var changedShadowTiddlers = {};
-				// Collect the shadow tiddlers of any deleted plugins
-				$tw.utils.each(changes.deletedPlugins,function(pluginTitle) {
-					var pluginInfo = $tw.wiki.getPluginInfo(pluginTitle);
-					if(pluginInfo) {
-						$tw.utils.each(Object.keys(pluginInfo.tiddlers),function(title) {
-							changedShadowTiddlers[title] = true;
-						});
-					}
-				});
-				// Collect the shadow tiddlers of any modified plugins
-				$tw.utils.each(changes.modifiedPlugins,function(pluginTitle) {
-					var pluginInfo = $tw.wiki.getPluginInfo(pluginTitle);
-					if(pluginInfo) {
-						$tw.utils.each(Object.keys(pluginInfo.tiddlers),function(title) {
-							changedShadowTiddlers[title] = false;
-						});
-					}
-				});
 				// (Re-)register any modified plugins
 				$tw.wiki.registerPluginTiddlers(null,changes.modifiedPlugins);
 				// Unregister any deleted plugins
 				$tw.wiki.unregisterPluginTiddlers(null,changes.deletedPlugins);
 				// Unpack the shadow tiddlers
 				$tw.wiki.unpackPluginTiddlers();
-				// Queue change events for the changed shadow tiddlers
-				$tw.utils.each(Object.keys(changedShadowTiddlers),function(title) {
-					$tw.wiki.enqueueTiddlerEvent(title,changedShadowTiddlers[title]);
-				});
 			}
 		}
 	});

core/modules/startup/render.js

@@ -21,7 +21,7 @@ exports.synchronous = true;
 // Default story and history lists
 var PAGE_TITLE_TITLE = "$:/core/wiki/title";
 var PAGE_STYLESHEET_TITLE = "$:/core/ui/PageStylesheet";
-var PAGE_TEMPLATE_TITLE = "$:/core/ui/RootTemplate";
+var PAGE_TEMPLATE_TITLE = "$:/core/ui/PageTemplate";
 
 // Time (in ms) that we defer refreshing changes to draft tiddlers
 var DRAFT_TIDDLER_TIMEOUT_TITLE = "$:/config/Drafts/TypingTimeout";
@@ -52,7 +52,7 @@ exports.startup = function() {
 	}));
 	// Display the $:/core/ui/PageTemplate tiddler to kick off the display
 	$tw.perf.report("mainRender",function() {
-		$tw.pageWidgetNode = $tw.wiki.makeTranscludeWidget(PAGE_TEMPLATE_TITLE,{document: document, parentWidget: $tw.rootWidget, recursionMarker: "no"});
+		$tw.pageWidgetNode = $tw.wiki.makeTranscludeWidget(PAGE_TEMPLATE_TITLE,{document: document, parentWidget: $tw.rootWidget});
 		$tw.pageContainer = document.createElement("div");
 		$tw.utils.addClass($tw.pageContainer,"tc-page-container-wrapper");
 		document.body.insertBefore($tw.pageContainer,document.body.firstChild);
@@ -106,8 +106,6 @@ exports.startup = function() {
 	// Fix up the link between the root widget and the page container
 	$tw.rootWidget.domNodes = [$tw.pageContainer];
 	$tw.rootWidget.children = [$tw.pageWidgetNode];
-	// Run any post-render startup actions
-	$tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/PostRender");
 };
 
 })();

core/modules/startup/rootwidget.js

@@ -25,9 +25,6 @@ exports.startup = function() {
 	$tw.rootWidget.addEventListener("tm-modal",function(event) {
 		$tw.modal.display(event.param,{variables: event.paramObject, event: event});
 	});
-	$tw.rootWidget.addEventListener("tm-show-switcher",function(event) {
-		$tw.modal.display("$:/core/ui/SwitcherModal",{variables: event.paramObject, event: event});
-	});	
 	// Install the notification  mechanism
 	$tw.notifier = new $tw.utils.Notifier($tw.wiki);
 	$tw.rootWidget.addEventListener("tm-notify",function(event) {

core/modules/startup/startup.js

@@ -64,12 +64,17 @@ exports.startup = function() {
 		document: $tw.browser ? document : $tw.fakeDocument
 	});
 	// Execute any startup actions
-	$tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction");
+	var executeStartupTiddlers = function(tag) {
+		$tw.utils.each($tw.wiki.filterTiddlers("[all[shadows+tiddlers]tag[" + tag + "]!has[draft.of]]"),function(title) {
+			$tw.rootWidget.invokeActionString($tw.wiki.getTiddlerText(title),$tw.rootWidget);
+		});
+	};
+	executeStartupTiddlers("$:/tags/StartupAction");
 	if($tw.browser) {
-		$tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Browser");		
+		executeStartupTiddlers("$:/tags/StartupAction/Browser");		
 	}
 	if($tw.node) {
-		$tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Node");		
+		executeStartupTiddlers("$:/tags/StartupAction/Node");		
 	}
 	// Kick off the language manager and switcher
 	$tw.language = new $tw.Language();

core/modules/startup/story.js

@@ -150,11 +150,6 @@ function openStartupTiddlers(options) {
 	// Save the story list
 	$tw.wiki.addTiddler({title: DEFAULT_STORY_TITLE, text: "", list: storyList},$tw.wiki.getModificationFields());
 	// Update history
-	var story = new $tw.Story({
-		wiki: $tw.wiki,
-		storyTitle: DEFAULT_STORY_TITLE,
-		historyTitle: DEFAULT_HISTORY_TITLE
-	});
 	if(!options.disableHistory) {
 		// If a target tiddler was specified add it to the history stack
 		if(target && target !== "") {
@@ -162,9 +157,9 @@ function openStartupTiddlers(options) {
 			if(target.indexOf("[[") === 0 && target.substr(-2) === "]]") {
 				target = target.substr(2,target.length - 4);
 			}
-			story.addToHistory(target);
+			$tw.wiki.addToHistory(target);
 		} else if(storyList.length > 0) {
-			story.addToHistory(storyList[0]);
+			$tw.wiki.addToHistory(storyList[0]);
 		}		
 	}
 }

core/modules/startup/windows.js

@@ -19,7 +19,7 @@ exports.after = ["startup"];
 exports.synchronous = true;
 
 // Global to keep track of open windows (hashmap by title)
-$tw.windows = {};
+var windows = {};
 
 exports.startup = function() {
 	// Handle open window message
@@ -44,7 +44,7 @@ exports.startup = function() {
 		catch(e) {
 			return;
 		}
-		$tw.windows[title] = srcWindow;
+		windows[title] = srcWindow;
 		// Check for reopening the same window
 		if(srcWindow.haveInitialisedWindow) {
 			return;
@@ -54,7 +54,7 @@ exports.startup = function() {
 		srcDocument.close();
 		srcDocument.title = windowTitle;
 		srcWindow.addEventListener("beforeunload",function(event) {
-			delete $tw.windows[title];
+			delete windows[title];
 			$tw.wiki.removeEventListener("change",refreshHandler);
 		},false);
 		// Set up the styles
@@ -84,13 +84,16 @@ exports.startup = function() {
 			name: "keydown",
 			handlerObject: $tw.keyboardManager,
 			handlerMethod: "handleKeydownEvent"
+		},{
+			name: "click",
+			handlerObject: $tw.popup,
+			handlerMethod: "handleEvent"
 		}]);
-		srcWindow.document.documentElement.addEventListener("click",$tw.popup,true);
 		srcWindow.haveInitialisedWindow = true;
 	});
 	// Close open windows when unloading main window
 	$tw.addUnloadTask(function() {
-		$tw.utils.each($tw.windows,function(win) {
+		$tw.utils.each(windows,function(win) {
 			win.close();
 		});
 	});

core/modules/syncer.js

@@ -113,16 +113,8 @@ function Syncer(options) {
 			return confirmationMessage;
 		});
 		// Listen out for login/logout/refresh events in the browser
-		$tw.rootWidget.addEventListener("tm-login",function(event) {
-			var username = event && event.paramObject && event.paramObject.username,
-				password = event && event.paramObject && event.paramObject.password;
-			if(username && password) {
-				// Login with username and password
-				self.login(username,password,function() {});
-			} else {
-				// No username and password, so we display a prompt
-				self.handleLoginEvent();				
-			}
+		$tw.rootWidget.addEventListener("tm-login",function() {
+			self.handleLoginEvent();
 		});
 		$tw.rootWidget.addEventListener("tm-logout",function() {
 			self.handleLogoutEvent();
@@ -305,8 +297,7 @@ Syncer.prototype.syncFromServer = function() {
 				self.pollTimerId = null;
 				self.syncFromServer.call(self);
 			},self.pollTimerInterval);
-		},
-		syncSystemFromServer = (self.wiki.getTiddlerText("$:/config/SyncSystemTiddlersFromServer") === "yes" ? true : false);
+		};
 	if(this.syncadaptor && this.syncadaptor.getUpdatedTiddlers) {
 		this.logger.log("Retrieving updated tiddler list");
 		cancelNextSync();
@@ -321,11 +312,9 @@ Syncer.prototype.syncFromServer = function() {
 					self.titlesToBeLoaded[title] = true;
 				});
 				$tw.utils.each(updates.deletions,function(title) {
-					if(syncSystemFromServer || !self.wiki.isSystemTiddler(title)) {
-						delete self.tiddlerInfo[title];
-						self.logger.log("Deleting tiddler missing from server:",title);
-						self.wiki.deleteTiddler(title);
-					}
+					delete self.tiddlerInfo[title];
+					self.logger.log("Deleting tiddler missing from server:",title);
+					self.wiki.deleteTiddler(title);
 				});
 				if(updates.modifications.length > 0 || updates.deletions.length > 0) {
 					self.processTaskQueue();
@@ -368,11 +357,9 @@ Syncer.prototype.syncFromServer = function() {
 			}
 			// Delete any tiddlers that were previously reported but missing this time
 			$tw.utils.each(previousTitles,function(title) {
-				if(syncSystemFromServer || !self.wiki.isSystemTiddler(title)) {
-					delete self.tiddlerInfo[title];
-					self.logger.log("Deleting tiddler missing from server:",title);
-					self.wiki.deleteTiddler(title);
-				}
+				delete self.tiddlerInfo[title];
+				self.logger.log("Deleting tiddler missing from server:",title);
+				self.wiki.deleteTiddler(title);
 			});
 			self.processTaskQueue();
 		});
@@ -413,27 +400,15 @@ Syncer.prototype.handleLoginEvent = function() {
 	var self = this;
 	this.getStatus(function(err,isLoggedIn,username) {
 		if(!err && !isLoggedIn) {
-			if(self.syncadaptor && self.syncadaptor.displayLoginPrompt) {
-				self.syncadaptor.displayLoginPrompt(self);
-			} else {
-				self.displayLoginPrompt();
-			}
-		}
-	});
-};
-
-/*
-Dispay a password prompt
-*/
-Syncer.prototype.displayLoginPrompt = function() {
-	var self = this;
-	var promptInfo = $tw.passwordPrompt.createPrompt({
-		serviceName: $tw.language.getString("LoginToTiddlySpace"),
-		callback: function(data) {
-			self.login(data.username,data.password,function(err,isLoggedIn) {
-				self.syncFromServer();
+			$tw.passwordPrompt.createPrompt({
+				serviceName: $tw.language.getString("LoginToTiddlySpace"),
+				callback: function(data) {
+					self.login(data.username,data.password,function(err,isLoggedIn) {
+						self.syncFromServer();
+					});
+					return true; // Get rid of the password prompt
+				}
 			});
-			return true; // Get rid of the password prompt
 		}
 	});
 };
@@ -633,10 +608,6 @@ DeleteTiddlerTask.prototype.run = function(callback) {
 		}
 		// Remove the info stored about this tiddler
 		delete self.syncer.tiddlerInfo[self.title];
-		if($tw.boot.files){
-			// Remove the tiddler from $tw.boot.files
-			delete $tw.boot.files[self.title];
-		}
 		// Invoke the callback
 		callback(null);
 	},{

core/modules/upgraders/plugins.js

@@ -57,7 +57,7 @@ exports.upgrade = function(wiki,titles,tiddlers) {
 					// Reject the incoming plugin by blanking all its fields
 					if($tw.utils.checkVersions(existingTiddler.fields.version,incomingTiddler.version)) {
 						tiddlers[title] = Object.create(null);
-						messages[title] = $tw.language.getString("Import/Upgrader/Plugins/Suppressed/Version",{variables: {incoming: incomingTiddler.version, existing: existingTiddler.fields.version}});
+						messages[title] = requiresReload + $tw.language.getString("Import/Upgrader/Plugins/Suppressed/Version",{variables: {incoming: incomingTiddler.version, existing: existingTiddler.fields.version}});
 						return;
 					}
 				}

core/modules/utils/dom/modal.js

@@ -13,7 +13,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) {
 	this.wiki = wiki;
@@ -42,12 +41,7 @@ Modal.prototype.display = function(title,options) {
 		return;
 	}
 	// Create the variables
-	var variables = $tw.utils.extend({
-			currentTiddler: title,
-			"tv-story-list": (options.event && options.event.widget ? options.event.widget.getVariable("tv-story-list") : ""),
-			"tv-history-list": (options.event && options.event.widget ? options.event.widget.getVariable("tv-history-list") : "")
-		},options.variables);
-
+	var variables = $tw.utils.extend({currentTiddler: title},options.variables);
 	// Create the wrapper divs
 	var wrapper = this.srcDocument.createElement("div"),
 		modalBackdrop = this.srcDocument.createElement("div"),
@@ -81,31 +75,6 @@ Modal.prototype.display = function(title,options) {
 	modalFooter.appendChild(modalFooterHelp);
 	modalFooter.appendChild(modalFooterButtons);
 	modalWrapper.appendChild(modalFooter);
-	var navigatorTree = {
-		"type": "navigator",
-		"attributes": {
-			"story": {
-				"name": "story",
-				"type": "string",
-				"value": variables["tv-story-list"]
-			},
-			"history": {
-				"name": "history",
-				"type": "string",
-				"value": variables["tv-history-list"]
-			}
-		},
-		"tag": "$navigator",
-		"isBlock": true,
-		"children": []
-	};
-	var navigatorWidgetNode = new navigator.navigator(navigatorTree, {
-		wiki: this.wiki,
-		document : this.srcDocument,
-		parentWidget: $tw.rootWidget
-	});
-	navigatorWidgetNode.render(modalBody,null);
-	
 	// Render the title of the message
 	var headerWidgetNode = this.wiki.makeTranscludeWidget(title,{
 		field: "subtitle",
@@ -117,7 +86,7 @@ Modal.prototype.display = function(title,options) {
 					type: "string",
 					value: title
 		}}}],
-		parentWidget: navigatorWidgetNode,
+		parentWidget: $tw.rootWidget,
 		document: this.srcDocument,
 		variables: variables,
 		importPageMacros: true
@@ -125,12 +94,11 @@ Modal.prototype.display = function(title,options) {
 	headerWidgetNode.render(headerTitle,null);
 	// Render the body of the message
 	var bodyWidgetNode = this.wiki.makeTranscludeWidget(title,{
-		parentWidget: navigatorWidgetNode,
+		parentWidget: $tw.rootWidget,
 		document: this.srcDocument,
 		variables: variables,
 		importPageMacros: true
 	});
-
 	bodyWidgetNode.render(modalBody,null);
 	// Setup the link if present
 	if(options.downloadLink) {
@@ -167,7 +135,7 @@ Modal.prototype.display = function(title,options) {
 						value: $tw.language.getString("Buttons/Close/Caption")
 			}}}
 		]}],
-		parentWidget: navigatorWidgetNode,
+		parentWidget: $tw.rootWidget,
 		document: this.srcDocument,
 		variables: variables,
 		importPageMacros: true

core/modules/utils/dom/scroller.js

@@ -49,12 +49,7 @@ Handle an event
 */
 PageScroller.prototype.handleEvent = function(event) {
 	if(event.type === "tm-scroll") {
-		if(event.paramObject && event.paramObject.selector) {
-			this.scrollSelectorIntoView(null,event.paramObject.selector);
-		} else {
-			this.scrollIntoView(event.target);			
-		}
-		return false; // Event was handled
+		return this.scrollIntoView(event.target);
 	}
 	return true;
 };
@@ -122,14 +117,6 @@ PageScroller.prototype.scrollIntoView = function(element,callback) {
 	drawFrame();
 };
 
-PageScroller.prototype.scrollSelectorIntoView = function(baseElement,selector,callback) {
-	baseElement = baseElement || document.body;
-	var element = baseElement.querySelector(selector);
-	if(element) {
-		this.scrollIntoView(element,callback);		
-	}
-};
-
 exports.PageScroller = PageScroller;
 
 })();

core/modules/utils/filesystem.js

@@ -204,23 +204,15 @@ exports.deleteEmptyDirs = function(dirpath,callback) {
 /*
 Create a fileInfo object for saving a tiddler:
 	filepath: the absolute path to the file containing the tiddler
-	type: the type of the tiddler file on disk (NOT the type of the tiddler)
+	type: the type of the tiddler file (NOT the type of the tiddler)
 	hasMetaFile: true if the file also has a companion .meta file
-	isEditableFile: true if the tiddler was loaded via non-standard options & marked editable
 Options include:
 	directory: absolute path of root directory to which we are saving
 	pathFilters: optional array of filters to be used to generate the base path
-	extFilters: optional array of filters to be used to generate the base path
-	wiki: optional wiki for evaluating the pathFilters,
-	fileInfo: an existing fileInfo to check against
-	originalpath: a preferred filepath if no pathFilters match
+	wiki: optional wiki for evaluating the pathFilters
 */
 exports.generateTiddlerFileInfo = function(tiddler,options) {
-	var fileInfo = {}, metaExt;
-	// Propagate the isEditableFile flag
-	if(options.fileInfo) {
-		fileInfo.isEditableFile = options.fileInfo.isEditableFile || false;
-	}
+	var fileInfo = {};
 	// Check if the tiddler has any unsafe fields that can't be expressed in a .tid or .meta file: containing control characters, or leading/trailing whitespace
 	var hasUnsafeFields = false;
 	$tw.utils.each(tiddler.getFieldStrings(),function(value,fieldName) {
@@ -246,69 +238,19 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
 			fileInfo.type = tiddlerType;
 			fileInfo.hasMetaFile = true;
 		}
-		if(options.extFilters) {
-			// Check for extension override
-			metaExt = $tw.utils.generateTiddlerExtension(tiddler.fields.title,{
-				extFilters: options.extFilters,
-				wiki: options.wiki
-			});
-			if(metaExt){
-				if(metaExt === ".tid") {
-					// Overriding to the .tid extension needs special handling
-					fileInfo.type = "application/x-tiddler";
-					fileInfo.hasMetaFile = false;
-				} else if (metaExt === ".json") {
-					// Overriding to the .json extension needs special handling
-					fileInfo.type = "application/json";
-					fileInfo.hasMetaFile = false;
-				} else {
-					//If the new type matches a known extention, use that MIME type's encoding
-					var extInfo = $tw.utils.getFileExtensionInfo(metaExt);
-					fileInfo.type = extInfo ? extInfo.type : null;
-					fileInfo.encoding = $tw.utils.getTypeEncoding(metaExt);
-					fileInfo.hasMetaFile = true;
-				}
-			}
-		}
 	}
-	// Take the file extension from the tiddler content type or metaExt
-	var contentTypeInfo = $tw.config.contentTypeInfo[fileInfo.type] || {extension: ""};
+	// Take the file extension from the tiddler content type
+	var contentTypeInfo = $tw.utils.getContentTypeInfo(fileInfo.type) || {extension: ""};
 	// Generate the filepath
 	fileInfo.filepath = $tw.utils.generateTiddlerFilepath(tiddler.fields.title,{
-		extension: metaExt || contentTypeInfo.extension,
+		extension: contentTypeInfo.extension,
 		directory: options.directory,
 		pathFilters: options.pathFilters,
-		wiki: options.wiki,
-		fileInfo: options.fileInfo,
-		originalpath: options.originalpath
+		wiki: options.wiki
 	});
 	return fileInfo;
 };
 
-/*
-Generate the file extension for saving a tiddler
-Options include:
-	extFilters: optional array of filters to be used to generate the extention
-	wiki: optional wiki for evaluating the extFilters
-*/
-exports.generateTiddlerExtension = function(title,options) {
-	var self = this,
-		extension;
-	// Check if any of the extFilters applies
-	if(options.extFilters && options.wiki) { 
-		$tw.utils.each(options.extFilters,function(filter) {
-			if(!extension) {
-				var source = options.wiki.makeTiddlerIterator([title]),
-					result = options.wiki.filterTiddlers(filter,null,source);
-				if(result.length > 0) {
-					extension = result[0];
-				}
-			}
-		});
-	}
-	return extension;
-};
-
 /*
 Generate the filepath for saving a tiddler
 Options include:
@@ -316,14 +258,12 @@ Options include:
 	directory: absolute path of root directory to which we are saving
 	pathFilters: optional array of filters to be used to generate the base path
 	wiki: optional wiki for evaluating the pathFilters
-	fileInfo: an existing fileInfo object to check against
 */
 exports.generateTiddlerFilepath = function(title,options) {
 	var self = this,
 		directory = options.directory || "",
 		extension = options.extension || "",
-		originalpath = options.originalpath || "",
-		filepath;	
+		filepath;
 	// Check if any of the pathFilters applies
 	if(options.pathFilters && options.wiki) {
 		$tw.utils.each(options.pathFilters,function(filter) {
@@ -336,11 +276,8 @@ exports.generateTiddlerFilepath = function(title,options) {
 			}
 		});
 	}
-	if(!filepath && originalpath !== "") {
-		//Use the originalpath without the extension
-		var ext = path.extname(originalpath);
-		filepath = originalpath.substring(0,originalpath.length - ext.length);
-	} else if(!filepath) {
+	// If not, generate a base pathname
+	if(!filepath) {
 		filepath = title;
 		// If the filepath already ends in the extension then remove it
 		if(filepath.substring(filepath.length - extension.length) === extension) {
@@ -349,13 +286,10 @@ exports.generateTiddlerFilepath = function(title,options) {
 		// Remove any forward or backward slashes so we don't create directories
 		filepath = filepath.replace(/\/|\\/g,"_");
 	}
-	//If the path does not start with "." or ".." and 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,"_");
-	}
+	// Don't let the filename start with a dot because such files are invisible on *nix
+	filepath = filepath.replace(/^\./g,"_");
 	// Remove any characters that can't be used in cross-platform filenames
-	filepath = $tw.utils.transliterate(filepath.replace(/<|>|~|\:|\"|\||\?|\*|\^/g,"_"));
+	filepath = $tw.utils.transliterate(filepath.replace(/<|>|\:|\"|\||\?|\*|\^/g,"_"));
 	// Truncate the filename if it is too long
 	if(filepath.length > 200) {
 		filepath = filepath.substr(0,200);
@@ -372,30 +306,12 @@ exports.generateTiddlerFilepath = function(title,options) {
 		});
 	}
 	// Add a uniquifier if the file already exists
-	var fullPath, oldPath = (options.fileInfo) ? options.fileInfo.filepath : undefined,
+	var fullPath,
 		count = 0;
 	do {
 		fullPath = path.resolve(directory,filepath + (count ? "_" + count : "") + extension);
-		if(oldPath && oldPath == fullPath) {
-			break;
-		}
 		count++;
 	} while(fs.existsSync(fullPath));
-	// If the last write failed with an error, or if path does not start with:
-	//	the resolved options.directory, the resolved wikiPath directory, or the wikiTiddlersPath directory, 
-	//	then encodeURIComponent() and resolve to tiddler directory
-	var newPath = fullPath,
-		encode = (options.fileInfo || {writeError: false}).writeError == true;
-	if(!encode){
-		encode = !(fullPath.indexOf(path.resolve(directory)) == 0 ||
-			fullPath.indexOf(path.resolve($tw.boot.wikiPath)) == 0 ||
-			fullPath.indexOf($tw.boot.wikiTiddlersPath) == 0);
-		}
-	if(encode){
-		fullPath = path.resolve(directory, encodeURIComponent(fullPath));
-	}
-	// Call hook to allow plugins to modify the final path
-	fullPath = $tw.hooks.invokeHook("th-make-tiddler-path", newPath, fullPath);
 	// Return the full path to the file
 	return fullPath;
 };
@@ -410,7 +326,7 @@ exports.saveTiddlerToFile = function(tiddler,fileInfo,callback) {
 	$tw.utils.createDirectory(path.dirname(fileInfo.filepath));
 	if(fileInfo.hasMetaFile) {
 		// Save the tiddler as a separate body and meta file
-		var typeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/plain"] || {encoding: "utf8"};
+		var typeInfo = $tw.utils.getContentTypeInfo(tiddler.fields.type || "text/plain") || {encoding: "utf8"};
 		fs.writeFile(fileInfo.filepath,tiddler.fields.text,typeInfo.encoding,function(err) {
 			if(err) {
 				return callback(err);
@@ -437,7 +353,7 @@ exports.saveTiddlerToFileSync = function(tiddler,fileInfo) {
 	$tw.utils.createDirectory(path.dirname(fileInfo.filepath));
 	if(fileInfo.hasMetaFile) {
 		// Save the tiddler as a separate body and meta file
-		var typeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/plain"] || {encoding: "utf8"};
+		var typeInfo = $tw.utils.getContentTypeInfo(tiddler.fields.type || "text/plain") || {encoding: "utf8"};
 		fs.writeFileSync(fileInfo.filepath,tiddler.fields.text,typeInfo.encoding);
 		fs.writeFileSync(fileInfo.filepath + ".meta",tiddler.getFieldStringBlock({exclude: ["text","bag"]}),"utf8");
 	} else {
@@ -450,58 +366,4 @@ exports.saveTiddlerToFileSync = function(tiddler,fileInfo) {
 	}
 };
 
-/*
-Delete a file described by the fileInfo if it exits
-*/
-exports.deleteTiddlerFile = function(fileInfo, callback) {
-	//Only attempt to delete files that exist on disk
-	if(!fileInfo.filepath || !fs.existsSync(fileInfo.filepath)) {
-		return callback(null);
-	}
-	// Delete the file
-	fs.unlink(fileInfo.filepath,function(err) {
-		if(err) {
-			return callback(err);
-		}	
-		// Delete the metafile if present
-		if(fileInfo.hasMetaFile && fs.existsSync(fileInfo.filepath + ".meta")) {
-			fs.unlink(fileInfo.filepath + ".meta",function(err) {
-				if(err) {
-					return callback(err);
-				}
-				return $tw.utils.deleteEmptyDirs(path.dirname(fileInfo.filepath),callback);
-			});
-		} else {
-			return $tw.utils.deleteEmptyDirs(path.dirname(fileInfo.filepath),callback);
-		}
-	});
-};
-
-/*
-Cleanup old files on disk, by comparing the options values:
-	adaptorInfo from $tw.syncer.tiddlerInfo
-	bootInfo from $tw.boot.files
-*/
-exports.cleanupTiddlerFiles = function(options, callback) {
-	var adaptorInfo = options.adaptorInfo || {},
-	bootInfo = options.bootInfo || {},
-	title = options.title || "undefined";
-	if(adaptorInfo.filepath && bootInfo.filepath && adaptorInfo.filepath !== bootInfo.filepath) {
-		return $tw.utils.deleteTiddlerFile(adaptorInfo, function(err){
-			if(err) {
-				if ((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "unlink") {
-					// Error deleting the previous file on disk, should fail gracefully
-					$tw.syncer.displayError("Server desynchronized. Error cleaning up previous file for tiddler: "+title, err);
-					return callback(null);
-				} else {
-					return callback(err);
-				}
-			}
-			return callback(null);
-		});
-	} else {
-		return callback(null);
-	}
-};
-
 })();

core/modules/utils/linked-list.js

@@ -1,118 +0,0 @@
-/*\
-module-type: utils
-title: $:/core/modules/utils/linkedlist.js
-type: application/javascript
-
-This is a doubly-linked indexed list intended for manipulation, particularly
-pushTop, which it does with significantly better performance than an array.
-
-\*/
-(function(){
-
-function LinkedList() {
-	this.clear();
-};
-
-LinkedList.prototype.clear = function() {
-	this.index = Object.create(null);
-	// LinkedList performs the duty of both the head and tail node
-	this.next = this;
-	this.prev = this;
-	this.length = 0;
-};
-
-LinkedList.prototype.remove = function(value) {
-	if($tw.utils.isArray(value)) {
-		for(var t=0; t<value.length; t++) {
-			_removeOne(this,value[t]);
-		}
-	} else {
-		_removeOne(this,value);
-	}
-};
-
-LinkedList.prototype.push = function(/* values */) {
-	for(var i = 0; i < arguments.length; i++) {
-		var value = arguments[i];
-		var node = {value: value};
-		var preexistingNode = this.index[value];
-		_linkToEnd(this,node);
-		if(preexistingNode) {
-			// We want to keep pointing to the first instance, but we want
-			// to have that instance (or chain of instances) point to the
-			// new one.
-			while (preexistingNode.copy) {
-				preexistingNode = preexistingNode.copy;
-			}
-			preexistingNode.copy = node;
-		} else {
-			this.index[value] = node;
-		}
-	}
-};
-
-LinkedList.prototype.pushTop = function(value) {
-	if($tw.utils.isArray(value)) {
-		for(var t=0; t<value.length; t++) {
-			_removeOne(this,value[t]);
-		}
-		this.push.apply(this,value);
-	} else {
-		var node = _removeOne(this,value);
-		if(!node) {
-			node = {value: value};
-			this.index[value] = node;
-		} else {
-			// Put this node at the end of the copy chain.
-			var preexistingNode = node;
-			while(preexistingNode.copy) {
-				preexistingNode = preexistingNode.copy;
-			}
-			// The order of these three statements is important,
-			// because sometimes preexistingNode == node.
-			preexistingNode.copy = node;
-			this.index[value] = node.copy;
-			node.copy = undefined;
-		}
-		_linkToEnd(this,node);
-	}
-};
-
-LinkedList.prototype.each = function(callback) {
-	for(var ptr = this.next; ptr !== this; ptr = ptr.next) {
-		callback(ptr.value);
-	}
-};
-
-LinkedList.prototype.toArray = function() {
-	var output = [];
-	for(var ptr = this.next; ptr !== this; ptr = ptr.next) {
-		output.push(ptr.value);
-	}
-	return output;
-};
-
-function _removeOne(list,value) {
-	var node = list.index[value];
-	if(node) {
-		node.prev.next = node.next;
-		node.next.prev = node.prev;
-		list.length -= 1;
-		// Point index to the next instance of the same value, maybe nothing.
-		list.index[value] = node.copy;
-	}
-	return node;
-};
-
-function _linkToEnd(list,node) {
-	// Sticks the given node onto the end of the list.
-	list.prev.next = node;
-	node.prev = list.prev;
-	list.prev = node;
-	node.next = list;
-	list.length += 1;
-};
-
-exports.LinkedList = LinkedList;
-
-})();

core/modules/utils/utils.js

@@ -53,19 +53,6 @@ exports.warning = function(text) {
 	exports.log(text,"brown/orange");
 };
 
-/*
-Log a table of name: value pairs
-*/
-exports.logTable = function(data) {
-	if(console.table) {
-		console.table(data);
-	} else {
-		$tw.utils.each(data,function(value,name) {
-			console.log(name + ": " + value);
-		});
-	}
-}
-
 /*
 Return the integer represented by the str (string).
 Return the dflt (default) parameter if str is not a base-10 number.
@@ -302,7 +289,7 @@ exports.formatDateString = function(date,template) {
 				return $tw.utils.pad($tw.utils.getHours12(date));
 			}],
 			[/^wYYYY/, function() {
-				return $tw.utils.pad($tw.utils.getYearForWeekNo(date),4);
+				return $tw.utils.getYearForWeekNo(date);
 			}],
 			[/^hh12/, function() {
 				return $tw.utils.getHours12(date);
@@ -311,14 +298,7 @@ exports.formatDateString = function(date,template) {
 				return date.getDate() + $tw.utils.getDaySuffix(date);
 			}],
 			[/^YYYY/, function() {
-				return $tw.utils.pad(date.getFullYear(),4);
-			}],
-			[/^aYYYY/, function() {
-				return $tw.utils.pad(Math.abs(date.getFullYear()),4);
-			}],
-			[/^\{era:([^,\|}]*)\|([^}\|]*)\|([^}]*)\}/, function(match) {
-				var year = date.getFullYear();
-				return year === 0 ? match[2] : (year < 0 ? match[1] : match[3]);
+				return date.getFullYear();
 			}],
 			[/^0hh/, function() {
 				return $tw.utils.pad(date.getHours());
@@ -407,7 +387,7 @@ exports.formatDateString = function(date,template) {
 		$tw.utils.each(matches, function(m) {
 			var match = m[0].exec(t);
 			if(match) {
-				matchString = m[1].call(null,match);
+				matchString = m[1].call();
 				t = t.substr(match[0].length);
 				return false;
 			}
@@ -564,7 +544,7 @@ exports.escape = function(ch) {
 
 // Turns a string into a legal JavaScript string
 // Copied from peg.js, thanks to David Majda
-exports.stringify = function(s, rawUnicode) {
+exports.stringify = function(s) {
 	/*
 	* ECMA-262, 5th ed., 7.8.4: All characters may appear literally in a string
 	* literal except for the closing quote character, backslash, carriage return,
@@ -573,21 +553,19 @@ exports.stringify = function(s, rawUnicode) {
 	*
 	* For portability, we also escape all non-ASCII characters.
 	*/
-	var regex = rawUnicode ? /[\x00-\x1f]/g : /[\x00-\x1f\x80-\uFFFF]/g;
 	return (s || "")
 		.replace(/\\/g, '\\\\')            // backslash
 		.replace(/"/g, '\\"')              // double quote character
 		.replace(/'/g, "\\'")              // single quote character
 		.replace(/\r/g, '\\r')             // carriage return
 		.replace(/\n/g, '\\n')             // line feed
-		.replace(regex, exports.escape);   // non-ASCII characters
+		.replace(/[\x00-\x1f\x80-\uFFFF]/g, exports.escape); // non-ASCII characters
 };
 
 // Turns a string into a legal JSON string
 // Derived from peg.js, thanks to David Majda
-exports.jsonStringify = function(s, rawUnicode) {
+exports.jsonStringify = function(s) {
 	// See http://www.json.org/
-	var regex = rawUnicode ? /[\x00-\x1f]/g : /[\x00-\x1f\x80-\uFFFF]/g;
 	return (s || "")
 		.replace(/\\/g, '\\\\')            // backslash
 		.replace(/"/g, '\\"')              // double quote character
@@ -596,7 +574,7 @@ exports.jsonStringify = function(s, rawUnicode) {
 		.replace(/\x08/g, '\\b')           // backspace
 		.replace(/\x0c/g, '\\f')           // formfeed
 		.replace(/\t/g, '\\t')             // tab
-		.replace(regex,function(s) {
+		.replace(/[\x00-\x1f\x80-\uFFFF]/g,function(s) {
 			return '\\u' + $tw.utils.pad(s.charCodeAt(0).toString(16).toUpperCase(),4);
 		}); // non-ASCII characters
 };
@@ -782,7 +760,7 @@ Convert text and content type to a data URI
 */
 exports.makeDataUri = function(text,type,_canonical_uri) {
 	type = type || "text/vnd.tiddlywiki";
-	var typeInfo = $tw.config.contentTypeInfo[type] || $tw.config.contentTypeInfo["text/plain"],
+	var typeInfo = $tw.utils.getContentTypeInfo(type) || $tw.utils.getContentTypeInfo("text/plain"),
 		isBase64 = typeInfo.encoding === "base64",
 		parts = [];
 	if(_canonical_uri) {

core/modules/widgets/action-confirm.js

@@ -1,77 +0,0 @@
-/*\
-
-title: $:/core/modules/widgets/action-confirm.js
-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;
-
-var ConfirmWidget = function(parseTreeNode,options) {
-	this.initialise(parseTreeNode,options);
-};
-
-/*
-Inherit from the base widget class
-*/
-ConfirmWidget.prototype = new Widget();
-
-/*
-Render this widget into the DOM
-*/
-ConfirmWidget.prototype.render = function(parent,nextSibling) {
-	this.computeAttributes();
-	this.execute();
-	this.parentDomNode = parent;
-	this.renderChildren(parent,nextSibling);
-};
-
-/*
-Compute the internal state of the widget
-*/
-ConfirmWidget.prototype.execute = function() {
-	this.message = this.getAttribute("$message",$tw.language.getString("ConfirmAction"));
-	this.prompt = (this.getAttribute("$prompt","yes") == "no" ? false : true);
-	this.makeChildWidgets();
-};
-
-/*
-Refresh the widget by ensuring our attributes are up to date
-*/
-ConfirmWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
-	if(changedAttributes["$message"] || changedAttributes["$prompt"]) {
-		this.refreshSelf();
-		return true;
-	}
-	return this.refreshChildren(changedTiddlers);
-};
-
-/*
-Invoke the action associated with this widget
-*/
-ConfirmWidget.prototype.invokeAction = function(triggeringWidget,event) {
-	var invokeActions = true,
-		handled = true;
-	if(this.prompt) {
-		invokeActions = confirm(this.message);
-	}
-	if(invokeActions) {
-		handled = this.invokeActions(triggeringWidget,event);
-	}
-	return handled;
-};
-
-ConfirmWidget.prototype.allowActionPropagation = function() {
-	return false;
-};
-
-exports["action-confirm"] = ConfirmWidget;
-
-})();

core/modules/widgets/action-log.js

@@ -1,93 +0,0 @@
-/*\
-title: $:/core/modules/widgets/action-log.js
-type: application/javascript
-module-type: widget
-
-Action widget to log debug messages
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-var Widget = require("$:/core/modules/widgets/widget.js").widget;
-
-var LogWidget = function(parseTreeNode,options) {
-	this.initialise(parseTreeNode,options);
-};
-
-/*
-Inherit from the base widget class
-*/
-LogWidget.prototype = new Widget();
-
-/*
-Render this widget into the DOM
-*/
-LogWidget.prototype.render = function(parent,nextSibling) {
-	this.computeAttributes();
-	this.execute();
-};
-
-LogWidget.prototype.execute = function(){
-	this.message = this.getAttribute("$$message","debug");
-	this.logAll = this.getAttribute("$$all","no") === "yes" ? true : false;
-	this.filter = this.getAttribute("$$filter");
-}
-
-/*
-Refresh the widget by ensuring our attributes are up to date
-*/
-LogWidget.prototype.refresh = function(changedTiddlers) {
-	this.refreshSelf();
-	return true;
-};
-
-/*
-Invoke the action associated with this widget
-*/
-LogWidget.prototype.invokeAction = function(triggeringWidget,event) {
-	this.log();
-	return true; // Action was invoked
-};
-
-LogWidget.prototype.log = function() {
-	var data = {},
-		dataCount,
-		allVars = {},
-		filteredVars;
-
-	$tw.utils.each(this.attributes,function(attribute,name) {
-		if(name.substring(0,2) !== "$$") {
-			data[name] = attribute;
-		}		
-	});
-
-	for(var v in this.variables) {
-		allVars[v] = this.getVariable(v,{defaultValue:""});
-	}	
-	if(this.filter) {
-		filteredVars = this.wiki.compileFilter(this.filter).call(this.wiki,this.wiki.makeTiddlerIterator(allVars));
-		$tw.utils.each(filteredVars,function(name) {
-			data[name] = allVars[name];
-		});		
-	}
-	dataCount = $tw.utils.count(data);
-
-	console.group(this.message);
-	if(dataCount > 0) {
-		$tw.utils.logTable(data);
-	}
-	if(this.logAll || !dataCount) {
-		console.groupCollapsed("All variables");
-		$tw.utils.logTable(allVars);
-		console.groupEnd();
-	}
-	console.groupEnd();
-}
-
-exports["action-log"] = LogWidget;
-
-})();

core/modules/widgets/button.js

@@ -27,20 +27,18 @@ ButtonWidget.prototype = new Widget();
 Render this widget into the DOM
 */
 ButtonWidget.prototype.render = function(parent,nextSibling) {
-	var self = this,
-		tag = "button",
-		domNode;
+	var self = this;
 	// Remember parent
 	this.parentDomNode = parent;
 	// Compute attributes and execute state
 	this.computeAttributes();
 	this.execute();
 	// Create element
+	var tag = "button";
 	if(this.buttonTag && $tw.config.htmlUnsafeElements.indexOf(this.buttonTag) === -1) {
 		tag = this.buttonTag;
 	}
-	domNode = this.document.createElement(tag);
-	this.domNode = domNode;
+	var domNode = this.document.createElement(tag);
 	// Assign classes
 	var classes = this["class"].split(" ") || [],
 		isPoppedUp = (this.popup || this.popupTitle) && this.isPoppedUp();
@@ -69,10 +67,7 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
 	// Set the tabindex
 	if(this.tabIndex) {
 		domNode.setAttribute("tabindex",this.tabIndex);
-	}
-	if(this.isDisabled === "yes") {
-		domNode.setAttribute("disabled",true);
-	}
+	}	
 	// Add a click event handler
 	domNode.addEventListener("click",function (event) {
 		var handled = false;
@@ -202,10 +197,10 @@ ButtonWidget.prototype.execute = function() {
 	this.setTo = this.getAttribute("setTo");
 	this.popup = this.getAttribute("popup");
 	this.hover = this.getAttribute("hover");
+	this["class"] = this.getAttribute("class","");
 	this["aria-label"] = this.getAttribute("aria-label");
 	this.tooltip = this.getAttribute("tooltip");
 	this.style = this.getAttribute("style");
-	this["class"] = this.getAttribute("class","");
 	this.selectedClass = this.getAttribute("selectedClass");
 	this.defaultSetValue = this.getAttribute("default","");
 	this.buttonTag = this.getAttribute("tag");
@@ -216,39 +211,18 @@ ButtonWidget.prototype.execute = function() {
 	this.setIndex = this.getAttribute("setIndex");
 	this.popupTitle = this.getAttribute("popupTitle");
 	this.tabIndex = this.getAttribute("tabindex");
-	this.isDisabled = this.getAttribute("disabled","no");
 	// Make child widgets
 	this.makeChildWidgets();
 };
 
-ButtonWidget.prototype.updateDomNodeClasses = function() {
-	var domNodeClasses = this.domNode.className.split(" "),
-		oldClasses = this.class.split(" "),
-		newClasses;	
-	this["class"] = this.getAttribute("class","");
-	newClasses = this.class.split(" ");
-	//Remove classes assigned from the old value of class attribute
-	$tw.utils.each(oldClasses,function(oldClass){
-		var i = domNodeClasses.indexOf(oldClass);
-		if(i !== -1) {
-			domNodeClasses.splice(i,1);
-		}
-	});
-	//Add new classes from updated class attribute.
-	$tw.utils.pushTop(domNodeClasses,newClasses);
-	this.domNode.className = domNodeClasses.join(" ");
-}
-
 /*
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 ButtonWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled) {
+	if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes["class"] || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle) {
 		this.refreshSelf();
 		return true;
-	} else if(changedAttributes["class"]) {
-		this.updateDomNodeClasses();
 	}
 	return this.refreshChildren(changedTiddlers);
 };

core/modules/widgets/checkbox.js

@@ -41,9 +41,6 @@ CheckboxWidget.prototype.render = function(parent,nextSibling) {
 	if(this.getValue()) {
 		this.inputDomNode.setAttribute("checked","true");
 	}
-	if(this.isDisabled === "yes") {
-		this.inputDomNode.setAttribute("disabled",true);
-	}
 	this.labelDomNode.appendChild(this.inputDomNode);
 	this.spanDomNode = this.document.createElement("span");
 	this.labelDomNode.appendChild(this.spanDomNode);
@@ -184,7 +181,6 @@ CheckboxWidget.prototype.execute = function() {
 	this.checkboxDefault = this.getAttribute("default");
 	this.checkboxClass = this.getAttribute("class","");
 	this.checkboxInvertTag = this.getAttribute("invertTag","");
-	this.isDisabled = this.getAttribute("disabled","no");
 	// Make the child widgets
 	this.makeChildWidgets();
 };
@@ -194,7 +190,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 CheckboxWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.tiddler || changedAttributes.tag || changedAttributes.invertTag || changedAttributes.field || changedAttributes.index || changedAttributes.checked || changedAttributes.unchecked || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.disabled) {
+	if(changedAttributes.tiddler || changedAttributes.tag || changedAttributes.invertTag || changedAttributes.field || changedAttributes.index || changedAttributes.checked || changedAttributes.unchecked || changedAttributes["default"] || changedAttributes["class"]) {
 		this.refreshSelf();
 		return true;
 	} else {

core/modules/widgets/droppable.js

@@ -27,21 +27,21 @@ DroppableWidget.prototype = new Widget();
 Render this widget into the DOM
 */
 DroppableWidget.prototype.render = function(parent,nextSibling) {
-	var self = this,
-		tag = this.parseTreeNode.isBlock ? "div" : "span",
-		domNode;
+	var self = this;
 	// Remember parent
 	this.parentDomNode = parent;
 	// Compute attributes and execute state
 	this.computeAttributes();
 	this.execute();
+	var tag = this.parseTreeNode.isBlock ? "div" : "span";
 	if(this.droppableTag && $tw.config.htmlUnsafeElements.indexOf(this.droppableTag) === -1) {
 		tag = this.droppableTag;
 	}
 	// Create element and assign classes
-	domNode = this.document.createElement(tag);
-	this.domNode = domNode;
-	this.assignDomNodeClasses();
+	var domNode = this.document.createElement(tag),
+		classes = (this.droppableClass || "").split(" ");
+	classes.push("tc-droppable");
+	domNode.className = classes.join(" ");
 	// Add event handlers
 	if(this.droppableEnable) {
 		$tw.utils.addEventListeners(domNode,[
@@ -50,8 +50,6 @@ DroppableWidget.prototype.render = function(parent,nextSibling) {
 			{name: "dragleave", handlerObject: this, handlerMethod: "handleDragLeaveEvent"},
 			{name: "drop", handlerObject: this, handlerMethod: "handleDropEvent"}
 		]);		
-	} else {
-		$tw.utils.addClass(this.domNode,this.disabledClass);
 	}
 	// Insert element
 	parent.insertBefore(domNode,nextSibling);
@@ -146,32 +144,24 @@ DroppableWidget.prototype.execute = function() {
 	this.droppableActions = this.getAttribute("actions");
 	this.droppableEffect = this.getAttribute("effect","copy");
 	this.droppableTag = this.getAttribute("tag");
+	this.droppableClass = this.getAttribute("class");
 	this.droppableEnable = (this.getAttribute("enable") || "yes") === "yes";
-	this.disabledClass = this.getAttribute("disabledClass","");
 	// Make child widgets
 	this.makeChildWidgets();
 };
 
-DroppableWidget.prototype.assignDomNodeClasses = function() {
-	var classes = this.getAttribute("class","").split(" ");
-	classes.push("tc-droppable");
-	this.domNode.className = classes.join(" ");	
-};
-
 /*
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 DroppableWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.tag || changedAttributes.enable || changedAttributes.disabledClass || changedAttributes.actions || changedAttributes.effect) {
+	if(changedAttributes["class"] || changedAttributes.tag || changedAttributes.enable) {
 		this.refreshSelf();
 		return true;
-	} else if(changedAttributes["class"]) {
-		this.assignDomNodeClasses();
 	}
 	return this.refreshChildren(changedTiddlers);
 };
 
 exports.droppable = DroppableWidget;
 
-})();
+})();

core/modules/widgets/edit.js

@@ -51,7 +51,6 @@ EditWidget.prototype.execute = function() {
 	this.editCancelPopups = this.getAttribute("cancelPopups","");
 	this.editInputActions = this.getAttribute("inputActions");
 	this.editRefreshTitle = this.getAttribute("refreshTitle");
-	this.editAutoComplete = this.getAttribute("autocomplete");
 	// Choose the appropriate edit widget
 	this.editorType = this.getEditorType();
 	// Make the child widgets
@@ -71,10 +70,10 @@ EditWidget.prototype.getEditorType = function() {
 			type = tiddler.fields.type;
 		}
 	}
-	type = type || "text/vnd.tiddlywiki";
+	type = $tw.utils.parseContentType(type || "text/vnd.tiddlywiki")[0];
 	var editorType = this.wiki.getTiddlerText(EDITOR_MAPPING_PREFIX + type);
 	if(!editorType) {
-		var typeInfo = $tw.config.contentTypeInfo[type];
+		var typeInfo = $tw.utils.getContentTypeInfo(type);
 		if(typeInfo && typeInfo.encoding === "base64") {
 			editorType = "binary";
 		} else {
@@ -90,7 +89,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 EditWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
 	// Refresh if an attribute has changed, or the type associated with the target tiddler has changed
-	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || (changedTiddlers[this.editTitle] && this.getEditorType() !== this.editorType)) {
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || (changedTiddlers[this.editTitle] && this.getEditorType() !== this.editorType)) {
 		this.refreshSelf();
 		return true;
 	} else {

core/modules/widgets/eventcatcher.js

@@ -1,156 +0,0 @@
-/*\
-title: $:/core/modules/widgets/eventcatcher.js
-type: application/javascript
-module-type: widget
-
-Event handler widget
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-var Widget = require("$:/core/modules/widgets/widget.js").widget;
-
-var EventWidget = function(parseTreeNode,options) {
-	this.initialise(parseTreeNode,options);
-};
-
-/*
-Inherit from the base widget class
-*/
-EventWidget.prototype = new Widget();
-
-/*
-Render this widget into the DOM
-*/
-EventWidget.prototype.render = function(parent,nextSibling) {
-	var self = this;
-	// Remember parent
-	this.parentDomNode = parent;
-	// Compute attributes and execute state
-	this.computeAttributes();
-	this.execute();
-	// Create element
-	var tag = this.parseTreeNode.isBlock ? "div" : "span";
-	if(this.elementTag && $tw.config.htmlUnsafeElements.indexOf(this.elementTag) === -1) {
-		tag = this.elementTag;
-	}	
-	var domNode = this.document.createElement(tag);
-	this.domNode = domNode;
-	// Assign classes
-	this.assignDomNodeClasses();	
-	// Add our event handler
-	$tw.utils.each(this.types,function(type) {
-		domNode.addEventListener(type,function(event) {
-			var selector = self.getAttribute("selector"),
-				actions = self.getAttribute("actions-"+type),
-				selectedNode = event.target,
-				selectedNodeRect,
-				catcherNodeRect,
-				variables = {};
-			if(selector) {
-				// Search ancestors for a node that matches the selector
-				while(!selectedNode.matches(selector) && selectedNode !== domNode) {
-					selectedNode = selectedNode.parentNode;
-				}
-				// If we found one, copy the attributes as variables, otherwise exit
-				if(selectedNode.matches(selector)) {
-					$tw.utils.each(selectedNode.attributes,function(attribute) {
-						variables["dom-" + attribute.name] = attribute.value.toString();
-					});
-					//Add a variable with a popup coordinate string for the selected node
-					variables["tv-popup-coords"] = "(" + selectedNode.offsetLeft + "," + selectedNode.offsetTop +"," + selectedNode.offsetWidth + "," + selectedNode.offsetHeight + ")";
-					
-					//Add variables for offset of selected node
-					variables["tv-selectednode-posx"] = selectedNode.offsetLeft.toString();
-					variables["tv-selectednode-posy"] = selectedNode.offsetTop.toString();
-					variables["tv-selectednode-width"] = selectedNode.offsetWidth.toString();
-					variables["tv-selectednode-height"] = selectedNode.offsetHeight.toString();
-
-					//Add variables for event X and Y position relative to selected node
-					selectedNodeRect = selectedNode.getBoundingClientRect();				
-					variables["event-fromselected-posx"] = (event.clientX - selectedNodeRect.left).toString();
-					variables["event-fromselected-posy"] = (event.clientY - selectedNodeRect.top).toString();
-
-					//Add variables for event X and Y position relative to event catcher node
-					catcherNodeRect = self.domNode.getBoundingClientRect();
-					variables["event-fromcatcher-posx"] = (event.clientX - catcherNodeRect.left).toString();
-					variables["event-fromcatcher-posy"] = (event.clientY - catcherNodeRect.top).toString();
-				} else {
-					return false;
-				}
-			}
-			// Execute our actions with the variables
-			if(actions) {
-				// Add a variable for the modifier key
-				variables.modifier = $tw.keyboardManager.getEventModifierKeyDescriptor(event);
-				// Add a variable for the mouse button
-				if("button" in event) {
-					if(event.button === 0) {
-						variables["event-mousebutton"] = "left";
-					} else if(event.button === 1) {
-						variables["event-mousebutton"] = "middle";
-					} else if(event.button === 2) {
-						variables["event-mousebutton"] = "right";
-					}
-				}
-				variables["event-type"] = event.type.toString();
-				if(typeof event.detail === "object" && !!event.detail) {
-					$tw.utils.each(event.detail,function(detailValue,detail) {
-						variables["event-detail-" + detail] = detailValue.toString();
-					});
-				} else if(!!event.detail) {
-					variables["event-detail"] = event.detail.toString();
-				}
-				self.invokeActionString(actions,self,event,variables);
-				event.preventDefault();
-				event.stopPropagation();
-				return true;
-			}
-			return false;
-		},false);
-	});
-	// Insert element
-	parent.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
-	this.domNodes.push(domNode);
-};
-
-/*
-Compute the internal state of the widget
-*/
-EventWidget.prototype.execute = function() {
-	var self = this;
-	// Get attributes that require a refresh on change
-	this.types = this.getAttribute("events","").split(" ");
-	this.elementTag = this.getAttribute("tag");
-	// Make child widgets
-	this.makeChildWidgets();
-};
-
-EventWidget.prototype.assignDomNodeClasses = function() {
-	var classes = this.getAttribute("class","").split(" ");
-	classes.push("tc-eventcatcher");
-	this.domNode.className = classes.join(" ");	
-};
-
-/*
-Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
-*/
-EventWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
-	if(changedAttributes["events"] || changedAttributes["tag"]) {
-		this.refreshSelf();
-		return true;
-	} else if(changedAttributes["class"]) {
-		this.assignDomNodeClasses();
-	}
-	return this.refreshChildren(changedTiddlers);
-};
-
-exports.eventcatcher = EventWidget;
-
-})();

core/modules/widgets/keyboard.js

@@ -46,15 +46,13 @@ KeyboardWidget.prototype.render = function(parent,nextSibling) {
 	// Add a keyboard event handler
 	domNode.addEventListener("keydown",function (event) {
 		if($tw.keyboardManager.checkKeyDescriptors(event,self.keyInfoArray)) {
-			var handled = self.invokeActions(self,event);
+			self.invokeActions(self,event);
 			if(self.actions) {
 				self.invokeActionString(self.actions,self,event);
 			}
 			self.dispatchMessage(event);
-			if(handled || self.actions || self.message) {
-				event.preventDefault();
-				event.stopPropagation();
-			}
+			event.preventDefault();
+			event.stopPropagation();
 			return true;
 		}
 		return false;

core/modules/widgets/list.js

@@ -87,14 +87,8 @@ ListWidget.prototype.getTiddlerList = function() {
 };
 
 ListWidget.prototype.getEmptyMessage = function() {
-	var parser,
-		emptyMessage = this.getAttribute("emptyMessage","");
-	// this.wiki.parseText() calls 
-	// new Parser(..), which should only be done, if needed, because it's heavy!
-	if (emptyMessage === "") {
-		return [];
-	}
-	parser = this.wiki.parseText("text/vnd.tiddlywiki",emptyMessage,{parseAsInline: true});
+	var emptyMessage = this.getAttribute("emptyMessage",""),
+		parser = this.wiki.parseText("text/vnd.tiddlywiki",emptyMessage,{parseAsInline: true});
 	if(parser) {
 		return parser.tree;
 	} else {

core/modules/widgets/log.js

@@ -1,30 +0,0 @@
-/*\
-title: $:/core/modules/widgets/log.js
-type: application/javascript
-module-type: widget-subclass
-
-Widget to log debug messages
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-exports.baseClass = "action-log";
-
-exports.name = "log";
-
-exports.constructor = function(parseTreeNode,options) {
-	this.initialise(parseTreeNode,options);
-}
-
-exports.prototype = {};
-
-exports.prototype.render = function(event) {
-	Object.getPrototypeOf(Object.getPrototypeOf(this)).render.call(this,event);	
-	Object.getPrototypeOf(Object.getPrototypeOf(this)).log.call(this);
-}
-
-})();

core/modules/widgets/macrocall.js

@@ -55,19 +55,9 @@ MacroCallWidget.prototype.execute = function() {
 	// Are we rendering to HTML?
 	if(this.renderOutput === "text/html") {
 		// If so we'll return the parsed macro
-		// Check if we've already cached parsing this macro
-		var mode = this.parseTreeNode.isBlock ? "blockParser" : "inlineParser",
-			parser;
-		if(variableInfo.srcVariable && variableInfo.srcVariable[mode]) {
-			parser = variableInfo.srcVariable[mode];
-		} else {
-			parser = this.wiki.parseText(this.parseType,text,
-								{parseAsInline: !this.parseTreeNode.isBlock});
-			if(variableInfo.isCacheable && variableInfo.srcVariable) {
-				variableInfo.srcVariable[mode] = parser;
-			}
-		}
-		var parseTreeNodes = parser ? parser.tree : [];
+		var parser = this.wiki.parseText(this.parseType,text,
+							{parseAsInline: !this.parseTreeNode.isBlock});
+		parseTreeNodes = parser ? parser.tree : [];
 		// Wrap the parse tree in a vars widget assigning the parameters to variables named "__paramname__"
 		var attributes = {};
 		$tw.utils.each(variableInfo.params,function(param) {

core/modules/widgets/navigator.js

@@ -62,11 +62,6 @@ NavigatorWidget.prototype.execute = function() {
 	this.historyTitle = this.getAttribute("history");
 	this.setVariable("tv-story-list",this.storyTitle);
 	this.setVariable("tv-history-list",this.historyTitle);
-	this.story = new $tw.Story({
-		wiki: this.wiki,
-		storyTitle: this.storyTitle,
-		historyTitle: this.historyTitle
-	});
 	// Construct the child widgets
 	this.makeChildWidgets();
 };
@@ -128,7 +123,7 @@ NavigatorWidget.prototype.replaceFirstTitleInStory = function(storyList,oldTitle
 
 NavigatorWidget.prototype.addToStory = function(title,fromTitle) {
 	if(this.storyTitle) {
-		this.story.addToStory(title,fromTitle,{
+		this.wiki.addToStory(title,fromTitle,this.storyTitle,{
 			openLinkFromInsideRiver: this.getAttribute("openLinkFromInsideRiver","top"),
 			openLinkFromOutsideRiver: this.getAttribute("openLinkFromOutsideRiver","top")
 		});
@@ -141,7 +136,7 @@ title: a title string or an array of title strings
 fromPageRect: page coordinates of the origin of the navigation
 */
 NavigatorWidget.prototype.addToHistory = function(title,fromPageRect) {
-	this.story.addToHistory(title,fromPageRect,this.historyTitle);
+	this.wiki.addToHistory(title,fromPageRect,this.historyTitle);
 };
 
 /*
@@ -529,7 +524,6 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 	$tw.utils.each(importData.tiddlers,function(tiddler,title) {
 		if($tw.utils.count(tiddler) === 0) {
 			newFields["selection-" + title] = "unchecked";
-			newFields["suppressed-" + title] = "yes";
 		}
 	});
 	// Save the $:/Import tiddler
@@ -564,14 +558,10 @@ NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
 	$tw.utils.each(importData.tiddlers,function(tiddlerFields) {
 		var title = tiddlerFields.title;
 		if(title && importTiddler && importTiddler.fields["selection-" + title] !== "unchecked") {
-			if($tw.utils.hop(importTiddler.fields,["rename-" + title])) {
-				var tiddler = new $tw.Tiddler(tiddlerFields,{title : importTiddler.fields["rename-" + title]});
-			} else {
-				var tiddler = new $tw.Tiddler(tiddlerFields);
-			}
+			var tiddler = new $tw.Tiddler(tiddlerFields);
 			tiddler = $tw.hooks.invokeHook("th-importing-tiddler",tiddler);
 			self.wiki.addTiddler(tiddler);
-			importReport.push("# [[" + tiddler.fields.title + "]]");
+			importReport.push("# [[" + tiddlerFields.title + "]]");
 		}
 	});
 	// Replace the $:/Import tiddler with an import report

core/modules/widgets/radio.js

@@ -13,6 +13,7 @@ Set a field or index at a given tiddler via radio buttons
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
 var RadioWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);
 };
@@ -36,16 +37,13 @@ RadioWidget.prototype.render = function(parent,nextSibling) {
 	// Create our elements
 	this.labelDomNode = this.document.createElement("label");
 	this.labelDomNode.setAttribute("class",
-		"tc-radio " + this.radioClass + (isChecked ? " tc-radio-selected" : "")
-	);
+   		"tc-radio " + this.radioClass + (isChecked ? " tc-radio-selected" : "")
+  	);
 	this.inputDomNode = this.document.createElement("input");
 	this.inputDomNode.setAttribute("type","radio");
 	if(isChecked) {
 		this.inputDomNode.setAttribute("checked","true");
 	}
-	if(this.isDisabled === "yes") {
-		this.inputDomNode.setAttribute("disabled",true);
-	}
 	this.labelDomNode.appendChild(this.inputDomNode);
 	this.spanDomNode = this.document.createElement("span");
 	this.labelDomNode.appendChild(this.spanDomNode);
@@ -85,10 +83,6 @@ RadioWidget.prototype.handleChangeEvent = function(event) {
 	if(this.inputDomNode.checked) {
 		this.setValue();
 	}
-	// Trigger actions
-	if(this.radioActions) {
-		this.invokeActionString(this.radioActions,this,event,{"actionValue": this.radioValue});
-	}
 };
 
 /*
@@ -101,8 +95,6 @@ RadioWidget.prototype.execute = function() {
 	this.radioIndex = this.getAttribute("index");
 	this.radioValue = this.getAttribute("value");
 	this.radioClass = this.getAttribute("class","");
-	this.isDisabled = this.getAttribute("disabled","no");
-	this.radioActions = this.getAttribute("actions","");
 	// Make the child widgets
 	this.makeChildWidgets();
 };
@@ -112,11 +104,16 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 RadioWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(($tw.utils.count(changedAttributes) > 0) || changedTiddlers[this.radioTitle]) {
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.value || changedAttributes["class"]) {
 		this.refreshSelf();
 		return true;
 	} else {
-		return this.refreshChildren(changedTiddlers);
+		var refreshed = false;
+		if(changedTiddlers[this.radioTitle]) {
+			this.inputDomNode.checked = this.getValue() === this.radioValue;
+			refreshed = true;
+		}
+		return this.refreshChildren(changedTiddlers) || refreshed;
 	}
 };
 

core/modules/widgets/range.js

@@ -46,16 +46,11 @@ RangeWidget.prototype.render = function(parent,nextSibling) {
 	if(this.increment){
 		this.inputDomNode.setAttribute("step", this.increment);
 	}
-	if(this.isDisabled === "yes") {
-		this.inputDomNode.setAttribute("disabled",true);
-	}
 	this.inputDomNode.value = this.getValue();
 	// Add a click event handler
 	$tw.utils.addEventListeners(this.inputDomNode,[
-		{name:"mousedown", handlerObject:this, handlerMethod:"handleMouseDownEvent"},
-		{name:"mouseup",   handlerObject:this, handlerMethod:"handleMouseUpEvent"},
-		{name:"change",    handlerObject:this, handlerMethod:"handleChangeEvent"},
-		{name:"input",     handlerObject:this, handlerMethod:"handleInputEvent"},
+		{name: "input", handlerObject: this, handlerMethod: "handleInputEvent"},
+		{name: "change", handlerObject: this, handlerMethod: "handleInputEvent"}		
 	]);
 	// Insert the label into the DOM and render any children
 	parent.insertBefore(this.inputDomNode,nextSibling);
@@ -64,77 +59,23 @@ RangeWidget.prototype.render = function(parent,nextSibling) {
 
 RangeWidget.prototype.getValue = function() {
 	var tiddler = this.wiki.getTiddler(this.tiddlerTitle),
-		fieldName = this.tiddlerField,
-		value = this.defaultValue;
+		fieldName = this.tiddlerField || "text",
+		value   = this.defaultValue;
 	if(tiddler) {
 		if(this.tiddlerIndex) {
-			value = this.wiki.extractTiddlerDataItem(tiddler,this.tiddlerIndex,this.defaultValue);
+			value = this.wiki.extractTiddlerDataItem(tiddler,this.tiddlerIndex,this.defaultValue || "");
 		} else {
 			if($tw.utils.hop(tiddler.fields,fieldName)) {
 				value = tiddler.fields[fieldName] || "";
 			} else {
-				value = this.defaultValue;
+				value = this.defaultValue || "";
 			}
 		}
 	}
 	return value;
 };
 
-RangeWidget.prototype.getActionVariables = function(options) {
-	options = options || {};
-	var hasChanged = (this.startValue !== this.inputDomNode.value) ? "yes" : "no";
-	// Trigger actions. Use variables = {key:value, key:value ...}
-	// the "value" is needed.
-	return $tw.utils.extend({"actionValue": this.inputDomNode.value, "actionValueHasChanged": hasChanged}, options);
-}
-
-// actionsStart
-RangeWidget.prototype.handleMouseDownEvent = function(event) {
-	this.mouseDown = true; // TODO remove once IE is gone.
-	this.startValue = this.inputDomNode.value; // TODO remove this line once IE is gone!
-	this.handleEvent(event);
-	// Trigger actions
-	if(this.actionsMouseDown) {
-		var variables = this.getActionVariables() // TODO this line will go into the function call below.
-		this.invokeActionString(this.actionsMouseDown,this,event,variables);
-	}
-}
-
-// actionsStop
-RangeWidget.prototype.handleMouseUpEvent = function(event) {
-	this.mouseDown = false; // TODO remove once IE is gone.
-	this.handleEvent(event);
-	// Trigger actions
-	if(this.actionsMouseUp) {
-		var variables = this.getActionVariables()
-		this.invokeActionString(this.actionsMouseUp,this,event,variables);
-	}
-	// TODO remove the following if() once IE is gone!
-	if ($tw.browser.isIE) {
-		if (this.startValue !== this.inputDomNode.value) {
-			this.handleChangeEvent(event);
-			this.startValue = this.inputDomNode.value;
-		}
-	}
-}
-
-RangeWidget.prototype.handleChangeEvent = function(event) {
-	if (this.mouseDown) {  // TODO refactor this function once IE is gone.
-		this.handleInputEvent(event);
-	}
-};
-
 RangeWidget.prototype.handleInputEvent = function(event) {
-	this.handleEvent(event);
-	// Trigger actions
-	if(this.actionsInput) {
-		// "tiddler" parameter may be missing. See .execute() below
-		var variables = this.getActionVariables({"actionValueHasChanged": "yes"}) // TODO this line will go into the function call below.
-		this.invokeActionString(this.actionsInput,this,event,variables);
-	}
-};
-
-RangeWidget.prototype.handleEvent = function(event) {
 	if(this.getValue() !== this.inputDomNode.value) {
 		if(this.tiddlerIndex) {
 			this.wiki.setText(this.tiddlerTitle,"",this.tiddlerIndex,this.inputDomNode.value);
@@ -148,24 +89,15 @@ RangeWidget.prototype.handleEvent = function(event) {
 Compute the internal state of the widget
 */
 RangeWidget.prototype.execute = function() {
-	// TODO remove the next 1 lines once IE is gone!
-	this.mouseUp = true; // Needed for IE10
 	// Get the parameters from the attributes
 	this.tiddlerTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler"));
-	this.tiddlerField = this.getAttribute("field","text");
+	this.tiddlerField = this.getAttribute("field");
 	this.tiddlerIndex = this.getAttribute("index");
 	this.minValue = this.getAttribute("min");
 	this.maxValue = this.getAttribute("max");
 	this.increment = this.getAttribute("increment");
-	this.defaultValue = this.getAttribute("default","");
+	this.defaultValue = this.getAttribute("default");
 	this.elementClass = this.getAttribute("class","");
-	this.isDisabled = this.getAttribute("disabled","no");
-	// Actions since 5.1.23
-	// Next 2 only fire once!
-	this.actionsMouseDown = this.getAttribute("actionsStart","");
-	this.actionsMouseUp = this.getAttribute("actionsStop","");
-	// Input fires very often!
-	this.actionsInput = this.getAttribute("actions","");
 	// Make the child widgets
 	this.makeChildWidgets();
 };
@@ -175,7 +107,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 RangeWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if($tw.utils.count(changedAttributes) > 0) {
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes['min'] || changedAttributes['max'] || changedAttributes['increment'] || changedAttributes["default"] || changedAttributes["class"]) {
 		this.refreshSelf();
 		return true;
 	} else {
@@ -183,7 +115,7 @@ RangeWidget.prototype.refresh = function(changedTiddlers) {
 		if(changedTiddlers[this.tiddlerTitle]) {
 			var value = this.getValue();
 			if(this.inputDomNode.value !== value) {
-				this.inputDomNode.value = value;
+				this.inputDomNode.value = value;				
 			}
 			refreshed = true;
 		}

core/modules/widgets/reveal.js

@@ -35,8 +35,9 @@ RevealWidget.prototype.render = function(parent,nextSibling) {
 		tag = this.revealTag;
 	}
 	var domNode = this.document.createElement(tag);
-	this.domNode = domNode;
-	this.assignDomNodeClasses();
+	var classes = this["class"].split(" ") || [];
+	classes.push("tc-reveal");
+	domNode.className = classes.join(" ");
 	if(this.style) {
 		domNode.setAttribute("style",this.style);
 	}
@@ -69,10 +70,6 @@ RevealWidget.prototype.positionPopup = function(domNode) {
 			left = this.popup.left + this.popup.width;
 			top = this.popup.top + this.popup.height - domNode.offsetHeight;
 			break;
-		case "belowright":
-			left = this.popup.left + this.popup.width;
-			top = this.popup.top + this.popup.height;
-			break;			
 		case "right":
 			left = this.popup.left + this.popup.width;
 			top = this.popup.top;
@@ -81,10 +78,6 @@ RevealWidget.prototype.positionPopup = function(domNode) {
 			left = this.popup.left + this.popup.width - domNode.offsetWidth;
 			top = this.popup.top + this.popup.height;
 			break;
-		case "aboveleft":
-			left = this.popup.left - domNode.offsetWidth;
-			top = this.popup.top - domNode.offsetHeight;
-			break;			
 		default: // Below
 			left = this.popup.left;
 			top = this.popup.top + this.popup.height;
@@ -109,14 +102,13 @@ RevealWidget.prototype.execute = function() {
 	this.text = this.getAttribute("text");
 	this.position = this.getAttribute("position");
 	this.positionAllowNegative = this.getAttribute("positionAllowNegative") === "yes";
-	// class attribute handled in assignDomNodeClasses()
+	this["class"] = this.getAttribute("class","");
 	this.style = this.getAttribute("style","");
 	this["default"] = this.getAttribute("default","");
 	this.animate = this.getAttribute("animate","no");
 	this.retain = this.getAttribute("retain","no");
 	this.openAnimation = this.animate === "no" ? undefined : "open";
 	this.closeAnimation = this.animate === "no" ? undefined : "close";
-	this.updatePopupPosition = this.getAttribute("updatePopupPosition","no") === "yes";
 	// Compute the title of the state tiddler and read it
 	this.stateTiddlerTitle = this.state;
 	this.stateTitle = this.getAttribute("stateTitle");
@@ -202,12 +194,6 @@ RevealWidget.prototype.readPopupState = function(state) {
 	}
 };
 
-RevealWidget.prototype.assignDomNodeClasses = function() {
-	var classes = this.getAttribute("class","").split(" ");
-	classes.push("tc-reveal");
-	this.domNode.className = classes.join(" ");
-};
-
 /*
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
@@ -226,15 +212,7 @@ RevealWidget.prototype.refresh = function(changedTiddlers) {
 				this.refreshSelf();
 				return true;
 			}
-		} else if(this.type === "popup" && this.updatePopupPosition && (changedTiddlers[this.state] || changedTiddlers[this.stateTitle])) {
-			this.positionPopup(this.domNode);
 		}
-		if(changedAttributes.style) {
-			this.domNode.style = this.getAttribute("style","");
-		}
-		if(changedAttributes["class"]) {
-			this.assignDomNodeClasses();
-		}		
 		return this.refreshChildren(changedTiddlers);
 	}
 };

core/modules/widgets/scrollable.js

@@ -58,11 +58,7 @@ ScrollableWidget.prototype.handleScrollEvent = function(event) {
 	if(this.outerDomNode.scrollWidth <= this.outerDomNode.offsetWidth && this.outerDomNode.scrollHeight <= this.outerDomNode.offsetHeight && this.fallthrough === "yes") {
 		return true;
 	}
-	if(event.paramObject && event.paramObject.selector) {
-		this.scrollSelectorIntoView(null,event.paramObject.selector);
-	} else {
-		this.scrollIntoView(event.target);			
-	}
+	this.scrollIntoView(event.target);
 	return false; // Handled event
 };
 
@@ -134,14 +130,6 @@ ScrollableWidget.prototype.scrollIntoView = function(element) {
 	}
 };
 
-ScrollableWidget.prototype.scrollSelectorIntoView = function(baseElement,selector,callback) {
-	baseElement = baseElement || document.body;
-	var element = baseElement.querySelector(selector);
-	if(element) {
-		this.scrollIntoView(element,callback);		
-	}
-};
-
 /*
 Render this widget into the DOM
 */

core/modules/widgets/transclude.js

@@ -43,7 +43,6 @@ TranscludeWidget.prototype.execute = function() {
 	this.transcludeField = this.getAttribute("field");
 	this.transcludeIndex = this.getAttribute("index");
 	this.transcludeMode = this.getAttribute("mode");
-	this.recursionMarker = this.getAttribute("recursionMarker","yes");
 	// Parse the text reference
 	var parseAsInline = !this.parseTreeNode.isBlock;
 	if(this.transcludeMode === "inline") {
@@ -62,9 +61,7 @@ TranscludeWidget.prototype.execute = function() {
 		parseTreeNodes = parser ? parser.tree : this.parseTreeNode.children;
 	// Set context variables for recursion detection
 	var recursionMarker = this.makeRecursionMarker();
-	if(this.recursionMarker === "yes") {
-		this.setVariable("transclusion",recursionMarker);
-	}
+	this.setVariable("transclusion",recursionMarker);
 	// Check for recursion
 	if(parser) {
 		if(this.parentWidget && this.parentWidget.hasVariable("transclusion",recursionMarker)) {

core/modules/widgets/widget.js

@@ -113,8 +113,7 @@ Widget.prototype.getVariableInfo = function(name,options) {
 	// Check for the variable defined in the parent widget (or an ancestor in the prototype chain)
 	if(parentWidget && name in parentWidget.variables) {
 		var variable = parentWidget.variables[name],
-			originalValue = variable.value,
-			value = originalValue,
+			value = variable.value,
 			params = this.resolveVariableParameters(variable.params,actualParams);
 		// Substitute any parameters specified in the definition
 		$tw.utils.each(params,function(param) {
@@ -126,9 +125,7 @@ Widget.prototype.getVariableInfo = function(name,options) {
 		}
 		return {
 			text: value,
-			params: params,
-			srcVariable: variable,
-			isCacheable: originalValue === value
+			params: params
 		};
 	}
 	// If the variable doesn't exist in the parent widget then look for a macro module
@@ -574,16 +571,6 @@ Widget.prototype.invokeActionString = function(actions,triggeringWidget,event,va
 	return widgetNode.invokeActions(this,event);
 };
 
-/*
-Execute action tiddlers by tag
-*/
-Widget.prototype.invokeActionsByTag = function(tag,event,variables) {
-	var self = this;
-	$tw.utils.each(self.wiki.filterTiddlers("[all[shadows+tiddlers]tag[" + tag + "]!has[draft.of]]"),function(title) {
-		self.invokeActionString(self.wiki.getTiddlerText(title),self,event,variables);
-	});
-};
-
 Widget.prototype.allowActionPropagation = function() {
 	return true;
 };

core/modules/wiki.js

@@ -214,7 +214,7 @@ exports.isTemporaryTiddler = function(title) {
 exports.isImageTiddler = function(title) {
 	var tiddler = this.getTiddler(title);
 	if(tiddler) {		
-		var contentTypeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/vnd.tiddlywiki"];
+		var contentTypeInfo = $tw.utils.getContentTypeInfo(tiddler.fields.type || "text/vnd.tiddlywiki");
 		return !!contentTypeInfo && contentTypeInfo.flags.indexOf("image") !== -1;
 	} else {
 		return null;
@@ -224,7 +224,7 @@ exports.isImageTiddler = function(title) {
 exports.isBinaryTiddler = function(title) {
 	var tiddler = this.getTiddler(title);
 	if(tiddler) {		
-		var contentTypeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/vnd.tiddlywiki"];
+		var contentTypeInfo = $tw.utils.getContentTypeInfo(tiddler.fields.type || "text/vnd.tiddlywiki");
 		return !!contentTypeInfo && contentTypeInfo.encoding === "base64";
 	} else {
 		return null;
@@ -378,10 +378,10 @@ exports.sortTiddlers = function(titles,sortField,isDescending,isCaseSensitive,is
 		y = Number(b);
 		if(isNumeric && (!isNaN(x) || !isNaN(y))) {
 			return compareNumbers(x,y);
-		} else if($tw.utils.isDate(a) && $tw.utils.isDate(b)) {
-			return isDescending ? b - a : a - b;
 		} else if(isAlphaNumeric) {
 			return isDescending ? b.localeCompare(a,undefined,{numeric: true,sensitivity: "base"}) : a.localeCompare(b,undefined,{numeric: true,sensitivity: "base"});
+		} else if($tw.utils.isDate(a) && $tw.utils.isDate(b)) {
+			return isDescending ? b - a : a - b;
 		} else {
 			a = String(a);
 			b = String(b);
@@ -877,14 +877,17 @@ exports.initParsers = function(moduleType) {
 
 /*
 Parse a block of text of a specified MIME type
-	type: content type of text to be parsed
+	contentType: content type of text to be parsed
 	text: text
 	options: see below
 Options include:
 	parseAsInline: if true, the text of the tiddler will be parsed as an inline run
 	_canonical_uri: optional string of the canonical URI of this content
 */
-exports.parseText = function(type,text,options) {
+exports.parseText = function(contentType,text,options) {
+	// Parse the parameteter from the content type
+	var parsedContentType = $tw.utils.parseContentType(contentType),
+		type = parsedContentType[0];
 	text = text || "";
 	options = options || {};
 	// Select a parser
@@ -902,7 +905,9 @@ exports.parseText = function(type,text,options) {
 	return new Parser(type,text,{
 		parseAsInline: options.parseAsInline,
 		wiki: this,
-		_canonical_uri: options._canonical_uri
+		_canonical_uri: options._canonical_uri,
+		paramName: parsedContentType[1],
+		paramValue: parsedContentType[2]
 	});
 };
 
@@ -1004,7 +1009,6 @@ title: target tiddler title
 options: as for wiki.makeWidget() plus:
 options.field: optional field to transclude (defaults to "text")
 options.mode: transclusion mode "inline" or "block"
-options.recursionMarker : optional flag to set a recursion marker, defaults to "yes"
 options.children: optional array of children for the transclude widget
 options.importVariables: optional importvariables filter string for macros to be included
 options.importPageMacros: optional boolean; if true, equivalent to passing "[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]" to options.importVariables
@@ -1028,17 +1032,10 @@ exports.makeTranscludeWidget = function(title,options) {
 		parseTreeTransclude = {
 			type: "transclude",
 			attributes: {
-				recursionMarker: {
-					name: "recursionMarker",
-					type: "string",
-					value: options.recursionMarker || "yes"
-					},
 				tiddler: {
 					name: "tiddler",
 					type: "string",
-					value: title
-				}
-			},
+					value: title}},
 			isBlock: !options.parseAsInline};
 	if(options.importVariables || options.importPageMacros) {
 		if(options.importVariables) {
@@ -1189,7 +1186,7 @@ exports.search = function(text,options) {
 		if(!tiddler) {
 			tiddler = new $tw.Tiddler({title: title, text: "", type: "text/vnd.tiddlywiki"});
 		}
-		var contentTypeInfo = $tw.config.contentTypeInfo[tiddler.fields.type] || $tw.config.contentTypeInfo["text/vnd.tiddlywiki"],
+		var contentTypeInfo = $tw.utils.getContentTypeInfo(tiddler.fields.type) || $tw.utils.getContentTypeInfo("text/vnd.tiddlywiki"),
 			searchFields;
 		// Get the list of fields we're searching
 		if(options.excludeField) {
@@ -1343,7 +1340,7 @@ exports.readFile = function(file,options) {
 		}
 	}
 	// Figure out if we're reading a binary file
-	var contentTypeInfo = $tw.config.contentTypeInfo[type],
+	var contentTypeInfo = $tw.utils.getContentTypeInfo(type),
 		isBinary = contentTypeInfo ? contentTypeInfo.encoding === "base64" : false;
 	// Log some debugging information
 	if($tw.log.IMPORT) {
@@ -1370,7 +1367,7 @@ exports.readFileContent = function(file,type,isBinary,deserializer,callback) {
 	// Onload
 	reader.onload = function(event) {
 		var text = event.target.result,
-			tiddlerFields = {title: file.name || "Untitled"};
+			tiddlerFields = {title: file.name || "Untitled", type: type};
 		if(isBinary) {
 			var commaPos = text.indexOf(",");
 			if(commaPos !== -1) {
@@ -1434,8 +1431,7 @@ historyTitle: title of history tiddler (defaults to $:/HistoryList)
 */
 exports.addToHistory = function(title,fromPageRect,historyTitle) {
 	var story = new $tw.Story({wiki: this, historyTitle: historyTitle});
-	story.addToHistory(title,fromPageRect);	
-	console.log("$tw.wiki.addToHistory() is deprecated since V5.1.23! Use the this.story.addToHistory() from the story-object!")
+	story.addToHistory(title,fromPageRect);		
 };
 
 /*
@@ -1447,8 +1443,7 @@ options: see story.js
 */
 exports.addToStory = function(title,fromTitle,storyTitle,options) {
 	var story = new $tw.Story({wiki: this, storyTitle: storyTitle});
-	story.addToStory(title,fromTitle,options);
-	console.log("$tw.wiki.addToStory() is deprecated since V5.1.23! Use the this.story.addToStory() from the story-object!")
+	story.addToStory(title,fromTitle,options);		
 };
 
 /*

core/palettes/CupertinoDark.tid

@@ -1,129 +0,0 @@
-title: $:/palettes/CupertinoDark
-tags: $:/tags/Palette
-name: Cupertino Dark
-description: A macOS inspired dark palette
-type: application/x-tiddler-dictionary
-
-alert-background: #FF453A
-alert-border: #FF453A
-alert-highlight: #FFD60A
-alert-muted-foreground: <<colour muted-foreground>>
-background: #282828
-blockquote-bar: <<colour page-background>>
-button-foreground: <<colour background>>
-code-background: <<colour pre-background>>
-code-border: <<colour pre-border>>
-code-foreground: rgba(255, 255, 255, 0.54)
-dirty-indicator: #FF453A
-download-background: <<colour primary>>
-download-foreground: <<colour foreground>>
-dragger-background: <<colour foreground>>
-dragger-foreground: <<colour background>>
-dropdown-background: <<colour tiddler-info-background>>
-dropdown-border: <<colour dropdown-background>>
-dropdown-tab-background-selected: #3F638B
-dropdown-tab-background: #323232
-dropzone-background: #30D158
-external-link-background-hover: transparent
-external-link-background-visited: transparent
-external-link-background: transparent
-external-link-foreground-hover: 
-external-link-foreground-visited: #BF5AF2
-external-link-foreground: #32D74B
-foreground: #FFFFFF
-menubar-background: #464646
-menubar-foreground: #ffffff
-message-background: <<colour background>>
-message-border: <<colour very-muted-foreground>>
-message-foreground: rgba(255, 255, 255, 0.54)
-modal-backdrop: <<colour page-background>>
-modal-background: <<colour background>>
-modal-border: <<colour very-muted-foreground>>
-modal-footer-background: <<colour background>>
-modal-footer-border: <<colour background>>
-modal-header-border: <<colour very-muted-foreground>>
-muted-foreground: #98989D
-notification-background: <<colour dropdown-background>>
-notification-border: <<colour dropdown-background>>
-page-background: #323232
-pre-background: #464646
-pre-border: transparent
-primary: #0A84FF
-select-tag-background: <<colour background>>
-select-tag-foreground: <<colour foreground>>
-sidebar-button-foreground: <<colour background>>
-sidebar-controls-foreground-hover: #FF9F0A
-sidebar-controls-foreground: #8E8E93
-sidebar-foreground-shadow: transparent
-sidebar-foreground: rgba(255, 255, 255, 0.54)
-sidebar-muted-foreground-hover: rgba(255, 255, 255, 0.54)
-sidebar-muted-foreground: rgba(255, 255, 255, 0.38)
-sidebar-tab-background-selected: #3F638B
-sidebar-tab-background: <<colour background>>
-sidebar-tab-border-selected: <<colour background>>
-sidebar-tab-border: <<colour background>>
-sidebar-tab-divider: <<colour background>>
-sidebar-tab-foreground-selected: rgba(255, 255, 255, 0.87)
-sidebar-tab-foreground: rgba(255, 255, 255, 0.54)
-sidebar-tiddler-link-foreground-hover: rgba(255, 255, 255, 0.7)
-sidebar-tiddler-link-foreground: rgba(255, 255, 255, 0.54)
-site-title-foreground: #ffffff
-static-alert-foreground: #B4B4B4
-tab-background-selected: #3F638B
-tab-background: <<colour page-background>>
-tab-border-selected: <<colour page-background>>
-tab-border: <<colour page-background>>
-tab-divider: <<colour page-background>>
-tab-foreground-selected: rgba(255, 255, 255, 0.87)
-tab-foreground: rgba(255, 255, 255, 0.54)
-table-border: #464646
-table-footer-background: <<colour tiddler-editor-fields-odd>>
-table-header-background: <<colour tiddler-editor-fields-even>>
-tag-background: #48484A
-tag-foreground: #323232
-tiddler-background: <<colour background>>
-tiddler-border: transparent
-tiddler-controls-foreground-hover: <<colour sidebar-controls-foreground-hover>>
-tiddler-controls-foreground-selected: <<colour sidebar-controls-foreground-hover>>
-tiddler-controls-foreground: #48484A
-tiddler-editor-background: transparent
-tiddler-editor-border-image: 
-tiddler-editor-border: rgba(255, 255, 255, 0.08)
-tiddler-editor-fields-even: rgba(255, 255, 255, 0.1)
-tiddler-editor-fields-odd: rgba(255, 255, 255, 0.04)
-tiddler-info-background: #1E1E1E
-tiddler-info-border: #1E1E1E
-tiddler-info-tab-background: #3F638B
-tiddler-link-background: <<colour background>>
-tiddler-link-foreground: <<colour primary>>
-tiddler-subtitle-foreground: <<colour muted-foreground>>
-tiddler-title-foreground: #FFFFFF
-toolbar-new-button: 
-toolbar-options-button: 
-toolbar-save-button: 
-toolbar-info-button: 
-toolbar-edit-button: 
-toolbar-close-button: 
-toolbar-delete-button: 
-toolbar-cancel-button: 
-toolbar-done-button: 
-untagged-background: <<colour very-muted-foreground>>
-very-muted-foreground: #464646
-selection-background: #3F638B
-selection-foreground: #ffffff
-wikilist-background: <<colour page-background>>
-wikilist-button-background: #3F638B
-wikilist-button-foreground: <<colour foreground>>
-wikilist-button-open: #32D74B
-wikilist-button-open-hover: #32D74B
-wikilist-button-reveal: #0A84FF
-wikilist-button-reveal-hover: #0A84FF
-wikilist-button-remove: #FF453A
-wikilist-button-remove-hover: #FF453A
-wikilist-droplink-dragover: #32D74B
-wikilist-item: <<colour background>>
-wikilist-toolbar-background: <<colour background>>
-wikilist-title: <<colour foreground>>
-wikilist-title-svg: <<colour foreground>>
-wikilist-toolbar-foreground: <<colour foreground>>
-wikilist-url: <<colour muted-foreground>>

core/palettes/DesertSand.tid

@@ -1,138 +0,0 @@
-title: $:/palettes/DesertSand
-tags: $:/tags/Palette
-name: Desert Sand
-description: A desert sand palette
-type: application/x-tiddler-dictionary
-
-alert-background: #ffe476
-alert-border: #b99e2f
-alert-highlight: #881122
-alert-muted-foreground: #b99e2f
-background: #E9E0C7
-blockquote-bar: <<colour muted-foreground>>
-button-foreground: <<colour foreground>>
-code-background: #F3EDDF
-code-border: #C3BAA1
-code-foreground: #ab3250
-diff-delete-background: #bd8b8b
-diff-delete-foreground: <<colour foreground>>
-diff-equal-background: 
-diff-equal-foreground: <<colour foreground>>
-diff-insert-background: #91c093
-diff-insert-foreground: <<colour foreground>>
-diff-invisible-background: 
-diff-invisible-foreground: <<colour muted-foreground>>
-dirty-indicator: #ad3434
-download-background: #6ca16c
-download-foreground: <<colour background>>
-dragger-background: <<colour foreground>>
-dragger-foreground: <<colour background>>
-dropdown-background: <<colour background>>
-dropdown-border: <<colour muted-foreground>>
-dropdown-tab-background-selected: #E9E0C7
-dropdown-tab-background: #BAB29C
-dropzone-background: rgba(0,200,0,0.7)
-external-link-background-hover: inherit
-external-link-background-visited: inherit
-external-link-background: inherit
-external-link-foreground-hover: inherit
-external-link-foreground-visited: #313163
-external-link-foreground: #555592
-foreground: #2D2A23
-menubar-background: #CDC2A6
-menubar-foreground: #5A5446
-message-background: #ECE5CF
-message-border: #D6CBAA
-message-foreground: #5f6e7d
-modal-backdrop: <<colour foreground>>
-modal-background: <<colour background>>
-modal-border: #8A8885
-modal-footer-background: #CDC2A6
-modal-footer-border: #9D998E
-modal-header-border: #9D998E
-muted-foreground: #9D998E
-notification-background: #F0E9D7
-notification-border: #939189
-page-background: #e0d3af
-pre-background: #D6CBAA
-pre-border: #CDC2A6
-primary: #5B6F55
-selection-background: #9D947B
-selection-foreground: <<colour foreground>>
-select-tag-background: #F0E9D7
-select-tag-foreground: #2D2A23
-sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: #2D2A23
-sidebar-controls-foreground: #867F69
-sidebar-foreground-shadow: transparent
-sidebar-foreground: #867F69
-sidebar-muted-foreground-hover: #706A58
-sidebar-muted-foreground: #B3A98C
-sidebar-tab-background-selected: #e0d3af
-sidebar-tab-background: #A6A193
-sidebar-tab-border-selected: #C3BAA1
-sidebar-tab-border: #C3BAA1
-sidebar-tab-divider: #CDC2A6
-sidebar-tab-foreground-selected: 
-sidebar-tab-foreground: #2D2A23
-sidebar-tiddler-link-foreground-hover: #433F35
-sidebar-tiddler-link-foreground: #706A58
-site-title-foreground: <<colour tiddler-title-foreground>>
-static-alert-foreground: #A6A193
-tab-background-selected: #E9E0C7
-tab-background: #A6A193
-tab-border-selected: #C3BAA1
-tab-border: #C3BAA1
-tab-divider: #CDC2A6
-tab-foreground-selected: <<colour tab-foreground>>
-tab-foreground: #2D2A23
-table-border: #9D998E
-table-footer-background: #8A8885
-table-header-background: #B0AA98
-tag-background: #706A58
-tag-foreground: #E3D7B7
-tiddler-background: <<colour background>>
-tiddler-border: <<colour background>>
-tiddler-controls-foreground-hover: #9D947B
-tiddler-controls-foreground-selected: #706A58
-tiddler-controls-foreground: #C3BAA1
-tiddler-editor-background: #E9E0C7
-tiddler-editor-border-image: #A6A193
-tiddler-editor-border: #A6A193
-tiddler-editor-fields-even: #D6CBAA
-tiddler-editor-fields-odd: #C3BAA1
-tiddler-info-background: #E3D7B7
-tiddler-info-border: #BAB29C
-tiddler-info-tab-background: #E9E0C7
-tiddler-link-background: <<colour background>>
-tiddler-link-foreground: <<colour primary>>
-tiddler-subtitle-foreground: #867F69
-tiddler-title-foreground: #374464
-toolbar-new-button: 
-toolbar-options-button: 
-toolbar-save-button: 
-toolbar-info-button: 
-toolbar-edit-button: 
-toolbar-close-button: 
-toolbar-delete-button: 
-toolbar-cancel-button: 
-toolbar-done-button: 
-untagged-background: #8A8885
-very-muted-foreground: #CDC2A6
-wikilist-background: <<colour page-background>>
-wikilist-item: #CDC2A6
-wikilist-info: #161512
-wikilist-title: #433F35
-wikilist-title-svg: <<colour wikilist-title>>
-wikilist-url: #706A58
-wikilist-button-open: #7db66a
-wikilist-button-open-hover: #56a556
-wikilist-button-reveal: #5a6c9e
-wikilist-button-reveal-hover: #454591
-wikilist-button-remove: #bc5972
-wikilist-button-remove-hover: #814040
-wikilist-toolbar-background: #CDC2A6
-wikilist-toolbar-foreground: #2D2A23
-wikilist-droplink-dragover: rgba(255,192,192,0.5)
-wikilist-button-background: #A6A193
-wikilist-button-foreground: #161512

core/palettes/GruvBoxDark.tid

@@ -11,7 +11,9 @@ alert-highlight: #d79921
 alert-muted-foreground: #504945
 background: #3c3836
 blockquote-bar: <<colour muted-foreground>>
-button-foreground: <<colour page-background>>
+button-background: #504945
+button-foreground: #fbf1c7
+button-border: transparent
 code-background: #504945
 code-border: #504945
 code-foreground: #fb4934
@@ -60,9 +62,7 @@ pre-border: #504945
 primary: #d79921
 select-tag-background: #665c54
 select-tag-foreground: <<colour foreground>>
-selection-background: #458588
-selection-foreground: <<colour foreground>>
-sidebar-button-foreground: <<colour page-background>>
+sidebar-button-foreground: <<colour foreground>>
 sidebar-controls-foreground-hover: #7c6f64
 sidebar-controls-foreground: #504945
 sidebar-foreground-shadow: transparent
@@ -97,7 +97,7 @@ tiddler-border: <<colour background>>
 tiddler-controls-foreground-hover: #7c6f64
 tiddler-controls-foreground-selected: <<colour primary>>
 tiddler-controls-foreground: #665c54
-tiddler-editor-background: #32302f
+tiddler-editor-background: #282828
 tiddler-editor-border-image: #282828
 tiddler-editor-border: #282828
 tiddler-editor-fields-even: #504945
@@ -121,7 +121,7 @@ toolbar-done-button:
 untagged-background: #504945
 very-muted-foreground: #bdae93
 wikilist-background: <<colour page-background>>
-wikilist-button-background: #acacac
+wikilist-button-background: <<colour button-background>>
 wikilist-button-foreground: <<colour button-foreground>>
 wikilist-item: <<colour background>>
 wikilist-toolbar-background: <<colour background>>

core/palettes/Nord.tid

@@ -11,7 +11,9 @@ alert-highlight: #B48EAD
 alert-muted-foreground: #4C566A
 background: #3b4252
 blockquote-bar: <<colour muted-foreground>>
-button-foreground: <<colour page-background>>
+button-background: #4C566A
+button-foreground: #D8DEE9
+button-border: transparent
 code-background: #2E3440
 code-border: #2E3440
 code-foreground: #BF616A
@@ -60,9 +62,7 @@ pre-border: #2E3440
 primary: #5E81AC
 select-tag-background: #3b4252
 select-tag-foreground: <<colour foreground>>
-selection-background: #5E81AC
-selection-foreground: <<colour foreground>>
-sidebar-button-foreground: <<colour page-background>>
+sidebar-button-foreground: <<colour foreground>>
 sidebar-controls-foreground-hover: #D8DEE9
 sidebar-controls-foreground: #4C566A
 sidebar-foreground-shadow: transparent
@@ -99,7 +99,7 @@ tiddler-controls-foreground-selected: #EBCB8B
 tiddler-controls-foreground: #4C566A
 tiddler-editor-background: #2e3440
 tiddler-editor-border-image: #2e3440
-tiddler-editor-border: #3b4252
+tiddler-editor-border: #2e3440
 tiddler-editor-fields-even: #2e3440
 tiddler-editor-fields-odd: #2e3440
 tiddler-info-background: #2e3440
@@ -120,14 +120,3 @@ toolbar-cancel-button:
 toolbar-done-button: 
 untagged-background: #2d3038
 very-muted-foreground: #2d3038
-wikilist-background: <<colour page-background>>
-wikilist-toolbar-background: <<colour background>>
-wikilist-item: <<colour background>>
-wikilist-title: <<colour foreground>>
-wikilist-info: <<colour muted-foreground>>
-wikilist-button-open: #A3BE8C
-wikilist-button-open-hover: #A3BE8C
-wikilist-button-reveal: #81A1C1
-wikilist-button-reveal-hover: #81A1C1
-wikilist-button-remove: #B48EAD
-wikilist-button-remove-hover: #B48EAD

core/templates/exporters/StaticRiver.tid

@@ -26,7 +26,7 @@ extension: .html
 </head>
 <body class="tc-body">
 {{$:/StaticBanner||$:/core/templates/html-tiddler}}
-<section class="tc-story-river tc-static-story-river">
+<section class="tc-story-river">
 {{$:/core/templates/exporters/StaticRiver/Content||$:/core/templates/html-tiddler}}
 </section>
 </body>

core/templates/exporters/TidFile.tid

@@ -2,7 +2,6 @@ title: $:/core/templates/exporters/TidFile
 tags: $:/tags/Exporter
 description: {{$:/language/Exporters/TidFile}}
 extension: .tid
-condition: [<count>compare:lte[1]]
 
 \define renderContent()
 {{{ $(exportFilter)$ +[limit[1]] ||$:/core/templates/tid-tiddler}}}

core/templates/external-js/save-all-external-js.tid

@@ -2,6 +2,6 @@ title: $:/core/save/all-external-js
 
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/core]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end
 {{$:/core/templates/tiddlywiki5-external-js.html}}

core/templates/save-all.tid

@@ -2,6 +2,6 @@ title: $:/core/save/all
 
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end
 {{$:/core/templates/tiddlywiki5.html}}

core/templates/static.tiddler.html.tid

@@ -22,9 +22,9 @@ title: $:/core/templates/static.tiddler.html
 </head>
 <body class="tc-body">
 `{{$:/StaticBanner||$:/core/templates/html-tiddler}}`
-<section class="tc-story-river tc-static-story-river">
+<section class="tc-story-river">
 `<$view tiddler="$:/core/ui/ViewTemplate" format="htmlwikified"/>`
 </section>
 </body>
 </html>
-`
+`

core/ui/Actions/new-image.tid

@@ -5,7 +5,6 @@ description: create a new image tiddler
 \define get-type()
 image/$(imageType)$
 \end
-\define get-tags() $(textFieldTags)$ $(tagsFieldTags)$
-<$vars imageType={{$:/config/NewImageType}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}}>
-<$action-sendmessage $message="tm-new-tiddler" type=<<get-type>> tags=<<get-tags>>/>
+<$vars imageType={{$:/config/NewImageType}}>
+<$action-sendmessage $message="tm-new-tiddler" type=<<get-type>> tags={{$:/config/NewTiddler/Tags}}/>
 </$vars>

core/ui/Actions/new-journal.tid

@@ -2,14 +2,13 @@ title: $:/core/ui/Actions/new-journal
 tags: $:/tags/Actions
 description: create a new journal tiddler
 
-\define get-tags() $(textFieldTags)$ $(tagsFieldTags)$
-<$vars journalTitleTemplate={{$:/config/NewJournal/Title}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}>
+<$vars journalTitleTemplate={{$:/config/NewJournal/Title}} journalTags={{$:/config/NewJournal/Tags}} journalText={{$:/config/NewJournal/Text}}>
 <$wikify name="journalTitle" text="""<$macrocall $name="now" format=<<journalTitleTemplate>>/>""">
 <$reveal type="nomatch" state=<<journalTitle>> text="">
-<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<get-tags>> text={{{ [<journalTitle>get[]] }}}/>
+<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<journalTags>> text={{{ [<journalTitle>get[]] }}}/>
 </$reveal>
 <$reveal type="match" state=<<journalTitle>> text="">
-<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<get-tags>> text=<<journalText>>/>
+<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<journalTags>> text=<<journalText>>/>
 </$reveal>
 </$wikify>
 </$vars>

core/ui/Actions/new-tiddler.tid

@@ -2,7 +2,4 @@ title: $:/core/ui/Actions/new-tiddler
 tags: $:/tags/Actions
 description: create a new empty tiddler
 
-\define get-tags() $(textFieldTags)$ $(tagsFieldTags)$
-<$vars textFieldTags={{$:/config/NewTiddler/Tags}} tagsFieldTags={{$:/config/NewTiddler/Tags!!tags}}>
-<$action-sendmessage $message="tm-new-tiddler" tags=<<get-tags>>/>
-</$vars>
+<$action-sendmessage $message="tm-new-tiddler" tags={{$:/config/NewTiddler/Tags}}/>

core/ui/AdvancedSearch.tid

@@ -3,5 +3,5 @@ icon: $:/core/images/advanced-search-button
 color: #bbb
 
 <div class="tc-advanced-search">
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch]!has[draft.of]]" default="$:/core/ui/AdvancedSearch/System" actions="""<$action-setfield $tiddler="$:/state/advancedsearch/currentTab" text=<<currentTab>>/>""" explicitState="$:/state/tab--1498284803"/>
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch]!has[draft.of]]" "$:/core/ui/AdvancedSearch/System">>
 </div>

core/ui/AdvancedSearch/Filter.tid

@@ -3,26 +3,10 @@ tags: $:/tags/AdvancedSearch
 caption: {{$:/language/Search/Filter/Caption}}
 
 \define lingo-base() $:/language/Search/
-\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" beforeafter="$beforeafter$" defaultState="$:/core/ui/AdvancedSearch/System" actions="""<$action-setfield $tiddler="$:/state/advancedsearch/currentTab" text=<<nextTab>>/>"""/>
-
-\define cancel-search-actions() <$list filter="[{$:/temp/advancedsearch/input}!match{$:/temp/advancedsearch}]" emptyMessage="""<$action-deletetiddler $filter="[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]" />"""><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/></$list>
-
-\define input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>"""><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>
-
-\define input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>"""><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>
-
 <<lingo Filter/Hint>>
 
 <div class="tc-search tc-advanced-search">
-<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
-<$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
-<$macrocall $name="keyboard-driven-input" tiddler="$:/temp/advancedsearch/input" storeTitle="$:/temp/advancedsearch" 
-		refreshTitle="$:/temp/advancedsearch/refresh" selectionStateTitle="$:/temp/advancedsearch/selected-item" type="search" 
-		tag="input" focus={{$:/config/Search/AutoFocus}} configTiddlerFilter="[[$:/temp/advancedsearch]]" firstSearchFilterField="text" 
-		inputAcceptActions=<<input-accept-actions>> inputAcceptVariantActions=<<input-accept-variant-actions>> 
-		inputCancelActions=<<cancel-search-actions>>/>
-</$keyboard>
-</$keyboard>
+<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input" focus={{$:/config/Search/AutoFocus}}/>
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch/FilterButton]!has[draft.of]]"><$transclude/></$list>
 </div>
 
@@ -30,11 +14,7 @@ caption: {{$:/language/Search/Filter/Caption}}
 <$set name="resultCount" value="""<$count filter={{$:/temp/advancedsearch}}/>""">
 <div class="tc-search-results">
 <<lingo Filter/Matches>>
-<$list filter={{$:/temp/advancedsearch}}>
-<span class={{{[<currentTiddler>addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] +[then[]else[tc-list-item-selected]] }}}>
-<$transclude tiddler="$:/core/ui/ListItemTemplate"/>
-</span>
-</$list>
+<$list filter={{$:/temp/advancedsearch}} template="$:/core/ui/ListItemTemplate"/>
 </div>
 </$set>
 </$reveal>

core/ui/AdvancedSearch/FilterButtons/clear.tid

@@ -3,8 +3,7 @@ tags: $:/tags/AdvancedSearch/FilterButton
 
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button class="tc-btn-invisible">
-<<cancel-search-actions>>
-<$action-sendmessage $message="tm-focus-selector" $param=""".tc-advanced-search input""" />
+<$action-setfield $tiddler="$:/temp/advancedsearch" $field="text" $value=""/>
 {{$:/core/images/close-button}}
 </$button>
 </$reveal>

core/ui/AdvancedSearch/FilterButtons/dropdown.tid

@@ -9,7 +9,7 @@ tags: $:/tags/AdvancedSearch/FilterButton
 
 <$reveal state=<<qualify "$:/state/filterDropdown">> type="popup" position="belowleft" animate="yes">
 <$set name="tv-show-missing-links" value="yes">
-<$linkcatcher actions="""<$action-setfield $tiddler="$:/temp/advancedsearch" text=<<navigateTo>>/><$action-setfield $tiddler="$:/temp/advancedsearch/input" text=<<navigateTo>>/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/><$action-sendmessage $message="tm-focus-selector" $param='.tc-advanced-search input' />""">
+<$linkcatcher to="$:/temp/advancedsearch">
 <div class="tc-block-dropdown-wrapper">
 <div class="tc-block-dropdown tc-edit-type-dropdown">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]]"><$link to={{!!filter}}><$transclude field="description"/></$link>

core/ui/AdvancedSearch/Shadows.tid

@@ -1,53 +1,35 @@
 title: $:/core/ui/AdvancedSearch/Shadows
 tags: $:/tags/AdvancedSearch
 caption: {{$:/language/Search/Shadows/Caption}}
-first-search-filter: [all[shadows]search<userInput>sort[title]limit[250]] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]]
 
 \define lingo-base() $:/language/Search/
-
-\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" beforeafter="$beforeafter$" defaultState="$:/core/ui/AdvancedSearch/System" actions="""<$action-setfield $tiddler="$:/state/advancedsearch/currentTab" text=<<nextTab>>/>"""/>
-
-\define cancel-search-actions() <$list filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]" emptyMessage="""<$action-deletetiddler $filter="[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]" />"""><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/></$list><$action-sendmessage $message="tm-focus-selector" $param=""".tc-advanced-search input"""/>
-
-\define input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>"""><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>
-
-\define input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>"""><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>
+<$linkcatcher to="$:/temp/advancedsearch">
 
 <<lingo Shadows/Hint>>
 
 <div class="tc-search">
-<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
-<$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
-<$macrocall $name="keyboard-driven-input" tiddler="$:/temp/advancedsearch/input" storeTitle="$:/temp/advancedsearch"
-		refreshTitle="$:/temp/advancedsearch/refresh" selectionStateTitle="$:/temp/advancedsearch/selected-item" type="search"
-		tag="input" focus={{$:/config/Search/AutoFocus}} configTiddlerFilter="[[$:/core/ui/AdvancedSearch/Shadows]]"
-		inputCancelActions=<<cancel-search-actions>> inputAcceptActions=<<input-accept-actions>> 
-		inputAcceptVariantActions=<<input-accept-variant-actions>>  filterMinLength={{$:/config/Search/MinLength}}/>
-</$keyboard>
-</$keyboard>
+<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input" focus={{$:/config/Search/AutoFocus}}/>
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button class="tc-btn-invisible">
-<<cancel-search-actions>>
+<$action-setfield $tiddler="$:/temp/advancedsearch" $field="text" $value=""/>
 {{$:/core/images/close-button}}
 </$button>
 </$reveal>
 </div>
 
+</$linkcatcher>
+
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 
 <$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
 
-<$set name="resultCount" value="""<$count filter="[all[shadows]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]]"/>""">
+<$set name="resultCount" value="""<$count filter="[all[shadows]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]]"/>""">
 
 <div class="tc-search-results">
 
 <<lingo Shadows/Matches>>
 
-<$list filter="[all[shadows]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]]">
-<span class={{{[<currentTiddler>addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] +[then[]else[tc-list-item-selected]] }}}>
-<$transclude tiddler="$:/core/ui/ListItemTemplate"/>
-</span>
-</$list>
+<$list filter="[all[shadows]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]]" template="$:/core/ui/ListItemTemplate"/>
 
 </div>
 

core/ui/AdvancedSearch/Standard.tid

@@ -3,51 +3,32 @@ tags: $:/tags/AdvancedSearch
 caption: {{$:/language/Search/Standard/Caption}}
 
 \define lingo-base() $:/language/Search/
-\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" beforeafter="$beforeafter$" defaultState="$:/core/ui/AdvancedSearch/System" actions="""<$action-setfield $tiddler="$:/state/advancedsearch/currentTab" text=<<nextTab>>/>"""/>
-
-\define next-search-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/advancedsearch" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/advancedsearch/standard/currentTab" text=<<nextTab>>/>"""/>
-
-\define cancel-search-actions() <$list filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]" emptyMessage="""<$action-deletetiddler $filter="[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]" />"""><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/></$list><$action-sendmessage $message="tm-focus-selector" $param=""".tc-advanced-search input"""/>
-
-\define input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>"""><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>
-
-\define input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>"""><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>
+<$linkcatcher to="$:/temp/advancedsearch">
 
 <<lingo Standard/Hint>>
 
 <div class="tc-search">
-<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
-<$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
-<$keyboard key="shift-alt-Right" actions=<<next-search-tab>>>
-<$keyboard key="shift-alt-Left" actions=<<next-search-tab "before">>>
-<$macrocall $name="keyboard-driven-input" tiddler="$:/temp/advancedsearch/input" storeTitle="$:/temp/advancedsearch"
-		refreshTitle="$:/temp/advancedsearch/refresh" selectionStateTitle="$:/temp/advancedsearch/selected-item" type="search"
-		tag="input" focus={{$:/config/Search/AutoFocus}} inputCancelActions=<<cancel-search-actions>> 
-		inputAcceptActions=<<input-accept-actions>> inputAcceptVariantActions=<<input-accept-variant-actions>> 
-		configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]"
-		filterMinLength={{$:/config/Search/MinLength}}/>
-</$keyboard>
-</$keyboard>
-</$keyboard>
-</$keyboard>
+<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input" focus={{$:/config/Search/AutoFocus}}/>
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button class="tc-btn-invisible">
-<<cancel-search-actions>>
+<$action-setfield $tiddler="$:/temp/advancedsearch" $field="text" $value=""/>
 {{$:/core/images/close-button}}
 </$button>
 </$reveal>
 </div>
 
+</$linkcatcher>
+
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
-<$vars userInput={{{ [[$:/temp/advancedsearch]get[text]] }}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}} searchListState="$:/temp/advancedsearch/selected-item">
+<$set name="searchTiddler" value="$:/temp/advancedsearch">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]" emptyMessage="""
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]">
 <$transclude/>
 </$list>
 """>
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]" default={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/advancedsearch/standard/currentTab" text=<<currentTab>>/>""" explicitState="$:/state/tab/search-results/advancedsearch" />
+<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]" default={{$:/config/SearchResults/Default}}/>
 </$list>
-</$vars>
+</$set>
 </$list>
 </$reveal>

core/ui/AdvancedSearch/System.tid

@@ -1,52 +1,35 @@
 title: $:/core/ui/AdvancedSearch/System
 tags: $:/tags/AdvancedSearch
 caption: {{$:/language/Search/System/Caption}}
-first-search-filter: [is[system]search<userInput>sort[title]limit[250]] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]]
 
 \define lingo-base() $:/language/Search/
-\define set-next-input-tab(beforeafter:"after",stateTitle,tag,defaultState,currentTabTiddler) <$macrocall $name="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" beforeafter="$beforeafter$" defaultState="$:/core/ui/AdvancedSearch/System" actions="""<$action-setfield $tiddler="$:/state/advancedsearch/currentTab" text=<<nextTab>>/>"""/>
-
-\define cancel-search-actions() <$list filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]" emptyMessage="""<$action-deletetiddler $filter="[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]" />"""><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/></$list><$action-sendmessage $message="tm-focus-selector" $param=""".tc-advanced-search input"""/>
-
-\define input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>"""><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>
-
-\define input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>"""><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>
+<$linkcatcher to="$:/temp/advancedsearch">
 
 <<lingo System/Hint>>
 
 <div class="tc-search">
-<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
-<$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
-<$macrocall $name="keyboard-driven-input" tiddler="$:/temp/advancedsearch/input" storeTitle="$:/temp/advancedsearch"
-		refreshTitle="$:/temp/advancedsearch/refresh" selectionStateTitle="$:/temp/advancedsearch/selected-item"
-		type="search" tag="input" focus={{$:/config/Search/AutoFocus}} configTiddlerFilter="[[$:/core/ui/AdvancedSearch/System]]"
-		inputCancelActions=<<cancel-search-actions>> inputAcceptActions=<<input-accept-actions>> 
-		inputAcceptVariantActions=<<input-accept-variant-actions>> filterMinLength={{$:/config/Search/MinLength}}/>
-</$keyboard>
-</$keyboard>
+<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input" focus={{$:/config/Search/AutoFocus}}/>
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button class="tc-btn-invisible">
-<<cancel-search-actions>>
+<$action-setfield $tiddler="$:/temp/advancedsearch" $field="text" $value=""/>
 {{$:/core/images/close-button}}
 </$button>
 </$reveal>
 </div>
 
+</$linkcatcher>
+
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 
 <$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
 
-<$set name="resultCount" value="""<$count filter="[is[system]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]]"/>""">
+<$set name="resultCount" value="""<$count filter="[is[system]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]]"/>""">
 
 <div class="tc-search-results">
 
 <<lingo System/Matches>>
 
-<$list filter="[is[system]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]]">
-<span class={{{[<currentTiddler>addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] +[then[]else[tc-list-item-selected]] }}}>
-<$transclude tiddler="$:/core/ui/ListItemTemplate"/>
-</span>
-</$list>
+<$list filter="[is[system]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]]" template="$:/core/ui/ListItemTemplate"/>
 
 </div>
 

core/ui/ControlPanel.tid

@@ -3,5 +3,5 @@ icon: $:/core/images/options-button
 color: #bbb
 
 <div class="tc-control-panel">
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel]!has[draft.of]]" default="$:/core/ui/ControlPanel/Info" explicitState="$:/state/tab-1749438307"/>
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel]!has[draft.of]]" "$:/core/ui/ControlPanel/Info">>
 </div>

core/ui/ControlPanel/Advanced.tid

@@ -5,5 +5,5 @@ caption: {{$:/language/ControlPanel/Advanced/Caption}}
 {{$:/language/ControlPanel/Advanced/Hint}}
 
 <div class="tc-control-panel">
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Advanced]!has[draft.of]]" default="$:/core/ui/ControlPanel/TiddlerFields" explicitState="$:/state/tab--959111941"/>
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Advanced]!has[draft.of]]" "$:/core/ui/ControlPanel/TiddlerFields">>
 </div>

core/ui/ControlPanel/Appearance.tid

@@ -5,5 +5,5 @@ caption: {{$:/language/ControlPanel/Appearance/Caption}}
 {{$:/language/ControlPanel/Appearance/Hint}}
 
 <div class="tc-control-panel">
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance]!has[draft.of]]" default="$:/core/ui/ControlPanel/Theme" explicitState="$:/state/tab--1963855381"/>
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance]!has[draft.of]]" "$:/core/ui/ControlPanel/Theme">>
 </div>

core/ui/ControlPanel/Basics.tid

@@ -7,11 +7,8 @@ caption: {{$:/language/ControlPanel/Basics/Caption}}
 \define show-filter-count(filter)
 <$button class="tc-btn-invisible">
 <$action-setfield $tiddler="$:/temp/advancedsearch" $value="""$filter$"""/>
-<$action-setfield $tiddler="$:/temp/advancedsearch/input" $value="""$filter$"""/>
-<$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/>
 <$action-setfield $tiddler="$:/state/tab--1498284803" $value="$:/core/ui/AdvancedSearch/Filter"/>
 <$action-navigate $to="$:/AdvancedSearch"/>
-<$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/>
 ''<$count filter="""$filter$"""/>''
 {{$:/core/images/advanced-search-button}}
 </$button>
@@ -26,8 +23,8 @@ caption: {{$:/language/ControlPanel/Basics/Caption}}
 |<$link to="$:/language/DefaultNewTiddlerTitle"><<lingo NewTiddler/Title/Prompt>></$link> |<$edit-text tiddler="$:/language/DefaultNewTiddlerTitle" default="" tag="input"/> |
 |<$link to="$:/config/NewJournal/Title"><<lingo NewJournal/Title/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Title" default="" tag="input"/> |
 |<$link to="$:/config/NewJournal/Text"><<lingo NewJournal/Text/Prompt>></$link> |<$edit tiddler="$:/config/NewJournal/Text" tag="textarea" class="tc-edit-texteditor" default=""/> |
-|<$link to="$:/config/NewTiddler/Tags"><<lingo NewTiddler/Tags/Prompt>></$link> |<$vars currentTiddler="$:/config/NewTiddler/Tags" tagField="text">{{||$:/core/ui/EditTemplate/tags}}<$list filter="[<currentTiddler>tags[]] +[limit[1]]" variable="ignore"><$button tooltip={{$:/language/ControlPanel/Basics/RemoveTags/Hint}}><<lingo RemoveTags>><$action-listops $tiddler=<<currentTiddler>> $field="text" $subfilter={{{ [<currentTiddler>get[tags]] }}}/><$action-setfield $tiddler=<<currentTiddler>> tags=""/></$button></$list></$vars> |
-|<$link to="$:/config/NewJournal/Tags"><<lingo NewJournal/Tags/Prompt>></$link> |<$vars currentTiddler="$:/config/NewJournal/Tags" tagField="text">{{||$:/core/ui/EditTemplate/tags}}<$list filter="[<currentTiddler>tags[]] +[limit[1]]" variable="ignore"><$button tooltip={{$:/language/ControlPanel/Basics/RemoveTags/Hint}}><<lingo RemoveTags>><$action-listops $tiddler=<<currentTiddler>> $field="text" $subfilter={{{ [<currentTiddler>get[tags]] }}}/><$action-setfield $tiddler=<<currentTiddler>> tags=""/></$button></$list></$vars> |
+|<$link to="$:/config/NewTiddler/Tags"><<lingo NewTiddler/Tags/Prompt>></$link> |<$edit-text tiddler="$:/config/NewTiddler/Tags" tag="input" default=""/> |
+|<$link to="$:/config/NewJournal/Tags"><<lingo NewJournal/Tags/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Tags" tag="input" default=""/> |
 |<$link to="$:/config/AutoFocus"><<lingo AutoFocus/Prompt>></$link> |{{$:/snippets/minifocusswitcher}} |
 |<<lingo Language/Prompt>> |{{$:/snippets/minilanguageswitcher}} |
 |<<lingo Tiddlers/Prompt>> |<<show-filter-count "[!is[system]sort[title]]">> |

core/ui/ControlPanel/Info.tid

@@ -5,5 +5,5 @@ caption: {{$:/language/ControlPanel/Info/Caption}}
 {{$:/language/ControlPanel/Info/Hint}}
 
 <div class="tc-control-panel">
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Info]!has[draft.of]]" default="$:/core/ui/ControlPanel/Basics" explicitState="$:/state/tab--2112689675"/>
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Info]!has[draft.of]]" "$:/core/ui/ControlPanel/Basics">>
 </div>