Merge branch 'master' into social-media-cards

Thanks @simonbaird

.eslintignore

@@ -0,0 +1,8 @@
+# Ignore "third party" code whose style we will not change.
+/boot/sjcl.js
+/core/modules/utils/base64-utf8/base64-utf8.module.js
+/core/modules/utils/base64-utf8/base64-utf8.module.min.js
+/core/modules/utils/diff-match-patch/diff_match_patch.js
+/core/modules/utils/diff-match-patch/diff_match_patch_uncompressed.js
+/core/modules/utils/dom/csscolorparser.js
+/plugins/tiddlywiki/*/files/

.eslintrc.yml

@@ -0,0 +1,286 @@
+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:
+    - error
+    - before: true
+      after: false
+      overrides:
+        'case':
+          after: true
+        'do':
+          'after': true
+        'else':
+          after: true
+        'return':
+          after: true
+        'throw':
+          after: true
+        'try':
+          after: true
+  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:
+    - error
+    - double
+    - avoidEscape: true
+  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

@@ -5,17 +5,17 @@ on:
       - master
       - tiddlywiki-com
 env:
-  NODE_VERSION: "22"
+  NODE_VERSION: "18"
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
         with:
           node-version: "${{ env.NODE_VERSION }}"
       - run: "./bin/ci-test.sh"
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: playwright-report
@@ -30,8 +30,8 @@ jobs:
       TW5_BUILD_MAIN_EDITION: "./editions/prerelease"
       TW5_BUILD_OUTPUT: "./output/prerelease"
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
         with:
           node-version: "${{ env.NODE_VERSION }}"
       - run: "./bin/ci-pre-build.sh"
@@ -62,8 +62,8 @@ jobs:
       TW5_BUILD_OUTPUT: "./output"
       TW5_BUILD_ARCHIVE: "./output"
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
         with:
           node-version: "${{ env.NODE_VERSION }}"
       - run: "./bin/ci-pre-build.sh"

.github/workflows/cla-check.yml

@@ -14,7 +14,7 @@ jobs:
     if: ${{ (github.event.pull_request.user.login != github.repository_owner) }}
     steps:
     - run: |
-        if ! curl -s https://raw.githubusercontent.com/Jermolene/TiddlyWiki5/tiddlywiki-com/licenses/cla-individual.md | grep -io "@$USER,"; then
+        if ! curl -s https://raw.githubusercontent.com/Jermolene/TiddlyWiki5/tiddlywiki-com/licenses/cla-individual.md | grep -o "@$USER,"; then
           echo "CLA not signed"
           gh pr comment "$NUMBER" -b "@$USER It appears that this is your first contribution to the project, welcome.
           

.github/workflows/cla-signed.yml

@@ -23,8 +23,8 @@ jobs:
       pull-requests: write
     steps:
     - run: |
-        if [[ "$BRANCH" != "tiddlywiki-com" ]]; then
-          echo "This CLA signature targets the wrong branch: $BRANCH"
+        if ! $BRANCH == "tiddlywiki-com"; then
+          echo "This CLA signature targets the wrong branch"
           gh pr comment "$NUMBER" -b "@$AUTHOR Signatures to the CLA must target the 'tiddlywiki-com' branch."
         fi
       env:

bin/build-site.sh

@@ -5,7 +5,7 @@
 # Default to the current version number for building the plugin library
 
 if [  -z "$TW5_BUILD_VERSION" ]; then
-    TW5_BUILD_VERSION=v5.3.7
+    TW5_BUILD_VERSION=v5.3.6
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -97,6 +97,7 @@ if [ -n "$TW5_BUILD_ARCHIVE" ]; then
 
 node $TW5_BUILD_TIDDLYWIKI \
 	$TW5_BUILD_MAIN_EDITION \
+	--verbose \
 	--version \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_ARCHIVE \
@@ -105,34 +106,21 @@ node $TW5_BUILD_TIDDLYWIKI \
 fi
 
 # /index.html			Main site
-# /external-(version).html External core version of main site
 # /favicon.ico			Favicon for main site
-
-node $TW5_BUILD_TIDDLYWIKI \
-	$TW5_BUILD_MAIN_EDITION \
-	--version \
-	--load $TW5_BUILD_OUTPUT/build.tid \
-	--output $TW5_BUILD_OUTPUT \
-	--build favicon index external-js \
-	|| exit 1
-
 # /static.html			Static rendering of default tiddlers
 # /alltiddlers.html		Static rendering of all tiddlers
 # /static/*				Static single tiddlers
 # /static/static.css	Static stylesheet
 # /static/favicon.ico	Favicon for static pages
 
-# Conditionally build static files if $TW5_BUILD_STATIC variable is not set or is set to 0
-if [ -z "$TW5_BUILD_STATIC" ] || [ "$TW5_BUILD_STATIC" = "0" ]; then
-
 node $TW5_BUILD_TIDDLYWIKI \
 	$TW5_BUILD_MAIN_EDITION \
+	--verbose \
 	--version \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--build static \
+	--build favicon static index \
 	|| exit 1
-fi
 
 # /empty.html					Empty
 # /empty.hta					For Internet Explorer
@@ -140,6 +128,7 @@ fi
 # /tiddlywikicore-<version>.js	Core plugin javascript
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/empty \
+	--verbose \
 	--output $TW5_BUILD_OUTPUT \
 	--build empty emptyexternalcore \
 	|| exit 1
@@ -148,6 +137,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /test.html			Test edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/test \
+	--verbose \
 	--output $TW5_BUILD_OUTPUT \
 	--rendertiddler $:/core/save/all test.html text/plain \
 	|| exit 1
@@ -160,6 +150,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /dev/static/static.css	Static stylesheet
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/dev \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/dev \
 	--build index favicon static \
@@ -168,13 +159,29 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /tour.html			tour edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/tour \
+	--verbose \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all-external-js tour.html text/plain \
+	--rendertiddler $:/core/save/all tour.html text/plain \
+	|| exit 1
+
+# /dev/index.html			Developer docs
+# /dev/favicon.ico			Favicon for dev site
+# /dev/static.html			Static rendering of default tiddlers
+# /dev/alltiddlers.html		Static rendering of all tiddlers
+# /dev/static/*				Static single tiddlers
+# /dev/static/static.css	Static stylesheet
+node $TW5_BUILD_TIDDLYWIKI \
+	./editions/dev \
+	--verbose \
+	--load $TW5_BUILD_OUTPUT/build.tid \
+	--output $TW5_BUILD_OUTPUT/dev \
+	--build index favicon static \
 	|| exit 1
 
 # /share.html				Custom edition for sharing via the URL
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/share \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--build share \
@@ -183,6 +190,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /upgrade.html				Custom edition for performing upgrades
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/upgrade \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--build upgrade \
@@ -191,6 +199,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /encrypted.html			Copy of the main file encrypted with the password "password"
 node $TW5_BUILD_TIDDLYWIKI \
 	$TW5_BUILD_MAIN_EDITION \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--build encrypted \
@@ -203,20 +212,19 @@ node $TW5_BUILD_TIDDLYWIKI \
 #
 ######################################################
 
-# Conditionally build editions if $TW5_BUILD_EDITIONS variable is not set or is set to 0
-if [ -z "$TW5_BUILD_EDITIONS" ] || [ "$TW5_BUILD_EDITIONS" = "0" ]; then
-
 # /editions/xlsx-utils/index.html	xlsx-utils edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/xlsx-utils \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/xlsx-utils/ \
-	--build external \
+	--build index \
 	|| exit 1
 
 # /editions/resumebuilder/index.html	Resume builder edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/resumebuilder \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/resumebuilder/ \
 	--build index \
@@ -225,14 +233,16 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /editions/text-slicer/index.html	Text slicer edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/text-slicer \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/text-slicer/ \
-	--build external \
+	--build index \
 	|| exit 1
 
 # /editions/translators/index.html	Translators edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/translators \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/translators/ \
 	--build index \
@@ -241,6 +251,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /editions/introduction/index.html	Introduction edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/introduction \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/introduction/ \
 	--build index \
@@ -249,6 +260,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /editions/full/index.html	Full edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/full \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/full/ \
 	--build index \
@@ -257,38 +269,35 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /editions/tw5.com-docs/index.html	tiddlywiki.com docs edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/tw5.com-docs \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/tw5.com-docs/ \
-	--build external \
+	--build index \
 	|| exit 1
 
 # /editions/twitter-archivist/index.html	Twitter Archivist edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/twitter-archivist \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/twitter-archivist/ \
 	--build index \
 	|| exit 1
 
-fi
-
-
 ######################################################
 #
 # Plugin demos
 #
 ######################################################
 
-# Conditionally build plugin demos if $TW5_BUILD_PLUGIN_DEMOS variable is not set
-if [ -z "$TW5_BUILD_PLUGIN_DEMOS" ] || [ "$TW5_BUILD_PLUGIN_DEMOS" = "0" ]; then
-
 # /plugins/tiddlywiki/innerwiki/index.html	Demo wiki with Innerwiki plugin
 
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/innerwikidemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/innerwiki/index.html text/plain \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/innerwiki/index.html text/plain \
 	|| exit 1
 
 # /plugins/tiddlywiki/dynaview/index.html	Demo wiki with DynaView plugin
@@ -296,9 +305,10 @@ node $TW5_BUILD_TIDDLYWIKI \
 
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/dynaviewdemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/dynaview/index.html text/plain \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/dynaview/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/dynaview/empty.html text/plain \
 	|| exit 1
 
@@ -310,9 +320,10 @@ node $TW5_BUILD_TIDDLYWIKI \
 
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/katexdemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/katex/index.html text/plain \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/katex/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/katex/empty.html text/plain \
 	|| exit 1
 
@@ -320,6 +331,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /plugins/tiddlywiki/tahoelafs/empty.html	Empty wiki with Tahoe-LAFS plugin
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/tahoelafs \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--rendertiddler $:/core/save/all plugins/tiddlywiki/tahoelafs/index.html text/plain \
@@ -330,6 +342,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /plugins/tiddlywiki/d3/empty.html	Empty wiki with D3 plugin
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/d3demo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--rendertiddler $:/core/save/all plugins/tiddlywiki/d3/index.html text/plain \
@@ -340,9 +353,10 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /plugins/tiddlywiki/codemirror/empty.html	Empty wiki with codemirror plugin
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/codemirrordemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/codemirror/index.html text/plain \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/codemirror/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/codemirror/empty.html text/plain \
 	|| exit 1
 
@@ -350,9 +364,10 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /plugins/tiddlywiki/markdown/empty.html		Empty wiki with Markdown plugin
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/markdowndemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/markdown/index.html text/plain \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/markdown/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/markdown/empty.html text/plain \
 	|| exit 1
 
@@ -360,9 +375,10 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /plugins/tiddlywiki/tw2parser/empty.html		Empty wiki with tw2parser plugin
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/classicparserdemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/tw2parser/index.html text/plain \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/tw2parser/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/tw2parser/empty.html text/plain \
 	|| exit 1
 
@@ -370,9 +386,10 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /plugins/tiddlywiki/highlight/empty.html		Empty wiki with highlight plugin
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/highlightdemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/highlight/index.html text/plain \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/highlight/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/highlight/empty.html text/plain \
 	|| exit 1
 
@@ -380,23 +397,19 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /plugins/tiddlywiki/geospatial/empty.html		Empty wiki with geospatial plugin
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/geospatialdemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/geospatial/index.html text/plain \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/geospatial/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/geospatial/empty.html text/plain \
 	|| exit 1
 
-fi
-
 ######################################################
 #
 # Language editions
 #
 ######################################################
 
-# Conditionally build language editions if $TW5_BUILD_LANGUAGE_DEMOS variable is not set
-if [ -z "$TW5_BUILD_LANGUAGE_DEMOS" ] || [ "$TW5_BUILD_LANGUAGE_DEMOS" = "0" ]; then
-
 # Delete any existing static content
 
 rm -rf $TW5_BUILD_OUTPUT/languages/de-AT/static/*
@@ -412,6 +425,7 @@ rm -rf $TW5_BUILD_OUTPUT/languages/zh-Hant/static/*
 # /languages/de-AT/empty.html		Empty wiki with de-AT language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/de-AT \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/de-AT \
 	--build favicon empty static index \
@@ -421,6 +435,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/de-DE/empty.html		Empty wiki with de-DE language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/de-DE \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/de-DE \
 	--build favicon empty static index \
@@ -430,6 +445,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/es-ES/empty.html		Empty wiki with es-ES language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/es-ES \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/es-ES \
 	--build favicon empty static index \
@@ -439,6 +455,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/fr-FR/empty.html		Empty wiki with fr-FR language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/fr-FR \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/fr-FR \
 	--build favicon empty static index \
@@ -448,6 +465,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/ja-JP/empty.html		Empty wiki with ja-JP language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/ja-JP \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/ja-JP \
 	--build empty index \
@@ -457,6 +475,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/ko-KR/empty.html		Empty wiki with ko-KR language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/ko-KR \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/ko-KR \
 	--build favicon empty static index \
@@ -466,6 +485,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/zh-Hans/empty.html		Empty wiki with zh-Hans language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/zh-Hans \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/zh-Hans \
 	--build empty index \
@@ -475,31 +495,26 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/zh-Hant/empty.html		Empty wiki with zh-Hant language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/zh-Hant \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/zh-Hant \
 	--build empty index \
 	|| exit 1
 
-fi
-
 ######################################################
 #
 # Plugin library
 #
 ######################################################
 
-# Conditionally build plugin library if $TW5_BUILD_PLUGIN_LIBRARY variable is not set
-if [ -z "$TW5_BUILD_PLUGIN_LIBRARY" ] || [ "$TW5_BUILD_PLUGIN_LIBRARY" = "0" ]; then
-
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/pluginlibrary \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/library/$TW5_BUILD_VERSION \
 	--build library\
 	|| exit 1
 
-fi
-
 # Delete the temporary build tiddler
 
 rm $TW5_BUILD_OUTPUT/build.tid || exit 1

bin/readme-bld.sh

@@ -15,11 +15,3 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--output . \
 	--build readmes \
 	|| exit 1
-
-# tw.org readmes
-node $TW5_BUILD_TIDDLYWIKI \
-	editions/tw.org \
-	--verbose \
-	--output . \
-	--build readmes \
-	|| exit 1

boot/boot.js

@@ -232,10 +232,10 @@ $tw.utils.error = function(err) {
 				var link = dm("a"),
 					text = JSON.stringify(tiddlers);
 				if(Blob !== undefined) {
-					var blob = new Blob([text], {type: "application/json"});
+					var blob = new Blob([text], {type: "text/html"});
 					link.setAttribute("href", URL.createObjectURL(blob));
 				} else {
-					link.setAttribute("href","data:application/json," + encodeURIComponent(text));
+					link.setAttribute("href","data:text/html," + encodeURIComponent(text));
 				}
 				link.setAttribute("download","emergency-tiddlers-" + (new Date()) + ".json");
 				document.body.appendChild(link);
@@ -386,8 +386,8 @@ $tw.utils.parseDate = function(value) {
 				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;
+		  d.setUTCFullYear(year); // See https://stackoverflow.com/a/5870822
+		  return d;
 	} else if($tw.utils.isDate(value)) {
 		return value;
 	} else {
@@ -1470,15 +1470,17 @@ $tw.Wiki = function(options) {
 	// Unpack the currently registered plugins, creating shadow tiddlers for their constituent tiddlers
 	this.unpackPluginTiddlers = function() {
 		var self = this;
-		// Sort the plugin titles by the `plugin-priority` field, if this field is missing, default to 1
-		pluginTiddlers.sort(function(a, b) {
-			var priorityA = "plugin-priority" in a.fields ? a.fields["plugin-priority"] : 1;
-			var priorityB = "plugin-priority" in b.fields ? b.fields["plugin-priority"] : 1;
-			if (priorityA !== priorityB) {
-				return priorityA - priorityB;
-			} else if (a.fields.title < b.fields.title) {
+		// Sort the plugin titles by the `plugin-priority` field
+		pluginTiddlers.sort(function(a,b) {
+			if("plugin-priority" in a.fields && "plugin-priority" in b.fields) {
+				return a.fields["plugin-priority"] - b.fields["plugin-priority"];
+			} else if("plugin-priority" in a.fields) {
 				return -1;
-			} else if (a.fields.title === b.fields.title) {
+			} else if("plugin-priority" in b.fields) {
+				return +1;
+			} else if(a.fields.title < b.fields.title) {
+				return -1;
+			} else if(a.fields.title === b.fields.title) {
 				return 0;
 			} else {
 				return +1;
@@ -1902,16 +1904,8 @@ $tw.loadTiddlersFromFile = function(filepath,fields) {
 		extensionInfo = $tw.utils.getFileExtensionInfo(ext),
 		type = extensionInfo ? extensionInfo.type : null,
 		typeInfo = type ? $tw.config.contentTypeInfo[type] : null,
-		fileSize = fs.statSync(filepath).size,
-		data;
-	if(fileSize > $tw.config.maxEditFileSize) {
-		data = "File " + filepath + "not loaded because it is too large";
-		console.log("Warning: " + data);
-		ext = ".txt";
-	} else {
-		data = fs.readFileSync(filepath,typeInfo ? typeInfo.encoding : "utf8");
-	}
-	var tiddlers = $tw.wiki.deserializeTiddlers(ext,data,fields),
+		data = fs.readFileSync(filepath,typeInfo ? typeInfo.encoding : "utf8"),
+		tiddlers = $tw.wiki.deserializeTiddlers(ext,data,fields),
 		metadata = $tw.loadMetadataForFile(filepath);
 	if(metadata) {
 		if(type === "application/json") {
@@ -2000,7 +1994,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 					var value = tiddler[name];
 					switch(fieldInfo.source) {
 						case "subdirectories":
-							value = $tw.utils.stringifyList(path.relative(rootPath, filename).split(path.sep).slice(0, -1));
+							value = path.relative(rootPath, filename).split(path.sep).slice(0, -1);
 							break;
 						case "filepath":
 							value = path.relative(rootPath, filename).split(path.sep).join('/');
@@ -2021,10 +2015,10 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 							value = path.extname(filename);
 							break;
 						case "created":
-							value = $tw.utils.stringifyDate(new Date(fs.statSync(pathname).birthtime));
+							value = new Date(fs.statSync(pathname).birthtime);
 							break;
 						case "modified":
-							value = $tw.utils.stringifyDate(new Date(fs.statSync(pathname).mtime));
+							value = new Date(fs.statSync(pathname).mtime);
 							break;
 					}
 					if(fieldInfo.prefix) {
@@ -2471,15 +2465,13 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("image/webp","base64",".webp",{flags:["image"]});
 	$tw.utils.registerFileType("image/heic","base64",".heic",{flags:["image"]});
 	$tw.utils.registerFileType("image/heif","base64",".heif",{flags:["image"]});
-	$tw.utils.registerFileType("image/avif","base64",".avif",{flags:["image"]});
 	$tw.utils.registerFileType("image/svg+xml","utf8",".svg",{flags:["image"]});
 	$tw.utils.registerFileType("image/vnd.microsoft.icon","base64",".ico",{flags:["image"]});
 	$tw.utils.registerFileType("image/x-icon","base64",".ico",{flags:["image"]});
 	$tw.utils.registerFileType("application/wasm","base64",".wasm");
-	$tw.utils.registerFileType("font/woff","base64",".woff");
-	$tw.utils.registerFileType("font/woff2","base64",".woff2");
-	$tw.utils.registerFileType("font/ttf","base64",".ttf");
-	$tw.utils.registerFileType("font/otf","base64",".otf");
+	$tw.utils.registerFileType("application/font-woff","base64",".woff");
+	$tw.utils.registerFileType("application/x-font-ttf","base64",".woff");
+	$tw.utils.registerFileType("application/font-woff2","base64",".woff2");
 	$tw.utils.registerFileType("audio/ogg","base64",".ogg");
 	$tw.utils.registerFileType("audio/mp4","base64",[".mp4",".m4a"]);
 	$tw.utils.registerFileType("video/ogg","base64",[".ogm",".ogv",".ogg"]);
@@ -2732,15 +2724,14 @@ $tw.hooks.removeHook = function(hookName,definition) {
 /*
 Invoke the hook by key
 */
-$tw.hooks.invokeHook = function(hookName, firstArgument /*, value,... */) {
-	if(Object.prototype.hasOwnProperty.call($tw.hooks.names,hookName)) {
-		var args = Array.prototype.slice.call(arguments,1);
+$tw.hooks.invokeHook = function(hookName /*, value,... */) {
+	var args = Array.prototype.slice.call(arguments,1);
+	if($tw.utils.hop($tw.hooks.names,hookName)) {
 		for(var i = 0; i < $tw.hooks.names[hookName].length; i++) {
 			args[0] = $tw.hooks.names[hookName][i].apply(null,args);
 		}
-		return args[0];
 	}
-	return firstArgument;
+	return args[0];
 };
 
 /////////////////////////// Main boot function to decrypt tiddlers and then startup

boot/bootprefix.js

@@ -19,10 +19,6 @@ var _bootprefix = (function($tw) {
 $tw = $tw || Object.create(null);
 $tw.boot = $tw.boot || Object.create(null);
 
-// Config
-$tw.config = $tw.config || Object.create(null);
-$tw.config.maxEditFileSize = 100 * 1024 * 1024; // 100MB
-
 // Detect platforms
 if(!("browser" in $tw)) {
 	$tw.browser = typeof(window) !== "undefined" && typeof(document) !== "undefined" ? {} : null;

code-of-conduct.md

@@ -1 +0,0 @@
-<p>This community exists because TiddlyWiki is more useful when people share and work together.</p><p>This community is a beautiful but fragile thing: a collection of diverse people from all over the planet, united in their interest in the project, and their commitment to helping one another achieve and learn more.</p><p>We try to make the community as broad and welcoming as possible by remembering some basic principles of culture and behaviour.</p><p>These principles guide technical and non-technical decisions, and help contributors and leaders support our project and community.</p><ul><li>We are optimistic and hopeful</li><li>We aim to foster a learning environment that is collaborative and safe for everyone</li><li>We recognise that the motivation for sharing and helping is usually for appreciation, and not financial gain, and so we take care to acknowledge and <strong>thank the people who enrich the community by sharing what they have created</strong></li><li>While we are united in our interest in TiddlyWiki, we differ in every other conceivable way. We choose to focus on what unites us, and <strong>avoid unnecessarily mixing contentious topics like religion and politics</strong></li><li>We treat each other with respect, and start with the assumption that <strong>others are acting in good faith</strong></li><li>We avoid discriminatory language</li><li>We try to use our strength as a community to help others</li><li>We avoid responding when angry or upset because we try to de-escalate conflict</li><li>We make sure we critique ideas, not people</li><li>When we disagree with others we do so graciously, and treat others with dignity and respoect</li><li>We do not tolerate intolerance towards others</li><li>We seek first to understand others, and then to be understood</li><li>We have fun</li></ul><p>Our discussions are in English. It is not the first language of many people in the community, nor do we all share the same cultural background and reference points. So we take care to use language that is clear and unambigous, and avoid cultural references or jokes that will not be widely understood.</p><p>It is not acceptable to make jokes or other comments that discriminate by race, gender, sexuality, or other protected characteristic.</p><p>As an inclusive community, we are committed to making sure that TiddlyWiki is an accessible tool that understands the needs of people with disabilities.</p>

core/acknowledgements.tid

@@ -5,3 +5,7 @@ TiddlyWiki incorporates code from these fine OpenSource projects:
 * [[The Stanford Javascript Crypto Library|http://bitwiseshiftleft.github.io/sjcl/]]
 * [[The Jasmine JavaScript Test Framework|https://jasmine.github.io/]]
 * [[Normalize.css by Nicolas Gallagher|http://necolas.github.io/normalize.css/]]
+
+And media from these projects:
+
+* World flag icons from [[Wikipedia|http://commons.wikimedia.org/wiki/Category:SVG_flags_by_country]]

core/copyright.tid

@@ -4,7 +4,7 @@ type: text/plain
 TiddlyWiki created by Jeremy Ruston, (jeremy [at] jermolene [dot] com)
 
 Copyright (c) 2004-2007, Jeremy Ruston
-Copyright (c) 2007-2025, UnaMesa Association
+Copyright (c) 2007-2024, UnaMesa Association
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

core/images/language.tid

@@ -1,5 +0,0 @@
-title: $:/core/images/language
-tags: $:/tags/Image
-
-\parameters (size:"22pt")
-<svg width=<<size>> height=<<size>> class="tc-image-language tc-image-button" viewBox="0 0 92 92"><path d="M0 0h2480.32v3507.87H0z" style="fill:none" transform="scale(.03696 .02613)"/><path d="M71.508 62.298c-1.243 15.83-16.758 28.344-35.714 28.344-5.713 0-11.113-1.136-15.905-3.158-2.977 2.498-8.618 4.183-15.088 4.183-.929 0-1.84-.034-2.73-.102 4.499-1.5 7.989-4.886 9.298-9.099C4.373 76.918 0 69.016 0 60.246 0 49.773 6.237 40.537 15.729 35.07c1.235 7.764 5.492 14.713 11.724 19.953l-7.269 18.453c-.393.976-.676 1.737-.847 2.285a5.326 5.326 0 0 0-.256 1.591c0 .89.368 1.686 1.103 2.388.736.702 1.583 1.052 2.542 1.052 1.13 0 1.942-.33 2.438-.988.497-.659 1.096-1.93 1.797-3.812l1.797-4.826h15.3l1.797 4.723c.239.582.526 1.254.86 2.015.333.762.646 1.327.936 1.695.291.368.65.659 1.078.873.428.213.942.32 1.54.32a3.586 3.586 0 0 0 2.632-1.09c.727-.728 1.09-1.528 1.09-2.4 0-.84-.384-2.183-1.154-4.031l-3.545-8.755c2.142.3 4.34.455 6.58.455 5.541 0 10.824-.951 15.636-2.674Zm-30.563.247 1.059 2.898H30.76l2.32-6.467a43.152 43.152 0 0 0 7.865 3.569Z"/><path d="M71.778 57.635c-4.793 2.023-10.191 3.157-15.907 3.157-19.767 0-35.793-13.61-35.793-30.396S36.104.001 55.87.001c19.772 0 35.797 13.61 35.797 30.395 0 8.77-4.373 16.674-11.371 22.221 1.309 4.211 4.8 7.6 9.299 9.1-.89.067-1.802.1-2.73.1-6.47 0-12.11-1.686-15.088-4.182Zm-15.59-15.887a44.237 44.237 0 0 0 3.3 2.496c4.284 2.942 9.06 5.381 14.33 7.315l2.334-3.517c-5.134-1.871-9.696-4.125-13.69-6.763a42.558 42.558 0 0 1-3.37-2.483c4.247-4.806 7.374-10.43 9.38-16.869h6.698V17.78h-16.7a47.226 47.226 0 0 0-1.528-2.959 52.943 52.943 0 0 0-2.885-4.562l-4.218 1.554a36.467 36.467 0 0 1 2.971 3.983c.427.661.833 1.323 1.217 1.984H36.394v4.148h6.77a36.878 36.878 0 0 0 5.422 11.56 42.918 42.918 0 0 0 4.591 5.497c-4.687 4.017-10.548 6.932-17.582 8.744l2.247 3.709c7.746-2.44 13.861-5.67 18.347-9.689Zm-9.047-19.82h16.991c-1.86 5.668-4.528 10.402-8 14.204a42.526 42.526 0 0 1-4.247-4.922c-2.126-2.883-3.71-5.977-4.744-9.283Z"/></svg>

core/language/en-GB/Buttons.multids

@@ -133,7 +133,6 @@ Excise/Caption/Replace/Link: link
 Excise/Caption/Replace/Transclusion: transclusion
 Excise/Caption/Tag: Tag new tiddler with the title of this tiddler
 Excise/Caption/TiddlerExists: Warning: tiddler already exists
-Excise/DefaultTitle: New Excision
 Excise/Hint: Excise the selected text into a new tiddler
 Heading1/Caption: heading 1
 Heading1/Hint: Apply heading level 1 formatting to lines containing selection

core/language/en-GB/ControlPanel.multids

@@ -96,10 +96,6 @@ Plugins/PluginWillRequireReload: (requires reload)
 Plugins/Plugins/Caption: Plugins
 Plugins/Plugins/Hint: Plugins
 Plugins/Reinstall/Caption: reinstall
-Plugins/Stability/Deprecated: DEPRECATED
-Plugins/Stability/Experimental: EXPERIMENTAL
-Plugins/Stability/Legacy: LEGACY
-Plugins/Stability/Stable: STABLE
 Plugins/Themes/Caption: Themes
 Plugins/Themes/Hint: Theme plugins
 Plugins/Update/Caption: update
@@ -175,8 +171,6 @@ Settings/NavigationPermalinkviewMode/UpdateAddressBar/Description: Update addres
 Settings/PerformanceInstrumentation/Caption: Performance Instrumentation
 Settings/PerformanceInstrumentation/Hint: Displays performance statistics in the browser developer console. Requires reload to take effect
 Settings/PerformanceInstrumentation/Description: Enable performance instrumentation
-Settings/RecentLimit/Caption: Recent Tab Limit 
-Settings/RecentLimit/Hint: Maximum number of tiddlers to be displayed under the sidebar "Recent" tab
 Settings/ToolbarButtonStyle/Caption: Toolbar Button Style
 Settings/ToolbarButtonStyle/Hint: Choose the style for toolbar buttons:
 Settings/ToolbarButtonStyle/Styles/Borderless: Borderless
@@ -206,10 +200,10 @@ Settings/MissingLinks/Hint: Choose whether to link to tiddlers that do not exist
 Settings/MissingLinks/Description: Enable links to missing tiddlers
 SocialCard/Caption: Social Media Card
 SocialCard/Domain/Prompt: Domain name to display for the link (for example, ''tiddlywiki.com'')
-SocialCard/Hint: This information is used by social and messaging services to display a preview card for links to this ~TiddlyWiki when hosted online
-SocialCard/PreviewUrl/Prompt: Full URL to preview image for this ~TiddlyWiki
+SocialCard/Hint: This information is used by social and messaging services to display a preview card for links to this TiddlyWiki when hosted online
+SocialCard/PreviewUrl/Prompt: Full URL to preview image for this TiddlyWiki
 SocialCard/PreviewUrl/Preview: Preview image:
-SocialCard/Url/Prompt: Full URL of this ~TiddlyWiki
+SocialCard/Url/Prompt: Full URL of this TiddlyWiki
 StoryTiddler/Caption: Story Tiddler
 StoryTiddler/Hint: This rule cascade is used to dynamically choose the template for displaying a tiddler in the story river.
 StoryView/Caption: Story View

core/language/en-GB/EditTemplate.multids

@@ -26,8 +26,6 @@ Tags/ClearInput/Caption: clear input
 Tags/ClearInput/Hint: Clear tag input
 Tags/Dropdown/Caption: tag list
 Tags/Dropdown/Hint: Show tag list
-Tags/EmptyMessage: No tags found
-Tags/EmptyMessage/System: No system tags found
 Title/BadCharacterWarning: Warning: avoid using any of the characters <<bad-chars>> in tiddler titles
 Title/Exists/Prompt: Target tiddler already exists
 Title/Relink/Prompt: Update ''<$text text=<<fromTitle>>/>'' to ''<$text text=<<toTitle>>/>'' in the //tags// and //list// fields of other tiddlers

core/language/en-GB/Fields.multids

@@ -4,12 +4,12 @@ _canonical_uri: The full URI of an external image tiddler
 author: Name of the author of a plugin
 bag: The name of the bag from which a tiddler came
 caption: The text to be displayed on a tab or button
-class: The CSS class applied to a tiddler when rendering it.  Also used for Modals
+class: The CSS class applied to a tiddler when rendering it - see [[Custom styles by user-class]].  Also used for [[Modals]]
 code-body: The view template will display the tiddler as code if set to ''yes''
 color: The CSS color value associated with a tiddler
-component: The name of the component responsible for an alert tiddler
+component: The name of the component responsible for an [[alert tiddler|AlertMechanism]]
 core-version: For a plugin, indicates what version of TiddlyWiki with which it is compatible
-current-tiddler: Used to cache the top tiddler in a history list
+current-tiddler: Used to cache the top tiddler in a [[history list|HistoryMechanism]]
 created: The date a tiddler was created
 creator: The name of the person who created a tiddler
 dependents: For a plugin, lists the dependent plugin titles

core/language/en-GB/Search.multids

@@ -3,13 +3,9 @@ title: $:/language/Search/
 DefaultResults/Caption: List
 Filter/Caption: Filter
 Filter/Hint: Search via a [[filter expression|https://tiddlywiki.com/static/Filters.html]]
-Filter/Placeholder: Filter expression
 Filter/Matches: //<small><<resultCount>> matches</small>//
-Filter/FilterResults/Results/Caption: Results
 Matches: //<small><<resultCount>> matches</small>//
 Matches/All: All matches:
-Matches/NoMatch: //No match//
-Matches/NoResult: //No search result//
 Matches/Title: Title matches:
 Search: Search
 Search/TooShort: Search text too short

core/language/en-GB/icon.tid

@@ -0,0 +1,13 @@
+title: $:/languages/en-GB/icon
+type: image/svg+xml
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="1200" height="600">
+<clipPath id="t">
+	<path d="M30,15 h30 v15 z v15 h-30 z h-30 v-15 z v-15 h30 z"/>
+</clipPath>
+<path d="M0,0 v30 h60 v-30 z" fill="#00247d"/>
+<path d="M0,0 L60,30 M60,0 L0,30" stroke="#fff" stroke-width="6"/>
+<path d="M0,0 L60,30 M60,0 L0,30" clip-path="url(#t)" stroke="#cf142b" stroke-width="4"/>
+<path d="M30,0 v30 M0,15 h60" stroke="#fff" stroke-width="10"/>
+<path d="M30,0 v30 M0,15 h60" stroke="#cf142b" stroke-width="6"/>
+</svg>

core/modules/commander.js

@@ -6,7 +6,10 @@ module-type: global
 The $tw.Commander class is a command interpreter
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -170,3 +173,5 @@ Commander.initCommands = function(moduleType) {
 };
 
 exports.Commander = Commander;
+
+})();

core/modules/commands/build.js

@@ -6,7 +6,10 @@ module-type: command
 Command to build a build target
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -21,7 +24,7 @@ var Command = function(params,commander) {
 
 Command.prototype.execute = function() {
 	// Get the build targets defined in the wiki
-	var buildTargets = $tw.boot.wikiInfo && $tw.boot.wikiInfo.build;
+	var buildTargets = $tw.boot.wikiInfo.build;
 	if(!buildTargets) {
 		return "No build targets defined";
 	}
@@ -45,3 +48,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/clearpassword.js

@@ -6,7 +6,10 @@ module-type: command
 Clear password for crypto operations
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -26,3 +29,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/commands.js

@@ -7,6 +7,10 @@ Runs the commands returned from a filter
 
 \*/
 
+(function() {
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -34,3 +38,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/deletetiddlers.js

@@ -6,7 +6,10 @@ module-type: command
 Command to delete tiddlers
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -35,3 +38,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/editions.js

@@ -6,7 +6,10 @@ module-type: command
 Command to list the available editions
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -32,3 +35,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/fetch.js

@@ -6,7 +6,10 @@ module-type: command
 Commands to fetch external tiddlers
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -168,3 +171,5 @@ Command.prototype.processBody = function(body,type,options,url) {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/help.js

@@ -6,7 +6,10 @@ module-type: command
 Help command
 
 \*/
+(function(){
 
+/*jshint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -34,3 +37,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/import.js

@@ -6,7 +6,10 @@ module-type: command
 Command to import tiddlers from a file
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -41,3 +44,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/init.js

@@ -6,7 +6,10 @@ module-type: command
 Command to initialise an empty wiki folder
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -52,3 +55,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/listen.js

@@ -6,7 +6,10 @@ module-type: command
 Listen for HTTP requests and serve tiddlers
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var Server = require("$:/core/modules/server/server.js").Server;
@@ -41,3 +44,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/load.js

@@ -6,7 +6,10 @@ module-type: command
 Command to load tiddlers from a file or directory
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -44,3 +47,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/makelibrary.js

@@ -6,7 +6,10 @@ module-type: command
 Command to pack all of the plugins in the library into a plugin tiddler of type "library"
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -38,3 +41,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/output.js

@@ -6,7 +6,10 @@ module-type: command
 Command to set the default output location (defaults to current working directory)
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -31,3 +34,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/password.js

@@ -6,7 +6,10 @@ module-type: command
 Save password for crypto operations
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -29,3 +32,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/render.js

@@ -6,7 +6,10 @@ module-type: command
 Render individual tiddlers and save the results to the specified files
 
 \*/
+(function(){
 
+	/*jslint node: true, browser: true */
+	/*global $tw: false */
 	"use strict";
 	
 	var widget = require("$:/core/modules/widgets/widget.js");
@@ -63,3 +66,6 @@ Render individual tiddlers and save the results to the specified files
 	};
 	
 	exports.Command = Command;
+	
+	})();
+	

core/modules/commands/rendertiddler.js

@@ -6,7 +6,10 @@ module-type: command
 Command to render a tiddler and save it to a file
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -50,3 +53,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/rendertiddlers.js

@@ -6,7 +6,10 @@ module-type: command
 Command to render several tiddlers to a folder of files
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var widget = require("$:/core/modules/widgets/widget.js");
@@ -62,3 +65,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/save.js

@@ -6,7 +6,10 @@ module-type: command
 Saves individual tiddlers in their raw text or binary format to the specified files
 
 \*/
+(function(){
 
+	/*jslint node: true, browser: true */
+	/*global $tw: false */
 	"use strict";
 	
 	exports.info = {
@@ -61,3 +64,6 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
 	};
 	
 	exports.Command = Command;
+	
+	})();
+	

core/modules/commands/savelibrarytiddlers.js

@@ -16,7 +16,10 @@ The pathname specifies the pathname to the folder in which the JSON files should
 The skinnylisting specifies the title of the tiddler to which a JSON catalogue of the subtiddlers will be saved. The JSON file contains the same data as the bundle tiddler but with the `text` field removed.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -91,3 +94,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/savetiddler.js

@@ -6,7 +6,10 @@ module-type: command
 Command to save the content of a tiddler to a file
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -44,3 +47,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/savetiddlers.js

@@ -6,7 +6,10 @@ module-type: command
 Command to save several tiddlers to a folder of files
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var widget = require("$:/core/modules/widgets/widget.js");
@@ -49,3 +52,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/savewikifolder.js

@@ -15,7 +15,10 @@ The following options are supported:
 Supports backward compatibility with --savewikifolder <wikifolderpath> [<filter>] [ [<name>=<value>] ]*
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -218,3 +221,5 @@ WikiFolderMaker.prototype.saveFile = function(filename,encoding,data) {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/server.js

@@ -6,7 +6,10 @@ module-type: command
 Deprecated legacy command for serving tiddlers
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var Server = require("$:/core/modules/server/server.js").Server;
@@ -48,3 +51,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/setfield.js

@@ -6,7 +6,10 @@ module-type: command
 Command to modify selected tiddlers to set a field to the text of a template tiddler that has been wikified with the selected tiddler as the current tiddler.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var widget = require("$:/core/modules/widgets/widget.js");
@@ -51,3 +54,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/unpackplugin.js

@@ -6,7 +6,10 @@ module-type: command
 Command to extract the shadow tiddlers from within a plugin
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -37,3 +40,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/verbose.js

@@ -6,7 +6,10 @@ module-type: command
 Verbose command
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -27,3 +30,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/commands/version.js

@@ -6,7 +6,10 @@ module-type: command
 Version command
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -25,3 +28,5 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
+
+})();

core/modules/config.js

@@ -6,7 +6,10 @@ module-type: config
 Core configuration constants
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.preferences = {};
@@ -34,3 +37,5 @@ exports.htmlVoidElements = "area,base,br,col,command,embed,hr,img,input,keygen,l
 exports.htmlBlockElements = "address,article,aside,audio,blockquote,canvas,dd,details,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,hr,li,nav,ol,p,pre,section,summary,table,tfoot,ul,video".split(",");
 
 exports.htmlUnsafeElements = "script".split(",");
+
+})();

core/modules/deserializers.js

@@ -6,7 +6,10 @@ module-type: tiddlerdeserializer
 Functions to deserialise tiddlers from a block of text
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["application/x-tiddler-html-div"] = function(text,fields) {
@@ -178,3 +181,5 @@ var deserializeTiddlerDiv = function(text /* [,fields] */) {
 	}
 	return undefined;
 };
+
+})();

core/modules/editor/engines/framed.js

@@ -6,7 +6,10 @@ module-type: library
 Text editor engine based on a simple input or textarea within an iframe. This is done so that the selection is preserved even when clicking away from the textarea
 
 \*/
+(function(){
 
+/*jslint node: true,browser: true */
+/*global $tw: false */
 "use strict";
 
 var HEIGHT_VALUE_TITLE = "$:/config/TextEditor/EditorHeight/Height";
@@ -270,3 +273,5 @@ FramedEngine.prototype.executeTextOperation = function(operation) {
 };
 
 exports.FramedEngine = FramedEngine;
+
+})();

core/modules/editor/engines/simple.js

@@ -6,7 +6,10 @@ module-type: library
 Text editor engine based on a simple input or textarea tag
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var HEIGHT_VALUE_TITLE = "$:/config/TextEditor/EditorHeight/Height";
@@ -169,3 +172,5 @@ SimpleEngine.prototype.executeTextOperation = function(operation) {
 };
 
 exports.SimpleEngine = SimpleEngine;
+
+})();

core/modules/editor/factory.js

@@ -6,7 +6,10 @@ module-type: library
 Factory for constructing text editor widgets with specified engines for the toolbar and non-toolbar cases
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var DEFAULT_MIN_TEXT_AREA_HEIGHT = "100px"; // Minimum height of textareas in pixels
@@ -383,3 +386,5 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 }
 
 exports.editTextWidgetFactory = editTextWidgetFactory;
+
+})();

core/modules/editor/operations/bitmap/clear.js

@@ -6,7 +6,10 @@ module-type: bitmapeditoroperation
 Bitmap editor operation to clear the image
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["clear"] = function(event) {
@@ -17,3 +20,5 @@ exports["clear"] = function(event) {
 	// Save changes
 	this.strokeEnd();
 };
+
+})();

core/modules/editor/operations/bitmap/resize.js

@@ -6,7 +6,10 @@ module-type: bitmapeditoroperation
 Bitmap editor operation to resize the image
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["resize"] = function(event) {
@@ -22,3 +25,5 @@ exports["resize"] = function(event) {
 	// Save the image into the tiddler
 	this.saveChanges();
 };
+
+})();

core/modules/editor/operations/bitmap/rotate-left.js

@@ -6,7 +6,10 @@ module-type: bitmapeditoroperation
 Bitmap editor operation to rotate the image left by 90 degrees
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["rotate-left"] = function(event) {
@@ -17,3 +20,5 @@ exports["rotate-left"] = function(event) {
 	// Save the image into the tiddler
 	this.saveChanges();
 };
+
+})();

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

@@ -6,30 +6,26 @@ module-type: texteditoroperation
 Text editor operation to excise the selection to a new tiddler
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
-function isMarkdown(mediaType) {
-	return mediaType === 'text/markdown' || mediaType === 'text/x-markdown';
-}
-
 exports["excise"] = function(event,operation) {
 	var editTiddler = this.wiki.getTiddler(this.editTitle),
-		editTiddlerTitle = this.editTitle,
-		wikiLinks = !isMarkdown(editTiddler.fields.type),
-		excisionBaseTitle = $tw.language.getString("Buttons/Excise/DefaultTitle");
+		editTiddlerTitle = this.editTitle;
 	if(editTiddler && editTiddler.fields["draft.of"]) {
 		editTiddlerTitle = editTiddler.fields["draft.of"];
 	}
-	var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle(excisionBaseTitle);
+	var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle("New Excision");
 	this.wiki.addTiddler(new $tw.Tiddler(
 		this.wiki.getCreationFields(),
 		this.wiki.getModificationFields(),
 		{
 			title: excisionTitle,
 			text: operation.selection,
-			tags: event.paramObject.tagnew === "yes" ?  [editTiddlerTitle] : [],
-			type: editTiddler.fields.type
+			tags: event.paramObject.tagnew === "yes" ?  [editTiddlerTitle] : []
 		}
 	));
 	operation.replacement = excisionTitle;
@@ -38,8 +34,7 @@ exports["excise"] = function(event,operation) {
 			operation.replacement = "{{" + operation.replacement+ "}}";
 			break;
 		case "link":
-			operation.replacement = wikiLinks ? "[[" + operation.replacement+ "]]"
-				: ("[" + operation.replacement + "](<#" + operation.replacement + ">)");
+			operation.replacement = "[[" + operation.replacement+ "]]";
 			break;
 		case "macro":
 			operation.replacement = "<<" + (event.paramObject.macro || "translink") + " \"\"\"" + operation.replacement + "\"\"\">>";
@@ -50,3 +45,5 @@ exports["excise"] = function(event,operation) {
 	operation.newSelStart = operation.selStart;
 	operation.newSelEnd = operation.selStart + operation.replacement.length;
 };
+
+})();

core/modules/editor/operations/text/focus-editor.js

@@ -4,9 +4,14 @@ type: application/javascript
 module-type: texteditoroperation
 Simply focus the Text editor
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["focus-editor"] = function(event,operation) {
 	operation = null;
 };
+
+})();

core/modules/editor/operations/text/insert-text.js

@@ -6,7 +6,10 @@ module-type: texteditoroperation
 Text editor operation insert text at the caret position. If there is a selection it is replaced.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["insert-text"] = function(event,operation) {
@@ -16,3 +19,5 @@ exports["insert-text"] = function(event,operation) {
 	operation.newSelStart = operation.selStart + operation.replacement.length;
 	operation.newSelEnd = operation.newSelStart;
 };
+
+})();

core/modules/editor/operations/text/make-link.js

@@ -6,7 +6,10 @@ module-type: texteditoroperation
 Text editor operation to make a link
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["make-link"] = function(event,operation) {
@@ -22,3 +25,5 @@ exports["make-link"] = function(event,operation) {
 	operation.newSelStart = operation.selStart + operation.replacement.length;
 	operation.newSelEnd = operation.newSelStart;
 };
+
+})();

core/modules/editor/operations/text/prefix-lines.js

@@ -6,7 +6,10 @@ module-type: texteditoroperation
 Text editor operation to add a prefix to the selected lines
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["prefix-lines"] = function(event,operation) {
@@ -48,3 +51,5 @@ exports["prefix-lines"] = function(event,operation) {
 		operation.newSelEnd = operation.newSelStart + operation.replacement.length;
 	}
 };
+
+})();

core/modules/editor/operations/text/replace-all.js

@@ -6,7 +6,10 @@ module-type: texteditoroperation
 Text editor operation to replace the entire text
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["replace-all"] = function(event,operation) {
@@ -16,3 +19,5 @@ exports["replace-all"] = function(event,operation) {
 	operation.newSelStart = 0;
 	operation.newSelEnd = operation.replacement.length;
 };
+
+})();

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

@@ -6,7 +6,10 @@ module-type: texteditoroperation
 Text editor operation to replace the selection
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["replace-selection"] = function(event,operation) {
@@ -16,3 +19,5 @@ exports["replace-selection"] = function(event,operation) {
 	operation.newSelStart = operation.selStart;
 	operation.newSelEnd = operation.selStart + operation.replacement.length;
 };
+
+})();

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

@@ -6,7 +6,10 @@ module-type: texteditoroperation
 Text editor operation to save the current selection in a specified tiddler
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["save-selection"] = function(event,operation) {
@@ -16,3 +19,5 @@ exports["save-selection"] = function(event,operation) {
 		this.wiki.setText(tiddler,field,null,operation.text.substring(operation.selStart,operation.selEnd));
 	}
 };
+
+})();

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

@@ -6,7 +6,10 @@ module-type: texteditoroperation
 Text editor operation to wrap the selected lines with a prefix and suffix
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["wrap-lines"] = function(event,operation) {
@@ -40,3 +43,5 @@ exports["wrap-lines"] = function(event,operation) {
 		operation.newSelEnd = operation.newSelStart + (operation.cutEnd - operation.cutStart);
 	}
 };
+
+})();

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

@@ -6,128 +6,45 @@ module-type: texteditoroperation
 Text editor operation to wrap the selection with the specified prefix and suffix
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["wrap-selection"] = function(event,operation) {
-	var o = operation,
-		prefix = event.paramObject.prefix,
-		suffix = event.paramObject.suffix,
-		trimSelection = event.paramObject.trimSelection || "no",
-		selLength = o.selEnd - o.selStart;
-
-	// This function detects, if trailing spaces are part of the selection __and__ if the user wants to handle them
-	// Returns "yes", "start", "end", "no" (default)
-	//	yes .. there are trailing spaces at both ends
-	//	start .. there are trailing spaces at the start
-	//	end .. there are trailing spaces at the end
-	//	no .. no trailing spaces are taken into account
-	var trailingSpaceAt = function(sel) {
-		var _start,
-			_end,
-			result;
-		// trimSelection is a user parameter, which this evaluations takes into account
-		switch(trimSelection) {
-			case "end":
-				result = (sel.trimEnd().length !== selLength) ? "end" : "no";
-				break;
-			case "yes":
-				_start = sel.trimStart().length !== selLength;
-				_end = sel.trimEnd().length !== selLength;
-				result = (_start && _end) ? "yes" : (_start) ? "start" : (_end) ? "end" : "no";
-				break;
-			case "start":
-				result = (sel.trimStart().length !== selLength) ? "start" : "no";
-				break;
-			default:
-				result = "no";
-				break;
-		}
-		return result;
-	}
-
-	function togglePrefixSuffix() {
-		if(o.text.substring(o.selStart - prefix.length, o.selStart + suffix.length) === prefix + suffix) {
+	if(operation.selStart === operation.selEnd) {
+		// No selection; check if we're within the prefix/suffix
+		if(operation.text.substring(operation.selStart - event.paramObject.prefix.length,operation.selStart + event.paramObject.suffix.length) === event.paramObject.prefix + event.paramObject.suffix) {
 			// Remove the prefix and suffix
-			o.cutStart = o.selStart - prefix.length;
-			o.cutEnd = o.selEnd + suffix.length;
-			o.replacement = "";
-			o.newSelStart = o.cutStart;
-			o.newSelEnd = o.newSelStart;
+			operation.cutStart = operation.selStart - event.paramObject.prefix.length;
+			operation.cutEnd = operation.selEnd + event.paramObject.suffix.length;
+			operation.replacement = "";
+			operation.newSelStart = operation.cutStart;
+			operation.newSelEnd = operation.newSelStart;
 		} else {
 			// Wrap the cursor instead
-			o.cutStart = o.selStart;
-			o.cutEnd = o.selEnd;
-			o.replacement = prefix + suffix;
-			o.newSelStart = o.selStart + prefix.length;
-			o.newSelEnd = o.newSelStart;
+			operation.cutStart = operation.selStart;
+			operation.cutEnd = operation.selEnd;
+			operation.replacement = event.paramObject.prefix + event.paramObject.suffix;
+			operation.newSelStart = operation.selStart + event.paramObject.prefix.length;
+			operation.newSelEnd = operation.newSelStart;
 		}
-	}
-
-	// options: lenPrefix, lenSuffix
-	function removePrefixSuffix(options) {
-		options = options || {};
-		var _lenPrefix = options.lenPrefix || 0;
-		var _lenSuffix = options.lenSuffix || 0;
-
-		o.cutStart = o.selStart - _lenPrefix;
-		o.cutEnd = o.selEnd + _lenSuffix;
-		o.replacement = (_lenPrefix || _lenSuffix) ? o.selection : o.selection.substring(prefix.length, o.selection.length - suffix.length);
-		o.newSelStart = o.cutStart;
-		o.newSelEnd = o.cutStart + o.replacement.length;
-	}
-
-	function addPrefixSuffix() {
-		// remove trailing space if requested
-		switch(trailingSpaceAt(o.selection)) {
-			case "no":
-				// has no trailing spaces
-				o.cutStart = o.selStart;
-				o.cutEnd = o.selEnd;
-				o.replacement = prefix + o.selection + suffix;
-				o.newSelStart = o.selStart;
-				o.newSelEnd = o.selStart + o.replacement.length;
-				break;
-			case "yes":
-				// handle both ends
-				o.cutStart = o.selEnd - (o.selection.trimStart().length);
-				o.cutEnd = o.selection.trimEnd().length + o.selStart;
-				o.replacement = prefix + o.selection.trim() + suffix;
-				o.newSelStart = o.cutStart;
-				o.newSelEnd = o.cutStart + o.replacement.length;
-				break;
-			case "start":
-				// handle leading
-				o.cutStart = o.selEnd - (o.selection.trimStart().length);
-				o.cutEnd = o.selEnd;
-				o.replacement = prefix + o.selection.trimStart() + suffix;
-				o.newSelStart = o.cutStart;
-				o.newSelEnd = o.cutStart + o.replacement.length;
-				break;
-			case "end":
-				// handle trailing
-				o.cutStart = o.selStart;
-				o.cutEnd = o.selection.trimEnd().length + o.selStart;
-				o.replacement = prefix + o.selection.trimEnd() + suffix;
-				o.newSelStart = o.selStart;
-				o.newSelEnd = o.selStart + o.replacement.length;
-				break;
-		}
-	}
-
-	if(o.selStart === o.selEnd) {
-		// No selection; Create prefix and suffix. Set cursor in between them: ""|""
-		togglePrefixSuffix();
-	} else if(o.text.substring(o.selStart, o.selStart + prefix.length) === prefix &&
-				o.text.substring(o.selEnd - suffix.length,o.selEnd) === suffix) {
+	} else if(operation.text.substring(operation.selStart,operation.selStart + event.paramObject.prefix.length) === event.paramObject.prefix && operation.text.substring(operation.selEnd - event.paramObject.suffix.length,operation.selEnd) === event.paramObject.suffix) {
 		// Prefix and suffix are already present, so remove them
-		removePrefixSuffix();
-	} else if(o.text.substring(o.selStart - prefix.length, o.selStart) === prefix &&
-				o.text.substring(o.selEnd, o.selEnd + suffix.length) === suffix) {
-		// Prefix and suffix are present BUT not selected -> remove them
-		removePrefixSuffix({"lenPrefix": prefix.length, "lenSuffix": suffix.length});
+		operation.cutStart = operation.selStart;
+		operation.cutEnd = operation.selEnd;
+		operation.replacement = operation.selection.substring(event.paramObject.prefix.length,operation.selection.length - event.paramObject.suffix.length);
+		operation.newSelStart = operation.selStart;
+		operation.newSelEnd = operation.selStart + operation.replacement.length;
 	} else {
 		// Add the prefix and suffix
-		addPrefixSuffix();
+		operation.cutStart = operation.selStart;
+		operation.cutEnd = operation.selEnd;
+		operation.replacement = event.paramObject.prefix + operation.selection + event.paramObject.suffix;
+		operation.newSelStart = operation.selStart;
+		operation.newSelEnd = operation.selStart + operation.replacement.length;
 	}
 };
+
+})();

core/modules/filterrunprefixes/all.js

@@ -7,7 +7,10 @@ Union of sets without de-duplication.
 Equivalent to = filter run prefix.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -18,3 +21,5 @@ exports.all = function(operationSubFunction) {
 		results.push.apply(results, operationSubFunction(source,widget));
 	};
 };
+
+})();

core/modules/filterrunprefixes/and.js

@@ -7,7 +7,10 @@ Intersection of sets.
 Equivalent to + filter run prefix.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -21,3 +24,5 @@ exports.and = function(operationSubFunction,options) {
 		results.pushTop(operationSubFunction(source,widget));
 	};
 };
+
+})();

core/modules/filterrunprefixes/cascade.js

@@ -3,7 +3,10 @@ title: $:/core/modules/filterrunprefixes/cascade.js
 type: application/javascript
 module-type: filterrunprefix
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -36,3 +39,5 @@ exports.cascade = function(operationSubFunction,options) {
 		}
 	}
 };
+
+})();

core/modules/filterrunprefixes/else.js

@@ -6,7 +6,10 @@ module-type: filterrunprefix
 Equivalent to ~ filter run prefix.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -20,3 +23,5 @@ exports.else = function(operationSubFunction) {
 		}
 	};
 };
+
+})();

core/modules/filterrunprefixes/except.js

@@ -7,7 +7,10 @@ Difference of sets.
 Equivalent to - filter run prefix.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -18,3 +21,5 @@ exports.except = function(operationSubFunction) {
 		results.remove(operationSubFunction(source,widget));
 	};
 };
+
+})();

core/modules/filterrunprefixes/filter.js

@@ -4,7 +4,10 @@ type: application/javascript
 module-type: filterrunprefix
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -32,3 +35,5 @@ exports.filter = function(operationSubFunction,options) {
 		}
 	}
 };
+
+})();

core/modules/filterrunprefixes/intersection.js

@@ -4,7 +4,10 @@ type: application/javascript
 module-type: filterrunprefix
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -24,3 +27,5 @@ exports.intersection = function(operationSubFunction) {
 		}
 	};
 };
+
+})();

core/modules/filterrunprefixes/map.js

@@ -3,7 +3,10 @@ title: $:/core/modules/filterrunprefixes/map.js
 type: application/javascript
 module-type: filterrunprefix
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -37,3 +40,5 @@ exports.map = function(operationSubFunction,options) {
 		}
 	}
 };
+
+})();

core/modules/filterrunprefixes/or.js

@@ -6,7 +6,10 @@ module-type: filterrunprefix
 Equivalent to a filter run with no prefix.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -17,3 +20,5 @@ exports.or = function(operationSubFunction) {
 		results.pushTop(operationSubFunction(source,widget));
 	};
 };
+
+})();

core/modules/filterrunprefixes/reduce.js

@@ -3,7 +3,10 @@ title: $:/core/modules/filterrunprefixes/reduce.js
 type: application/javascript
 module-type: filterrunprefix
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -33,3 +36,5 @@ exports.reduce = function(operationSubFunction,options) {
 		}
 	}
 };
+
+})();

core/modules/filterrunprefixes/sort.js

@@ -4,7 +4,10 @@ type: application/javascript
 module-type: filterrunprefix
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -45,3 +48,5 @@ exports.sort = function(operationSubFunction,options) {
 		}
 	}
 };
+
+})();

core/modules/filterrunprefixes/then.js

@@ -6,7 +6,10 @@ module-type: filterrunprefix
 Replace results of previous runs unless empty
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -25,3 +28,5 @@ exports.then = function(operationSubFunction) {
 		}
 	};
 };
+
+})();

core/modules/filters.js

@@ -6,7 +6,10 @@ module-type: wikimethod
 Adds tiddler filtering methods to the $tw.Wiki object.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var widgetClass = require("$:/core/modules/widgets/widget.js").widget;
@@ -220,25 +223,13 @@ exports.filterTiddlers = function(filterString,widget,source) {
 Compile a filter into a function with the signature fn(source,widget) where:
 source: an iterator function for the source tiddlers, called source(iterator), where iterator is called as iterator(tiddler,title)
 widget: an optional widget node for retrieving the current tiddler etc.
-
-Parameters:
-filterString: the filter string to compile
-options: includes:
-
-wrappers: a hashmap of wrapper functions to apply to the compiled filter function
 */
-exports.compileFilter = function(filterString,options) {
-	options = options || {};
-	var self = this;
-	var wrappers = options.wrappers || {};
-	// Invoke the hook to allow the filter to be inspected
-	wrappers = $tw.hooks.invokeHook("th-filter-evaluation",filterString,wrappers) || wrappers;
-	// Get the result from the cache if we can
+exports.compileFilter = function(filterString) {
 	if(!this.filterCache) {
 		this.filterCache = Object.create(null);
 		this.filterCacheCount = 0;
 	}
-	if(this.filterCache[filterString] !== undefined && !wrappers.prefix && !wrappers.operation && !wrappers.operator && !wrappers.start && !wrappers.done) {
+	if(this.filterCache[filterString] !== undefined) {
 		return this.filterCache[filterString];
 	}
 	var filterParseTree;
@@ -247,14 +238,7 @@ exports.compileFilter = function(filterString,options) {
 	} catch(e) {
 		// We do not cache this result, so it adjusts along with localization changes
 		return function(source,widget) {
-			if(wrappers.start) {
-				wrappers.start(source,widget);
-			}
-			var resultsArray = [$tw.language.getString("Error/Filter") + ": " + e];
-			if(wrappers.done) {
-				wrappers.done(resultsArray);
-			}
-			return resultsArray;
+			return [$tw.language.getString("Error/Filter") + ": " + e];
 		};
 	}
 	// Get the hashmap of filter operator functions
@@ -268,64 +252,52 @@ exports.compileFilter = function(filterString,options) {
 		var operationSubFunction = function(source,widget) {
 			var accumulator = source,
 				results = [],
-				currTiddlerTitle = widget && widget.getVariable("currentTiddler"),
-				handleOperation = function() {
-					$tw.utils.each(operation.operators,function(operator) {
-						var operands = [],
-							operatorName,operatorFunction;
-						if(!operator.operator) {
-							// Use the "title" operator if no operator is specified
-							operatorName = "title";
-						} else if(!filterOperators[operator.operator]) {
-							// Unknown operators treated as "[unknown]" - at run time we can distinguish between a custom operator and falling back to the default "field" operator
-							operatorName = "[unknown]";
-						} else {
-							// Use the operator function
-							operatorName = operator.operator;
-						}
-						operatorFunction = filterOperators[operatorName];
-						$tw.utils.each(operator.operands,function(operand) {
-							if(operand.indirect) {
-								operand.value = self.getTextReference(operand.text,"",currTiddlerTitle);
-							} else if(operand.variable) {
-								var varTree = $tw.utils.parseFilterVariable(operand.text);
-								operand.value = widgetClass.evaluateVariable(widget,varTree.name,{params: varTree.params, source: source})[0] || "";
-							} else {
-								operand.value = operand.text;
-							}
-							operands.push(operand.value);
+				currTiddlerTitle = widget && widget.getVariable("currentTiddler");
+			$tw.utils.each(operation.operators,function(operator) {
+				var operands = [],
+					operatorFunction;
+				if(!operator.operator) {
+					// Use the "title" operator if no operator is specified
+					operatorFunction = filterOperators.title;
+				} else if(!filterOperators[operator.operator]) {
+					// Unknown operators treated as "[unknown]" - at run time we can distinguish between a custom operator and falling back to the default "field" operator
+					operatorFunction = filterOperators["[unknown]"];
+				} else {
+					// Use the operator function
+					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) {
+						var varTree = $tw.utils.parseFilterVariable(operand.text);
+						operand.value = widgetClass.evaluateVariable(widget,varTree.name,{params: varTree.params, source: source})[0] || "";
+					} else {
+						operand.value = operand.text;
+					}
+					operands.push(operand.value);
+				});
+
+				// Invoke the appropriate filteroperator module
+				results = operatorFunction(accumulator,{
+							operator: operator.operator,
+							operand: operands.length > 0 ? operands[0] : undefined,
+							operands: operands,
+							prefix: operator.prefix,
+							suffix: operator.suffix,
+							suffixes: operator.suffixes,
+							regexp: operator.regexp
+						},{
+							wiki: self,
+							widget: widget
 						});
-						// Wrap the filter operator module if required
-						if(wrappers.operator) {
-							operatorFunction = wrappers.operator.bind(self,operatorFunction);
-						}
-						// Invoke the appropriate filteroperator module
-						results = operatorFunction(accumulator,{
-									parseTree: operator,
-									operator: operator.operator,
-									operatorName: operatorName,
-									operand: operands.length > 0 ? operands[0] : undefined,
-									operands: operands,
-									prefix: operator.prefix,
-									suffix: operator.suffix,
-									suffixes: operator.suffixes,
-									regexp: operator.regexp
-								},{
-									wiki: self,
-									widget: widget
-								});
-						if($tw.utils.isArray(results)) {
-							accumulator = self.makeTiddlerIterator(results);
-						} else {
-							accumulator = results;
-						}
-					});
-				};
-		if(wrappers.operation) {
-			handleOperation = wrappers.operation.bind(self,handleOperation,operation);
-		}
-		handleOperation();
-		if($tw.utils.isArray(results)) {
+				if($tw.utils.isArray(results)) {
+					accumulator = self.makeTiddlerIterator(results);
+				} else {
+					accumulator = results;
+				}
+			});
+			if($tw.utils.isArray(results)) {
 				return results;
 			} else {
 				var resultArray = [];
@@ -338,45 +310,27 @@ exports.compileFilter = function(filterString,options) {
 		var filterRunPrefixes = self.getFilterRunPrefixes();
 		// Wrap the operator functions in a wrapper function that depends on the prefix
 		operationFunctions.push((function() {
-			var prefixName;
+			var options = {wiki: self, suffixes: operation.suffixes || []};
 			switch(operation.prefix || "") {
 				case "": // No prefix means that the operation is unioned into the result
-					prefixName = "or";
-					break;
+					return filterRunPrefixes["or"](operationSubFunction, options);
 				case "=": // The results of the operation are pushed into the result without deduplication
-					prefixName = "all";
-					break;
+					return filterRunPrefixes["all"](operationSubFunction, options);
 				case "-": // The results of this operation are removed from the main result
-					prefixName = "except";
-					break;
+					return filterRunPrefixes["except"](operationSubFunction, options);
 				case "+": // This operation is applied to the main results so far
-					prefixName = "and";
-					break;
+					return filterRunPrefixes["and"](operationSubFunction, options);
 				case "~": // This operation is unioned into the result only if the main result so far is empty
-					prefixName = "else";
-					break;
-				default:
-					prefixName = operation.namedPrefix;
-					break;
-			}
-			if(prefixName && filterRunPrefixes[prefixName]) {
-				var options = {
-						wiki: self,
-						suffixes: operation.suffixes || [],
-						prefixName: prefixName,
-						prefix: operation.prefix
-					},
-					filterRunPrefixFunction = filterRunPrefixes[prefixName];
-				// Wrap the filter operator module if required
-				if(wrappers.prefix) {
-					filterRunPrefixFunction = wrappers.prefix.bind(self,filterRunPrefixFunction);
-				}
-				return filterRunPrefixFunction(operationSubFunction,options);
-			} else {
-				return function(results,source,widget) {
-					results.clear();
-					results.push($tw.language.getString("Error/FilterRunPrefix"));
-				};
+					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"));
+						};
+					}
 			}
 		})());
 	});
@@ -390,9 +344,6 @@ exports.compileFilter = function(filterString,options) {
 		if(!widget) {
 			widget = $tw.rootWidget;
 		}
-		if(wrappers.start) {
-			wrappers.start(source,widget);
-		}
 		var results = new $tw.utils.LinkedList();
 		self.filterRecursionCount = (self.filterRecursionCount || 0) + 1;
 		if(self.filterRecursionCount < MAX_FILTER_DEPTH) {
@@ -403,11 +354,7 @@ exports.compileFilter = function(filterString,options) {
 			results.push("/**-- Excessive filter recursion --**/");
 		}
 		self.filterRecursionCount = self.filterRecursionCount - 1;
-		var resultsArray = results.toArray();
-		if(wrappers.done) {
-			wrappers.done(resultsArray);
-		}
-		return resultsArray;
+		return results.toArray();
 	});
 	if(this.filterCacheCount >= 2000) {
 		// To prevent memory leak, we maintain an upper limit for cache size.
@@ -416,9 +363,9 @@ exports.compileFilter = function(filterString,options) {
 		this.filterCache = Object.create(null);
 		this.filterCacheCount = 0;
 	}
-	if(!wrappers.prefix && !wrappers.operator) {
-		this.filterCache[filterString] = fnMeasured;
-		this.filterCacheCount++;
-	}
+	this.filterCache[filterString] = fnMeasured;
+	this.filterCacheCount++;
 	return fnMeasured;
 };
+
+})();

core/modules/filters/addprefix.js

@@ -8,7 +8,10 @@ especially useful in contexts where only a filter expression is allowed
 and macro substitution isn't available.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -21,3 +24,5 @@ exports.addprefix = function(source,operator,options) {
 	});
 	return results;
 };
+
+})();

core/modules/filters/addsuffix.js

@@ -8,7 +8,10 @@ especially useful in contexts where only a filter expression is allowed
 and macro substitution isn't available.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -21,3 +24,5 @@ exports.addsuffix = function(source,operator,options) {
 	});
 	return results;
 };
+
+})();

core/modules/filters/after.js

@@ -6,7 +6,10 @@ module-type: filteroperator
 Filter operator returning the tiddler from the current list that is after the tiddler named in the operand.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -24,3 +27,5 @@ exports.after = function(source,operator,options) {
 		return [results[index + 1]];
 	}
 };
+
+})();

core/modules/filters/all.js

@@ -8,7 +8,10 @@ Filter operator for selecting tiddlers
 [all[shadows+tiddlers]]
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var allFilterOperators;
@@ -51,3 +54,5 @@ exports.all = function(source,operator,options) {
 	}
 	return results.makeTiddlerIterator(options.wiki);
 };
+
+})();

core/modules/filters/all/current.js

@@ -6,7 +6,10 @@ module-type: allfilteroperator
 Filter function for [all[current]]
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -20,3 +23,5 @@ exports.current = function(source,prefix,options) {
 		return [];
 	}
 };
+
+})();

core/modules/filters/all/missing.js

@@ -6,7 +6,10 @@ module-type: allfilteroperator
 Filter function for [all[missing]]
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -15,3 +18,5 @@ Export our filter function
 exports.missing = function(source,prefix,options) {
 	return options.wiki.getMissingTitles();
 };
+
+})();

core/modules/filters/all/orphans.js

@@ -6,7 +6,10 @@ module-type: allfilteroperator
 Filter function for [all[orphans]]
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -15,3 +18,5 @@ Export our filter function
 exports.orphans = function(source,prefix,options) {
 	return options.wiki.getOrphanTitles();
 };
+
+})();

core/modules/filters/all/shadows.js

@@ -6,7 +6,10 @@ module-type: allfilteroperator
 Filter function for [all[shadows]]
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -15,3 +18,5 @@ Export our filter function
 exports.shadows = function(source,prefix,options) {
 	return options.wiki.allShadowTitles();
 };
+
+})();

core/modules/filters/all/tags.js

@@ -6,7 +6,10 @@ module-type: allfilteroperator
 Filter function for [all[tags]]
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -15,3 +18,5 @@ Export our filter function
 exports.tags = function(source,prefix,options) {
 	return Object.keys(options.wiki.getTagMap());
 };
+
+})();

core/modules/filters/all/tiddlers.js

@@ -6,7 +6,10 @@ module-type: allfilteroperator
 Filter function for [all[tiddlers]]
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -15,3 +18,5 @@ Export our filter function
 exports.tiddlers = function(source,prefix,options) {
 	return options.wiki.allTitles();
 };
+
+})();

core/modules/filters/backlinks.js

@@ -6,7 +6,10 @@ module-type: filteroperator
 Filter operator for returning all the backlinks from a tiddler
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -19,3 +22,5 @@ exports.backlinks = function(source,operator,options) {
 	});
 	return results.makeTiddlerIterator(options.wiki);
 };
+
+})();

core/modules/filters/backtranscludes.js

@@ -6,6 +6,10 @@ module-type: filteroperator
 Filter operator for returning all the backtranscludes from a tiddler
 
 \*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -18,3 +22,5 @@ exports.backtranscludes = function(source,operator,options) {
 	});
 	return results.makeTiddlerIterator(options.wiki);
 };
+
+})();

core/modules/filters/before.js

@@ -6,7 +6,10 @@ module-type: filteroperator
 Filter operator returning the tiddler from the current list that is before the tiddler named in the operand.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -24,3 +27,5 @@ exports.before = function(source,operator,options) {
 		return [results[index - 1]];
 	}
 };
+
+})();

core/modules/filters/commands.js

@@ -6,7 +6,10 @@ module-type: filteroperator
 Filter operator for returning the names of the commands available in this wiki
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -20,3 +23,5 @@ exports.commands = function(source,operator,options) {
 	results.sort();
 	return results;
 };
+
+})();

core/modules/filters/compare.js

@@ -6,7 +6,10 @@ module-type: filteroperator
 General purpose comparison operator
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.compare = function(source,operator,options) {
@@ -33,3 +36,5 @@ var modes = {
 	"lteq": function(value) {return value <= 0;},
 	"lt": function(value) {return value < 0;}
 }
+
+})();

core/modules/filters/contains.js

@@ -6,7 +6,10 @@ module-type: filteroperator
 Filter operator for finding values in array fields
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -38,3 +41,5 @@ exports.contains = function(source,operator,options) {
 	}
 	return results;
 };
+
+})();

core/modules/filters/count.js

@@ -6,7 +6,10 @@ module-type: filteroperator
 Filter operator returning the number of entries in the current list.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -19,3 +22,5 @@ exports.count = function(source,operator,options) {
 	});
 	return [count + ""];
 };
+
+})();

core/modules/filters/crypto.js

@@ -6,7 +6,10 @@ module-type: filteroperator
 Filter operators for cryptography, using the Stanford JavaScript library
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.sha256 = function(source,operator,options) {
@@ -17,3 +20,5 @@ exports.sha256 = function(source,operator,options) {
 	});
 	return results;
 };
+
+})();

core/modules/filters/days.js

@@ -6,7 +6,10 @@ module-type: filteroperator
 Filter operator that selects tiddlers with a specified date field within a specified date interval.
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -43,3 +46,5 @@ exports.days = function(source,operator,options) {
 	}
 	return results;
 };
+
+})();

core/modules/filters/deserialize.js

@@ -4,7 +4,10 @@ type: application/javascript
 module-type: filteroperator
 Filter operator for deserializing string data into JSON representing tiddlers
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["deserialize"] = function(source,operator,options) {
@@ -32,3 +35,5 @@ exports["deserialize"] = function(source,operator,options) {
 	}
 	return results;
 }
+
+})();

core/modules/filters/deserializers.js

@@ -6,7 +6,10 @@ module-type: filteroperator
 Filter operator for returning the names of the deserializers in this wiki
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -20,3 +23,5 @@ exports.deserializers = function(source,operator,options) {
 	results.sort();
 	return results;
 };
+
+})();

core/modules/filters/duplicateslugs.js

@@ -6,7 +6,10 @@ module-type: filteroperator
 Filter function for [duplicateslugs[]]
 
 \*/
+(function(){
 
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -29,3 +32,5 @@ exports.duplicateslugs = function(source,operator,options) {
 	});
 	return results;
 };
+
+})();