diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index 30a0dae7c..000000000
--- a/.eslintignore
+++ /dev/null
@@ -1,15 +0,0 @@
-# Known minified files
-/boot/sjcl.js
-/core/modules/utils/base64-utf8/base64-utf8.module.min.js
-/core/modules/utils/diff-match-patch/diff_match_patch.js
-/plugins/tiddlywiki/async/files/async.min.v1.5.0.js
-/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/anyword-hint.js
-/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/css-hint.js
-/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/html-hint.js
-/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/javascript-hint.js
-/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/show-hint.js
-/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/xml-hint.js
-/plugins/tiddlywiki/codemirror-closebrackets/files/addon/edit/closebrackets.js
-/plugins/tiddlywiki/codemirror-closebrackets/files/addon/edit/matchbrackets.js
-/plugins/tiddlywiki/codemirror-closetag/files/addon/edit/closetag.js
-/plugins/tiddlywiki/codemirror-closetag/files/addon/fold/xml-fold.js
diff --git a/.eslintrc.yml b/.eslintrc.yml
deleted file mode 100644
index 105ca829e..000000000
--- a/.eslintrc.yml
+++ /dev/null
@@ -1,267 +0,0 @@
-env:
- browser: true
- commonjs: true
- es2021: true
- node: true
-extends: 'eslint:recommended'
-globals:
- "$tw": "writable" # temporary
-parserOptions:
- ecmaVersion: 5
-rules:
- array-bracket-newline: 'off'
- array-bracket-spacing: 'off'
- array-callback-return: 'off'
- array-element-newline: 'off'
- arrow-body-style: error
- arrow-parens:
- - error
- - as-needed
- arrow-spacing:
- - error
- - after: true
- before: true
- block-scoped-var: 'off'
- block-spacing: 'off'
- brace-style: 'off'
- callback-return: 'off'
- camelcase: 'off'
- capitalized-comments: 'off'
- class-methods-use-this: error
- comma-dangle: 'off'
- comma-spacing: 'off'
- comma-style: 'off'
- complexity: 'off'
- computed-property-spacing: 'off'
- consistent-return: 'off'
- consistent-this: 'off'
- curly: 'off'
- default-case: 'off'
- default-case-last: error
- default-param-last: error
- dot-location: 'off'
- dot-notation: 'off'
- eol-last: 'off'
- eqeqeq: 'off'
- func-call-spacing: 'off'
- func-name-matching: 'off'
- func-names: 'off'
- func-style: 'off'
- function-call-argument-newline: 'off'
- function-paren-newline: 'off'
- generator-star-spacing: error
- global-require: 'off'
- grouped-accessor-pairs: error
- guard-for-in: 'off'
- handle-callback-err: 'off'
- id-blacklist: error
- id-denylist: error
- id-length: 'off'
- id-match: error
- implicit-arrow-linebreak: error
- indent: 'off'
- indent-legacy: 'off'
- init-declarations: 'off'
- jsx-quotes: error
- key-spacing: 'off'
- keyword-spacing: 'off'
- line-comment-position: 'off'
- linebreak-style: 'off'
- lines-around-comment: 'off'
- lines-around-directive: 'off'
- lines-between-class-members: error
- max-classes-per-file: error
- max-depth: 'off'
- max-len: 'off'
- max-lines: 'off'
- max-lines-per-function: 'off'
- max-nested-callbacks: error
- max-params: 'off'
- max-statements: 'off'
- max-statements-per-line: 'off'
- multiline-comment-style: 'off'
- multiline-ternary: 'off'
- new-parens: 'off'
- newline-after-var: 'off'
- newline-before-return: 'off'
- newline-per-chained-call: 'off'
- no-alert: 'off'
- no-array-constructor: 'off'
- no-await-in-loop: error
- no-bitwise: 'off'
- no-buffer-constructor: 'off'
- no-caller: error
- no-catch-shadow: 'off'
- no-confusing-arrow: error
- no-console: 'off'
- no-constant-condition:
- - error
- - checkLoops: false
- no-constructor-return: error
- no-continue: 'off'
- no-div-regex: 'off'
- no-duplicate-imports: error
- no-else-return: 'off'
- no-empty-function: 'off'
- no-eq-null: 'off'
- no-eval: 'off'
- no-extend-native: 'off'
- no-extra-bind: 'off'
- no-extra-label: 'off'
- no-extra-parens: 'off'
- no-floating-decimal: 'off'
- no-implicit-coercion:
- - error
- - boolean: false
- number: false
- string: false
- no-implicit-globals: 'off'
- no-implied-eval: error
- no-inline-comments: 'off'
- no-invalid-this: 'off'
- no-iterator: error
- no-label-var: 'off'
- no-labels: 'off'
- no-lone-blocks: 'off'
- no-lonely-if: 'off'
- no-loop-func: 'off'
- no-loss-of-precision: error
- no-magic-numbers: 'off'
- no-mixed-operators: 'off'
- no-mixed-requires: 'off'
- no-multi-assign: 'off'
- no-multi-spaces: 'off'
- no-multi-str: error
- no-multiple-empty-lines: 'off'
- no-native-reassign: 'off'
- no-negated-condition: 'off'
- no-negated-in-lhs: error
- no-nested-ternary: 'off'
- no-new: 'off'
- no-new-func: 'off'
- no-new-object: 'off'
- no-new-require: error
- no-new-wrappers: error
- no-octal-escape: error
- no-param-reassign: 'off'
- no-path-concat: error
- no-plusplus: 'off'
- no-process-env: 'off'
- no-process-exit: 'off'
- no-promise-executor-return: error
- no-proto: 'off'
- no-restricted-exports: error
- no-restricted-globals: error
- no-restricted-imports: error
- no-restricted-modules: error
- no-restricted-properties: error
- no-restricted-syntax: error
- no-return-assign: 'off'
- no-return-await: error
- no-script-url: 'off'
- no-self-compare: 'off'
- no-sequences: 'off'
- no-shadow: 'off'
- no-spaced-func: 'off'
- no-sync: 'off'
- no-tabs: 'off'
- no-template-curly-in-string: error
- no-ternary: 'off'
- no-throw-literal: 'off'
- no-trailing-spaces: 'off'
- no-undef-init: 'off'
- no-undefined: 'off'
- no-underscore-dangle: 'off'
- no-unmodified-loop-condition: 'off'
- no-unneeded-ternary: 'off'
- no-unreachable-loop: error
- no-unused-expressions: 'off'
- no-use-before-define: 'off'
- no-useless-backreference: error
- no-useless-call: 'off'
- no-useless-computed-key: error
- no-useless-concat: 'off'
- no-useless-constructor: error
- no-useless-rename: error
- no-useless-return: 'off'
- no-var: 'off'
- no-void: 'off'
- no-warning-comments: 'off'
- no-whitespace-before-property: error
- nonblock-statement-body-position:
- - error
- - any
- object-curly-newline: 'off'
- object-curly-spacing: 'off'
- object-property-newline: 'off'
- object-shorthand: 'off'
- one-var: 'off'
- one-var-declaration-per-line: 'off'
- operator-assignment: 'off'
- operator-linebreak: 'off'
- padded-blocks: 'off'
- padding-line-between-statements: error
- prefer-arrow-callback: 'off'
- prefer-const: 'off'
- prefer-destructuring: 'off'
- prefer-exponentiation-operator: 'off'
- prefer-named-capture-group: 'off'
- prefer-numeric-literals: error
- prefer-object-spread: 'off'
- prefer-promise-reject-errors: error
- prefer-reflect: 'off'
- prefer-regex-literals: 'off'
- prefer-rest-params: 'off'
- prefer-spread: 'off'
- prefer-template: 'off'
- quote-props: 'off'
- quotes: 'off'
- radix: 'off'
- require-atomic-updates: error
- require-await: error
- require-jsdoc: 'off'
- require-unicode-regexp: 'off'
- rest-spread-spacing: error
- semi: 'off'
- semi-spacing: 'off'
- semi-style: 'off'
- sort-imports: error
- sort-keys: 'off'
- sort-vars: 'off'
- space-before-blocks: 'off'
- space-before-function-paren: 'off'
- space-in-parens: 'off'
- space-infix-ops: 'off'
- space-unary-ops: 'off'
- spaced-comment: 'off'
- strict: 'off'
- switch-colon-spacing: 'off'
- symbol-description: error
- template-curly-spacing: error
- template-tag-spacing: error
- unicode-bom:
- - error
- - never
- valid-jsdoc: 'off'
- valid-typeof:
- - error
- - requireStringLiterals: false
- vars-on-top: 'off'
- wrap-iife: 'off'
- wrap-regex: 'off'
- yield-star-spacing: error
- yoda: 'off'
-
- # temporary rules
- no-useless-escape: 'off'
- no-unused-vars: 'off'
- no-empty: 'off'
- no-extra-semi: 'off'
- no-redeclare: 'off'
- no-control-regex: "off"
- no-mixed-spaces-and-tabs: "off"
- no-extra-boolean-cast: "off"
- no-prototype-builtins: "off"
- no-undef: "off"
- no-unreachable: "off"
- no-self-assign: "off"
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 77d3f5f03..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve TiddlyWiki 5
-title: "[BUG]"
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**TiddlyWiki Configuration (please complete the following information):**
- - Version [e.g. v5.1.24]
- - Saving mechanism [e.g. Node.js, TiddlyDesktop, TiddlyHost etc]
- - Plugins installed [e.g. Freelinks, TiddlyMap]
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..286a842bc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,67 @@
+name: Bug report
+description: Create a report to help us improve TiddlyWiki 5
+title: "[BUG] "
+body:
+ - type: textarea
+ id: Describe
+ attributes:
+ label: Describe the bug
+ description: A clear and concise description of what the bug is.
+ validations:
+ required: true
+ - type: textarea
+ id: Expected
+ attributes:
+ label: Expected behavior
+ description: A clear and concise description of what you expected to happen.
+ validations:
+ required: false
+ - type: textarea
+ id: Reproduce
+ attributes:
+ label: To Reproduce
+ description: "Steps to reproduce the behavior:"
+ placeholder: |
+ 1. Go to '...'
+ 2. Click on '....'
+ 3. Scroll down to '....'
+ 4. See error
+ validations:
+ required: false
+ - type: textarea
+ id: Screenshots
+ attributes:
+ label: Screenshots
+ description: If applicable, add screenshots to help explain your problem.
+ placeholder: Drag image here to upload screenshot!
+ validations:
+ required: false
+ - type: textarea
+ id: Configuration
+ attributes:
+ label: TiddlyWiki Configuration
+ description: please complete the following information
+ placeholder: |
+ - Version [e.g. v5.1.24]
+ - Saving mechanism [e.g. Node.js, TiddlyDesktop, TiddlyHost etc]
+ - Plugins installed [e.g. Freelinks, TiddlyMap]
+
+ ### Desktop (please complete the following information):
+
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+ ### Smartphone (please complete the following information):
+
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+ validations:
+ required: true
+ - type: textarea
+ id: Context
+ attributes:
+ label: Additional context
+ description: Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..dca23b783
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+ - name: Discuss feature request
+ url: https://github.com/TiddlyWiki/TiddlyWiki5/discussions
+ about: Open new discussion about new feature
+ - name: Talk.Tiddlywiki Forum
+ url: https://talk.tiddlywiki.org
+ about: Join the Forum
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
index e3d0735c3..a1e80f7e3 100644
--- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -20,3 +20,11 @@ A clear and concise description of any alternative solutions or features you've
Add any other context or screenshots about the feature request here.
If you link to discussions elsewhere then please copy and paste the important text, and don't expect readers to scan the entire discussion to find the relevant part.
+
+## Checklist before requesting a review
+
+- [ ] Illustrate any visual changes (however minor) with before/after screenshots
+- [ ] Self-review of code
+- [ ] Documentation updates (for user-visible changes)
+- [ ] Tests (for core code changes)
+- [ ] Complies with coding style guidelines (for JavaScript code)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f377b3921..f6fb58f7d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,16 +5,22 @@ on:
- master
- tiddlywiki-com
env:
- NODE_VERSION: "12"
+ NODE_VERSION: "22"
jobs:
test:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-node@v1
+ - uses: actions/checkout@v5
+ - uses: actions/setup-node@v4
with:
node-version: "${{ env.NODE_VERSION }}"
- - run: "./bin/test.sh"
+ - run: "./bin/ci-test.sh"
+ - uses: actions/upload-artifact@v4
+ if: always()
+ with:
+ name: playwright-report
+ path: playwright-report/
+ retention-days: 30
build-prerelease:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master'
@@ -24,8 +30,8 @@ jobs:
TW5_BUILD_MAIN_EDITION: "./editions/prerelease"
TW5_BUILD_OUTPUT: "./output/prerelease"
steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-node@v1
+ - uses: actions/checkout@v5
+ - uses: actions/setup-node@v4
with:
node-version: "${{ env.NODE_VERSION }}"
- run: "./bin/ci-pre-build.sh"
@@ -54,9 +60,10 @@ jobs:
TW5_BUILD_TIDDLYWIKI: "./node_modules/tiddlywiki/tiddlywiki.js"
TW5_BUILD_MAIN_EDITION: "./editions/tw5.com"
TW5_BUILD_OUTPUT: "./output"
+ TW5_BUILD_ARCHIVE: "./output"
steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-node@v1
+ - uses: actions/checkout@v5
+ - uses: actions/setup-node@v4
with:
node-version: "${{ env.NODE_VERSION }}"
- run: "./bin/ci-pre-build.sh"
@@ -72,3 +79,6 @@ jobs:
- run: "./bin/ci-push.sh"
env:
GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }}
+ - run: "./bin/build-tw-org.sh"
+ env:
+ GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }}
diff --git a/.github/workflows/cla-check.yml b/.github/workflows/cla-check.yml
new file mode 100644
index 000000000..331727b71
--- /dev/null
+++ b/.github/workflows/cla-check.yml
@@ -0,0 +1,30 @@
+name: Check CLA Signature
+on:
+ pull_request_target:
+ types:
+ - opened
+ - reopened
+ paths-ignore:
+ - 'licenses/cla-individual.md'
+jobs:
+ check_cla:
+ runs-on: ubuntu-latest
+ permissions:
+ pull-requests: write
+ 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
+ echo "CLA not signed"
+ gh pr comment "$NUMBER" -b "@$USER It appears that this is your first contribution to the project, welcome.
+
+ With apologies for the bureaucracy, please could you prepare a separate PR to the 'tiddlywiki-com' branch with your signature for the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))."
+ else
+ echo "CLA already signed"
+ gh pr comment "$NUMBER" -b "Confirmed: **$USER** has already signed the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))"
+ fi
+ env:
+ GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ GH_REPO: ${{ github.repository }}
+ NUMBER: ${{ github.event.pull_request.number }}
+ USER: ${{ github.actor }}
diff --git a/.github/workflows/cla-signed.yml b/.github/workflows/cla-signed.yml
new file mode 100644
index 000000000..01d57d014
--- /dev/null
+++ b/.github/workflows/cla-signed.yml
@@ -0,0 +1,70 @@
+name: CLA Signed
+
+on:
+ pull_request_target:
+ types:
+ - opened
+ - closed
+ paths:
+ - 'licenses/cla-individual.md'
+
+env:
+ GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ GH_REPO: ${{ github.repository }}
+ NUMBER: ${{ github.event.pull_request.number }}
+ AUTHOR: ${{ github.event.pull_request.user.login }}
+
+jobs:
+ # check if PRs updating the CLA are targetting the tiddlywiki-com branch
+ check-signature-branch:
+ if: (github.event.pull_request.merged != true) && (github.event.pull_request.user.login != github.repository_owner)
+ runs-on: ubuntu-latest
+ permissions:
+ pull-requests: write
+ steps:
+ - run: |
+ if [[ "$BRANCH" != "tiddlywiki-com" ]]; then
+ echo "This CLA signature targets the wrong branch: $BRANCH"
+ gh pr comment "$NUMBER" -b "@$AUTHOR Signatures to the CLA must target the 'tiddlywiki-com' branch."
+ fi
+ env:
+ BRANCH: ${{ github.event.pull_request.base.ref }}
+
+ # leave a comment on each open PR by a given author when their signature is added to the CLA
+ cla-signed:
+ if: (github.event.pull_request.merged == true) && (github.event.pull_request.user.login != github.repository_owner)
+ runs-on: ubuntu-latest
+ permissions:
+ pull-requests: write
+ steps:
+ - name: List open PRs by user
+ id: list-prs
+ uses: actions/github-script@v6
+ with:
+ result-encoding: string
+ script: |
+ const owner = context.repo.owner,
+ repo = context.repo.repo,
+ author = context.payload.pull_request.user.login;
+
+ const { data: pullRequests } = await github.rest.pulls.list({
+ owner: owner,
+ repo: repo,
+ state: 'open',
+ sort: 'created',
+ direction: 'desc',
+ per_page: 100
+ });
+ const userPullRequests = pullRequests.filter(pr => pr.user.login === author),
+ prNumbers = userPullRequests.map(pr => pr.number).join(',');
+ console.log(`Open pull requests by ${author}:${prNumbers}`);
+ return prNumbers;
+
+ - name: Comment open PRs by the same author
+ run: |
+ prs=($(echo ${{ steps.list-prs.outputs.result }} | tr "," "\n"))
+
+ for number in "${prs[@]}"
+ do
+ gh pr comment "$number" -b "**$AUTHOR** has signed the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))"
+ done
diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
new file mode 100644
index 000000000..eae1d2c46
--- /dev/null
+++ b/.github/workflows/eslint.yml
@@ -0,0 +1,40 @@
+name: ESLint
+
+on:
+ pull_request:
+ types: [opened, synchronize, reopened]
+ workflow_dispatch:
+
+concurrency:
+ group: lint-${{ github.event.pull_request.number || github.ref_name }}
+ cancel-in-progress: true
+
+permissions:
+ contents: read
+ # Needed for GitHub Checks API
+ checks: write
+
+jobs:
+ eslint:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v5
+
+ - name: Setup Node.js
+ uses: actions/setup-node@v4
+ with:
+ node-version: 20
+
+ - name: Install dependencies
+ run: npm install --include=dev
+
+ - name: Run ESLint with reviewdog (GitHub Checks)
+ uses: reviewdog/action-eslint@v1
+ with:
+ eslint_flags: '.'
+ reporter: github-pr-check
+ fail_level: error
+ level: error
+ tool_name: ESLint PR code
diff --git a/.github/workflows/pr-check-build-size.yml b/.github/workflows/pr-check-build-size.yml
new file mode 100644
index 000000000..8512a30d4
--- /dev/null
+++ b/.github/workflows/pr-check-build-size.yml
@@ -0,0 +1,55 @@
+name: Calculate PR build size
+on:
+ pull_request_target:
+ types: [opened, reopened, synchronize]
+ paths:
+ - 'boot/**'
+ - 'core/**'
+ - 'themes/tiddlywiki/snowwhite/**'
+ - 'themes/tiddlywiki/vanilla/**'
+
+jobs:
+ calculate-build-size:
+ runs-on: ubuntu-latest
+ permissions:
+ pull-requests: read
+ contents: read
+ outputs:
+ pr_size: ${{ steps.get_sizes.outputs.pr_size }}
+ base_size: ${{ steps.get_sizes.outputs.base_size }}
+ steps:
+ - name: build-size-check
+ id: get_sizes
+ uses: TiddlyWiki/cerebrus@v4
+ with:
+ pr_number: ${{ github.event.pull_request.number }}
+ repo: ${{ github.repository }}
+ base_ref: ${{ github.event.pull_request.base.ref }}
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ mode: size:calc
+
+ dispatch-followup:
+ needs: calculate-build-size
+ runs-on: ubuntu-latest
+ permissions:
+ actions: write # Required to dispatch another workflow
+ pull-requests: write
+ contents: read
+ steps:
+ - name: Trigger follow-up workflow
+ uses: actions/github-script@v6
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ script: |
+ await github.rest.actions.createWorkflowDispatch({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ workflow_id: 'pr-comment-build-size.yml',
+ ref: 'master',
+ inputs: {
+ pr_number: '${{ github.event.pull_request.number }}',
+ base_ref: '${{ github.event.pull_request.base.ref }}',
+ pr_size: '${{ needs.calculate-build-size.outputs.pr_size }}',
+ base_size: '${{ needs.calculate-build-size.outputs.base_size }}'
+ }
+ });
\ No newline at end of file
diff --git a/.github/workflows/pr-comment-build-size.yml b/.github/workflows/pr-comment-build-size.yml
new file mode 100644
index 000000000..8421d99c8
--- /dev/null
+++ b/.github/workflows/pr-comment-build-size.yml
@@ -0,0 +1,36 @@
+name: Comment on PR build size (Trusted workflow)
+
+on:
+ workflow_dispatch:
+ inputs:
+ pr_number:
+ required: true
+ type: string
+ base_ref:
+ required: true
+ type: string
+ pr_size:
+ required: true
+ type: string
+ base_size:
+ required: true
+ type: string
+
+jobs:
+ comment-on-pr:
+ runs-on: ubuntu-latest
+ permissions:
+ pull-requests: write
+ contents: read
+
+ steps:
+ - name: Build and check size
+ uses: TiddlyWiki/cerebrus@v4
+ with:
+ pr_number: ${{ inputs.pr_number }}
+ repo: ${{ github.repository }}
+ base_ref: ${{ inputs.base_ref }}
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ mode: size:comment
+ pr_size: ${{ inputs.pr_size }}
+ base_size: ${{ inputs.base_size }}
diff --git a/.github/workflows/pr-path-validation.yml b/.github/workflows/pr-path-validation.yml
new file mode 100644
index 000000000..674a9115b
--- /dev/null
+++ b/.github/workflows/pr-path-validation.yml
@@ -0,0 +1,18 @@
+name: Validate PR Paths
+
+on:
+ pull_request_target:
+ types: [opened, reopened, synchronize]
+
+jobs:
+ validate-pr:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Validate PR
+ uses: TiddlyWiki/cerebrus@v4
+ with:
+ pr_number: ${{ github.event.pull_request.number }}
+ repo: ${{ github.repository }}
+ base_ref: ${{ github.base_ref }}
+ github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 5d7cc4870..412759161 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,11 @@
.DS_Store
.c9/
+.vs/
+.vscode/
tmp/
output/
node_modules/
+/test-results/
+/playwright-report/
+/playwright/.cache/
+$__StoryList.tid
diff --git a/bin/build-site.sh b/bin/build-site.sh
index f896abcac..a68dc0752 100755
--- a/bin/build-site.sh
+++ b/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.1.24
+ TW5_BUILD_VERSION=v5.4.0
fi
echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -73,10 +73,8 @@ rm $TW5_BUILD_OUTPUT/dev/static/*
echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/index.html" > $TW5_BUILD_OUTPUT/classicparserdemo.html
echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/codemirror/index.html" > $TW5_BUILD_OUTPUT/codemirrordemo.html
-echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/d3/index.html" > $TW5_BUILD_OUTPUT/d3demo.html
echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/highlight/index.html" > $TW5_BUILD_OUTPUT/highlightdemo.html
echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/markdown/index.html" > $TW5_BUILD_OUTPUT/markdowndemo.html
-echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/tahoelafs/index.html" > $TW5_BUILD_OUTPUT/tahoelafs.html
# Put the build details into a .tid file so that it can be included in each build (deleted at the end of this script)
@@ -84,40 +82,57 @@ echo -e -n "title: $:/build\ncommit: $TW5_BUILD_COMMIT\n\n$TW5_BUILD_DETAILS\n"
######################################################
#
-# Core distribution
+# Core distributions
#
######################################################
+# Conditionally build archive if $TW5_BUILD_ARCHIVE variable is set, otherwise do nothing
+#
+# /archive/Empty-TiddlyWiki-.html Empty archived version
+# /archive/TiddlyWiki-.html Full archived version
+
+if [ -n "$TW5_BUILD_ARCHIVE" ]; then
+
+node $TW5_BUILD_TIDDLYWIKI \
+ $TW5_BUILD_MAIN_EDITION \
+ --version \
+ --load $TW5_BUILD_OUTPUT/build.tid \
+ --output $TW5_BUILD_ARCHIVE \
+ --build archive \
+ || exit 1
+fi
+
# /index.html Main site
+# /external-(version).html External core version of main site
# /favicon.ico Favicon for main site
# /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
+
node $TW5_BUILD_TIDDLYWIKI \
$TW5_BUILD_MAIN_EDITION \
- --verbose \
--version \
--load $TW5_BUILD_OUTPUT/build.tid \
--output $TW5_BUILD_OUTPUT \
- --build favicon static index \
+ --build favicon static index external-js \
|| exit 1
-# /empty.html Empty
-# /empty.hta For Internet Explorer
+# /empty.html Empty
+# /empty.hta For Internet Explorer
+# /empty-external-core.html External core empty
+# /tiddlywikicore-.js Core plugin javascript
node $TW5_BUILD_TIDDLYWIKI \
./editions/empty \
- --verbose \
--output $TW5_BUILD_OUTPUT \
- --build empty \
+ --build empty emptyexternalcore \
|| exit 1
# /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
@@ -130,16 +145,28 @@ 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 \
|| exit 1
+# /tour.html tour edition
+node $TW5_BUILD_TIDDLYWIKI \
+ ./editions/tour \
+ --output $TW5_BUILD_OUTPUT \
+ --rendertiddler $:/core/save/all-external-js tour.html text/plain \
+ || exit 1
+
+# /surveys.html surveys edition
+node $TW5_BUILD_TIDDLYWIKI \
+ ./editions/tiddlywiki-surveys \
+ --output $TW5_BUILD_OUTPUT \
+ --build index \
+ || 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 \
@@ -148,7 +175,6 @@ 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 \
@@ -157,7 +183,6 @@ 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 \
@@ -173,16 +198,14 @@ node $TW5_BUILD_TIDDLYWIKI \
# /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 index \
+ --build external \
|| 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 \
@@ -191,16 +214,14 @@ 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 index \
+ --build external \
|| 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 \
@@ -209,7 +230,6 @@ 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 \
@@ -218,7 +238,6 @@ 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 \
@@ -227,9 +246,16 @@ 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 \
+ || exit 1
+
+# /editions/twitter-archivist/index.html Twitter Archivist edition
+node $TW5_BUILD_TIDDLYWIKI \
+ ./editions/twitter-archivist \
+ --load $TW5_BUILD_OUTPUT/build.tid \
+ --output $TW5_BUILD_OUTPUT/editions/twitter-archivist/ \
--build index \
|| exit 1
@@ -243,10 +269,9 @@ node $TW5_BUILD_TIDDLYWIKI \
node $TW5_BUILD_TIDDLYWIKI \
./editions/innerwikidemo \
- --verbose \
--load $TW5_BUILD_OUTPUT/build.tid \
--output $TW5_BUILD_OUTPUT \
- --rendertiddler $:/core/save/all plugins/tiddlywiki/innerwiki/index.html text/plain \
+ --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/innerwiki/index.html text/plain \
|| exit 1
# /plugins/tiddlywiki/dynaview/index.html Demo wiki with DynaView plugin
@@ -254,10 +279,9 @@ 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 plugins/tiddlywiki/dynaview/index.html text/plain \
+ --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/dynaview/index.html text/plain \
--rendertiddler $:/core/save/empty plugins/tiddlywiki/dynaview/empty.html text/plain \
|| exit 1
@@ -269,43 +293,19 @@ 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 plugins/tiddlywiki/katex/index.html text/plain \
+ --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/katex/index.html text/plain \
--rendertiddler $:/core/save/empty plugins/tiddlywiki/katex/empty.html text/plain \
|| exit 1
-# /plugins/tiddlywiki/tahoelafs/index.html Demo wiki with Tahoe-LAFS plugin
-# /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 \
- --rendertiddler $:/core/save/empty plugins/tiddlywiki/tahoelafs/empty.html text/plain \
- || exit 1
-
-# /plugins/tiddlywiki/d3/index.html Demo wiki with D3 plugin
-# /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 \
- --rendertiddler $:/core/save/empty plugins/tiddlywiki/d3/empty.html text/plain \
- || exit 1
-
# /plugins/tiddlywiki/codemirror/index.html Demo wiki with codemirror plugin
# /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 plugins/tiddlywiki/codemirror/index.html text/plain \
+ --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/codemirror/index.html text/plain \
--rendertiddler $:/core/save/empty plugins/tiddlywiki/codemirror/empty.html text/plain \
|| exit 1
@@ -313,10 +313,9 @@ 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 plugins/tiddlywiki/markdown/index.html text/plain \
+ --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/markdown/index.html text/plain \
--rendertiddler $:/core/save/empty plugins/tiddlywiki/markdown/empty.html text/plain \
|| exit 1
@@ -324,10 +323,9 @@ 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 plugins/tiddlywiki/tw2parser/index.html text/plain \
+ --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/tw2parser/index.html text/plain \
--rendertiddler $:/core/save/empty plugins/tiddlywiki/tw2parser/empty.html text/plain \
|| exit 1
@@ -335,13 +333,22 @@ 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 plugins/tiddlywiki/highlight/index.html text/plain \
+ --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/highlight/index.html text/plain \
--rendertiddler $:/core/save/empty plugins/tiddlywiki/highlight/empty.html text/plain \
|| exit 1
+# /plugins/tiddlywiki/geospatial/index.html Demo wiki with geospatial plugin
+# /plugins/tiddlywiki/geospatial/empty.html Empty wiki with geospatial plugin
+node $TW5_BUILD_TIDDLYWIKI \
+ ./editions/geospatialdemo \
+ --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/empty plugins/tiddlywiki/geospatial/empty.html text/plain \
+ || exit 1
+
######################################################
#
# Language editions
@@ -350,20 +357,19 @@ node $TW5_BUILD_TIDDLYWIKI \
# Delete any existing static content
-rm $TW5_BUILD_OUTPUT/languages/de-AT/static/*
-rm $TW5_BUILD_OUTPUT/languages/de-DE/static/*
-rm $TW5_BUILD_OUTPUT/languages/es-ES/static/*
-rm $TW5_BUILD_OUTPUT/languages/fr-FR/static/*
-rm $TW5_BUILD_OUTPUT/languages/ja-JP/static/*
-rm $TW5_BUILD_OUTPUT/languages/ko-KR/static/*
-rm $TW5_BUILD_OUTPUT/languages/zh-Hans/static/*
-rm $TW5_BUILD_OUTPUT/languages/zh-Hant/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/de-AT/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/de-DE/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/es-ES/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/fr-FR/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/ja-JP/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/ko-KR/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/zh-Hans/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/zh-Hant/static/*
# /languages/de-AT/index.html Demo wiki with de-AT language
# /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 \
@@ -373,7 +379,6 @@ 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 \
@@ -383,7 +388,6 @@ 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 \
@@ -393,7 +397,6 @@ 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 \
@@ -403,7 +406,6 @@ 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 \
@@ -413,7 +415,6 @@ 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 \
@@ -423,7 +424,6 @@ 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 \
@@ -433,7 +433,6 @@ 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 \
@@ -447,10 +446,9 @@ node $TW5_BUILD_TIDDLYWIKI \
node $TW5_BUILD_TIDDLYWIKI \
./editions/pluginlibrary \
- --verbose \
--load $TW5_BUILD_OUTPUT/build.tid \
--output $TW5_BUILD_OUTPUT/library/$TW5_BUILD_VERSION \
- --build \
+ --build library\
|| exit 1
# Delete the temporary build tiddler
diff --git a/bin/build-tw-org.sh b/bin/build-tw-org.sh
new file mode 100755
index 000000000..eb76baa85
--- /dev/null
+++ b/bin/build-tw-org.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Build tiddlywiki.org assets.
+
+# Default to the version of TiddlyWiki installed in this repo
+
+if [ -z "$TWORG_BUILD_TIDDLYWIKI" ]; then
+ TWORG_BUILD_TIDDLYWIKI=./tiddlywiki.js
+fi
+
+echo "Using TWORG_BUILD_TIDDLYWIKI as [$TWORG_BUILD_TIDDLYWIKI]"
+
+# Set up the build details
+
+if [ -z "$TWORG_BUILD_DETAILS" ]; then
+ TWORG_BUILD_DETAILS="$(git symbolic-ref --short HEAD)-$(git rev-parse HEAD) from $(git remote get-url origin)"
+fi
+
+echo "Using TWORG_BUILD_DETAILS as [$TWORG_BUILD_DETAILS]"
+
+if [ -z "$TWORG_BUILD_COMMIT" ]; then
+ TWORG_BUILD_COMMIT="$(git rev-parse HEAD)"
+fi
+
+echo "Using TWORG_BUILD_COMMIT as [$TWORG_BUILD_COMMIT]"
+
+# Set up the build output directory
+
+if [ -z "$TWORG_BUILD_OUTPUT" ]; then
+ TWORG_BUILD_OUTPUT=$(mktemp -d)
+fi
+
+mkdir -p $TWORG_BUILD_OUTPUT
+
+if [ ! -d "$TWORG_BUILD_OUTPUT" ]; then
+ echo 'A valid TWORG_BUILD_OUTPUT environment variable must be set'
+ exit 1
+fi
+
+echo "Using TWORG_BUILD_OUTPUT as [$TWORG_BUILD_OUTPUT]"
+
+# Pull existing GitHub pages content
+
+git clone --depth=1 --branch=main "https://github.com/TiddlyWiki/tiddlywiki.org-gh-pages.git" $TWORG_BUILD_OUTPUT
+
+# Make the CNAME file that GitHub Pages requires
+
+echo "tiddlywiki.org" > $TWORG_BUILD_OUTPUT/CNAME
+
+# Delete any existing static content
+
+mkdir -p $TWORG_BUILD_OUTPUT/static
+rm $TWORG_BUILD_OUTPUT/static/*
+
+# Put the build details into a .tid file so that it can be included in each build (deleted at the end of this script)
+
+echo -e -n "title: $:/build\ncommit: $TWORG_BUILD_COMMIT\n\n$TWORG_BUILD_DETAILS\n" > $TWORG_BUILD_OUTPUT/build.tid
+
+######################################################
+#
+# tiddlywiki.org distribution
+#
+######################################################
+
+# /index.html Main site
+# /favicon.ico Favicon for main site
+# /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
+node $TWORG_BUILD_TIDDLYWIKI \
+ editions/tw.org \
+ --verbose \
+ --version \
+ --load $TWORG_BUILD_OUTPUT/build.tid \
+ --output $TWORG_BUILD_OUTPUT \
+ --build favicon static index \
+ || exit 1
+
+# Delete the temporary build tiddler
+
+rm $TWORG_BUILD_OUTPUT/build.tid || exit 1
+
+# Push output back to GitHub
+
+# Exit script immediately if any command fails
+set -e
+
+pushd $TWORG_BUILD_OUTPUT
+git config --global user.email "actions@github.com"
+git config --global user.name "GitHub Actions"
+git add -A .
+git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))"
+git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.org-gh-pages.git" &>/dev/null
+git push deploy main &>/dev/null
+popd
diff --git a/bin/ci-pre-build.sh b/bin/ci-pre-build.sh
index 6f4b0ca78..a11b8e0c4 100755
--- a/bin/ci-pre-build.sh
+++ b/bin/ci-pre-build.sh
@@ -7,4 +7,4 @@ npm --force install tiddlywiki || exit 1
# Pull existing GitHub pages content
-git clone --depth=1 --branch=master "https://github.com/Jermolene/jermolene.github.io.git" output
+git clone --depth=1 --branch=master "https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages.git" output
diff --git a/bin/ci-push.sh b/bin/ci-push.sh
index dff297c80..fe8373785 100755
--- a/bin/ci-push.sh
+++ b/bin/ci-push.sh
@@ -10,6 +10,6 @@ git config --global user.email "actions@github.com"
git config --global user.name "GitHub Actions"
git add -A .
git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))"
-git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" &>/dev/null
+git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.com-gh-pages.git" &>/dev/null
git push deploy master &>/dev/null
cd ..
diff --git a/bin/ci-test.sh b/bin/ci-test.sh
new file mode 100755
index 000000000..ffcae66b2
--- /dev/null
+++ b/bin/ci-test.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# test TiddlyWiki5 for tiddlywiki.com
+
+node ./tiddlywiki.js \
+ ./editions/test \
+ --verbose \
+ --version \
+ --rendertiddler $:/core/save/all test.html text/plain \
+ --test \
+ || exit 1
+
+npm install playwright @playwright/test
+npx playwright install chromium firefox --with-deps
+
+npx playwright test
diff --git a/bin/clean.sh b/bin/clean.sh
index 522479edb..5a56e1971 100755
--- a/bin/clean.sh
+++ b/bin/clean.sh
@@ -2,4 +2,4 @@
# Remove any output files
-find . -regex "^./editions/[a-z0-9\.-]*/output/.*" -delete
+find . -regex "^./editions/.*/output/.*" -delete
diff --git a/bin/optimise-svgs.js b/bin/optimise-svgs.js
index 28f4f715d..4920ab920 100755
--- a/bin/optimise-svgs.js
+++ b/bin/optimise-svgs.js
@@ -5,52 +5,52 @@ Optimise the SVGs in ./core/images using SVGO from https://github.com/svg/svgo
Install SVGO with the following command in the root of the repo:
-npm install svgo
+npm install svgo@2.3.0
*/
"use strict";
var fs = require("fs"),
path = require("path"),
- SVGO = require("svgo"),
- svgo = new SVGO({
+ { optimize } = require("svgo"),
+ config = {
plugins: [
- {cleanupAttrs: true},
- {removeDoctype: true},
- {removeXMLProcInst: true},
- {removeComments: true},
- {removeMetadata: true},
- {removeTitle: true},
- {removeDesc: true},
- {removeUselessDefs: true},
- {removeEditorsNSData: true},
- {removeEmptyAttrs: true},
- {removeHiddenElems: true},
- {removeEmptyText: true},
- {removeEmptyContainers: true},
- {removeViewBox: false},
- {cleanupEnableBackground: true},
- {convertStyleToAttrs: true},
- {convertColors: true},
- {convertPathData: true},
- {convertTransform: true},
- {removeUnknownsAndDefaults: true},
- {removeNonInheritableGroupAttrs: true},
- {removeUselessStrokeAndFill: true},
- {removeUnusedNS: true},
- {cleanupIDs: true},
- {cleanupNumericValues: true},
- {moveElemsAttrsToGroup: true},
- {moveGroupAttrsToElems: true},
- {collapseGroups: true},
- {removeRasterImages: false},
- {mergePaths: true},
- {convertShapeToPath: true},
- {sortAttrs: true},
- {removeDimensions: false},
- {removeAttrs: {attrs: "(stroke|fill)"}}
+ 'cleanupAttrs',
+ 'removeDoctype',
+ 'removeXMLProcInst',
+ 'removeComments',
+ 'removeMetadata',
+ 'removeTitle',
+ 'removeDesc',
+ 'removeUselessDefs',
+ 'removeEditorsNSData',
+ 'removeEmptyAttrs',
+ 'removeHiddenElems',
+ 'removeEmptyText',
+ 'removeEmptyContainers',
+ // 'removeViewBox',
+ 'cleanupEnableBackground',
+ 'convertStyleToAttrs',
+ 'convertColors',
+ 'convertPathData',
+ 'convertTransform',
+ 'removeUnknownsAndDefaults',
+ 'removeNonInheritableGroupAttrs',
+ 'removeUselessStrokeAndFill',
+ 'removeUnusedNS',
+ 'cleanupIDs',
+ 'cleanupNumericValues',
+ 'moveElemsAttrsToGroup',
+ 'moveGroupAttrsToElems',
+ 'collapseGroups',
+ // 'removeRasterImages',
+ 'mergePaths',
+ 'convertShapeToPath',
+ 'sortAttrs',
+ //'removeDimensions',
+ {name: 'removeAttrs', params: { attrs: '(stroke|fill)' } }
]
- });
+ };
var basepath = "./core/images/",
files = fs.readdirSync(basepath).sort();
@@ -66,12 +66,14 @@ files.forEach(function(filename) {
fakeSVG = body.join("\n");
// A hack to make the new-journal-button work
fakeSVG = fakeSVG.replace("<>","<<now "DD">>");
- svgo.optimize(fakeSVG, {path: filepath}).then(function(result) {
+ config.path = filepath;
+ var result = optimize(fakeSVG,config);
+ if(result) {
var newSVG = header.join("\n") + "\n\n" + result.data.replace("<<now "DD">>","<>");
fs.writeFileSync(filepath,newSVG);
- },function(err) {
+ } else {
console.log("Error " + err + " with " + filename)
process.exit();
- });
+ };
}
});
diff --git a/bin/readme-bld.sh b/bin/readme-bld.sh
index 198c3abd0..e7c9df564 100755
--- a/bin/readme-bld.sh
+++ b/bin/readme-bld.sh
@@ -15,3 +15,11 @@ 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
diff --git a/bin/test.sh b/bin/test.sh
index 2de66b1fd..61c7b7143 100755
--- a/bin/test.sh
+++ b/bin/test.sh
@@ -9,6 +9,7 @@ node ./tiddlywiki.js \
--verbose \
--version \
--rendertiddler $:/core/save/all test.html text/plain \
+ --test \
|| exit 1
echo To run the tests in a browser, open "editions/test/output/test.html"
diff --git a/boot/boot.js b/boot/boot.js
index fbac37d77..6ac64c586 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -68,6 +68,26 @@ $tw.utils.isArrayEqual = function(array1,array2) {
});
};
+/*
+Add an entry to a sorted array if it doesn't already exist, while maintaining the sort order
+*/
+$tw.utils.insertSortedArray = function(array,value) {
+ var low = 0, high = array.length - 1, mid, cmp;
+ while(low <= high) {
+ mid = (low + high) >> 1;
+ cmp = value.localeCompare(array[mid]);
+ if(cmp > 0) {
+ low = mid + 1;
+ } else if(cmp < 0) {
+ high = mid - 1;
+ } else {
+ return array;
+ }
+ }
+ array.splice(low,0,value);
+ return array;
+};
+
/*
Push entries onto an array, removing them first if they already exist in the array
array: array to modify (assumed to be free of duplicates)
@@ -122,15 +142,15 @@ $tw.utils.each = function(object,callback) {
var next,f,length;
if(object) {
if(Object.prototype.toString.call(object) == "[object Array]") {
- for (f=0, length=object.length; f and """ to "
*/
@@ -271,7 +339,7 @@ $tw.utils.getLocationHash = function() {
var idx = href.indexOf('#');
if(idx === -1) {
return "#";
- } else if(idx < href.length-1 && href[idx+1] === '#') {
+ } else if(href.substr(idx + 1,1) === "#" || href.substr(idx + 1,3) === "%23") {
// Special case: ignore location hash if it itself starts with a #
return "#";
} else {
@@ -318,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 {
@@ -333,7 +401,7 @@ $tw.utils.stringifyList = function(value) {
var result = new Array(value.length);
for(var t=0, l=value.length; t $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),
metadata = $tw.loadMetadataForFile(filepath);
if(metadata) {
if(type === "application/json") {
@@ -1808,7 +1947,7 @@ A default set of files for TiddlyWiki to ignore during load.
This matches what NPM ignores, and adds "*.meta" to ignore tiddler
metadata files.
*/
-$tw.boot.excludeRegExp = /^\.DS_Store$|^.*\.meta$|^\..*\.swp$|^\._.*$|^\.git$|^\.hg$|^\.lock-wscript$|^\.svn$|^\.wafpickle-.*$|^CVS$|^npm-debug\.log$/;
+$tw.boot.excludeRegExp = /^\.DS_Store$|^.*\.meta$|^\..*\.swp$|^\._.*$|^\.git$|^\.github$|^\.vscode$|^\.hg$|^\.lock-wscript$|^\.svn$|^\.wafpickle-.*$|^CVS$|^npm-debug\.log$/;
/*
Load all the tiddlers recursively from a directory, including honouring `tiddlywiki.files` files for drawing in external files. Returns an array of {filepath:,type:,tiddlers: [{..fields...}],hasMetaFile:}. Note that no file information is returned for externally loaded tiddlers, just the `tiddlers` property.
@@ -1845,22 +1984,41 @@ filepath: pathname of the directory containing the specification file
$tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
var tiddlers = [];
// Read the specification
- var filesInfo = JSON.parse(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"));
+ var filesInfo = $tw.utils.parseJSONSafe(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"), function(e) {
+ console.log("Warning: tiddlywiki.files in " + filepath + " invalid: " + e.message);
+ return {};
+ });
+
// Helper to process a file
- var processFile = function(filename,isTiddlerFile,fields,isEditableFile) {
+ var processFile = function(filename,isTiddlerFile,fields,isEditableFile,rootPath) {
var extInfo = $tw.config.fileExtensionInfo[path.extname(filename)],
type = (extInfo || {}).type || fields.type || "text/plain",
typeInfo = $tw.config.contentTypeInfo[type] || {},
pathname = path.resolve(filepath,filename),
- text = fs.readFileSync(pathname,typeInfo.encoding || "utf8"),
metadata = $tw.loadMetadataForFile(pathname) || {},
- fileTiddlers;
+ fileTooLarge = false,
+ text, fileTiddlers;
+
+ if("_canonical_uri" in fields) {
+ text = "";
+ } else if(fs.statSync(pathname).size > $tw.config.maxEditFileSize) {
+ var msg = "File " + pathname + " not loaded because it is too large";
+ console.log("Warning: " + msg);
+ fileTooLarge = true;
+ text = isTiddlerFile ? msg : "";
+ } else {
+ text = fs.readFileSync(pathname,typeInfo.encoding || "utf8");
+ }
+
if(isTiddlerFile) {
- fileTiddlers = $tw.wiki.deserializeTiddlers(path.extname(pathname),text,metadata) || [];
+ fileTiddlers = $tw.wiki.deserializeTiddlers(fileTooLarge ? ".txt" : path.extname(pathname),text,metadata) || [];
} else {
fileTiddlers = [$tw.utils.extend({text: text},metadata)];
}
var combinedFields = $tw.utils.extend({},fields,metadata);
+ if(fileTooLarge && isTiddlerFile) {
+ delete combinedFields.type; // type altered
+ }
$tw.utils.each(fileTiddlers,function(tiddler) {
$tw.utils.each(combinedFields,function(fieldInfo,name) {
if(typeof fieldInfo === "string" || $tw.utils.isArray(fieldInfo)) {
@@ -1868,26 +2026,32 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
} else {
var value = tiddler[name];
switch(fieldInfo.source) {
+ case "subdirectories":
+ value = $tw.utils.stringifyList(path.relative(rootPath, filename).split(path.sep).slice(0, -1));
+ break;
+ case "filepath":
+ value = path.relative(rootPath, filename).split(path.sep).join('/');
+ break;
case "filename":
value = path.basename(filename);
break;
case "filename-uri-decoded":
- value = decodeURIComponent(path.basename(filename));
+ value = $tw.utils.decodeURIComponentSafe(path.basename(filename));
break;
case "basename":
value = path.basename(filename,path.extname(filename));
break;
case "basename-uri-decoded":
- value = decodeURIComponent(path.basename(filename,path.extname(filename)));
+ value = $tw.utils.decodeURIComponentSafe(path.basename(filename,path.extname(filename)));
break;
case "extname":
value = path.extname(filename);
break;
case "created":
- value = new Date(fs.statSync(pathname).birthtime);
+ value = $tw.utils.stringifyDate(new Date(fs.statSync(pathname).birthtime));
break;
case "modified":
- value = new Date(fs.statSync(pathname).mtime);
+ value = $tw.utils.stringifyDate(new Date(fs.statSync(pathname).mtime));
break;
}
if(fieldInfo.prefix) {
@@ -1906,6 +2070,20 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
tiddlers.push({tiddlers: fileTiddlers});
}
};
+ // Helper to recursively search subdirectories
+ var getAllFiles = function(dirPath, recurse, arrayOfFiles) {
+ recurse = recurse || false;
+ arrayOfFiles = arrayOfFiles || [];
+ var files = fs.readdirSync(dirPath);
+ files.forEach(function(file) {
+ if(recurse && fs.statSync(dirPath + path.sep + file).isDirectory()) {
+ arrayOfFiles = getAllFiles(dirPath + path.sep + file, recurse, arrayOfFiles);
+ } else if(fs.statSync(dirPath + path.sep + file).isFile()){
+ arrayOfFiles.push(path.join(dirPath, path.sep, file));
+ }
+ });
+ return arrayOfFiles;
+ }
// Process the listed tiddlers
$tw.utils.each(filesInfo.tiddlers,function(tidInfo) {
if(tidInfo.prefix && tidInfo.suffix) {
@@ -1915,6 +2093,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
} else if(tidInfo.suffix) {
tidInfo.fields.text = {suffix: tidInfo.suffix};
}
+ tidInfo.fields = tidInfo.fields || {};
processFile(tidInfo.file,tidInfo.isTiddlerFile,tidInfo.fields);
});
// Process any listed directories
@@ -1929,18 +2108,20 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
// Process directory specifier
var dirPath = path.resolve(filepath,dirSpec.path);
if(fs.existsSync(dirPath) && fs.statSync(dirPath).isDirectory()) {
- var files = fs.readdirSync(dirPath),
+ var files = getAllFiles(dirPath, dirSpec.searchSubdirectories),
fileRegExp = new RegExp(dirSpec.filesRegExp || "^.*$"),
metaRegExp = /^.*\.meta$/;
for(var t=0; tThis community exists because TiddlyWiki is more useful when people share and work together.
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.
We try to make the community as broad and welcoming as possible by remembering some basic principles of culture and behaviour.
These principles guide technical and non-technical decisions, and help contributors and leaders support our project and community.
We are optimistic and hopeful
We aim to foster a learning environment that is collaborative and safe for everyone
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 thank the people who enrich the community by sharing what they have created
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 avoid unnecessarily mixing contentious topics like religion and politics
We treat each other with respect, and start with the assumption that others are acting in good faith
We avoid discriminatory language
We try to use our strength as a community to help others
We avoid responding when angry or upset because we try to de-escalate conflict
We make sure we critique ideas, not people
When we disagree with others we do so graciously, and treat others with dignity and respoect
We do not tolerate intolerance towards others
We seek first to understand others, and then to be understood
We have fun
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.
It is not acceptable to make jokes or other comments that discriminate by race, gender, sexuality, or other protected characteristic.
As an inclusive community, we are committed to making sure that TiddlyWiki is an accessible tool that understands the needs of people with disabilities.
\ No newline at end of file
diff --git a/community/docs/Community Cards Caveats.tid b/community/docs/Community Cards Caveats.tid
new file mode 100644
index 000000000..c63a29d63
--- /dev/null
+++ b/community/docs/Community Cards Caveats.tid
@@ -0,0 +1,5 @@
+title: Community Cards Caveats
+created: 20250909171928024
+modified: 20250909171928024
+
+''Please note that [[Community Cards]] are a new initiative started in September 2025. There is further work required to complete the team and people information.''
diff --git a/community/docs/Community Cards.tid b/community/docs/Community Cards.tid
new file mode 100644
index 000000000..087eaac65
--- /dev/null
+++ b/community/docs/Community Cards.tid
@@ -0,0 +1,11 @@
+title: Community Cards
+tags: Community
+modified: 20250909171928024
+created: 20250909171928024
+
+The purpose of Community Cards is to allow project plans and other community activities to be linked to the people who are involved in them. They also allow people to share their interests and activities in the TiddlyWiki community, and to help people in the TiddlyWiki community get to know each other better.
+
+{{Community Cards Caveats}}
+
+* [[Submitting a Community Card]]
+* [[Displaying Community Cards]]
diff --git a/community/docs/Displaying Community Cards.tid b/community/docs/Displaying Community Cards.tid
new file mode 100644
index 000000000..3d371ccd8
--- /dev/null
+++ b/community/docs/Displaying Community Cards.tid
@@ -0,0 +1,26 @@
+title: Displaying Community Cards
+tags: [[Community Cards]]
+modified: 20250909171928024
+created: 20250909171928024
+
+!! Cards for people
+
+This is an inline card for <> and <> which can be used in the middle of a sentence.
+
+This is a stack of inline cards:
+
+<>
+
+Here is a full format card:
+
+<>
+
+This is how the card looks when there is no such person:
+
+<>
+
+!! Cards for teams
+
+This is a card for a project team:
+
+<>
\ No newline at end of file
diff --git a/community/docs/Submitting a Community Card.tid b/community/docs/Submitting a Community Card.tid
new file mode 100644
index 000000000..195bf289f
--- /dev/null
+++ b/community/docs/Submitting a Community Card.tid
@@ -0,0 +1,36 @@
+title: Submitting a Community Card
+tags: [[Community Cards]]
+modified: 20250909171928024
+created: 20250909171928024
+
+Anyone associated with the TiddlyWiki community can submit a Community Card. The submission process currently involves making a GitHub pull request but we intend to provide a more user-friendly submission process in the future.
+
+Pull requests to add or update a community card should be made against the `tiddlywiki-com` branch of the [[TiddlyWiki repository|https://github.com/TiddlyWiki/TiddlyWiki5]] in the directory `community/people`.
+
+The card should be a TiddlyWiki tiddler with the following fields:
+
+|!Field |!Required|!Description |
+|`title`|Yes |The username of the person represented by the card, starting with `@` (e.g. `@Jermolene`). This is the title of the card and should be unique |
+|`tags`|Yes |The tags for the card, including `Community/Person` |
+|`fullname`|Yes |The full name of the person or group represented by the card |
+|`avatar`|Yes |The base64 representation of the 32x32 avatar image for the person represented by the card |
+|`first-sighting`|No |The date of the first sighting in the community of the person represented by the card. This should be in ISO 8601 format (YYYY-MM-DD) |
+|`talk.tiddlywiki.org`|Yes |The username of the person or group on the TiddlyWiki Talk forum |
+|`github`|No |The username of the person or group on GitHub |
+|`linkedin`|No |The URL of the LinkedIn profile for the person or group represented by the card |
+|`flickr`|No |The URL of the Flickr profile for the person or group represented by the card |
+|`homepage`|No |The URL of the homepage for the person or group represented by the card |
+|`email`|No |The email address of the person or group represented by the card |
+|`text`|Yes |The text of the card. This should include a brief description of the person or group represented by the card, and any other relevant information |
+
+! Rules for Community Cards
+
+Community cards must observe the following rules. It is intended to enforce them with an automated script, but for the moment they will be manually checked.
+
+* `title` must be unique and start with `@`
+* `tags` must include `Community/Person`
+* `fullname` must be provided
+* `avatar` must be a base64 representation of a 32x32 image, with a limit of 1KB. [[Squoosh|https://squoosh.app/]] is recommended for resizing and compressing images
+* `first-sighting` should be in ISO 8601 format (YYYY-MM-DD)
+* `talk.tiddlywiki.org` must be provided
+* `text` total size must not exceed 2KB
diff --git a/community/people/Arlen22.tid b/community/people/Arlen22.tid
new file mode 100644
index 000000000..5bc102312
--- /dev/null
+++ b/community/people/Arlen22.tid
@@ -0,0 +1,10 @@
+title: @Arlen22
+tags: Community/Person
+fullname: Arlen Beiler
+first-sighting: 2011-06-20
+talk.tiddlywiki.org: arlen22
+github: Arlen22
+homepage: arlen22.github.io
+avatar: /9j/4AAQSkZJRgABAQAAAQABAAD/2wEEEAAVABUAFQAVABYAFQAYABoAGgAYACEAIwAfACMAIQAwAC0AKQApAC0AMABJADQAOAA0ADgANABJAG8ARQBRAEUARQBRAEUAbwBiAHcAYQBaAGEAdwBiALEAiwB7AHsAiwCxAMwArACiAKwAzAD4AN0A3QD4ATgBKAE4AZcBlwIkEQAVABUAFQAVABYAFQAYABoAGgAYACEAIwAfACMAIQAwAC0AKQApAC0AMABJADQAOAA0ADgANABJAG8ARQBRAEUARQBRAEUAbwBiAHcAYQBaAGEAdwBiALEAiwB7AHsAiwCxAMwArACiAKwAzAD4AN0A3QD4ATgBKAE4AZcBlwIk/8IAEQgAQABAAwEiAAIRAQMRAf/EADAAAAIDAQEAAAAAAAAAAAAAAAMFAQQGAgABAQEBAQEAAAAAAAAAAAAAAAIDAQAE/9oADAMBAAIQAxAAAADIRMd3XctQlXtCTTmB6RFvANDouy4DYwEEar6YVM7ocz57mcqnZys+V2azZU4XZSoiZqhQt9TKOlnO+GOl1HyoUPXLn//EACYQAAICAQQCAgEFAAAAAAAAAAECABEDBBIhMUFRECITFCMycZH/2gAIAQEAAT8AI4Bv4ryAeBAnANHuNidWogEwYHNRsdfA8iruVMOIu6iYtK4c714vgTDpXyOfrQHdifoArEXxM2mR0NeOhUzI+LJzYbuHszCm5hYseZh0gXYWFIai4cWJgFJuFKYvtr2sJRuB9fUzgDHlGMHia2757uYsYc0TNHpsSmzzMONjl9iu74iK6PbWT7gv/RMiZDk+qcA3NXkAVl3gE+ADU1PDVdiaDCGJZjQEyowKANS1ZMwK+HJ+3a0KUDqYnYINxJ3eItDk81M2cZD+NVIrmanU/wAl2gCZiGNiaFziJ3LYIHcXMrLvDABe17EN1vCgqR2TNPnGTBSBbDTeV3c2amdlxPuD2C3H9epqmV628xqsUYmdiuwkVVTSZ0Q/dxwYdScrgBRsqONi2KQX7mo1G4WCK20B6j6p/VpcfMXPVQ9mbhx9eLgZrFGDUZB1DqMrCma4xN8mDcR5qK5Rgw7Hx//EABwRAQEBAQACAwAAAAAAAAAAAAECABEDIhIxQf/aAAgBAgEBPwDVQYpfzd66qDeOSn7yEmH23ffDAi66mug6DM9N8HTAY3//xAAcEQEBAQEAAgMAAAAAAAAAAAABAAIREBIiQVH/2gAIAQMBAT8AglC+rJbdCT1vVC33l83tj2OPLS+AJ3+Tf//Z
+
+I make random software.
\ No newline at end of file
diff --git a/community/people/EricShulman.tid b/community/people/EricShulman.tid
new file mode 100644
index 000000000..24201765f
--- /dev/null
+++ b/community/people/EricShulman.tid
@@ -0,0 +1,29 @@
+title: @ericshulman
+tags: Community/Person Community/Team/Contributors
+fullname: Eric Shulman
+first-sighting: 2005-06-21
+talk.tiddlywiki.org: ericshulman
+github: ericshulman
+homepage: tiddlytools.com
+email: elsdesign@gmail.com
+avatar: iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAD/ElEQVR42o2Tf2iUdRzH37e7rOa222233bab3mqKU9QihCAi+isKwX/sh5UQhGYQhNAvQowRUoghQWDOIJtQmOY0M92ZmVGm0WbTyZI1Nnft99S1jc3dPT9efffg/bHdLn19Hp4HPjzv9/fz+fL5aE58PwUkjzzFVC4P/G/k6E445Pc+uceeaqnv7Ogd6Rq68PPhrc+vkiERWOLT/+Ib8uQHNiXax3BIM0mC+CEtl2G7X9mIeCV+9Ejrr2MAtgkH14SNBRZXrYYPNF86nsXCkx/8dATAsp0JhknQTYJrTHg5SNI0qMekb+aw8Hr74WCKpNNu/0Kck5ymkRMcZz/1Jv5g2CUFbZYelrbMvlBMonHvJK3JuPsdTQxwExc8XG7SxF7OcxGScP6wRGCG/Asjf39VPydTzbQyRBrXBKToBCP/nQQ9VpIDO6SumU3EjUFLzX766HMG0mIvoJnXEbU47GGXc4TGBs3zWp5Jh7F47omdf56hy9lLIz3gyYfZSQMJztFEH3KEDg+bf1dkzkO9Savks7H9NLqnuEw3MEU314nTwABj/MV2R6y8JL+0wKdM8MtX23aFy04dF5mg08QI6XYsemmzRfiMDP5Mg1emK4ienZxi0p0gBfRwhSHAxgXGGeS6tYUdu6TPA3Ofr3Mfj9Bv4zHMDaCTMcBlnG4cJqx64sagN9Ngw3RJoa5R+MftI8k1Wm7NcSsH6KKPFGBbG1n1srQ+06DWpJ59cRhsGKGbo0wBFpDgNGcBcHGsl9BuSZmjfCRHWnv0BtgOcJVWwAZG2cw+3uErAKacZ6hq32PkGWuNSaxsHgIHxqjje5I4/Ms2dCt+BHpcUT4ai0j5sw22TCea2sCBbz3BOjaRFj+JeAE46IoHxlUmlfrmWuZT+8Ae935fjljDe3zpLdEJxGriLHdFtL8mKC2cbbAgIOXVBemwBhHibZq4xN/0YgPrESsRsiMs+C1zEwwFxqBqs4hY2yhlKeIUab5GLEM8SLlVRslu77jZhEwL/ofKKZ4uknxiiLO0cYFGFpJPMTGiRO0iQqtNrX7NxueTcahqv4/FTpgwFYinOcoxtiLKWEwF+U6Mqv5FuVlWSQHzvBWmKmUqIEg1YiMfIu6lhjKCRK0YkXelwoDmIjztWrCot5KQs5R5zKccIVZQwl3cTaVdQVGnfOkrzFbDuvuJWTVuBcXcQ5iFlFFAmBynlBKKH/f6z06pX6r6pJoSQlaeW2gsighi3na1E6HwNSkUUHbS45FXG7ajhIi68+1cO98qtqqJEHzTW6LbEfUstER1ef2llBKhiGqKW7VGUk6lT7dnmS/gnZMf1KPaoI16VWsrA1KhX3dObo5m9VqQpff/AFTcI4hMzFV+AAAAAElFTkSuQmCC
+
+\define wiki(text,topic) [[$text$|https://en.wikipedia.org/wiki/$topic$]]
+
+''Hello! My name is Eric Shulman''. I am the author of ''[[www.TiddlyTools.com|http://www.TiddlyTools.com]] (Small Tools for Big Ideas! ™)'', a popular collection of original plugins, macros, widgets, templates and stylesheets for TiddlyWiki that I have created and shared with the TiddlyWiki community.
+
+<<<
+Think of TiddlyTools as a ''virtual hardware store and "demonstration showroom"'', offering tools, parts and techniques that provide a rich variety of new functionality and feature enhancements to help you ''turn a general-purpose TiddlyWiki "info-house" into a comfortable, custom-built "info-home"''.
+
+The TiddlyWiki core system provides the basic structure and utilities: the foundation, framing, walls, roof, windows/doors, plumbing, heating, and electrical systems. Then, TiddlyTools helps you with all the "finish work": the appliances, fixtures, lighting, cabinets, furniture, paint, wallpaper, carpeting, etc. ''to best suit your specific needs and personal style''.
+<<<
+
+Since the early days of TiddlyWiki (April 2005), I have worked closely with its inventor, [[Jeremy Ruston|https://jermolene.com/]], to help develop and improve TiddlyWiki's core functions. I am also a key contributor and administrator of the online TiddlyWiki [[Discourse|https://talk.TiddlyWiki.org]] and [[GoogleGroups|https://groups.google.com/forum/#!forum/tiddlywiki]] discussion forums, providing ongoing assistance to the worldwide TiddlyWiki community. I have written over 15,000 detailed responses to individual questions posted online. For several years I was also the lead developer and maintainer of the [[TiddlyWiki Classic|https://classic.tiddlywiki.com/]] codebase.
+
+I was born and raised in suburban Long Island, NY, and attended [[Carnegie Mellon University (CMU)|https://www.cmu.edu/]] in Pittsburgh, PA, where I studied ''Computer Science, Cognitive Psychology, Sociology, Human Factors Design, and Artificial Intelligence''. As an undergraduate at CMU, I was privileged to work with some of the major luminaries in early software research and design, including <>, <>, <>, and <>. I was also employed in several Computer Science Department research projects, including the development of speech recognition technologies, graphical interface systems, and interactive applications for instruction in physics, art and music. I received a ''Bachelor of Science in "Interactive Systems Design"'' from CMU in 1985.
+
+During my early post-graduate years, I worked for several notable software development companies, including
+<> and <>. I was an integral member of the <> development team where I helped create the first GUI-based application interfaces for Microsoft Windows and IBM OS/2.
+
+Since 1998, I have been an ''independent design consultant'', living and working in Silicon Valley, where I apply more than 40 years of experience to provide ''analysis, design and software development services'' for commercial companies and not-for-profit organizations, with emphasis on ''information architecture'' and ''interaction/visual design standards'' to improve ease-of-use for new and existing software products and online environments.
diff --git a/community/people/Jermolene.tid b/community/people/Jermolene.tid
new file mode 100644
index 000000000..b75e410c7
--- /dev/null
+++ b/community/people/Jermolene.tid
@@ -0,0 +1,21 @@
+title: @Jermolene
+tags: Community/Person
+fullname: Jeremy Ruston
+first-sighting: 2004-09-20
+talk.tiddlywiki.org: jeremyruston
+github: Jermolene
+linkedin: www.linkedin.com/in/jermy
+flickr: www.flickr.com/photos/jermy/
+bluesky: https://bsky.app/profile/jermolene.bsky.social
+homepage: jermolene.com
+email: jeremy@jermolene.com
+avatar: /9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAgICAgJCAkKCgkNDgwODRMREBARExwUFhQWFBwrGx8bGx8bKyYuJSMlLiZENS8vNUROQj5CTl9VVV93cXecnNEBCAgICAkICQoKCQ0ODA4NExEQEBETHBQWFBYUHCsbHxsbHxsrJi4lIyUuJkQ1Ly81RE5CPkJOX1VVX3dxd5yc0f/CABEIACAAIAMBIgACEQEDEQH/xAAtAAEBAAMAAAAAAAAAAAAAAAAHBgIEBQEBAQEBAAAAAAAAAAAAAAAAAgQBBf/aAAwDAQACEAMQAAAANF4uTuPRhD2nBLnUiJvKM0DtMKy//8QAKxAAAgIBAwMDAQkAAAAAAAAAAQIDBBEABRITITEiMkFxFEJRUmFicoGR/9oACAEBAAE/AInTA6gUGP4ZOQbW1bPsmyUq1q+gmvFPUzZPDkPamtwqU75ks04JakroVcg5RwRjg66NUx25KbzqJYyMngfqSuq0M3NZYIebJIvZozIvI/iNPcp/aalSdJXsS4VcKeIzlvU3jVTcYLNiaGISrjkhWQYDfQ63pYAzCDBsOiu7Dsx4EHH6r2w2ttimjd2IsNErhhJHKI04/uzqxuCxpBYVVWKSHqwMyMSQ33SB7dUJFmlkMYRgnqZgCMf7rf8AeEt3A9YOhjXAb2k8u7dtT1RZeOtXmYxiOPj4ZWY/lb51skqUNnNW/wBNzC7IpB6gQeeB/jq/fqGOaLbowuYn5MAQOw8LjW5Vmeo0qIsqYLLKjHIZmwv9fB1//8QAHxEAAQMEAwEAAAAAAAAAAAAAEQABAgMSIWExMkFR/9oACAECAQE/AD9iTy2lJmHUB8BVKM4SNSOj46a29saX/8QAHREAAgICAwEAAAAAAAAAAAAAAQIAAwQRITGBkf/aAAgBAwEBPwDHpFpJZtamVSiBWT2Yt7hmCDsb+TKtsKqpGg3M/9k=
+
+I'm the original inventor of TiddlyWiki. You can hire me through my consultancy company [[Intertwingled Innovations|https://intertwingledinnovations.com]] or contact me directly.
+
+Further information:
+
+* A recording of the [[keynote I gave at QCon London in April 2024|https://www.infoq.com/presentations/bbc-micro/]], and the [[discussion on talk.tiddlywiki.org|https://talk.tiddlywiki.org/t/recording-of-jeremys-keynote-at-qcon-london-april-2024/10505]]. The talk mixes some nostalgia about my teenage activities with the BBC Micro with thoughts on the development of the software industry and insights gained from working with TiddlyWiki
+* An [[interview with me in The Inquirer|https://web.archive.org/web/20111103225832/http://www.theinquirer.net/inquirer/feature/2105529/bt-software-engineer-tells-telco-source]] by Wendy Grossman
+* A [[hilarious interview with me|https://www.youtube.com/watch?v=auyIhw8MTmQ]] from British television in 1983
+* Here's a video of a presentation I did in 2007 called [["How to Start an Open Source Project"|http://vimeo.com/856110]].
diff --git a/community/people/MotovunJack.tid b/community/people/MotovunJack.tid
new file mode 100644
index 000000000..0d8bee7ae
--- /dev/null
+++ b/community/people/MotovunJack.tid
@@ -0,0 +1,11 @@
+title: @MotovunJack
+tags: Community/Person Community/Robot
+fullname: Motovun Jack
+first-sighting: 2012-01-12
+github: MotovunJack
+homepage: tiddlywiki.com
+avatar: /9j/4AAQSkZJRgABAQAAAQABAAD/2wEEEAAYABgAGAAYABkAGAAaAB0AHQAaACUAKAAjACgAJQA2ADIALgAuADIANgBSADsAPwA7AD8AOwBSAH0ATgBbAE4ATgBbAE4AfQBuAIYAbQBlAG0AhgBuAMYAnACKAIoAnADGAOUAwQC2AMEA5QEWAPgA+AEWAV4BTAFeAckByQJmEQAYABgAGAAYABkAGAAaAB0AHQAaACUAKAAjACgAJQA2ADIALgAuADIANgBSADsAPwA7AD8AOwBSAH0ATgBbAE4ATgBbAE4AfQBuAIYAbQBlAG0AhgBuAMYAnACKAIoAnADGAOUAwQC2AMEA5QEWAPgA+AEWAV4BTAFeAckByQJm/8IAEQgAQABAAwEiAAIRAQMRAf/EADAAAAIDAQEAAAAAAAAAAAAAAAMEAQIFBgABAQEBAQEAAAAAAAAAAAAAAAIDAQAE/9oADAMBAAIQAxAAAADZCfn5vZJz+rnODGtpbpm6O8xzG9lCiszXtikQhtkTBputBxURJuVVYlEdBaQ284mPDj6GmkNUblMxRmi7dKw//8QAKxAAAgIBAgUCBgMBAAAAAAAAAQIAAxESIQQTIkFRFGEjMUJxgaEyNGLR/9oACAEBAAE/AMmX3ilMkjPaV3ragZDtNRmoxpvA2sEqQcHEwJxlwa98nYbCU8TymDfSTvPVKMbZHkQcTU4yDH46tTiE8RxjLXnQp7Dx5MACgKuyqMAS1xXU7kjYTiEbWp3y0IucYbGx6e05hDAqMH/k59o3DfxAE5hss1MNzODdVraxu50ieppH1Tivi8O6eYQ1j4B6guAftChDMNjBqycHcCYJqdj2s3idRBHfpi/1Kie7PDo95w/EMxYM22n9yy5AzBc/iLe7dIqx7kyy2ypyOWoYTofhCyDAZtx4MOmpK9sncyx1NdSq2kBBt3EKf6mgIzDUPIiByuqk7faMLbOyEjuuxEAyo56AgeTA3KL1AYRm1CcvmkgAs2wHjEvPxGIMJPmHUQCQNothr32A0ggeYluplcAK2PlLbTytZUkdwI7V3lAQMgbAfP8AMoCV1AKMOR+pdsc5yD595mMmNIGD4h0vsfupHyBlTKW9znMd+TQnljPWqHYIqhwD1zKsqtjBzCAVAyBicnqG6jbOe0//xAAbEQEBAAMBAQEAAAAAAAAAAAABAAIRIRASQf/aAAgBAgEBPwBYbZDuXvnLE5OrkWJzxI4g33ift//EABsRAAMBAQADAAAAAAAAAAAAAAABEQIhEBJB/9oACAEDAQE/AMqjzHwjGoZXPHTb6Zp1/TRp1khYjW01xHqz/9k=
+
+Motovun Jack is a robot that helps maintain the TiddlyWiki project infrastructure. It is not a person, but rather a set of automated scripts and tools that assist in managing the various services and resources used by the TiddlyWiki community.
+
+The origin of the name "Motovun Jack" is a lovable and playful kitten encountered by [[@Jermolene]] in the beautiful medieval hill town of Motovun in Croatia. Jack was [[first adopted|https://github.com/TiddlyWiki/TiddlyWiki5/commit/ecfbaaa5641f14e1766ef17ef6416bf9aa992863]] as the TiddlyWiki 5 mascot in 2012.
diff --git a/community/project/TiddlyWiki People.tid b/community/project/TiddlyWiki People.tid
new file mode 100644
index 000000000..64ac944d8
--- /dev/null
+++ b/community/project/TiddlyWiki People.tid
@@ -0,0 +1,10 @@
+title: TiddlyWiki People
+modified: 20250909171928024
+created: 20250909171928024
+tags: Community About
+
+Members of the TiddlyWiki community who are involved in the development of TiddlyWiki and the running of the project are invited to [[create a Community Card|Submitting a Community Card]] so that they can be included in project plans and organisation charts. Community Cards can also showcase their interests and activities in the TiddlyWiki community.
+
+{{Community Cards Caveats}}
+
+<>
\ No newline at end of file
diff --git a/community/project/TiddlyWiki Project.tid b/community/project/TiddlyWiki Project.tid
new file mode 100644
index 000000000..b0d62cf1f
--- /dev/null
+++ b/community/project/TiddlyWiki Project.tid
@@ -0,0 +1,10 @@
+title: TiddlyWiki Project
+modified: 20250909171928024
+created: 20250909171928024
+tags: Community About
+
+The TiddlyWiki Project is the coordinated, ongoing effort to maintain and improve TiddlyWiki, and to support the TiddlyWiki community.
+
+{{Community Cards Caveats}}
+
+<$list filter="[tag[Community/Team]]" template="$:/tiddlywiki/community/cards/ViewTemplateBodyTemplateTeam"/>
\ No newline at end of file
diff --git a/community/project/Vacant Positions.tid b/community/project/Vacant Positions.tid
new file mode 100644
index 000000000..8408c793b
--- /dev/null
+++ b/community/project/Vacant Positions.tid
@@ -0,0 +1,4 @@
+title: Vacant Positions
+tags: [[TiddlyWiki Project]]
+
+If you are interested in volunteering to help the project please get in touch with <>.
\ No newline at end of file
diff --git a/community/project/teams/Core Team.tid b/community/project/teams/Core Team.tid
new file mode 100644
index 000000000..932477fc0
--- /dev/null
+++ b/community/project/teams/Core Team.tid
@@ -0,0 +1,8 @@
+title: Core Team
+tags: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+leader: @Jermolene
+team: @saqimtiaz
+
+The core team is responsible for the maintenance and development of the TiddlyWiki core and official plugins.
diff --git a/community/project/teams/Infrastructure Team.tid b/community/project/teams/Infrastructure Team.tid
new file mode 100644
index 000000000..e531aa421
--- /dev/null
+++ b/community/project/teams/Infrastructure Team.tid
@@ -0,0 +1,14 @@
+title: Infrastructure Team
+tags: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+team: @MotovunJack
+
+The Infrastructure Team is responsible for maintaining and improving the infrastructure that supports the TiddlyWiki project. This includes the hosting, deployment, and management of the TiddlyWiki websites and services, as well as the tools and systems used by the TiddlyWiki community.
+
+The infrastructure includes:
+
+* talk.tiddlywiki.org
+* github.com/TiddlyWiki
+* tiddlywiki.com DNS
+* Netlify account for PR previews
diff --git a/community/project/teams/MultiWikiServer Team.tid b/community/project/teams/MultiWikiServer Team.tid
new file mode 100644
index 000000000..922cf7582
--- /dev/null
+++ b/community/project/teams/MultiWikiServer Team.tid
@@ -0,0 +1,8 @@
+title: MultiWikiServer Team
+tags: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+leader: @Arlen22
+team:
+
+The MultiWikiServer development repository is at https://github.com/TiddlyWiki/MultiWikiServer
diff --git a/community/project/teams/Newsletter Team.tid b/community/project/teams/Newsletter Team.tid
new file mode 100644
index 000000000..2c20fd219
--- /dev/null
+++ b/community/project/teams/Newsletter Team.tid
@@ -0,0 +1,6 @@
+title: Newsletter Team
+tags: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+
+The Newsletter Team is responsible for producing the TiddlyWiki Newsletter, a monthly email newsletter that highlights news, updates, and community contributions related to TiddlyWiki.
\ No newline at end of file
diff --git a/community/project/teams/Project Team.tid b/community/project/teams/Project Team.tid
new file mode 100644
index 000000000..5cd92cc3b
--- /dev/null
+++ b/community/project/teams/Project Team.tid
@@ -0,0 +1,15 @@
+title: Project Team
+tags: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+icon: $:/tiddlywiki/community/icons/project-team
+leader: @Jermolene
+team: @saqimtiaz @ericshulman
+
+The project team is responsible for the overall TiddlyWiki project, its vision, mission and values, and ensuring that it meets the needs of the community.
+
+Areas of responsibility include:
+
+* Communicating and demonstrating the vision, mission and values of the project
+* Continuously improve the development process and practices of the project
+* more to come...
diff --git a/community/project/teams/Succession Team.tid b/community/project/teams/Succession Team.tid
new file mode 100644
index 000000000..e57a7affd
--- /dev/null
+++ b/community/project/teams/Succession Team.tid
@@ -0,0 +1,13 @@
+title: Succession Team
+tags: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+leader: @Jermolene
+team: @saqimtiaz @ericshulman
+
+The Succession Team is responsible for ensuring that personnel changes do not impact access to the external infrastructure used by the project.
+
+* Work with the other teams to ensure that the project has a succession plan for key personnel
+* Work with the other teams to ensure that they are using the appropriate, community-owned infrastructure
+* Ensure that the members of the succession team share ownership of the key project resources (eg passwords and user accounts). The Succession Team is not expected to use their access rights apart from managing access in the event of personnel changes
+
diff --git a/community/project/teams/tagCommunityTeam.tid b/community/project/teams/tagCommunityTeam.tid
new file mode 100644
index 000000000..9ae81d76f
--- /dev/null
+++ b/community/project/teams/tagCommunityTeam.tid
@@ -0,0 +1,5 @@
+title: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+list: [[Project Team]] [[Core Team]] [[Documentation Team]] [[MultiWikiServer Team]] [[Newsletter Team]] [[Infrastructure Team]] [[Succession Team]]
+
diff --git a/community/readme.md b/community/readme.md
new file mode 100644
index 000000000..09cd58c5b
--- /dev/null
+++ b/community/readme.md
@@ -0,0 +1,3 @@
+# Community Records and Resources
+
+These raw tiddlers comprise the community records and resources for the TiddlyWiki project. They are packaged as a root directory outside of the usual "editions" folder so that they can be shared with other wikis.
diff --git a/community/tools/cards/DefaultColourMappings.multids b/community/tools/cards/DefaultColourMappings.multids
new file mode 100644
index 000000000..6cab7fdc8
--- /dev/null
+++ b/community/tools/cards/DefaultColourMappings.multids
@@ -0,0 +1,15 @@
+title: $:/config/DefaultColourMappings/
+
+community-card-background: #ffffee
+community-card-foreground: #441111
+community-card-dark-shadow: rgba(188, 189, 189, 0.5)
+community-card-shadow: rgba(212, 212, 213, 0.5)
+community-card-header-background: #9e3060
+community-card-header-foreground: #ddddee
+community-card-team-header-background: #306090
+community-card-team-header-foreground: #ddeedd
+community-card-vacancy-header-background: #609030
+community-card-vacancy-header-foreground: #eedddd
+community-card-info-background: #f3f38b
+community-card-info-foreground: #444411
+community-card-field-name-foreground: #888844
diff --git a/community/tools/cards/Procedures.tid b/community/tools/cards/Procedures.tid
new file mode 100644
index 000000000..9d3879012
--- /dev/null
+++ b/community/tools/cards/Procedures.tid
@@ -0,0 +1,168 @@
+title: $:/tiddlywiki/community/cards/Procedures
+tags: $:/tags/Global
+
+\procedure community-card-display-jpeg-field(fieldName,mode:"block",default)
+<$genesis $type={{{ [match[block]then[div]else[span]] }}} class={{{ tc-community-card-field-image [[tc-community-card-field-image-]addsuffix] +[join[ ]] }}}>
+ <%if [has] %>
+ getaddprefix[data:image/jpeg;base64,]] }}} width="32"/>
+ <%else%>
+ <$transclude $tiddler=<> $mode=<>/>
+ <%endif%>
+
+\end community-card-display-jpeg-field
+
+\procedure community-card-display-transclusion(fieldName,mode:"inline",default)
+<$genesis $type={{{ [match[block]then[div]else[span]] }}} class={{{ tc-community-card-field-image [[tc-community-card-field-image-]addsuffix] +[join[ ]] }}}>
+ <%if [has] %>
+ <$transclude $tiddler={{{ [get] }}} $mode=<>/>
+ <%else%>
+ <$transclude $tiddler=<> $mode=<>/>
+ <%endif%>
+
+\end community-card-display-transclusion
+
+\procedure community-card-display-text-field(fieldName,showLabel:"yes",linkPrefix,displayPrefix,mode:"block")
+<%if [has] :or[match[title]] %>
+ <$genesis $type={{{ [match[block]then[div]else[span]] }}} class={{{ tc-community-card-field-text [[tc-community-card-field-text-]addsuffix] +[join[ ]] }}}>
+ <%if [match[yes]] %>
+ <$text text=<>/>
+ <%endif%>
+ <%if [!match[]] %>
+ getaddprefix] }}}
+ class="tc-community-card-field-text-value"
+ rel="noopener noreferrer"
+ target="_blank"
+ >
+ <$text text={{{ [get] :else[match[title]then] +[addprefix] }}}/>
+
+ <%else%>
+
+ <$text text={{{ [get] :else[match[title]then] +[addprefix] }}}/>
+
+ <%endif%>
+
+<%endif%>
+\end community-card-display-text-field
+
+\procedure community-card-person(title)
+ <$let currentTiddler=<>>
+ <div class="tc-community-card">
+ <$link to=<<currentTiddler>> class="tc-community-card-header-link">
+ <div class="tc-community-card-header">
+ <<community-card-display-jpeg-field "avatar" default:"$:/tiddlywiki/community/icons/person">>
+ <<community-card-display-text-field "title" showLabel:"no">>
+ </div>
+ </$link>
+ <div class="tc-community-card-info">
+ <<community-card-display-text-field "fullname">>
+ <<community-card-display-text-field "first-sighting">>
+ <<community-card-display-text-field "talk.tiddlywiki.org" linkPrefix:"https://talk.tiddlywiki.org/u/" displayPrefix:"@">>
+ <<community-card-display-text-field "github" linkPrefix:"https://github.com/" displayPrefix:"@">>
+ <<community-card-display-text-field "linkedin" linkPrefix:"https://">>
+ <<community-card-display-text-field "flickr" linkPrefix:"https://">>
+ <<community-card-display-text-field "homepage" linkPrefix:"https://">>
+ <<community-card-display-text-field "email" linkPrefix:"mailto:">>
+ <%if [all[tiddlers+shadows]tag[Community/Team]sort[title]] :filter[{!!leader}match<..currentTiddler>] +[count[]compare:number:gt[0]] %>
+ <div class="tc-community-card-field-text">
+ <span class="tc-community-card-field-text-name">leader</span>
+ <span class="tc-community-card-field-text-value">
+ <$list filter="[all[tiddlers+shadows]tag[Community/Team]sort[title]] :filter[{!!leader}match<..currentTiddler>]">
+ <$transclude $variable="community-card-pill-team" title=<<currentTiddler>>/>
+ </$list>
+ </span>
+ </div>
+ <%endif%>
+ <%if [all[tiddlers+shadows]tag[Community/Team]sort[title]] :filter[enlist{!!team}match<..currentTiddler>] +[count[]compare:number:gt[0]] %>
+ <div class="tc-community-card-field-text">
+ <span class="tc-community-card-field-text-name">member</span>
+ <span class="tc-community-card-field-text-value">
+ <$list filter="[all[tiddlers+shadows]tag[Community/Team]sort[title]] :filter[enlist{!!team}match<..currentTiddler>]">
+ <$transclude $variable="community-card-pill-team" title=<<currentTiddler>>/>
+ </$list>
+ </span>
+ </div>
+ <%endif%>
+ </div>
+ <div class="tc-community-card-body">
+ <$transclude $tiddler=<<currentTiddler>> $field="text" $mode="block"/>
+ </div>
+ </div>
+ </$let>
+\end community-card-person
+
+\procedure community-card-team(title)
+ <$let currentTiddler=<<title>>>
+ <div class="tc-community-card tc-community-card-team">
+ <$link to=<<currentTiddler>> class="tc-community-card-header-link">
+ <div class="tc-community-card-header">
+ <<community-card-display-transclusion fieldName:"icon" default:"$:/tiddlywiki/community/icons/team">>
+ <<community-card-display-text-field "title" showLabel:"no">>
+ </div>
+ </$link>
+ <div class="tc-community-card-info">
+ <div class="tc-community-card-field-text">
+ <span class="tc-community-card-field-text-name">leader</span>
+ <span class="tc-community-card-field-text-value">
+ <%if [<currentTiddler>has[leader]] %>
+ <$transclude $variable="community-card-pill-person" title={{!!leader}}/>
+ <%else%>
+ <$transclude $variable="community-card-vacancy"/>
+ <%endif%>
+ </span>
+ </div>
+ <div class="tc-community-card-field-text">
+ <span class="tc-community-card-field-text-name">team</span>
+ <span class="tc-community-card-field-text-value"><$transclude $variable="community-card-pill-stack-person" personFilter={{!!team}}/></span>
+ </div>
+ </div>
+ <div class="tc-community-card-body">
+ <$transclude $tiddler=<<currentTiddler>> $field="text" $mode="block"/>
+ </div>
+ </div>
+ </$let>
+\end community-card-team
+
+\procedure community-card-pill-person(title)
+ <$let currentTiddler=<<title>>>
+ <$link to=<<currentTiddler>> class="tc-community-card-pill">
+ <<community-card-display-jpeg-field "avatar" default:"$:/tiddlywiki/community/icons/person" mode="inline">>
+ <<community-card-display-text-field "title" showLabel:"no" mode:"inline">>
+ </$link>
+ </$let>
+\end community-card-pill-person
+
+\procedure community-card-pill-stack-person(personFilter:"[tag[Community/Person]]")
+ <div class="tc-community-card-pill-stack">
+ <$list filter=<<personFilter>>>
+ <$list-template>
+ <$transclude $variable="community-card-pill-person" title=<<currentTiddler>> mode="block"/>
+ </$list-template>
+ <$list-empty>
+ <$transclude $variable="community-card-vacancy"/>
+ </$list-empty>
+ </$list>
+ </div>
+\end community-card-pill-stack-person
+
+\procedure community-card-pill-team(title)
+ <$let currentTiddler=<<title>>>
+ <$link to=<<currentTiddler>> class="tc-community-card-pill">
+ <<community-card-display-transclusion fieldName:"icon" default:"$:/tiddlywiki/community/icons/team">>
+ <<community-card-display-text-field "title" showLabel:"no" mode:"inline">>
+ </$link>
+ </$let>
+\end community-card-pill-team
+
+\procedure community-card-vacancy()
+ <$link to="Vacant Positions" class="tc-community-card-pill tc-community-card-pill-vacancy">
+ <span class="tc-community-card-field-image tc-community-card-field-image-avatar">
+ {{$:/core/images/help}}
+ </span>
+ <span class="tc-community-card-field-text tc-community-card-field-text-title">
+ <span class="tc-community-card-field-text-value">
+ Vacant
+ </span>
+ </span>
+ </$link>
+\end community-card-vacancy
diff --git a/community/tools/cards/Styles.tid b/community/tools/cards/Styles.tid
new file mode 100644
index 000000000..48322922c
--- /dev/null
+++ b/community/tools/cards/Styles.tid
@@ -0,0 +1,158 @@
+title: $:/tiddlywiki/community/cards/Styles
+tags: $:/tags/Stylesheet
+
+.tc-community-card {
+ display: flex;
+ flex-direction: column;
+ flex-wrap: wrap;
+ justify-content: center;
+ border-radius: 8px;
+ width: 100%;
+ margin-bottom: 8px;
+ background: <<colour community-card-background>>;
+ color: <<colour community-card-foreground>>;
+ fill: <<colour community-card-foreground>>;
+ box-shadow: 0 1px 3px 0 <<colour community-card-shadow>>, 0 0 0 1px <<colour community-card-shadow>>;
+ transition: box-shadow 0.3s ease,transform .3s ease;
+}
+
+.tc-community-card:hover {
+ box-shadow: 0 1px 6px 0 <<colour community-card-dark-shadow>>, 0 0 0 1px <<colour community-card-shadow>>;
+ transform: translateY(-2px);
+}
+
+.tc-community-card .tc-community-card-header-link {
+ background-color: <<colour community-card-header-background>>;
+ color: <<colour community-card-header-foreground>>;
+ border-top-left-radius: 8px;
+ border-top-right-radius: 8px;
+}
+
+.tc-community-card.tc-community-card-team .tc-community-card-header-link {
+ background: <<colour community-card-team-header-background>>;
+ color: <<colour community-card-team-header-foreground>>;
+ fill: <<colour community-card-team-header-foreground>>;
+}
+
+.tc-community-card .tc-community-card-header-link:hover {
+ text-decoration: none;
+ background-color: <<colour community-card-header-foreground>>;
+ color: <<colour community-card-header-background>>;
+}
+
+.tc-community-card-header {
+ margin: 0;
+ padding: 0.5em;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ justify-content: flex-start;
+ align-items: center;
+ line-height: 0;
+}
+
+.tc-community-card-header .tc-community-card-field-text-title {
+ font-size: 1.5em;
+ font-weight: bold;
+}
+
+.tc-community-card-header .tc-community-card-field-image {
+ display: table-row;
+ width: auto;
+ max-width: 100%;
+ margin-right: 12px;
+}
+
+.tc-community-card-info {
+ display: table;
+ width: auto;
+ max-width: 100%;
+ padding: 8px;
+ margin: 0;
+ background-color: <<colour community-card-info-background>>;
+ color: <<colour community-card-info-foreground>>;
+}
+
+.tc-community-card-body {
+ padding: 0 8px;
+}
+
+.tc-community-card .tc-community-card-field-text {
+ display: table-row;
+}
+
+.tc-community-card .tc-community-card-field-text-name,
+.tc-community-card .tc-community-card-field-text-value {
+ display: table-cell;
+ padding: 2px 6px 2px 0;
+ vertical-align: top;
+}
+
+.tc-community-card .tc-community-card-field-text-name {
+ color: <<colour community-card-field-name-foreground>>;
+ white-space: nowrap;
+ text-align: right;
+ padding-right: 8px;
+}
+
+.tc-community-card .tc-community-card-field-text-value {
+ word-break: break-word;
+ font-weight: bold;
+ width: 100%;
+}
+
+a.tc-community-card-pill {
+ display: inline-flex;
+ align-items: center;
+ gap: 4px;
+ width: auto;
+ min-width:0;
+ max-width: none;
+ align-self: auto;
+ font-size: 0.9em;
+ line-height: 1;
+ vertical-align: middle;
+ padding: 4px;
+ border-radius: 4px;
+ background: <<colour community-card-header-background>>;
+ color: <<colour community-card-header-foreground>>;
+ fill: <<colour community-card-header-foreground>>;
+ box-shadow: 0 1px 3px 0 <<colour community-card-shadow>>, 0 0 0 1px <<colour community-card-shadow>>;
+ transition: box-shadow 0.3s ease,transform .3s ease;
+}
+
+a.tc-community-card-pill.tc-community-card-pill-vacancy {
+ background: <<colour community-card-vacancy-header-background>>;
+ color: <<colour community-card-vacancy-header-foreground>>;
+ fill: <<colour community-card-vacancy-header-foreground>>;
+}
+
+a.tc-community-card-pill:hover {
+ text-decoration: none;
+ box-shadow: 0 1px 6px 0 <<colour community-card-dark-shadow>>, 0 0 0 1px <<colour community-card-shadow>>;
+ transform: translateY(-2px);
+ background: <<colour community-card-header-foreground>>;
+ color: <<colour community-card-header-background>>;
+ fill: <<colour community-card-header-background>>;
+}
+
+a.tc-community-card-pill .tc-community-card-field-image img,
+a.tc-community-card-pill .tc-community-card-field-image svg {
+ width: 16px;
+ height: 16px;
+ vertical-align: middle;
+ display: inline-block;
+}
+
+a.tc-community-card-pill .tc-community-card-field-text {
+ display: inline;
+}
+
+.tc-community-card-pill-stack {
+ display: inline-flex;
+ flex-direction: column;
+ align-items: stretch;
+ gap: 4px;
+ margin: 0;
+ padding: 0;
+}
\ No newline at end of file
diff --git a/community/tools/cards/ViewTemplateBodyCascade.tid b/community/tools/cards/ViewTemplateBodyCascade.tid
new file mode 100644
index 000000000..db1338f2c
--- /dev/null
+++ b/community/tools/cards/ViewTemplateBodyCascade.tid
@@ -0,0 +1,6 @@
+title: $:/tiddlywiki/community/cards/ViewTemplateBodyCascade
+tags: $:/tags/ViewTemplateBodyFilter
+list-before:
+
+[tag[Community/Person]then[$:/tiddlywiki/community/cards/ViewTemplateBodyTemplatePerson]]
+[tag[Community/Team]then[$:/tiddlywiki/community/cards/ViewTemplateBodyTemplateTeam]]
\ No newline at end of file
diff --git a/community/tools/cards/ViewTemplateBodyTemplatePerson.tid b/community/tools/cards/ViewTemplateBodyTemplatePerson.tid
new file mode 100644
index 000000000..926393cdd
--- /dev/null
+++ b/community/tools/cards/ViewTemplateBodyTemplatePerson.tid
@@ -0,0 +1,3 @@
+title: $:/tiddlywiki/community/cards/ViewTemplateBodyTemplatePerson
+
+<$transclude $variable="community-card-person" title=<<currentTiddler>>/>
\ No newline at end of file
diff --git a/community/tools/cards/ViewTemplateBodyTemplateTeam.tid b/community/tools/cards/ViewTemplateBodyTemplateTeam.tid
new file mode 100644
index 000000000..600c04518
--- /dev/null
+++ b/community/tools/cards/ViewTemplateBodyTemplateTeam.tid
@@ -0,0 +1,3 @@
+title: $:/tiddlywiki/community/cards/ViewTemplateBodyTemplateTeam
+
+<$transclude $variable="community-card-team" title=<<currentTiddler>>/>
diff --git a/community/tools/icons/person.tid b/community/tools/icons/person.tid
new file mode 100644
index 000000000..373fb50ff
--- /dev/null
+++ b/community/tools/icons/person.tid
@@ -0,0 +1,7 @@
+title: $:/tiddlywiki/community/icons/person
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> viewBox="0 0 64 64">
+ <path d="M43.127,29.612c-0.879,-0.378 -1.452,-1.25 -1.452,-2.207c-0.006,-0.678 0.27,-1.33 0.761,-1.797c0.147,-0.141 0.29,-0.28 0.397,-0.393c0.753,-0.791 1.416,-1.663 1.978,-2.6c1.392,-2.318 2.126,-4.974 2.126,-7.677c0,-8.196 -6.744,-14.938 -14.938,-14.938c-0.945,0 -1.886,0.088 -2.813,0.266c-5.891,1.031 -10.578,5.586 -11.781,11.446c-1.105,5.016 0.454,10.264 4.118,13.865c0.495,0.469 0.78,1.118 0.792,1.799l0,0.012c0.008,0.966 -0.567,1.848 -1.453,2.23c-5.949,2.466 -10.698,7.172 -13.217,13.099c-1.772,4.059 -2.66,8.45 -2.607,12.88l0,3.192c0,2.858 2.351,5.211 5.212,5.211l43.5,0c2.859,0 5.212,-2.353 5.212,-5.211l-0,-3.225c0.053,-4.427 -0.837,-8.816 -2.611,-12.873c-2.523,-5.922 -7.274,-10.621 -13.224,-13.079Z" style="fill-rule:nonzero;"/>
+</svg>
\ No newline at end of file
diff --git a/community/tools/icons/project-team.tid b/community/tools/icons/project-team.tid
new file mode 100644
index 000000000..9d4a1e8f5
--- /dev/null
+++ b/community/tools/icons/project-team.tid
@@ -0,0 +1,7 @@
+title: $:/tiddlywiki/community/icons/project-team
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> viewBox="0 0 64 64">
+ <path d="M24.891,49.399l-3.521,0c-1.398,0 -2.547,-1.15 -2.547,-2.547l0,-1.56c-0.026,-2.165 0.408,-4.311 1.274,-6.295c1.231,-2.897 3.552,-5.197 6.46,-6.402c0.433,-0.187 0.714,-0.618 0.71,-1.09l0,-0.006c-0.006,-0.333 -0.145,-0.65 -0.387,-0.879c-1.791,-1.76 -2.553,-4.325 -2.013,-6.777c0.588,-2.864 2.879,-5.09 5.758,-5.594c0.453,-0.087 0.913,-0.13 1.375,-0.13c4.005,0 7.301,3.295 7.301,7.301c0,1.321 -0.359,2.619 -1.039,3.752c-0.275,0.458 -0.599,0.884 -0.967,1.271c-0.052,0.055 -0.122,0.123 -0.194,0.192c-0.24,0.228 -0.375,0.547 -0.372,0.878c0,0.468 0.28,0.894 0.71,1.079c2.908,1.201 5.23,3.498 6.463,6.392c0.815,1.865 1.248,3.872 1.276,5.904c-0.179,0.006 -0.351,0.007 -0.514,0.003c-0.556,-0.016 -1.375,-0.294 -2.288,-0.512c-1.295,-0.308 -2.719,-0.543 -4.01,-0.396l-0.013,0.001c-1.056,0.128 -2.116,0.325 -3.097,0.76c-0.385,0.171 -1.216,0.753 -1.446,0.916c-1.157,0.297 -2.564,0.475 -3.797,0.312c-0.713,-0.094 -1.402,-0.225 -1.703,-0.778c-0.207,-0.382 -0.181,-0.896 -0.031,-1.565c0.068,-0.3 0.11,-0.593 0.118,-0.842l-0.106,-0.887l-0.212,-0.491l-0.258,-0.36l-0.669,-0.514l-0.832,-0.231l-0.491,0.017l-0.459,0.12l-0.417,0.211l-0.415,0.342l-0.546,0.802l-0.033,0.067c-1.174,2.499 -0.945,4.643 0.013,6.317c0.251,0.437 0.56,0.845 0.919,1.219Zm22.984,-4.722c-0.052,-2.344 -0.566,-4.656 -1.514,-6.805c-1.232,-2.86 -3.339,-5.257 -6.018,-6.845c0.955,-0.816 2.033,-1.473 3.195,-1.949c0.434,-0.187 0.715,-0.618 0.71,-1.09l-0,-0.006c-0.005,-0.333 -0.144,-0.651 -0.386,-0.88c-1.791,-1.76 -2.553,-4.324 -2.013,-6.776c0.587,-2.864 2.878,-5.09 5.758,-5.594c0.453,-0.087 0.913,-0.131 1.375,-0.131c4.005,0 7.3,3.296 7.3,7.301c-0,1.322 -0.359,2.619 -1.038,3.753c-0.276,0.457 -0.6,0.883 -0.968,1.27c-0.052,0.055 -0.121,0.123 -0.194,0.192c-0.24,0.229 -0.375,0.547 -0.372,0.878c-0,0.468 0.28,0.894 0.71,1.079c2.908,1.201 5.229,3.498 6.462,6.392c0.756,1.728 1.184,3.578 1.264,5.458c-0.577,-0.341 -1.293,-0.373 -1.904,-0.07c-0.961,0.475 -1.861,1.117 -2.911,1.371c-0.49,-0.133 -0.983,-0.245 -1.485,-0.308c-0.253,-0.326 -0.536,-0.66 -0.84,-0.911l-0.813,-0.51l-0.752,-0.225c-0.327,-0.051 -0.662,-0.021 -0.974,0.089l-0.67,0.321l-0.569,0.448c-0.403,0.393 -0.733,0.911 -0.979,1.569c-0.202,0.54 -0.344,1.222 -0.492,2.014c-0.244,-0.027 -0.49,-0.047 -0.737,-0.058c-0.333,-0.02 -0.725,-0.006 -1.145,0.023Zm-24.215,-13.651c-2.683,1.591 -4.793,3.994 -6.024,6.861c-1.026,2.332 -1.542,4.857 -1.513,7.405l0,0.59l-11.735,0c-1.397,0 -2.547,-1.15 -2.547,-2.547l0,-1.561c-0.026,-2.165 0.409,-4.31 1.274,-6.295c1.231,-2.897 3.553,-5.197 6.46,-6.401c0.434,-0.187 0.715,-0.618 0.71,-1.09l0,-0.006c-0.005,-0.333 -0.144,-0.651 -0.386,-0.88c-1.791,-1.76 -2.553,-4.324 -2.013,-6.776c0.588,-2.864 2.879,-5.09 5.758,-5.594c0.453,-0.087 0.914,-0.131 1.375,-0.131c4.005,0 7.301,3.296 7.301,7.301c0,1.322 -0.359,2.619 -1.039,3.753c-0.275,0.457 -0.6,0.883 -0.967,1.27c-0.052,0.055 -0.122,0.123 -0.194,0.192c-0.24,0.228 -0.375,0.547 -0.372,0.878c0,0.468 0.28,0.894 0.71,1.079c1.164,0.476 2.246,1.135 3.202,1.952Zm29.027,33.111c-1.417,-0.04 -2.04,-0.037 -2.761,-1.223l-0.563,0.016c-0.654,-0.029 -0.381,-0.016 -0.818,-0.038c-0.73,-0.028 -0.613,-0.722 -0.742,-1.089c-0.205,-1.244 0.272,-2.494 0.257,-3.739c-0.005,-0.442 -0.63,-2.005 -0.854,-2.564c-0.7,0.131 -1.404,0.157 -2.114,0.192c-1.637,-0.004 -3.263,-0.205 -4.878,-0.459c-0.314,1.299 -1.249,3.118 -0.476,4.439c0.938,1.366 1.596,1.745 2.617,1.827c1.02,0.082 1.251,1.234 1.004,1.646c-0.219,0.284 -0.603,0.336 -0.929,0.405l-0.653,0.03c-0.513,-0.017 -0.973,-0.155 -1.43,-0.369c-0.765,-0.427 -1.554,-1.314 -2.141,-1.951c0.137,0.254 0.218,0.751 0.095,0.982c-0.347,0.491 -1.847,0.488 -2.534,0.183c-0.78,-0.347 -2.665,-2.781 -2.957,-4.604c0.776,-1.467 1.905,-2.744 2.477,-4.341c-1.246,-0.795 -1.913,-2.089 -1.827,-3.555l0.032,-0.17c-1.226,0.23 -0.59,0.144 -1.909,0.244c-4.2,-0.013 -7.893,-2.86 -5.813,-7.286c0.135,-0.262 0.263,-0.5 0.493,-0.386c0.184,0.091 0.157,0.457 0.065,0.863c-1.189,5.288 4.621,5.329 8.192,4.35c0.355,-0.097 1.06,-0.751 1.548,-0.968c0.798,-0.354 1.665,-0.498 2.524,-0.602c2.139,-0.244 4.709,0.883 6.015,0.92c1.306,0.037 3.164,-0.313 4.305,-0.239c0.827,0.037 1.64,0.187 2.438,0.4c0.517,-2.519 0.554,-4.374 1.779,-4.804c0.719,0.113 1.273,1.093 1.683,1.617l0.002,-0c0.835,-0.033 1.63,0.178 2.42,0.414c1.431,-0.203 2.631,-1.007 3.895,-1.632c-0.004,0.02 -0.025,0.027 -0.037,0.04c-1.244,1.005 -1.417,2.706 -1.271,4.278c0.054,0.816 -0.176,1.702 -0.461,2.538c-0.534,1.361 -1.564,2.796 -2.759,2.722c-0.452,-0.014 -0.715,-0.27 -1.051,-0.543c-0.065,0.553 -0.321,1.047 -0.568,1.536c-0.57,1.086 -2.06,1.564 -3.44,2.723c-1.379,1.159 0.442,5.297 0.883,6.052c0.442,0.754 1.674,1.03 1.196,1.71c-0.147,0.225 -0.37,0.305 -0.609,0.393l-0.325,0.042Zm-15.735,-3.096l0.206,0.06c0.258,-0.115 0.778,0.064 1.054,0.151c-0.508,-0.563 -1.273,-1.389 -1.824,-1.91c-0.181,-0.631 -0.103,-1.266 -0.065,-1.91l0.008,-0.053c-0.217,0.515 -0.493,1.016 -0.641,1.559c-0.173,0.732 0.771,1.522 1.137,1.975l0.125,0.128Z"/>
+</svg>
diff --git a/community/tools/icons/team.tid b/community/tools/icons/team.tid
new file mode 100644
index 000000000..ed98568b7
--- /dev/null
+++ b/community/tools/icons/team.tid
@@ -0,0 +1,9 @@
+title: $:/tiddlywiki/community/icons/team
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> viewBox="0 0 64 64">
+ <path d="M37.439,32.592c-0.43,-0.185 -0.71,-0.611 -0.71,-1.079c-0.003,-0.331 0.132,-0.65 0.372,-0.878c0.072,-0.069 0.142,-0.137 0.194,-0.192c0.368,-0.387 0.692,-0.813 0.967,-1.271c0.68,-1.133 1.039,-2.431 1.039,-3.752c-0,-4.006 -3.296,-7.301 -7.301,-7.301c-0.462,-0 -0.922,0.043 -1.375,0.13c-2.879,0.504 -5.17,2.73 -5.758,5.594c-0.54,2.452 0.222,5.017 2.013,6.777c0.242,0.229 0.381,0.546 0.387,0.879l-0,0.006c0.004,0.472 -0.277,0.903 -0.71,1.09c-2.908,1.205 -5.229,3.505 -6.46,6.402c-0.866,1.984 -1.3,4.13 -1.274,6.295l-0,1.56c-0,1.397 1.149,2.547 2.547,2.547c-0,-0 0,-0 0,-0l21.261,-0c1.397,-0 2.547,-1.15 2.547,-2.547l-0,-1.576c0.026,-2.164 -0.409,-4.309 -1.276,-6.292c-1.233,-2.894 -3.555,-5.191 -6.463,-6.392Z" style="fill-rule:nonzero;"/>
+ <path d="M60.882,35.466c-1.233,-2.894 -3.554,-5.191 -6.462,-6.392c-0.43,-0.185 -0.71,-0.611 -0.71,-1.079c-0.003,-0.331 0.132,-0.649 0.372,-0.878c0.073,-0.069 0.142,-0.137 0.194,-0.192c0.368,-0.387 0.692,-0.813 0.968,-1.27c0.679,-1.134 1.038,-2.431 1.038,-3.753c0,-4.005 -3.295,-7.301 -7.3,-7.301c-0.462,0 -0.922,0.044 -1.375,0.131c-2.88,0.504 -5.171,2.73 -5.758,5.594c-0.54,2.452 0.222,5.016 2.013,6.776c0.242,0.229 0.381,0.547 0.386,0.88l-0,0.006c0.005,0.472 -0.276,0.903 -0.71,1.09c-1.162,0.476 -2.24,1.133 -3.195,1.949c2.679,1.588 4.786,3.985 6.018,6.845c1.029,2.332 1.546,4.857 1.517,7.405l-0,0.605l11.734,-0c1.397,-0 2.547,-1.15 2.547,-2.547l-0,-1.576c0.026,-2.165 -0.409,-4.31 -1.277,-6.293Z" style="fill-rule:nonzero;"/>
+ <path d="M23.66,31.026c-0.956,-0.817 -2.038,-1.476 -3.202,-1.952c-0.43,-0.185 -0.71,-0.611 -0.71,-1.079c-0.003,-0.331 0.132,-0.65 0.372,-0.878c0.072,-0.069 0.142,-0.137 0.194,-0.192c0.367,-0.387 0.692,-0.813 0.967,-1.27c0.68,-1.134 1.039,-2.431 1.039,-3.753c-0,-4.005 -3.296,-7.301 -7.301,-7.301c-0.461,0 -0.922,0.044 -1.375,0.131c-2.879,0.504 -5.17,2.73 -5.758,5.594c-0.54,2.452 0.222,5.016 2.013,6.776c0.242,0.229 0.381,0.547 0.386,0.88l0,0.006c0.005,0.472 -0.276,0.903 -0.71,1.09c-2.907,1.204 -5.229,3.504 -6.46,6.401c-0.865,1.985 -1.3,4.13 -1.274,6.295c0,0 0,1.561 0,1.561c0,1.397 1.15,2.547 2.547,2.547c-0,-0 11.735,-0 11.735,-0l0,-0.59c-0.029,-2.548 0.487,-5.073 1.513,-7.405c1.231,-2.867 3.341,-5.27 6.024,-6.861Z" style="fill-rule:nonzero;"/>
+</svg>
diff --git a/contributing.md b/contributing.md
index cb328b582..707c34110 100644
--- a/contributing.md
+++ b/contributing.md
@@ -1,3 +1,3 @@
-<h1 class="">Contributing to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a></h1><p>We welcome contributions to the code and documentation of <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> in several ways:</p><ul><li><a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/ReportingBugs.html">ReportingBugs</a></li><li>Helping to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/Improving%2520TiddlyWiki%2520Documentation.html">improve our documentation</a></li><li>Contributing to the code via <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5" rel="noopener noreferrer" target="_blank">GitHub</a><ul><li>See <a class="tc-tiddlylink-external" href="https://tiddlywiki.com/dev" rel="noopener noreferrer" target="_blank">https://tiddlywiki.com/dev</a> for more details</li></ul></li></ul><p>There are other ways to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/HelpingTiddlyWiki.html">help TiddlyWiki</a> too.</p><h1 class="">Contributor License Agreement</h1><p>Like other <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/OpenSource.html">OpenSource</a> projects, <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a> needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the <a class="tc-tiddlylink tc-tiddlylink-missing" href="https://tiddlywiki.com/static/UnaMesa.html">UnaMesa</a> Association (the legal entity that owns <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on behalf of the community).</p><ul><li>For individuals use: <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md" rel="noopener noreferrer" target="_blank">licenses/CLA-individual</a></li><li>For entities use: <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md" rel="noopener noreferrer" target="_blank">licenses/CLA-entity</a></li></ul><h1 class="">How to sign the CLA</h1><p>Create a <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/GitHub.html">GitHub</a> pull request to add your name to <code>cla-individual.md</code> or <code>cla-entity.md</code>, with the date in the format (YYYY/MM/DD).</p><p><strong>step by step</strong></p><ol><li>Navigate to <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md" rel="noopener noreferrer" target="_blank">licenses/CLA-individual</a> or <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md" rel="noopener noreferrer" target="_blank">licenses/CLA-entity</a> according to whether you are signing as an individual or representative of an organisation</li><li>Ensure that the "branch" dropdown at the top left is set to <code>tiddlywiki-com</code></li><li>Click the "edit" button at the top-right corner (clicking this button will fork the project so you can edit the file)</li><li>Add your name at the bottom<ul><li>eg: <code>Jeremy Ruston, @Jermolene, 2011/11/22</code></li></ul></li><li>Below the edit box for the CLA text you should see a box labelled <strong>Propose file change</strong></li><li>Enter a brief title to explain the change (eg, "Signing the CLA")</li><li>Click the green button labelled <strong>Propose file change</strong></li><li>On the following screen, click the green button labelled <strong>Create pull request</strong></li></ol><hr><p><em>The CLA documents used for this project were created using <a class="tc-tiddlylink-external" href="http://www.harmonyagreements.org" rel="noopener noreferrer" target="_blank">Harmony Project Templates</a>. "HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "HA-CLA-E-LIST Version 1.0" for "CLA-entity".</em></p><h2 class="">Remarks</h2><p><strong>If you do not own the copyright in the entire work of authorship</strong>:</p><p>In this case, please clearly state so and provide links and any additional information that clarify under which license the rest of the code is distributed.
+<h1 class="">Contributing to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a></h1><p>Here we focus on contributions via <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/GitHub.html">GitHub</a> Pull Requests but there are many other ways that anyone can help the <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> project, such as <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/ReportingBugs.html">reporting bugs</a> or helping to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/Improving%2520TiddlyWiki%2520Documentation.html">improve our documentation</a>.</p><h1 class="">Rules for Pull Requests</h1><p>PRs must meet these minimum requirements before they can be considered for merging:</p><ul><li>The material in the PR must be free of licensing restrictions. Which means that either:<ul><li>The author must hold the copyright in all of the material themselves</li><li>The material must be licensed under a license compatible with <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a>'s BSD license</li></ul></li><li>The author must sign the Contributors License Agreement (see below)</li><li>Each PR should only make a single feature change</li><li>The title of the PR should be 50 characters or less</li><li>The title of the PR should be capitalised, and should not end with a period</li><li>The title of the PR should be written in the imperative mood. See below</li><li>Adequate explanation in the body of the PR for the motivation and implementation of the change. Focus on the <em>why</em> and <em>what</em>, rather than the <em>how</em></li><li>PRs must be self-contained. Although they can link to material elsewhere, everything needed to understand the intention of the PR should be included</li><li>Any visual changes introduced by the PR should be noted and illustrated with before/after screenshots</li><li>Documentation as appropriate for end-users or developers</li><li>Observe the coding style</li><li>Read the developers documentation</li><li>Please open a consultation issue prior to investing time in making a large PR</li></ul><h2 class="">Imperative Mood for PR Titles</h2><p>The "imperative mood" means written as if giving a command or instruction. See <a class="tc-tiddlylink-external" href="https://chris.beams.io/posts/git-commit/#imperative" rel="noopener noreferrer" target="_blank">this post</a> for more details, but the gist is that the title of the PR should make sense when used to complete the sentence "If applied, this commit will...". So for example, these are good PR titles:</p><ul><li>If applied, this commit will <em>update the contributing guidelines</em></li><li>If applied, this commit will <em>change css-escape-polyfill to a $tw.utils method</em></li><li>If applied, this commit will <em>make it easier to subclass the wikitext parser with a custom rule set</em></li></ul><p>These a poorly worded PR titles:</p><ul><li><strike>If applied, this commit will <em>edit text widgets should use default text for missing fields</em></strike></li><li><strike>If applied, this commit will <em>signing the CLA</em></strike></li><li><strike>If applied, this commit will <em>don't crash if options.event is missing</em></strike></li></ul><p>PR titles may also include a short prefix to indicate the subsystem to which they apply. For example:</p><ul><li><em>Menu plugin: Include menu text in aerial rotator</em></li></ul><h1 class="">Commenting on Pull Requests</h1><p>One of the principles of open source is that many pairs of eyes on the code can improve quality. So, we welcome comments and critiques of pending PRs. <a class="tc-tiddlylink-external" href="https://conventionalcomments.org" rel="noopener noreferrer" target="_blank">Conventional Comments</a> has some techniques to help make comments as constructive and actionable as possible. Notably, they recommend prefixing a comment with a label to clarify the intention:</p><table><tbody><tr class="evenRow"><td align="left">praise</td><td align="left">Praises highlight something positive. Try to leave at least one of these comments per review. Do not leave false praise (which can actually be damaging). Do look for something to sincerely praise</td></tr><tr class="oddRow"><td align="left">nitpick</td><td align="left">Nitpicks are small, trivial, but necessary changes. Distinguishing nitpick comments significantly helps direct the reader's attention to comments requiring more involvement</td></tr><tr class="evenRow"><td align="left">suggestion</td><td align="left">Suggestions are specific requests to improve the subject under review. It is assumed that we all want to do what's best, so these comments are never dismissed as “mere suggestions”, but are taken seriously</td></tr><tr class="oddRow"><td align="left">issue</td><td align="left">Issues represent user-facing problems. If possible, it's great to follow this kind of comment with a suggestion</td></tr><tr class="evenRow"><td align="left">question</td><td align="left">Questions are appropriate if you have a potential concern but are not quite sure if it's relevant or not. Asking the author for clarification or investigation can lead to a quick resolution</td></tr><tr class="oddRow"><td align="left">thought</td><td align="left">Thoughts represent an idea that popped up from reviewing. These comments are non-blocking by nature, but they are extremely valuable and can lead to more focused initiatives and mentoring opportunities</td></tr><tr class="evenRow"><td align="left">chore</td><td align="left">Chores are simple tasks that must be done before the subject can be “officially” accepted. Usually, these comments reference some common process. Try to leave a link to the process description so that the reader knows how to resolve the chore</td></tr></tbody></table><h1 class="">Contributor License Agreement</h1><p>Like other <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/OpenSource.html">OpenSource</a> projects, <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a> needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/UnaMesa.html">UnaMesa</a> Association (the legal entity that owns <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on behalf of the community).</p><ul><li>For individuals use: <a class="tc-tiddlylink-external" href="https://github.com/TiddlyWiki/TiddlyWiki5/tree/tiddlywiki-com/licenses/cla-individual.md" rel="noopener noreferrer" target="_blank">licenses/CLA-individual</a></li><li>For entities use: <a class="tc-tiddlylink-external" href="https://github.com/TiddlyWiki/TiddlyWiki5/tree/tiddlywiki-com/licenses/cla-entity.md" rel="noopener noreferrer" target="_blank">licenses/CLA-entity</a></li></ul><h1 class="">How to sign the CLA</h1><p>Create a <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/GitHub.html">GitHub</a> pull request to add your name to <code>cla-individual.md</code> or <code>cla-entity.md</code>, with the date in the format (YYYY/MM/DD).</p><p><strong>step by step</strong></p><ol><li>Navigate to <a class="tc-tiddlylink-external" href="https://github.com/TiddlyWiki/TiddlyWiki5/tree/tiddlywiki-com/licenses/cla-individual.md" rel="noopener noreferrer" target="_blank">licenses/CLA-individual</a> or <a class="tc-tiddlylink-external" href="https://github.com/TiddlyWiki/TiddlyWiki5/tree/tiddlywiki-com/licenses/cla-entity.md" rel="noopener noreferrer" target="_blank">licenses/CLA-entity</a> according to whether you are signing as an individual or representative of an organisation</li><li>Ensure that the "branch" dropdown at the top left is set to <code>tiddlywiki-com</code></li><li>Click the "edit" button at the top-right corner (clicking this button will fork the project so you can edit the file)</li><li>Add your name at the bottom<ul><li>eg: <code>Jeremy Ruston, @Jermolene, 2011/11/22</code></li></ul></li><li>Below the edit box for the CLA text you should see a box labelled <strong>Propose file change</strong></li><li>Enter a brief title to explain the change (eg, "Signing the CLA")</li><li>Click the green button labelled <strong>Propose file change</strong></li><li>On the following screen, click the green button labelled <strong>Create pull request</strong></li></ol><hr><p><em>The CLA documents used for this project were created using <a class="tc-tiddlylink-external" href="http://www.harmonyagreements.org" rel="noopener noreferrer" target="_blank">Harmony Project Templates</a>. "HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "HA-CLA-E-LIST Version 1.0" for "CLA-entity".</em>
</p><p><em>This file was automatically generated by <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a></em>
</p>
\ No newline at end of file
diff --git a/core/modules/commander.js b/core-server/commander.js
similarity index 92%
rename from core/modules/commander.js
rename to core-server/commander.js
index 302af525b..a6cdc81c9 100644
--- a/core/modules/commander.js
+++ b/core-server/commander.js
@@ -6,10 +6,7 @@ module-type: global
The $tw.Commander class is a command interpreter
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -102,16 +99,18 @@ Commander.prototype.executeNextCommand = function() {
}
}
if(command.info.synchronous) {
- // Synchronous command
+ // Synchronous command (await thenables)
c = new command.Command(params,this);
err = c.execute();
- if(err) {
+ if(err && typeof err.then === "function") {
+ err.then(e => { e ? this.callback(e) : this.executeNextCommand(); });
+ } else if(err) {
this.callback(err);
} else {
this.executeNextCommand();
}
} else {
- // Asynchronous command
+ // Asynchronous command (await thenables)
c = new command.Command(params,this,function(err) {
if(err) {
self.callback(err);
@@ -120,7 +119,9 @@ Commander.prototype.executeNextCommand = function() {
}
});
err = c.execute();
- if(err) {
+ if(err && typeof err.then === "function") {
+ err.then(e => { if(e) this.callback(e); });
+ } else if(err) {
this.callback(err);
}
}
@@ -154,7 +155,7 @@ Commander.prototype.extractNamedParameters = function(params,mandatoryParameters
if(errors.length > 0) {
return errors.join(" and\n");
} else {
- return paramsByName;
+ return paramsByName;
}
};
@@ -173,5 +174,3 @@ Commander.initCommands = function(moduleType) {
};
exports.Commander = Commander;
-
-})();
diff --git a/core/modules/commands/build.js b/core-server/commands/build.js
similarity index 88%
rename from core/modules/commands/build.js
rename to core-server/commands/build.js
index 8471119d7..cbb7663f1 100644
--- a/core/modules/commands/build.js
+++ b/core-server/commands/build.js
@@ -6,10 +6,7 @@ module-type: command
Command to build a build target
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.info = {
@@ -24,7 +21,7 @@ var Command = function(params,commander) {
Command.prototype.execute = function() {
// Get the build targets defined in the wiki
- var buildTargets = $tw.boot.wikiInfo.build;
+ var buildTargets = $tw.boot.wikiInfo && $tw.boot.wikiInfo.build;
if(!buildTargets) {
return "No build targets defined";
}
@@ -48,5 +45,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/clearpassword.js b/core-server/commands/clearpassword.js
similarity index 85%
rename from core/modules/commands/clearpassword.js
rename to core-server/commands/clearpassword.js
index 9f714a3ef..915c60d23 100644
--- a/core/modules/commands/clearpassword.js
+++ b/core-server/commands/clearpassword.js
@@ -6,10 +6,7 @@ module-type: command
Clear password for crypto operations
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.info = {
@@ -29,5 +26,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core-server/commands/commands.js b/core-server/commands/commands.js
new file mode 100644
index 000000000..ddaa387db
--- /dev/null
+++ b/core-server/commands/commands.js
@@ -0,0 +1,36 @@
+/*\
+title: $:/core/modules/commands/commands.js
+type: application/javascript
+module-type: command
+
+Runs the commands returned from a filter
+
+\*/
+
+"use strict";
+
+exports.info = {
+ name: "commands",
+ synchronous: true
+};
+
+var Command = function(params, commander) {
+ this.params = params;
+ this.commander = commander;
+};
+
+Command.prototype.execute = function() {
+ // Parse the filter
+ var filter = this.params[0];
+ if(!filter) {
+ return "No filter specified";
+ }
+ var commands = this.commander.wiki.filterTiddlers(filter)
+ if(commands.length === 0) {
+ return "No tiddlers found for filter '" + filter + "'";
+ }
+ this.commander.addCommandTokens(commands);
+ return null;
+};
+
+exports.Command = Command;
diff --git a/core/modules/commands/deletetiddlers.js b/core-server/commands/deletetiddlers.js
similarity index 89%
rename from core/modules/commands/deletetiddlers.js
rename to core-server/commands/deletetiddlers.js
index 3d8b855d9..797a6428a 100644
--- a/core/modules/commands/deletetiddlers.js
+++ b/core-server/commands/deletetiddlers.js
@@ -6,10 +6,7 @@ module-type: command
Command to delete tiddlers
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.info = {
@@ -38,5 +35,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/editions.js b/core-server/commands/editions.js
similarity index 90%
rename from core/modules/commands/editions.js
rename to core-server/commands/editions.js
index cc802b9f5..c46489d09 100644
--- a/core/modules/commands/editions.js
+++ b/core-server/commands/editions.js
@@ -6,10 +6,7 @@ module-type: command
Command to list the available editions
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.info = {
@@ -35,5 +32,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/fetch.js b/core-server/commands/fetch.js
similarity index 97%
rename from core/modules/commands/fetch.js
rename to core-server/commands/fetch.js
index 8d0997010..be076eb3c 100644
--- a/core/modules/commands/fetch.js
+++ b/core-server/commands/fetch.js
@@ -6,10 +6,7 @@ module-type: command
Commands to fetch external tiddlers
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.info = {
@@ -115,7 +112,7 @@ Command.prototype.fetchFile = function(url,options,callback,redirectCount) {
if(response.statusCode === 302 || response.statusCode === 303 || response.statusCode === 307) {
return self.fetchFile(response.headers.location,options,callback,redirectCount + 1);
} else {
- return callback("Error " + response.statusCode + " retrieving " + url)
+ return callback("Error " + response.statusCode + " retrieving " + url)
}
}
});
@@ -171,5 +168,3 @@ Command.prototype.processBody = function(body,type,options,url) {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/help.js b/core-server/commands/help.js
similarity index 90%
rename from core/modules/commands/help.js
rename to core-server/commands/help.js
index 90c190829..861c8f6d8 100644
--- a/core/modules/commands/help.js
+++ b/core-server/commands/help.js
@@ -6,10 +6,7 @@ module-type: command
Help command
\*/
-(function(){
-/*jshint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.info = {
@@ -37,5 +34,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/import.js b/core-server/commands/import.js
similarity index 92%
rename from core/modules/commands/import.js
rename to core-server/commands/import.js
index 9465c3da1..7c7b6740d 100644
--- a/core/modules/commands/import.js
+++ b/core-server/commands/import.js
@@ -6,10 +6,7 @@ module-type: command
Command to import tiddlers from a file
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.info = {
@@ -44,5 +41,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/init.js b/core-server/commands/init.js
similarity index 92%
rename from core/modules/commands/init.js
rename to core-server/commands/init.js
index 51b80f267..ed48a5494 100644
--- a/core/modules/commands/init.js
+++ b/core-server/commands/init.js
@@ -6,10 +6,7 @@ module-type: command
Command to initialise an empty wiki folder
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.info = {
@@ -48,12 +45,10 @@ Command.prototype.execute = function() {
}
// Tweak the tiddlywiki.info to remove any included wikis
var packagePath = $tw.boot.wikiPath + "/tiddlywiki.info",
- packageJson = JSON.parse(fs.readFileSync(packagePath));
+ packageJson = $tw.utils.parseJSONSafe(fs.readFileSync(packagePath));
delete packageJson.includeWikis;
fs.writeFileSync(packagePath,JSON.stringify(packageJson,null,$tw.config.preferences.jsonSpaces));
return null;
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/listen.js b/core-server/commands/listen.js
similarity index 90%
rename from core/modules/commands/listen.js
rename to core-server/commands/listen.js
index 3c5f6a63a..80cb18293 100644
--- a/core/modules/commands/listen.js
+++ b/core-server/commands/listen.js
@@ -6,10 +6,7 @@ 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;
@@ -18,7 +15,7 @@ exports.info = {
name: "listen",
synchronous: true,
namedParameterMode: true,
- mandatoryParameters: [],
+ mandatoryParameters: []
};
var Command = function(params,commander,callback) {
@@ -44,5 +41,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/load.js b/core-server/commands/load.js
similarity index 92%
rename from core/modules/commands/load.js
rename to core-server/commands/load.js
index 8fd9cba10..e19ecd59a 100644
--- a/core/modules/commands/load.js
+++ b/core-server/commands/load.js
@@ -6,10 +6,7 @@ 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 = {
@@ -47,5 +44,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core-server/commands/makelibrary.js b/core-server/commands/makelibrary.js
new file mode 100644
index 000000000..b8ad2e5b6
--- /dev/null
+++ b/core-server/commands/makelibrary.js
@@ -0,0 +1,40 @@
+/*\
+title: $:/core/modules/commands/makelibrary.js
+type: application/javascript
+module-type: command
+
+Command to pack all of the plugins in the library into a plugin tiddler of type "library"
+
+\*/
+
+"use strict";
+
+exports.info = {
+ name: "makelibrary",
+ synchronous: true
+};
+
+var UPGRADE_LIBRARY_TITLE = "$:/UpgradeLibrary";
+
+var Command = function(params,commander,callback) {
+ this.params = params;
+ this.commander = commander;
+ this.callback = callback;
+};
+
+Command.prototype.execute = function() {
+ var wiki = this.commander.wiki,
+ upgradeLibraryTitle = this.params[0] || UPGRADE_LIBRARY_TITLE,
+ tiddlers = $tw.utils.getAllPlugins();
+ // Save the upgrade library tiddler
+ var pluginFields = {
+ title: upgradeLibraryTitle,
+ type: "application/json",
+ "plugin-type": "library",
+ "text": JSON.stringify({tiddlers: tiddlers})
+ };
+ wiki.addTiddler(new $tw.Tiddler(pluginFields));
+ return null;
+};
+
+exports.Command = Command;
diff --git a/core/modules/commands/output.js b/core-server/commands/output.js
similarity index 89%
rename from core/modules/commands/output.js
rename to core-server/commands/output.js
index 0532f58d7..d43eb2596 100644
--- a/core/modules/commands/output.js
+++ b/core-server/commands/output.js
@@ -6,10 +6,7 @@ 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 = {
@@ -34,5 +31,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/password.js b/core-server/commands/password.js
similarity index 86%
rename from core/modules/commands/password.js
rename to core-server/commands/password.js
index 85d53fa33..27139a9ed 100644
--- a/core/modules/commands/password.js
+++ b/core-server/commands/password.js
@@ -6,10 +6,7 @@ module-type: command
Save password for crypto operations
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.info = {
@@ -32,5 +29,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core-server/commands/render.js b/core-server/commands/render.js
new file mode 100644
index 000000000..c85feda92
--- /dev/null
+++ b/core-server/commands/render.js
@@ -0,0 +1,65 @@
+/*\
+title: $:/core/modules/commands/render.js
+type: application/javascript
+module-type: command
+
+Render individual tiddlers and save the results to the specified files
+
+\*/
+
+ "use strict";
+
+ var widget = require("$:/core/modules/widgets/widget.js");
+
+ exports.info = {
+ name: "render",
+ synchronous: true
+ };
+
+ var Command = function(params,commander,callback) {
+ this.params = params;
+ this.commander = commander;
+ this.callback = callback;
+ };
+
+ Command.prototype.execute = function() {
+ if(this.params.length < 1) {
+ return "Missing tiddler filter";
+ }
+ var self = this,
+ fs = require("fs"),
+ path = require("path"),
+ wiki = this.commander.wiki,
+ tiddlerFilter = this.params[0],
+ filenameFilter = this.params[1] || "[is[tiddler]addsuffix[.html]]",
+ type = this.params[2] || "text/html",
+ template = this.params[3],
+ variableList = this.params.slice(4),
+ tiddlers = wiki.filterTiddlers(tiddlerFilter),
+ variables = Object.create(null);
+ while(variableList.length >= 2) {
+ variables[variableList[0]] = variableList[1];
+ variableList = variableList.slice(2);
+ }
+ $tw.utils.each(tiddlers,function(title) {
+ var filenameResults = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]));
+ if(filenameResults.length > 0) {
+ var filepath = path.resolve(self.commander.outputPath,filenameResults[0]);
+ if(self.commander.verbose) {
+ console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
+ }
+ var parser = wiki.parseTiddler(template || title),
+ widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
+ container = $tw.fakeDocument.createElement("div");
+ widgetNode.render(container,null);
+ var text = type === "text/html" ? container.innerHTML : container.textContent;
+ $tw.utils.createFileDirectories(filepath);
+ fs.writeFileSync(filepath,text,"utf8");
+ } else {
+ console.log("Not rendering \"" + title + "\" because the filename filter returned an empty result");
+ }
+ });
+ return null;
+ };
+
+ exports.Command = Command;
diff --git a/core/modules/commands/rendertiddler.js b/core-server/commands/rendertiddler.js
similarity index 93%
rename from core/modules/commands/rendertiddler.js
rename to core-server/commands/rendertiddler.js
index 1860beb7e..2a996c8c1 100755
--- a/core/modules/commands/rendertiddler.js
+++ b/core-server/commands/rendertiddler.js
@@ -6,10 +6,7 @@ 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 = {
@@ -40,6 +37,7 @@ Command.prototype.execute = function() {
$tw.utils.createFileDirectories(filename);
if(template) {
variables.currentTiddler = title;
+ variables.storyTiddler = title;
title = template;
}
if(name && value) {
@@ -52,5 +50,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/rendertiddlers.js b/core-server/commands/rendertiddlers.js
similarity index 87%
rename from core/modules/commands/rendertiddlers.js
rename to core-server/commands/rendertiddlers.js
index dd875e3eb..f392ba704 100644
--- a/core/modules/commands/rendertiddlers.js
+++ b/core-server/commands/rendertiddlers.js
@@ -6,10 +6,7 @@ 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");
@@ -36,7 +33,7 @@ Command.prototype.execute = function() {
filter = this.params[0],
template = this.params[1],
outputPath = this.commander.outputPath,
- pathname = path.resolve(outputPath,this.params[2]),
+ pathname = path.resolve(outputPath,this.params[2]),
type = this.params[3] || "text/html",
extension = this.params[4] || ".html",
deleteDirectory = (this.params[5] || "").toLowerCase() !== "noclean",
@@ -46,7 +43,7 @@ Command.prototype.execute = function() {
}
$tw.utils.each(tiddlers,function(title) {
var parser = wiki.parseTiddler(template),
- widgetNode = wiki.makeWidget(parser,{variables: {currentTiddler: title}}),
+ widgetNode = wiki.makeWidget(parser,{variables: {currentTiddler: title, storyTiddler: title}}),
container = $tw.fakeDocument.createElement("div");
widgetNode.render(container,null);
var text = type === "text/html" ? container.innerHTML : container.textContent,
@@ -57,7 +54,7 @@ Command.prototype.execute = function() {
exportPath = path.resolve(outputPath,macroPath + extension);
}
}
- var finalPath = exportPath || path.resolve(pathname,encodeURIComponent(title) + extension);
+ var finalPath = exportPath || path.resolve(pathname,$tw.utils.encodeURIComponentExtended(title) + extension);
$tw.utils.createFileDirectories(finalPath);
fs.writeFileSync(finalPath,text,"utf8");
});
@@ -65,5 +62,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core-server/commands/save.js b/core-server/commands/save.js
new file mode 100644
index 000000000..1d9155623
--- /dev/null
+++ b/core-server/commands/save.js
@@ -0,0 +1,63 @@
+/*\
+title: $:/core/modules/commands/save.js
+type: application/javascript
+module-type: command
+
+Saves individual tiddlers in their raw text or binary format to the specified files
+
+\*/
+
+ "use strict";
+
+ exports.info = {
+ name: "save",
+ synchronous: true
+ };
+
+ var Command = function(params,commander,callback) {
+ this.params = params;
+ this.commander = commander;
+ this.callback = callback;
+ };
+
+ Command.prototype.execute = function() {
+ if(this.params.length < 1) {
+ return "Missing filename filter";
+ }
+ var self = this,
+ fs = require("fs"),
+ path = require("path"),
+ result = null,
+ wiki = this.commander.wiki,
+ tiddlerFilter = this.params[0],
+ filenameFilter = this.params[1] || "[is[tiddler]]",
+ tiddlers = wiki.filterTiddlers(tiddlerFilter);
+ $tw.utils.each(tiddlers,function(title) {
+ if(!result) {
+ var tiddler = self.commander.wiki.getTiddler(title);
+ if(tiddler) {
+ var fileInfo = $tw.utils.generateTiddlerFileInfo(tiddler,{
+ directory: path.resolve(self.commander.outputPath),
+ pathFilters: [filenameFilter],
+ wiki: wiki,
+ fileInfo: {
+ overwrite: true
+ }
+ });
+ if(self.commander.verbose) {
+ console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");
+ }
+ try {
+ $tw.utils.saveTiddlerToFileSync(tiddler,fileInfo);
+ } catch (err) {
+ result = "Error saving tiddler \"" + title + "\", to file: \"" + fileInfo.filepath + "\"";
+ }
+ } else {
+ result = "Tiddler '" + title + "' not found";
+ }
+ }
+ });
+ return result;
+ };
+
+ exports.Command = Command;
diff --git a/core/modules/commands/savelibrarytiddlers.js b/core-server/commands/savelibrarytiddlers.js
similarity index 94%
rename from core/modules/commands/savelibrarytiddlers.js
rename to core-server/commands/savelibrarytiddlers.js
index a15bd807c..431960edd 100644
--- a/core/modules/commands/savelibrarytiddlers.js
+++ b/core-server/commands/savelibrarytiddlers.js
@@ -16,10 +16,7 @@ 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 = {
@@ -65,11 +62,11 @@ Command.prototype.execute = function() {
$tw.utils.each(filteredPluginList,function(title) {
var tiddler = containerData.tiddlers[title];
// Save each JSON file and collect the skinny data
- var pathname = path.resolve(self.commander.outputPath,basepath + encodeURIComponent(title) + ".json");
+ var pathname = path.resolve(self.commander.outputPath,basepath + $tw.utils.encodeURIComponentExtended(title) + ".json");
$tw.utils.createFileDirectories(pathname);
fs.writeFileSync(pathname,JSON.stringify(tiddler),"utf8");
// Collect the skinny list data
- var pluginTiddlers = JSON.parse(tiddler.text),
+ var pluginTiddlers = $tw.utils.parseJSONSafe(tiddler.text),
readmeContent = (pluginTiddlers.tiddlers[title + "/readme"] || {}).text,
doesRequireReload = !!self.commander.wiki.doesPluginInfoRequireReload(pluginTiddlers),
iconTiddler = pluginTiddlers.tiddlers[title + "/icon"] || {},
@@ -94,5 +91,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/savetiddler.js b/core-server/commands/savetiddler.js
similarity index 93%
rename from core/modules/commands/savetiddler.js
rename to core-server/commands/savetiddler.js
index efc484ec7..492fe9f12 100644
--- a/core/modules/commands/savetiddler.js
+++ b/core-server/commands/savetiddler.js
@@ -6,10 +6,7 @@ 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 = {
@@ -47,5 +44,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/savetiddlers.js b/core-server/commands/savetiddlers.js
similarity index 84%
rename from core/modules/commands/savetiddlers.js
rename to core-server/commands/savetiddlers.js
index de29efdb7..0e15d5edc 100644
--- a/core/modules/commands/savetiddlers.js
+++ b/core-server/commands/savetiddlers.js
@@ -6,10 +6,7 @@ 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");
@@ -45,12 +42,10 @@ Command.prototype.execute = function() {
var tiddler = self.commander.wiki.getTiddler(title),
type = tiddler.fields.type || "text/vnd.tiddlywiki",
contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"},
- filename = path.resolve(pathname,encodeURIComponent(title));
- fs.writeFileSync(filename,tiddler.fields.text,contentTypeInfo.encoding);
+ filename = path.resolve(pathname,$tw.utils.encodeURIComponentExtended(title));
+ fs.writeFileSync(filename,tiddler.fields.text || "",contentTypeInfo.encoding);
});
return null;
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/savewikifolder.js b/core-server/commands/savewikifolder.js
similarity index 77%
rename from core/modules/commands/savewikifolder.js
rename to core-server/commands/savewikifolder.js
index f5cfb9cd7..b17246e86 100644
--- a/core/modules/commands/savewikifolder.js
+++ b/core-server/commands/savewikifolder.js
@@ -5,13 +5,17 @@ module-type: command
Command to save the current wiki as a wiki folder
---savewikifolder <wikifolderpath> [<filter>]
+--savewikifolder <wikifolderpath> [ [<name>=<value>] ]*
+
+The following options are supported:
+
+* ''filter'': a filter expression defining the tiddlers to be included in the output
+* ''explodePlugins'': set to "no" to suppress exploding plugins into their constituent shadow tiddlers (defaults to "yes")
+
+Supports backward compatibility with --savewikifolder <wikifolderpath> [<filter>] [ [<name>=<value>] ]*
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.info = {
@@ -35,14 +39,28 @@ Command.prototype.execute = function() {
if(this.params.length < 1) {
return "Missing wiki folder path";
}
- var wikifoldermaker = new WikiFolderMaker(this.params[0],this.params[1],this.commander);
+ var regFilter = /^[a-zA-Z0-9\.\-_]+=/g, // dynamic parameters
+ namedParames,
+ tiddlerFilter,
+ options = {};
+ if (regFilter.test(this.params[1])) {
+ namedParames = this.commander.extractNamedParameters(this.params.slice(1));
+ tiddlerFilter = namedParames.filter || "[all[tiddlers]]";
+ } else {
+ namedParames = this.commander.extractNamedParameters(this.params.slice(2));
+ tiddlerFilter = this.params[1];
+ }
+ tiddlerFilter = tiddlerFilter || "[all[tiddlers]]";
+ options.explodePlugins = namedParames.explodePlugins || "yes";
+ var wikifoldermaker = new WikiFolderMaker(this.params[0],tiddlerFilter,this.commander,options);
return wikifoldermaker.save();
};
-function WikiFolderMaker(wikiFolderPath,wikiFilter,commander) {
+function WikiFolderMaker(wikiFolderPath,wikiFilter,commander,options) {
this.wikiFolderPath = wikiFolderPath;
- this.wikiFilter = wikiFilter || "[all[tiddlers]]";
+ this.wikiFilter = wikiFilter;
this.commander = commander;
+ this.explodePlugins = options.explodePlugins;
this.wiki = commander.wiki;
this.savedPaths = []; // So that we can detect filename clashes
}
@@ -58,6 +76,7 @@ WikiFolderMaker.prototype.tiddlersToIgnore = [
"$:/boot/boot.js",
"$:/boot/bootprefix.js",
"$:/core",
+ "$:/core-server",
"$:/library/sjcl.js",
"$:/temp/info-plugin"
];
@@ -93,11 +112,14 @@ WikiFolderMaker.prototype.save = function() {
self.log("Adding built-in plugin: " + libraryDetails.name);
newWikiInfo[libraryDetails.type] = newWikiInfo[libraryDetails.type] || [];
$tw.utils.pushTop(newWikiInfo[libraryDetails.type],libraryDetails.name);
- } else {
+ } else if(self.explodePlugins !== "no") {
// A custom plugin
self.log("Processing custom plugin: " + title);
self.saveCustomPlugin(tiddler);
- }
+ } else if(self.explodePlugins === "no") {
+ self.log("Processing custom plugin to tiddlders folder: " + title);
+ self.saveTiddler("tiddlers", tiddler);
+ }
} else {
// Ordinary tiddler
self.saveTiddler("tiddlers",tiddler);
@@ -151,8 +173,11 @@ WikiFolderMaker.prototype.saveCustomPlugin = function(pluginTiddler) {
pluginInfo = pluginTiddler.getFieldStrings({exclude: ["text","type"]});
this.saveJSONFile(directory + path.sep + "plugin.info",pluginInfo);
self.log("Writing " + directory + path.sep + "plugin.info: " + JSON.stringify(pluginInfo,null,$tw.config.preferences.jsonSpaces));
- var pluginTiddlers = JSON.parse(pluginTiddler.fields.text).tiddlers; // A hashmap of tiddlers in the plugin
- $tw.utils.each(pluginTiddlers,function(tiddler) {
+ var pluginTiddlers = $tw.utils.parseJSONSafe(pluginTiddler.fields.text).tiddlers; // A hashmap of tiddlers in the plugin
+ $tw.utils.each(pluginTiddlers,function(tiddler,title) {
+ if(!tiddler.title) {
+ tiddler.title = title;
+ }
self.saveTiddler(directory,new $tw.Tiddler(tiddler));
});
};
@@ -167,10 +192,10 @@ WikiFolderMaker.prototype.saveTiddler = function(directory,tiddler) {
}
var fileInfo = $tw.utils.generateTiddlerFileInfo(tiddler,{
directory: path.resolve(this.wikiFolderPath,directory),
- wiki: this.wiki,
pathFilters: pathFilters,
extFilters: extFilters,
- originalpath: this.wiki.extractTiddlerDataItem("$:/config/OriginalTiddlerPaths",title, "")
+ wiki: this.wiki,
+ fileInfo: {}
});
try {
$tw.utils.saveTiddlerToFileSync(tiddler,fileInfo);
@@ -194,5 +219,3 @@ WikiFolderMaker.prototype.saveFile = function(filename,encoding,data) {
};
exports.Command = Command;
-
-})();
diff --git a/core-server/commands/server.js b/core-server/commands/server.js
new file mode 100644
index 000000000..d1ee487a2
--- /dev/null
+++ b/core-server/commands/server.js
@@ -0,0 +1,50 @@
+/*\
+title: $:/core/modules/commands/server.js
+type: application/javascript
+module-type: command
+
+Deprecated legacy command for serving tiddlers
+
+\*/
+
+"use strict";
+
+var Server = require("$:/core/modules/server/server.js").Server;
+
+exports.info = {
+ name: "server",
+ synchronous: true
+};
+
+var Command = function(params,commander,callback) {
+ var self = this;
+ this.params = params;
+ this.commander = commander;
+ this.callback = callback;
+};
+
+Command.prototype.execute = function() {
+ if(!$tw.boot.wikiTiddlersPath) {
+ $tw.utils.warning("Warning: Wiki folder '" + $tw.boot.wikiPath + "' does not exist or is missing a tiddlywiki.info file");
+ }
+ // Set up server
+ this.server = new Server({
+ wiki: this.commander.wiki,
+ variables: {
+ port: this.params[0],
+ host: this.params[6],
+ "root-tiddler": this.params[1],
+ "root-render-type": this.params[2],
+ "root-serve-type": this.params[3],
+ username: this.params[4],
+ password: this.params[5],
+ "path-prefix": this.params[7],
+ "debug-level": this.params[8]
+ }
+ });
+ var nodeServer = this.server.listen();
+ $tw.hooks.invokeHook("th-server-command-post-start",this.server,nodeServer,"tiddlywiki");
+ return null;
+};
+
+exports.Command = Command;
diff --git a/core/modules/commands/setfield.js b/core-server/commands/setfield.js
similarity index 94%
rename from core/modules/commands/setfield.js
rename to core-server/commands/setfield.js
index 3f8ec1d14..7be8cbdca 100644
--- a/core/modules/commands/setfield.js
+++ b/core-server/commands/setfield.js
@@ -6,10 +6,7 @@ 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");
@@ -54,5 +51,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/unpackplugin.js b/core-server/commands/unpackplugin.js
similarity index 91%
rename from core/modules/commands/unpackplugin.js
rename to core-server/commands/unpackplugin.js
index 6f85c066f..5e2bd33c0 100644
--- a/core/modules/commands/unpackplugin.js
+++ b/core-server/commands/unpackplugin.js
@@ -6,10 +6,7 @@ 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 = {
@@ -40,5 +37,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/verbose.js b/core-server/commands/verbose.js
similarity index 87%
rename from core/modules/commands/verbose.js
rename to core-server/commands/verbose.js
index 6b0117829..23b5303c7 100644
--- a/core/modules/commands/verbose.js
+++ b/core-server/commands/verbose.js
@@ -6,10 +6,7 @@ module-type: command
Verbose command
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.info = {
@@ -30,5 +27,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/version.js b/core-server/commands/version.js
similarity index 84%
rename from core/modules/commands/version.js
rename to core-server/commands/version.js
index 24edc97f7..e14c635de 100644
--- a/core/modules/commands/version.js
+++ b/core-server/commands/version.js
@@ -6,10 +6,7 @@ module-type: command
Version command
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.info = {
@@ -28,5 +25,3 @@ Command.prototype.execute = function() {
};
exports.Command = Command;
-
-})();
diff --git a/core/modules/utils/filesystem.js b/core-server/filesystem.js
similarity index 84%
rename from core/modules/utils/filesystem.js
rename to core-server/filesystem.js
index b7fe2156c..aa214586a 100644
--- a/core/modules/utils/filesystem.js
+++ b/core-server/filesystem.js
@@ -6,10 +6,7 @@ module-type: utils-node
File system utilities
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var fs = require("fs"),
@@ -213,13 +210,13 @@ Options include:
extFilters: optional array of filters to be used to generate the base path
wiki: optional wiki for evaluating the pathFilters,
fileInfo: an existing fileInfo to check against
- originalpath: a preferred filepath if no pathFilters match
*/
exports.generateTiddlerFileInfo = function(tiddler,options) {
var fileInfo = {}, metaExt;
// Propagate the isEditableFile flag
- if(options.fileInfo) {
- fileInfo.isEditableFile = options.fileInfo.isEditableFile || false;
+ if(options.fileInfo && !!options.fileInfo.isEditableFile) {
+ fileInfo.isEditableFile = true;
+ fileInfo.originalpath = options.fileInfo.originalpath;
}
// Check if the tiddler has any unsafe fields that can't be expressed in a .tid or .meta file: containing control characters, or leading/trailing whitespace
var hasUnsafeFields = false;
@@ -228,6 +225,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
hasUnsafeFields = hasUnsafeFields || /[\x00-\x1F]/mg.test(value);
hasUnsafeFields = hasUnsafeFields || ($tw.utils.trim(value) !== value);
}
+ hasUnsafeFields = hasUnsafeFields || /:|#/mg.test(fieldName);
});
// Check for field values
if(hasUnsafeFields) {
@@ -237,7 +235,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
} else {
// Save as a .tid or a text/binary file plus a .meta file
var tiddlerType = tiddler.fields.type || "text/vnd.tiddlywiki";
- if(tiddlerType === "text/vnd.tiddlywiki") {
+ if(tiddlerType === "text/vnd.tiddlywiki" || tiddlerType === "text/vnd.tiddlywiki-multiple" || tiddler.hasField("_canonical_uri")) {
// Save as a .tid file
fileInfo.type = "application/x-tiddler";
fileInfo.hasMetaFile = false;
@@ -247,7 +245,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
fileInfo.hasMetaFile = true;
}
if(options.extFilters) {
- // Check for extension override
+ // Check for extension overrides
metaExt = $tw.utils.generateTiddlerExtension(tiddler.fields.title,{
extFilters: options.extFilters,
wiki: options.wiki
@@ -279,8 +277,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
directory: options.directory,
pathFilters: options.pathFilters,
wiki: options.wiki,
- fileInfo: options.fileInfo,
- originalpath: options.originalpath
+ fileInfo: options.fileInfo
});
return fileInfo;
};
@@ -292,8 +289,7 @@ Options include:
wiki: optional wiki for evaluating the extFilters
*/
exports.generateTiddlerExtension = function(title,options) {
- var self = this,
- extension;
+ var extension;
// Check if any of the extFilters applies
if(options.extFilters && options.wiki) {
$tw.utils.each(options.extFilters,function(filter) {
@@ -317,13 +313,14 @@ Options include:
pathFilters: optional array of filters to be used to generate the base path
wiki: optional wiki for evaluating the pathFilters
fileInfo: an existing fileInfo object to check against
+ fileInfo.overwrite: if true, turns off filename clash numbers (defaults to false)
*/
exports.generateTiddlerFilepath = function(title,options) {
- var self = this,
- directory = options.directory || "",
+ var directory = options.directory || "",
extension = options.extension || "",
- originalpath = options.originalpath || "",
- filepath;
+ originalpath = (options.fileInfo && options.fileInfo.originalpath) ? options.fileInfo.originalpath : "",
+ overwrite = options.fileInfo && options.fileInfo.overwrite || false,
+ filepath;
// Check if any of the pathFilters applies
if(options.pathFilters && options.wiki) {
$tw.utils.each(options.pathFilters,function(filter) {
@@ -336,7 +333,7 @@ exports.generateTiddlerFilepath = function(title,options) {
}
});
}
- if(!filepath && originalpath !== "") {
+ if(!filepath && !!originalpath) {
//Use the originalpath without the extension
var ext = path.extname(originalpath);
filepath = originalpath.substring(0,originalpath.length - ext.length);
@@ -345,29 +342,37 @@ exports.generateTiddlerFilepath = function(title,options) {
// Remove any forward or backward slashes so we don't create directories
filepath = filepath.replace(/\/|\\/g,"_");
}
- //If the path does not start with "." or ".." and a path seperator, then
+ // Replace any Windows control codes
+ filepath = filepath.replace(/^(con|prn|aux|nul|com[0-9]|lpt[0-9])$/i,"_$1_");
+ // Replace any leading spaces with the same number of underscores
+ filepath = filepath.replace(/^ +/,function (u) { return u.replace(/ /g, "_")});
+ //If the path does not start with "." or ".." && a path seperator, then
if(!/^\.{1,2}[/\\]/g.test(filepath)) {
// Don't let the filename start with any dots because such files are invisible on *nix
- filepath = filepath.replace(/^\.+/g,"_");
+ filepath = filepath.replace(/^\.+/g,function (u) { return u.replace(/\./g, "_")});
+ }
+ // Replace any Unicode control codes
+ filepath = filepath.replace(/[\x00-\x1f\x80-\x9f]/g,"_");
+ // Replace any characters that can't be used in cross-platform filenames
+ filepath = $tw.utils.transliterate(filepath.replace(/<|>|~|\:|\"|\||\?|\*|\^/g,"_"));
+ // Replace any dots or spaces at the end of the extension with the same number of underscores
+ extension = extension.replace(/[\. ]+$/, function (u) { return u.replace(/[\. ]/g, "_")});
+ // Truncate the extension if it is too long
+ if(extension.length > 32) {
+ extension = extension.substr(0,32);
}
// If the filepath already ends in the extension then remove it
if(filepath.substring(filepath.length - extension.length) === extension) {
filepath = filepath.substring(0,filepath.length - extension.length);
}
- // Remove any characters that can't be used in cross-platform filenames
- filepath = $tw.utils.transliterate(filepath.replace(/<|>|~|\:|\"|\||\?|\*|\^/g,"_"));
// Truncate the filename if it is too long
if(filepath.length > 200) {
filepath = filepath.substr(0,200);
}
- // Truncate the extension if it is too long
- if(extension.length > 32) {
- extension = extension.substr(0,32);
- }
- // If the resulting filename is blank (eg because the title is just punctuation characters)
- if(!filepath) {
+ // If the resulting filename is blank (eg because the title is just punctuation)
+ if(!filepath || /^_+$/g.test(filepath)) {
// ...then just use the character codes of the title
- filepath = "";
+ filepath = "";
$tw.utils.each(title.split(""),function(char) {
if(filepath) {
filepath += "-";
@@ -375,28 +380,30 @@ exports.generateTiddlerFilepath = function(title,options) {
filepath += char.charCodeAt(0).toString();
});
}
- // Add a uniquifier if the file already exists
- var fullPath, oldPath = (options.fileInfo) ? options.fileInfo.filepath : undefined,
+ // Add a uniquifier if the file already exists (default)
+ var fullPath = path.resolve(directory, filepath + extension);
+ if (!overwrite) {
+ var oldPath = (options.fileInfo) ? options.fileInfo.filepath : undefined,
count = 0;
- do {
- fullPath = path.resolve(directory,filepath + (count ? "_" + count : "") + extension);
- if(oldPath && oldPath == fullPath) {
- break;
- }
- count++;
- } while(fs.existsSync(fullPath));
+ do {
+ fullPath = path.resolve(directory,filepath + (count ? "_" + count : "") + extension);
+ if(oldPath && oldPath == fullPath) break;
+ count++;
+ } while(fs.existsSync(fullPath));
+ }
// If the last write failed with an error, or if path does not start with:
- // the resolved options.directory, the resolved wikiPath directory, or the wikiTiddlersPath directory,
- // then encodeURIComponent() and resolve to tiddler directory
- var writePath = $tw.hooks.invokeHook("th-make-tiddler-path",fullPath),
+ // the resolved options.directory, the resolved wikiPath directory, the wikiTiddlersPath directory,
+ // or the 'originalpath' directory, then $tw.utils.encodeURIComponentExtended() and resolve to options.directory.
+ var writePath = $tw.hooks.invokeHook("th-make-tiddler-path",fullPath,fullPath),
encode = (options.fileInfo || {writeError: false}).writeError == true;
if(!encode) {
- encode = !(fullPath.indexOf(path.resolve(directory)) == 0 ||
- fullPath.indexOf(path.resolve($tw.boot.wikiPath)) == 0 ||
- fullPath.indexOf($tw.boot.wikiTiddlersPath) == 0);
+ encode = !(writePath.indexOf($tw.boot.wikiTiddlersPath) == 0 ||
+ writePath.indexOf(path.resolve(directory)) == 0 ||
+ writePath.indexOf(path.resolve($tw.boot.wikiPath)) == 0 ||
+ writePath.indexOf(path.resolve($tw.boot.wikiTiddlersPath,originalpath)) == 0 );
}
if(encode) {
- writePath = path.resolve(directory,encodeURIComponent(fullPath));
+ writePath = path.resolve(directory,$tw.utils.encodeURIComponentExtended(fullPath));
}
// Return the full path to the file
return writePath;
@@ -413,7 +420,7 @@ exports.saveTiddlerToFile = function(tiddler,fileInfo,callback) {
if(fileInfo.hasMetaFile) {
// Save the tiddler as a separate body and meta file
var typeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/plain"] || {encoding: "utf8"};
- fs.writeFile(fileInfo.filepath,tiddler.fields.text,typeInfo.encoding,function(err) {
+ fs.writeFile(fileInfo.filepath,tiddler.fields.text || "",typeInfo.encoding,function(err) {
if(err) {
return callback(err);
}
@@ -455,7 +462,7 @@ exports.saveTiddlerToFileSync = function(tiddler,fileInfo) {
if(fileInfo.hasMetaFile) {
// Save the tiddler as a separate body and meta file
var typeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/plain"] || {encoding: "utf8"};
- fs.writeFileSync(fileInfo.filepath,tiddler.fields.text,typeInfo.encoding);
+ fs.writeFileSync(fileInfo.filepath,tiddler.fields.text || "",typeInfo.encoding);
fs.writeFileSync(fileInfo.filepath + ".meta",tiddler.getFieldStringBlock({exclude: ["text","bag"]}),"utf8");
} else {
// Save the tiddler as a self contained templated file
@@ -465,6 +472,7 @@ exports.saveTiddlerToFileSync = function(tiddler,fileInfo) {
fs.writeFileSync(fileInfo.filepath,JSON.stringify([tiddler.getFieldStrings({exclude: ["bag"]})],null,$tw.config.preferences.jsonSpaces),"utf8");
}
}
+ return fileInfo;
};
/*
@@ -481,7 +489,7 @@ exports.deleteTiddlerFile = function(fileInfo,callback) {
fs.unlink(fileInfo.filepath,function(err) {
if(err) {
return callback(err);
- }
+ }
// Delete the metafile if present
if(fileInfo.hasMetaFile && fs.existsSync(fileInfo.filepath + ".meta")) {
fs.unlink(fileInfo.filepath + ".meta",function(err) {
@@ -532,5 +540,3 @@ exports.cleanupTiddlerFiles = function(options,callback) {
return callback(null,bootInfo);
}
};
-
-})();
diff --git a/core-server/plugin.info b/core-server/plugin.info
new file mode 100644
index 000000000..21560a1ad
--- /dev/null
+++ b/core-server/plugin.info
@@ -0,0 +1,11 @@
+{
+ "title": "$:/core-server",
+ "name": "Core Server Components",
+ "description": "TiddlyWiki5 core server components",
+ "author": "JeremyRuston",
+ "core-version": ">=5.0.0",
+ "platform": "server",
+ "plugin-priority": "0",
+ "list": "readme",
+ "stability": "STABILITY_2_STABLE"
+}
diff --git a/core-server/readme.tid b/core-server/readme.tid
new file mode 100644
index 000000000..23efece01
--- /dev/null
+++ b/core-server/readme.tid
@@ -0,0 +1,7 @@
+title: $:/core-server/readme
+
+This plugin contains TiddlyWiki's core components that are only needed on the server, comprising:
+
+* Commands
+* HTTP server code
+* Utility functions for server
diff --git a/core/modules/server/authenticators/basic.js b/core-server/server/authenticators/basic.js
similarity index 97%
rename from core/modules/server/authenticators/basic.js
rename to core-server/server/authenticators/basic.js
index cd528c485..e67e701f5 100644
--- a/core/modules/server/authenticators/basic.js
+++ b/core-server/server/authenticators/basic.js
@@ -6,10 +6,7 @@ module-type: authenticator
Authenticator for WWW basic authentication
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
if($tw.node) {
@@ -90,5 +87,3 @@ BasicAuthenticator.prototype.authenticateRequest = function(request,response,sta
};
exports.AuthenticatorClass = BasicAuthenticator;
-
-})();
diff --git a/core/modules/server/authenticators/header.js b/core-server/server/authenticators/header.js
similarity index 91%
rename from core/modules/server/authenticators/header.js
rename to core-server/server/authenticators/header.js
index 78ae6cb0a..bbcf9a1d4 100644
--- a/core/modules/server/authenticators/header.js
+++ b/core-server/server/authenticators/header.js
@@ -6,10 +6,7 @@ module-type: authenticator
Authenticator for trusted header authentication
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
function HeaderAuthenticator(server) {
@@ -37,11 +34,12 @@ HeaderAuthenticator.prototype.authenticateRequest = function(request,response,st
return false;
} else {
// authenticatedUsername will be undefined for anonymous users
- state.authenticatedUsername = username;
+ if(username) {
+ state.authenticatedUsername = $tw.utils.decodeURIComponentSafe(username);
+ }
return true;
}
};
exports.AuthenticatorClass = HeaderAuthenticator;
-})();
diff --git a/core-server/server/routes/delete-tiddler.js b/core-server/server/routes/delete-tiddler.js
new file mode 100644
index 000000000..17db39848
--- /dev/null
+++ b/core-server/server/routes/delete-tiddler.js
@@ -0,0 +1,26 @@
+/*\
+title: $:/core/modules/server/routes/delete-tiddler.js
+type: application/javascript
+module-type: route
+
+DELETE /recipes/default/tiddlers/:title
+
+\*/
+"use strict";
+
+exports.methods = ["DELETE"];
+
+exports.path = /^\/bags\/default\/tiddlers\/(.+)$/;
+
+exports.info = {
+ priority: 100
+};
+
+exports.handler = function(request,response,state) {
+ var title = $tw.utils.decodeURIComponentSafe(state.params[0]);
+ state.wiki.deleteTiddler(title);
+ response.writeHead(204, "OK", {
+ "Content-Type": "text/plain"
+ });
+ response.end();
+};
diff --git a/core-server/server/routes/get-favicon.js b/core-server/server/routes/get-favicon.js
new file mode 100644
index 000000000..ce4bc55ed
--- /dev/null
+++ b/core-server/server/routes/get-favicon.js
@@ -0,0 +1,22 @@
+/*\
+title: $:/core/modules/server/routes/get-favicon.js
+type: application/javascript
+module-type: route
+
+GET /favicon.ico
+
+\*/
+"use strict";
+
+exports.methods = ["GET"];
+
+exports.path = /^\/favicon.ico$/;
+
+exports.info = {
+ priority: 100
+};
+
+exports.handler = function(request,response,state) {
+ var buffer = state.wiki.getTiddlerText("$:/favicon.ico","");
+ state.sendResponse(200,{"Content-Type": "image/x-icon"},buffer,"base64");
+};
diff --git a/core-server/server/routes/get-file.js b/core-server/server/routes/get-file.js
new file mode 100644
index 000000000..ec928319c
--- /dev/null
+++ b/core-server/server/routes/get-file.js
@@ -0,0 +1,73 @@
+/*\
+title: $:/core/modules/server/routes/get-file.js
+type: application/javascript
+module-type: route
+
+GET /files/:filepath
+
+\*/
+"use strict";
+
+exports.methods = ["GET"];
+
+exports.path = /^\/files\/(.+)$/;
+
+exports.info = {
+ priority: 100
+};
+
+exports.handler = function(request,response,state) {
+ var path = require("path"),
+ fs = require("fs"),
+ suppliedFilename = $tw.utils.decodeURIComponentSafe(state.params[0]),
+ baseFilename = path.resolve(state.boot.wikiPath,"files"),
+ filename = path.resolve(baseFilename,suppliedFilename),
+ extension = path.extname(filename);
+ // Check that the filename is inside the wiki files folder
+ if(path.relative(baseFilename,filename).indexOf("..") === 0) {
+ return state.sendResponse(404,{"Content-Type": "text/plain"},"File '" + suppliedFilename + "' not found");
+ }
+ fs.stat(filename, function(err, stats) {
+ if(err) {
+ return state.sendResponse(404,{"Content-Type": "text/plain"},"File '" + suppliedFilename + "' not found");
+ } else {
+ var type = ($tw.config.fileExtensionInfo[extension] ? $tw.config.fileExtensionInfo[extension].type : "application/octet-stream"),
+ responseHeaders = {
+ "Content-Type": type,
+ "Accept-Ranges": "bytes"
+ };
+ var rangeHeader = request.headers.range,
+ stream;
+ if(rangeHeader) {
+ // Handle range requests
+ var parts = rangeHeader.replace(/bytes=/, "").split("-"),
+ start = parseInt(parts[0], 10),
+ end = parts[1] ? parseInt(parts[1], 10) : stats.size - 1;
+ // Validate start and end
+ if(isNaN(start) || isNaN(end) || start < 0 || end < start || end >= stats.size) {
+ responseHeaders["Content-Range"] = "bytes */" + stats.size;
+ return response.writeHead(416, responseHeaders).end();
+ }
+ var chunksize = (end - start) + 1;
+ responseHeaders["Content-Range"] = "bytes " + start + "-" + end + "/" + stats.size;
+ responseHeaders["Content-Length"] = chunksize;
+ response.writeHead(206, responseHeaders);
+ stream = fs.createReadStream(filename, {start: start, end: end});
+ } else {
+ responseHeaders["Content-Length"] = stats.size;
+ response.writeHead(200, responseHeaders);
+ stream = fs.createReadStream(filename);
+ }
+ // Common stream error handling
+ stream.on("error", function(err) {
+ if(!response.headersSent) {
+ response.writeHead(500, {"Content-Type": "text/plain"});
+ response.end("Read error");
+ } else {
+ response.destroy();
+ }
+ });
+ stream.pipe(response);
+ }
+ });
+};
diff --git a/core-server/server/routes/get-index.js b/core-server/server/routes/get-index.js
new file mode 100644
index 000000000..f856bd511
--- /dev/null
+++ b/core-server/server/routes/get-index.js
@@ -0,0 +1,25 @@
+/*\
+title: $:/core/modules/server/routes/get-index.js
+type: application/javascript
+module-type: route
+
+GET /
+
+\*/
+"use strict";
+
+exports.methods = ["GET"];
+
+exports.path = /^\/$/;
+
+exports.info = {
+ priority: 100
+};
+
+exports.handler = function(request,response,state) {
+ var text = state.wiki.renderTiddler(state.server.get("root-render-type"),state.server.get("root-tiddler")),
+ responseHeaders = {
+ "Content-Type": state.server.get("root-serve-type")
+ };
+ state.sendResponse(200,responseHeaders,text);
+};
diff --git a/core/modules/server/routes/get-login-basic.js b/core-server/server/routes/get-login-basic.js
similarity index 75%
rename from core/modules/server/routes/get-login-basic.js
rename to core-server/server/routes/get-login-basic.js
index c3cb16eb6..e9a73c856 100644
--- a/core/modules/server/routes/get-login-basic.js
+++ b/core-server/server/routes/get-login-basic.js
@@ -6,30 +6,29 @@ module-type: route
GET /login-basic -- force a Basic Authentication challenge
\*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
-exports.method = "GET";
+exports.methods = ["GET"];
exports.path = /^\/login-basic$/;
+exports.info = {
+ priority: 100
+};
+
exports.handler = function(request,response,state) {
if(!state.authenticatedUsername) {
// Challenge if there's no username
response.writeHead(401,{
"WWW-Authenticate": 'Basic realm="Please provide your username and password to login to ' + state.server.servername + '"'
});
- response.end();
+ response.end();
} else {
// Redirect to the root wiki if login worked
+ var location = ($tw.syncadaptor && $tw.syncadaptor.host)? $tw.syncadaptor.host: `${state.pathPrefix}/`;
response.writeHead(302,{
- Location: "/"
+ Location: location
});
response.end();
}
};
-
-}());
diff --git a/core-server/server/routes/get-status.js b/core-server/server/routes/get-status.js
new file mode 100644
index 000000000..ed2c52806
--- /dev/null
+++ b/core-server/server/routes/get-status.js
@@ -0,0 +1,31 @@
+/*\
+title: $:/core/modules/server/routes/get-status.js
+type: application/javascript
+module-type: route
+
+GET /status
+
+\*/
+"use strict";
+
+exports.methods = ["GET"];
+
+exports.path = /^\/status$/;
+
+exports.info = {
+ priority: 100
+};
+
+exports.handler = function(request,response,state) {
+ var text = JSON.stringify({
+ username: state.authenticatedUsername || state.server.get("anon-username") || "",
+ anonymous: !state.authenticatedUsername,
+ read_only: !state.server.isAuthorized("writers",state.authenticatedUsername),
+ logout_is_available: false,
+ space: {
+ recipe: "default"
+ },
+ tiddlywiki_version: $tw.version
+ });
+ state.sendResponse(200,{"Content-Type": "application/json"},text,"utf8");
+};
diff --git a/core/modules/server/routes/get-tiddler-html.js b/core-server/server/routes/get-tiddler-html.js
similarity index 85%
rename from core/modules/server/routes/get-tiddler-html.js
rename to core-server/server/routes/get-tiddler-html.js
index 4fe440821..b7a8aa8f6 100644
--- a/core/modules/server/routes/get-tiddler-html.js
+++ b/core-server/server/routes/get-tiddler-html.js
@@ -6,18 +6,18 @@ module-type: route
GET /:title
\*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
-exports.method = "GET";
+exports.methods = ["GET"];
exports.path = /^\/([^\/]+)$/;
+exports.info = {
+ priority: 100
+};
+
exports.handler = function(request,response,state) {
- var title = decodeURIComponent(state.params[0]),
+ var title = $tw.utils.decodeURIComponentSafe(state.params[0]),
tiddler = state.wiki.getTiddler(title);
if(tiddler) {
var renderType = tiddler.getFieldString("_render_type"),
@@ -32,13 +32,11 @@ exports.handler = function(request,response,state) {
renderTemplate = renderTemplate || state.server.get("tiddler-render-template");
}
var text = state.wiki.renderTiddler(renderType,renderTemplate,{parseAsInline: true, variables: {currentTiddler: title}});
+
// Naughty not to set a content-type, but it's the easiest way to ensure the browser will see HTML pages as HTML, and accept plain text tiddlers as CSS or JS
- response.writeHead(200);
- response.end(text,"utf8");
+ state.sendResponse(200,{},text,"utf8");
} else {
response.writeHead(404);
response.end();
}
};
-
-}());
diff --git a/core/modules/server/routes/get-tiddler.js b/core-server/server/routes/get-tiddler.js
similarity index 78%
rename from core/modules/server/routes/get-tiddler.js
rename to core-server/server/routes/get-tiddler.js
index e125d7055..b5c4e11a0 100644
--- a/core/modules/server/routes/get-tiddler.js
+++ b/core-server/server/routes/get-tiddler.js
@@ -6,18 +6,18 @@ module-type: route
GET /recipes/default/tiddlers/:title
\*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
-exports.method = "GET";
+exports.methods = ["GET"];
exports.path = /^\/recipes\/default\/tiddlers\/(.+)$/;
+exports.info = {
+ priority: 100
+};
+
exports.handler = function(request,response,state) {
- var title = decodeURIComponent(state.params[0]),
+ var title = $tw.utils.decodeURIComponentSafe(state.params[0]),
tiddler = state.wiki.getTiddler(title),
tiddlerFields = {},
knownFields = [
@@ -36,12 +36,9 @@ exports.handler = function(request,response,state) {
tiddlerFields.revision = state.wiki.getChangeCount(title);
tiddlerFields.bag = "default";
tiddlerFields.type = tiddlerFields.type || "text/vnd.tiddlywiki";
- response.writeHead(200, {"Content-Type": "application/json"});
- response.end(JSON.stringify(tiddlerFields),"utf8");
+ state.sendResponse(200,{"Content-Type": "application/json"},JSON.stringify(tiddlerFields),"utf8");
} else {
response.writeHead(404);
response.end();
}
};
-
-}());
diff --git a/core/modules/server/routes/get-tiddlers-json.js b/core-server/server/routes/get-tiddlers-json.js
similarity index 87%
rename from core/modules/server/routes/get-tiddlers-json.js
rename to core-server/server/routes/get-tiddlers-json.js
index 203900346..8c78dad9f 100644
--- a/core/modules/server/routes/get-tiddlers-json.js
+++ b/core-server/server/routes/get-tiddlers-json.js
@@ -6,18 +6,18 @@ module-type: route
GET /recipes/default/tiddlers.json?filter=<filter>
\*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var DEFAULT_FILTER = "[all[tiddlers]!is[system]sort[title]]";
-exports.method = "GET";
+exports.methods = ["GET"];
exports.path = /^\/recipes\/default\/tiddlers.json$/;
+exports.info = {
+ priority: 100
+};
+
exports.handler = function(request,response,state) {
var filter = state.queryParameters.filter || DEFAULT_FILTER;
if(state.wiki.getTiddlerText("$:/config/Server/AllowAllExternalFilters") !== "yes") {
@@ -33,7 +33,6 @@ exports.handler = function(request,response,state) {
}
var excludeFields = (state.queryParameters.exclude || "text").split(","),
titles = state.wiki.filterTiddlers(filter);
- response.writeHead(200, {"Content-Type": "application/json"});
var tiddlers = [];
$tw.utils.each(titles,function(title) {
var tiddler = state.wiki.getTiddler(title);
@@ -45,7 +44,5 @@ exports.handler = function(request,response,state) {
}
});
var text = JSON.stringify(tiddlers);
- response.end(text,"utf8");
+ state.sendResponse(200,{"Content-Type": "application/json"},text,"utf8");
};
-
-}());
diff --git a/core-server/server/routes/put-tiddler.js b/core-server/server/routes/put-tiddler.js
new file mode 100644
index 000000000..55479b570
--- /dev/null
+++ b/core-server/server/routes/put-tiddler.js
@@ -0,0 +1,50 @@
+/*\
+title: $:/core/modules/server/routes/put-tiddler.js
+type: application/javascript
+module-type: route
+
+PUT /recipes/default/tiddlers/:title
+
+\*/
+"use strict";
+
+exports.methods = ["PUT"];
+
+exports.path = /^\/recipes\/default\/tiddlers\/(.+)$/;
+
+exports.info = {
+ priority: 100
+};
+
+exports.handler = function(request,response,state) {
+ var title = $tw.utils.decodeURIComponentSafe(state.params[0]),
+ fields = $tw.utils.parseJSONSafe(state.data);
+ // Pull up any subfields in the `fields` object
+ if(fields.fields) {
+ $tw.utils.each(fields.fields,function(field,name) {
+ fields[name] = field;
+ });
+ delete fields.fields;
+ }
+ // Remove any revision field
+ if(fields.revision) {
+ delete fields.revision;
+ }
+ // If this is a skinny tiddler, it means the client never got the full
+ // version of the tiddler to edit. So we must preserve whatever text
+ // already exists on the server, or else we'll inadvertently delete it.
+ if(fields._is_skinny !== undefined) {
+ var tiddler = state.wiki.getTiddler(title);
+ if(tiddler) {
+ fields.text = tiddler.fields.text;
+ }
+ delete fields._is_skinny;
+ }
+ state.wiki.addTiddler(new $tw.Tiddler(fields,{title: title}));
+ var changeCount = state.wiki.getChangeCount(title).toString();
+ response.writeHead(204, "OK",{
+ Etag: "\"default/" + encodeURIComponent(title) + "/" + changeCount + ":\"",
+ "Content-Type": "text/plain"
+ });
+ response.end();
+};
diff --git a/core-server/server/server.js b/core-server/server/server.js
new file mode 100644
index 000000000..e1741d08b
--- /dev/null
+++ b/core-server/server/server.js
@@ -0,0 +1,378 @@
+/*\
+title: $:/core/modules/server/server.js
+type: application/javascript
+module-type: library
+
+Serve tiddlers over http
+
+\*/
+
+"use strict";
+
+if($tw.node) {
+ var util = require("util"),
+ fs = require("fs"),
+ url = require("url"),
+ path = require("path"),
+ querystring = require("querystring"),
+ crypto = require("crypto"),
+ zlib = require("zlib");
+}
+
+/*
+A simple HTTP server with regexp-based routes
+options: variables - optional hashmap of variables to set (a misnomer - they are really constant parameters)
+ routes - optional array of routes to use
+ wiki - reference to wiki object
+*/
+function Server(options) {
+ var self = this;
+ this.routes = options.routes || [];
+ this.authenticators = options.authenticators || [];
+ this.wiki = options.wiki;
+ this.boot = options.boot || $tw.boot;
+ // Initialise the variables
+ this.variables = $tw.utils.extend({},this.defaultVariables);
+ if(options.variables) {
+ for(var variable in options.variables) {
+ if(options.variables[variable]) {
+ this.variables[variable] = options.variables[variable];
+ }
+ }
+ }
+ // Setup the default required plugins
+ this.requiredPlugins = this.get("required-plugins").split(',');
+ // Initialise CSRF
+ this.csrfDisable = this.get("csrf-disable") === "yes";
+ // Initialize Gzip compression
+ this.enableGzip = this.get("gzip") === "yes";
+ // Initialize browser-caching
+ this.enableBrowserCache = this.get("use-browser-cache") === "yes";
+ // Initialise authorization
+ var authorizedUserName;
+ if(this.get("username") && this.get("password")) {
+ authorizedUserName = this.get("username");
+ } else if(this.get("credentials")) {
+ authorizedUserName = "(authenticated)";
+ } else {
+ authorizedUserName = "(anon)";
+ }
+ this.authorizationPrincipals = {
+ readers: (this.get("readers") || authorizedUserName).split(",").map($tw.utils.trim),
+ writers: (this.get("writers") || authorizedUserName).split(",").map($tw.utils.trim)
+ }
+ if(this.get("admin") || authorizedUserName !== "(anon)") {
+ this.authorizationPrincipals["admin"] = (this.get("admin") || authorizedUserName).split(',').map($tw.utils.trim)
+ }
+ // Load and initialise authenticators
+ $tw.modules.forEachModuleOfType("authenticator", function(title,authenticatorDefinition) {
+ // console.log("Loading authenticator " + title);
+ self.addAuthenticator(authenticatorDefinition.AuthenticatorClass);
+ });
+ // Load route handlers
+ $tw.modules.forEachModuleOfType("route", function(title,routeDefinition) {
+ // console.log("Loading server route " + title);
+ self.addRoute(routeDefinition);
+ });
+ this.routes.sort((a, b) => {
+ const priorityA = a.info?.priority ?? 100,
+ priorityB = b.info?.priority ?? 100;
+ return priorityB - priorityA;
+ });
+ // Initialise the http vs https
+ this.listenOptions = null;
+ this.protocol = "http";
+ var tlsKeyFilepath = this.get("tls-key"),
+ tlsCertFilepath = this.get("tls-cert"),
+ tlsPassphrase = this.get("tls-passphrase");
+ if(tlsCertFilepath && tlsKeyFilepath) {
+ this.listenOptions = {
+ key: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsKeyFilepath),"utf8"),
+ cert: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsCertFilepath),"utf8"),
+ passphrase: tlsPassphrase || ''
+ };
+ this.protocol = "https";
+ }
+ this.transport = require(this.protocol);
+ // Name the server and init the boot state
+ this.servername = $tw.utils.transliterateToSafeASCII(this.get("server-name") || this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
+ this.boot.origin = this.get("origin")? this.get("origin"): this.protocol+"://"+this.get("host")+":"+this.get("port");
+ this.boot.pathPrefix = this.get("path-prefix") || "";
+}
+
+/*
+Send a response to the client. This method checks if the response must be sent
+or if the client alrady has the data cached. If that's the case only a 304
+response will be transmitted and the browser will use the cached data.
+Only requests with status code 200 are considdered for caching.
+request: request instance passed to the handler
+response: response instance passed to the handler
+statusCode: stauts code to send to the browser
+headers: response headers (they will be augmented with an `Etag` header)
+data: the data to send (passed to the end method of the response instance)
+encoding: the encoding of the data to send (passed to the end method of the response instance)
+*/
+function sendResponse(request,response,statusCode,headers,data,encoding) {
+ if(this.enableBrowserCache && (statusCode == 200)) {
+ var hash = crypto.createHash('md5');
+ // Put everything into the hash that could change and invalidate the data that
+ // the browser already stored. The headers the data and the encoding.
+ hash.update(data);
+ hash.update(JSON.stringify(headers));
+ if(encoding) {
+ hash.update(encoding);
+ }
+ var contentDigest = hash.digest("hex");
+ // RFC 7232 section 2.3 mandates for the etag to be enclosed in quotes
+ headers["Etag"] = '"' + contentDigest + '"';
+ headers["Cache-Control"] = "max-age=0, must-revalidate";
+ // Check if any of the hashes contained within the if-none-match header
+ // matches the current hash.
+ // If one matches, do not send the data but tell the browser to use the
+ // cached data.
+ // We do not implement "*" as it makes no sense here.
+ var ifNoneMatch = request.headers["if-none-match"];
+ if(ifNoneMatch) {
+ var matchParts = ifNoneMatch.split(",").map(function(etag) {
+ return etag.replace(/^[ "]+|[ "]+$/g, "");
+ });
+ if(matchParts.indexOf(contentDigest) != -1) {
+ response.writeHead(304,headers);
+ response.end();
+ return;
+ }
+ }
+ } else {
+ // RFC 7231, 6.1. Overview of Status Codes:
+ // Browser clients may cache 200, 203, 204, 206, 300, 301,
+ // 404, 405, 410, 414, and 501 unless given explicit cache controls
+ headers["Cache-Control"] = headers["Cache-Control"] || "no-store";
+ }
+ /*
+ If the gzip=yes is set, check if the user agent permits compression. If so,
+ compress our response if the raw data is bigger than 2k. Compressing less
+ data is inefficient. Note that we use the synchronous functions from zlib
+ to stay in the imperative style. The current `Server` doesn't depend on
+ this, and we may just as well use the async versions.
+ */
+ if(this.enableGzip && (data.length > 2048)) {
+ var acceptEncoding = request.headers["accept-encoding"] || "";
+ if(/\bdeflate\b/.test(acceptEncoding)) {
+ headers["Content-Encoding"] = "deflate";
+ data = zlib.deflateSync(data);
+ } else if(/\bgzip\b/.test(acceptEncoding)) {
+ headers["Content-Encoding"] = "gzip";
+ data = zlib.gzipSync(data);
+ }
+ }
+
+ response.writeHead(statusCode,headers);
+ response.end(data,encoding);
+}
+
+Server.prototype.defaultVariables = {
+ port: "8080",
+ host: "127.0.0.1",
+ "required-plugins": "$:/plugins/tiddlywiki/filesystem,$:/plugins/tiddlywiki/tiddlyweb",
+ "root-tiddler": "$:/core/save/all",
+ "root-render-type": "text/plain",
+ "root-serve-type": "text/html",
+ "tiddler-render-type": "text/html",
+ "tiddler-render-template": "$:/core/templates/server/static.tiddler.html",
+ "system-tiddler-render-type": "text/plain",
+ "system-tiddler-render-template": "$:/core/templates/wikified-tiddler",
+ "debug-level": "none",
+ "gzip": "no",
+ "use-browser-cache": "no"
+};
+
+Server.prototype.get = function(name) {
+ return this.variables[name];
+};
+
+Server.prototype.addRoute = function(route) {
+ this.routes.push(route);
+};
+
+Server.prototype.addAuthenticator = function(AuthenticatorClass) {
+ // Instantiate and initialise the authenticator
+ var authenticator = new AuthenticatorClass(this),
+ result = authenticator.init();
+ if(typeof result === "string") {
+ $tw.utils.error("Error: " + result);
+ } else if(result) {
+ // Only use the authenticator if it initialised successfully
+ this.authenticators.push(authenticator);
+ }
+};
+
+Server.prototype.findMatchingRoute = function(request,state) {
+ for(var t=0; t<this.routes.length; t++) {
+ var potentialRoute = this.routes[t],
+ pathRegExp = potentialRoute.path,
+ pathname = state.urlInfo.pathname,
+ match;
+ if(state.pathPrefix) {
+ if(pathname.substr(0,state.pathPrefix.length) === state.pathPrefix) {
+ pathname = pathname.substr(state.pathPrefix.length) || "/";
+ match = potentialRoute.path.exec(pathname);
+ } else {
+ match = false;
+ }
+ } else {
+ match = potentialRoute.path.exec(pathname);
+ }
+ if(match && (potentialRoute.methods?.includes(request.method) || potentialRoute.method === request.method)) {
+ state.params = [];
+ for(var p=1; p<match.length; p++) {
+ state.params.push(match[p]);
+ }
+ return potentialRoute;
+ }
+ }
+ return null;
+};
+
+Server.prototype.methodMappings = {
+ "GET": "readers",
+ "OPTIONS": "readers",
+ "HEAD": "readers",
+ "PUT": "writers",
+ "POST": "writers",
+ "DELETE": "writers"
+};
+
+/*
+Check whether a given user is authorized for the specified authorizationType ("readers" or "writers"). Pass null or undefined as the username to check for anonymous access
+*/
+Server.prototype.isAuthorized = function(authorizationType,username) {
+ var principals = this.authorizationPrincipals[authorizationType] || [];
+ return principals.indexOf("(anon)") !== -1 || (username && (principals.indexOf("(authenticated)") !== -1 || principals.indexOf(username) !== -1));
+}
+
+Server.prototype.requestHandler = function(request,response,options) {
+ options = options || {};
+ // Compose the state object
+ var self = this;
+ var state = {};
+ state.wiki = options.wiki || self.wiki;
+ state.boot = options.boot || self.boot;
+ state.server = self;
+ state.urlInfo = url.parse(request.url);
+ state.queryParameters = querystring.parse(state.urlInfo.query);
+ state.pathPrefix = options.pathPrefix || this.get("path-prefix") || "";
+ state.sendResponse = sendResponse.bind(self,request,response);
+ // Get the principals authorized to access this resource
+ state.authorizationType = options.authorizationType || this.methodMappings[request.method] || "readers";
+ // Check for the CSRF header if this is a write
+ if(!this.csrfDisable && state.authorizationType === "writers" && request.headers["x-requested-with"] !== "TiddlyWiki") {
+ response.writeHead(403,"'X-Requested-With' header required to login to '" + this.servername + "'");
+ response.end();
+ return;
+ }
+ // Check whether anonymous access is granted
+ state.allowAnon = this.isAuthorized(state.authorizationType,null);
+ // Authenticate with the first active authenticator
+ if(this.authenticators.length > 0) {
+ if(!this.authenticators[0].authenticateRequest(request,response,state)) {
+ // Bail if we failed (the authenticator will have sent the response)
+ return;
+ }
+ }
+ // Authorize with the authenticated username
+ if(!this.isAuthorized(state.authorizationType,state.authenticatedUsername)) {
+ response.writeHead(401,"'" + state.authenticatedUsername + "' is not authorized to access '" + this.servername + "'");
+ response.end();
+ return;
+ }
+ // Find the route that matches this path
+ var route = self.findMatchingRoute(request,state);
+ // Optionally output debug info
+ if(self.get("debug-level") !== "none") {
+ console.log("Request path:",JSON.stringify(state.urlInfo));
+ console.log("Request headers:",JSON.stringify(request.headers));
+ console.log("authenticatedUsername:",state.authenticatedUsername);
+ }
+ // Return a 404 if we didn't find a route
+ if(!route) {
+ response.writeHead(404);
+ response.end();
+ return;
+ }
+ // Receive the request body if necessary and hand off to the route handler
+ if(route.bodyFormat === "stream" || request.method === "GET" || request.method === "HEAD") {
+ // Let the route handle the request stream itself
+ route.handler(request,response,state);
+ } else if(route.bodyFormat === "string" || !route.bodyFormat) {
+ // Set the encoding for the incoming request
+ request.setEncoding("utf8");
+ var data = "";
+ request.on("data",function(chunk) {
+ data += chunk.toString();
+ });
+ request.on("end",function() {
+ state.data = data;
+ route.handler(request,response,state);
+ });
+ } else if(route.bodyFormat === "buffer") {
+ var data = [];
+ request.on("data",function(chunk) {
+ data.push(chunk);
+ });
+ request.on("end",function() {
+ state.data = Buffer.concat(data);
+ route.handler(request,response,state);
+ })
+ } else {
+ response.writeHead(400,"Invalid bodyFormat " + route.bodyFormat + " in route " + route.method + " " + route.path.source);
+ response.end();
+ }
+};
+
+/*
+Listen for requests
+port: optional port number (falls back to value of "port" variable)
+host: optional host address (falls back to value of "host" variable)
+prefix: optional prefix (falls back to value of "path-prefix" variable)
+*/
+Server.prototype.listen = function(port,host,prefix) {
+ var self = this;
+ // Handle defaults for port and host
+ port = port || this.get("port");
+ host = host || this.get("host");
+ prefix = prefix || this.get("path-prefix") || "";
+ // Check for the port being a string and look it up as an environment variable
+ if(parseInt(port,10).toString() !== port) {
+ port = process.env[port] || 8080;
+ }
+ // Warn if required plugins are missing
+ var missing = [];
+ for (var index=0; index<this.requiredPlugins.length; index++) {
+ if (!this.wiki.getTiddler(this.requiredPlugins[index])) {
+ missing.push(this.requiredPlugins[index]);
+ }
+ }
+ if(missing.length > 0) {
+ var error = "Warning: Plugin(s) required for client-server operation are missing.\n"+
+ "\""+ missing.join("\", \"")+"\"";
+ $tw.utils.warning(error);
+ }
+ // Create the server
+ var server;
+ if(this.listenOptions) {
+ server = this.transport.createServer(this.listenOptions,this.requestHandler.bind(this));
+ } else {
+ server = this.transport.createServer(this.requestHandler.bind(this));
+ }
+ // Display the port number after we've started listening (the port number might have been specified as zero, in which case we will get an assigned port)
+ server.on("listening",function() {
+ var address = server.address(),
+ url = self.protocol + "://" + (address.family === "IPv6" ? "[" + address.address + "]" : address.address) + ":" + address.port + prefix;
+ $tw.utils.log("Serving on " + url,"brown/orange");
+ $tw.utils.log("(press ctrl-C to exit)","red");
+ });
+ // Listen
+ return server.listen(port,host);
+};
+
+exports.Server = Server;
diff --git a/core-server/startup/commands.js b/core-server/startup/commands.js
new file mode 100644
index 000000000..3e4e40f45
--- /dev/null
+++ b/core-server/startup/commands.js
@@ -0,0 +1,32 @@
+/*\
+title: $:/core/modules/startup/commands.js
+type: application/javascript
+module-type: startup
+
+Command processing
+
+\*/
+
+"use strict";
+
+// Export name and synchronous status
+exports.name = "commands";
+exports.platforms = ["node"];
+exports.after = ["story"];
+exports.synchronous = false;
+
+exports.startup = function(callback) {
+ // On the server, start a commander with the command line arguments
+ var commander = new $tw.Commander(
+ $tw.boot.argv,
+ function(err) {
+ if(err) {
+ return $tw.utils.error("Error: " + err);
+ }
+ callback();
+ },
+ $tw.wiki,
+ {output: process.stdout, error: process.stderr}
+ );
+ commander.execute();
+};
diff --git a/core-server/utils/edition-info.js b/core-server/utils/edition-info.js
new file mode 100644
index 000000000..2c525e3cc
--- /dev/null
+++ b/core-server/utils/edition-info.js
@@ -0,0 +1,43 @@
+/*\
+title: $:/core/modules/utils/edition-info.js
+type: application/javascript
+module-type: utils-node
+
+Information about the available editions
+
+\*/
+
+"use strict";
+
+var fs = require("fs"),
+ path = require("path");
+
+var editionInfo;
+
+exports.getEditionInfo = function() {
+ if(!editionInfo) {
+ // Enumerate the edition paths
+ var editionPaths = $tw.getLibraryItemSearchPaths($tw.config.editionsPath,$tw.config.editionsEnvVar);
+ editionInfo = {};
+ for(var editionIndex=0; editionIndex<editionPaths.length; editionIndex++) {
+ var editionPath = editionPaths[editionIndex];
+ // Enumerate the folders
+ var entries = fs.readdirSync(editionPath);
+ for(var entryIndex=0; entryIndex<entries.length; entryIndex++) {
+ var entry = entries[entryIndex];
+ // Check if directories have a valid tiddlywiki.info
+ // Check if the entry is a hidden directory
+ if((entry.charAt(0) !== ".") && !editionInfo[entry] && $tw.utils.isDirectory(path.resolve(editionPath,entry))) {
+ var file=path.resolve(editionPath,entry,"tiddlywiki.info");
+ if(fs.existsSync(file)) {
+ var info = $tw.utils.parseJSONSafe(fs.readFileSync(file,"utf8"),null);
+ if(info) {
+ editionInfo[entry] = info;
+ }
+ }
+ }
+ }
+ }
+ }
+ return editionInfo;
+};
diff --git a/core-server/utils/repository.js b/core-server/utils/repository.js
new file mode 100644
index 000000000..08d8828d9
--- /dev/null
+++ b/core-server/utils/repository.js
@@ -0,0 +1,46 @@
+/*\
+title: $:/core/modules/utils/repository.js
+type: application/javascript
+module-type: utils
+
+Utilities for working with the TiddlyWiki repository file structure
+
+\*/
+"use strict";
+
+/*
+Get an object containing all the plugins as a hashmap by title of the JSON representation of the plugin
+Options:
+
+ignoreEnvironmentVariables: defaults to false
+*/
+exports.getAllPlugins = function(options) {
+ options = options || {};
+ var fs = require("fs"),
+ path = require("path"),
+ tiddlers = {};
+ // Collect up the library plugins
+ var collectPlugins = function(folder) {
+ var pluginFolders = $tw.utils.getSubdirectories(folder) || [];
+ for(var p=0; p<pluginFolders.length; p++) {
+ if(!$tw.boot.excludeRegExp.test(pluginFolders[p])) {
+ var pluginFields = $tw.loadPluginFolder(path.resolve(folder,"./" + pluginFolders[p]));
+ if(pluginFields && pluginFields.title) {
+ tiddlers[pluginFields.title] = pluginFields;
+ }
+ }
+ }
+ },
+ collectPublisherPlugins = function(folder) {
+ var publisherFolders = $tw.utils.getSubdirectories(folder) || [];
+ for(var t=0; t<publisherFolders.length; t++) {
+ if(!$tw.boot.excludeRegExp.test(publisherFolders[t])) {
+ collectPlugins(path.resolve(folder,"./" + publisherFolders[t]));
+ }
+ }
+ };
+ $tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.pluginsPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.pluginsEnvVar),collectPublisherPlugins);
+ $tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.themesPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.themesEnvVar),collectPublisherPlugins);
+ $tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.languagesPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.languagesEnvVar),collectPlugins);
+ return tiddlers;
+};
diff --git a/core/acknowledgements.tid b/core/acknowledgements.tid
index e7acee129..3d4010bfd 100644
--- a/core/acknowledgements.tid
+++ b/core/acknowledgements.tid
@@ -3,9 +3,5 @@ title: $:/Acknowledgements
TiddlyWiki incorporates code from these fine OpenSource projects:
* [[The Stanford Javascript Crypto Library|http://bitwiseshiftleft.github.io/sjcl/]]
-* [[The Jasmine JavaScript Test Framework|http://pivotal.github.io/jasmine/]]
-* [[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]]
+* [[The Jasmine JavaScript Test Framework|https://jasmine.github.io/]]
+* [[modern-normalize by Sindre Sorhus|https://github.com/sindresorhus/modern-normalize]]
diff --git a/core/copyright.tid b/core/copyright.tid
index da72136c4..233295ce2 100644
--- a/core/copyright.tid
+++ b/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-2021, UnaMesa Association
+Copyright (c) 2007-2025, UnaMesa Association
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/core/icon.tid b/core/icon.tid
index b327440df..21246d176 100644
--- a/core/icon.tid
+++ b/core/icon.tid
@@ -1,4 +1,5 @@
title: $:/core/icon
tags: $:/tags/Image
-<svg width="22pt" height="22pt" viewBox="0 0 128 128"><path d="M64 0l54.56 32v64L64 128 9.44 96V32L64 0zm21.127 95.408c-3.578-.103-5.15-.094-6.974-3.152l-1.42.042c-1.653-.075-.964-.04-2.067-.097-1.844-.07-1.548-1.86-1.873-2.8-.52-3.202.687-6.43.65-9.632-.014-1.14-1.593-5.17-2.157-6.61-1.768.34-3.546.406-5.34.497-4.134-.01-8.24-.527-12.317-1.183-.8 3.35-3.16 8.036-1.21 11.44 2.37 3.52 4.03 4.495 6.61 4.707 2.572.212 3.16 3.18 2.53 4.242-.55.73-1.52.864-2.346 1.04l-1.65.08c-1.296-.046-2.455-.404-3.61-.955-1.93-1.097-3.925-3.383-5.406-5.024.345.658.55 1.938.24 2.53-.878 1.27-4.665 1.26-6.4.47-1.97-.89-6.73-7.162-7.468-11.86 1.96-3.78 4.812-7.07 6.255-11.186-3.146-2.05-4.83-5.384-4.61-9.16l.08-.44c-3.097.59-1.49.37-4.82.628-10.608-.032-19.935-7.37-14.68-18.774.34-.673.664-1.287 1.243-.994.466.237.4 1.18.166 2.227-3.005 13.627 11.67 13.732 20.69 11.21.89-.25 2.67-1.936 3.905-2.495 2.016-.91 4.205-1.282 6.376-1.55 5.4-.63 11.893 2.276 15.19 2.37 3.3.096 7.99-.805 10.87-.615 2.09.098 4.143.483 6.16 1.03 1.306-6.49 1.4-11.27 4.492-12.38 1.814.293 3.213 2.818 4.25 4.167 2.112-.086 4.12.46 6.115 1.066 3.61-.522 6.642-2.593 9.833-4.203-3.234 2.69-3.673 7.075-3.303 11.127.138 2.103-.444 4.386-1.164 6.54-1.348 3.507-3.95 7.204-6.97 7.014-1.14-.036-1.805-.695-2.653-1.4-.164 1.427-.81 2.7-1.434 3.96-1.44 2.797-5.203 4.03-8.687 7.016-3.484 2.985 1.114 13.65 2.23 15.594 1.114 1.94 4.226 2.652 3.02 4.406-.37.58-.936.785-1.54 1.01l-.82.11zm-40.097-8.85l.553.14c.694-.27 2.09.15 2.83.353-1.363-1.31-3.417-3.24-4.897-4.46-.485-1.47-.278-2.96-.174-4.46l.02-.123c-.582 1.205-1.322 2.376-1.72 3.645-.465 1.71 2.07 3.557 3.052 4.615l.336.3z" fill-rule="evenodd"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> viewBox="0 0 128 128"><path d="M64 0l54.56 32v64L64 128 9.44 96V32L64 0zm21.127 95.408c-3.578-.103-5.15-.094-6.974-3.152l-1.42.042c-1.653-.075-.964-.04-2.067-.097-1.844-.07-1.548-1.86-1.873-2.8-.52-3.202.687-6.43.65-9.632-.014-1.14-1.593-5.17-2.157-6.61-1.768.34-3.546.406-5.34.497-4.134-.01-8.24-.527-12.317-1.183-.8 3.35-3.16 8.036-1.21 11.44 2.37 3.52 4.03 4.495 6.61 4.707 2.572.212 3.16 3.18 2.53 4.242-.55.73-1.52.864-2.346 1.04l-1.65.08c-1.296-.046-2.455-.404-3.61-.955-1.93-1.097-3.925-3.383-5.406-5.024.345.658.55 1.938.24 2.53-.878 1.27-4.665 1.26-6.4.47-1.97-.89-6.73-7.162-7.468-11.86 1.96-3.78 4.812-7.07 6.255-11.186-3.146-2.05-4.83-5.384-4.61-9.16l.08-.44c-3.097.59-1.49.37-4.82.628-10.608-.032-19.935-7.37-14.68-18.774.34-.673.664-1.287 1.243-.994.466.237.4 1.18.166 2.227-3.005 13.627 11.67 13.732 20.69 11.21.89-.25 2.67-1.936 3.905-2.495 2.016-.91 4.205-1.282 6.376-1.55 5.4-.63 11.893 2.276 15.19 2.37 3.3.096 7.99-.805 10.87-.615 2.09.098 4.143.483 6.16 1.03 1.306-6.49 1.4-11.27 4.492-12.38 1.814.293 3.213 2.818 4.25 4.167 2.112-.086 4.12.46 6.115 1.066 3.61-.522 6.642-2.593 9.833-4.203-3.234 2.69-3.673 7.075-3.303 11.127.138 2.103-.444 4.386-1.164 6.54-1.348 3.507-3.95 7.204-6.97 7.014-1.14-.036-1.805-.695-2.653-1.4-.164 1.427-.81 2.7-1.434 3.96-1.44 2.797-5.203 4.03-8.687 7.016-3.484 2.985 1.114 13.65 2.23 15.594 1.114 1.94 4.226 2.652 3.02 4.406-.37.58-.936.785-1.54 1.01l-.82.11zm-40.097-8.85l.553.14c.694-.27 2.09.15 2.83.353-1.363-1.31-3.417-3.24-4.897-4.46-.485-1.47-.278-2.96-.174-4.46l.02-.123c-.582 1.205-1.322 2.376-1.72 3.645-.465 1.71 2.07 3.557 3.052 4.615l.336.3z" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/core/images/add-comment.tid b/core/images/add-comment.tid
index 178221806..a118506ed 100644
--- a/core/images/add-comment.tid
+++ b/core/images/add-comment.tid
@@ -1,4 +1,5 @@
title: $:/core/images/add-comment
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-add-comment tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M56 56H36a8 8 0 100 16h20v20a8 8 0 1016 0V72h20a8 8 0 100-16H72V36a8 8 0 10-16 0v20zm-12.595 58.362c-6.683 7.659-20.297 12.903-36.006 12.903-2.196 0-4.35-.102-6.451-.3 9.652-3.836 17.356-12.24 21.01-22.874C8.516 94.28 0 79.734 0 63.5 0 33.953 28.206 10 63 10s63 23.953 63 53.5S97.794 117 63 117c-6.841 0-13.428-.926-19.595-2.638z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-add-comment tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M56 56H36a8 8 0 100 16h20v20a8 8 0 1016 0V72h20a8 8 0 100-16H72V36a8 8 0 10-16 0v20zm-12.595 58.362c-6.683 7.659-20.297 12.903-36.006 12.903-2.196 0-4.35-.102-6.451-.3 9.652-3.836 17.356-12.24 21.01-22.874C8.516 94.28 0 79.734 0 63.5 0 33.953 28.206 10 63 10s63 23.953 63 53.5S97.794 117 63 117c-6.841 0-13.428-.926-19.595-2.638z"/></svg>
\ No newline at end of file
diff --git a/core/images/advanced-search-button.tid b/core/images/advanced-search-button.tid
index 6fda3fe8b..8e5699c4d 100755
--- a/core/images/advanced-search-button.tid
+++ b/core/images/advanced-search-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/advanced-search-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-advanced-search-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M74.565 87.985A47.776 47.776 0 0148 96C21.49 96 0 74.51 0 48S21.49 0 48 0s48 21.49 48 48c0 9.854-2.97 19.015-8.062 26.636l34.347 34.347a9.443 9.443 0 010 13.36 9.446 9.446 0 01-13.36 0l-34.36-34.358zM48 80c17.673 0 32-14.327 32-32 0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32 0 17.673 14.327 32 32 32z"/><circle cx="48" cy="48" r="8"/><circle cx="28" cy="48" r="8"/><circle cx="68" cy="48" r="8"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-advanced-search-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M74.565 87.985A47.776 47.776 0 0148 96C21.49 96 0 74.51 0 48S21.49 0 48 0s48 21.49 48 48c0 9.854-2.97 19.015-8.062 26.636l34.347 34.347a9.443 9.443 0 010 13.36 9.446 9.446 0 01-13.36 0l-34.36-34.358zM48 80c17.673 0 32-14.327 32-32 0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32 0 17.673 14.327 32 32 32z"/><circle cx="48" cy="48" r="8"/><circle cx="28" cy="48" r="8"/><circle cx="68" cy="48" r="8"/></g></svg>
\ No newline at end of file
diff --git a/core/images/auto-height.tid b/core/images/auto-height.tid
index 78f95418b..76deecbad 100755
--- a/core/images/auto-height.tid
+++ b/core/images/auto-height.tid
@@ -1,4 +1,5 @@
title: $:/core/images/auto-height
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-auto-height tc-image-button" viewBox="0 0 128 128"><path d="M67.987 114.356l-.029-14.477a4 4 0 00-2.067-3.494l-15.966-8.813-1.933 7.502H79.9c4.222 0 5.564-5.693 1.786-7.58L49.797 71.572 48.01 79.15h31.982c4.217 0 5.564-5.682 1.795-7.575L49.805 55.517l-1.795 7.575h31.982c4.212 0 5.563-5.67 1.805-7.57l-16.034-8.105 2.195 3.57V35.614l9.214 9.213a4 4 0 105.656-5.656l-16-16a4 4 0 00-5.656 0l-16 16a4 4 0 105.656 5.656l9.13-9.13v15.288a4 4 0 002.195 3.57l16.035 8.106 1.804-7.57H48.01c-4.217 0-5.564 5.682-1.795 7.574l31.982 16.059 1.795-7.575H48.01c-4.222 0-5.564 5.693-1.787 7.579l31.89 15.923 1.787-7.578H47.992c-4.133 0-5.552 5.504-1.933 7.501l15.966 8.813-2.067-3.494.029 14.436-9.159-9.158a4 4 0 00-5.656 5.656l16 16a4 4 0 005.656 0l16-16a4 4 0 10-5.656-5.656l-9.185 9.184zM16 20h96a4 4 0 100-8H16a4 4 0 100 8z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-auto-height tc-image-button" viewBox="0 0 128 128"><path d="M67.987 114.356l-.029-14.477a4 4 0 00-2.067-3.494l-15.966-8.813-1.933 7.502H79.9c4.222 0 5.564-5.693 1.786-7.58L49.797 71.572 48.01 79.15h31.982c4.217 0 5.564-5.682 1.795-7.575L49.805 55.517l-1.795 7.575h31.982c4.212 0 5.563-5.67 1.805-7.57l-16.034-8.105 2.195 3.57V35.614l9.214 9.213a4 4 0 105.656-5.656l-16-16a4 4 0 00-5.656 0l-16 16a4 4 0 105.656 5.656l9.13-9.13v15.288a4 4 0 002.195 3.57l16.035 8.106 1.804-7.57H48.01c-4.217 0-5.564 5.682-1.795 7.574l31.982 16.059 1.795-7.575H48.01c-4.222 0-5.564 5.693-1.787 7.579l31.89 15.923 1.787-7.578H47.992c-4.133 0-5.552 5.504-1.933 7.501l15.966 8.813-2.067-3.494.029 14.436-9.159-9.158a4 4 0 00-5.656 5.656l16 16a4 4 0 005.656 0l16-16a4 4 0 10-5.656-5.656l-9.185 9.184zM16 20h96a4 4 0 100-8H16a4 4 0 100 8z"/></svg>
\ No newline at end of file
diff --git a/core/images/blank.tid b/core/images/blank.tid
index 731b55a5a..565ef6bec 100755
--- a/core/images/blank.tid
+++ b/core/images/blank.tid
@@ -1,4 +1,5 @@
title: $:/core/images/blank
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-blank tc-image-button" viewBox="0 0 128 128"/>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-blank tc-image-button" viewBox="0 0 128 128"/>
\ No newline at end of file
diff --git a/core/images/bold.tid b/core/images/bold.tid
index 67a00f894..d9259e4a1 100755
--- a/core/images/bold.tid
+++ b/core/images/bold.tid
@@ -1,4 +1,5 @@
title: $:/core/images/bold
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-bold tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M41.146 51.81V21.87h26.353c2.51 0 4.93.21 7.26.628 2.33.418 4.392 1.165 6.185 2.24 1.793 1.076 3.227 2.57 4.302 4.482 1.076 1.913 1.614 4.363 1.614 7.35 0 5.379-1.613 9.263-4.84 11.653-3.227 2.39-7.35 3.586-12.37 3.586H41.146zM13 0v128h62.028a65.45 65.45 0 0016.762-2.151c5.438-1.434 10.278-3.645 14.52-6.633 4.244-2.988 7.62-6.842 10.13-11.563 2.51-4.721 3.764-10.308 3.764-16.762 0-8.008-1.942-14.85-5.826-20.527-3.884-5.677-9.77-9.65-17.658-11.921 5.737-2.75 10.069-6.275 12.997-10.577 2.928-4.303 4.392-9.681 4.392-16.135 0-5.976-.986-10.995-2.958-15.059-1.972-4.063-4.75-7.32-8.336-9.77-3.585-2.45-7.888-4.213-12.907-5.289C84.888.538 79.33 0 73.235 0H13zm28.146 106.129V70.992H71.8c6.095 0 10.995 1.404 14.7 4.212 3.705 2.81 5.558 7.5 5.558 14.073 0 3.347-.568 6.096-1.703 8.247-1.136 2.151-2.66 3.854-4.572 5.11-1.912 1.254-4.123 2.15-6.633 2.688-2.51.538-5.139.807-7.888.807H41.146z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-bold tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M41.146 51.81V21.87h26.353c2.51 0 4.93.21 7.26.628 2.33.418 4.392 1.165 6.185 2.24 1.793 1.076 3.227 2.57 4.302 4.482 1.076 1.913 1.614 4.363 1.614 7.35 0 5.379-1.613 9.263-4.84 11.653-3.227 2.39-7.35 3.586-12.37 3.586H41.146zM13 0v128h62.028a65.45 65.45 0 0016.762-2.151c5.438-1.434 10.278-3.645 14.52-6.633 4.244-2.988 7.62-6.842 10.13-11.563 2.51-4.721 3.764-10.308 3.764-16.762 0-8.008-1.942-14.85-5.826-20.527-3.884-5.677-9.77-9.65-17.658-11.921 5.737-2.75 10.069-6.275 12.997-10.577 2.928-4.303 4.392-9.681 4.392-16.135 0-5.976-.986-10.995-2.958-15.059-1.972-4.063-4.75-7.32-8.336-9.77-3.585-2.45-7.888-4.213-12.907-5.289C84.888.538 79.33 0 73.235 0H13zm28.146 106.129V70.992H71.8c6.095 0 10.995 1.404 14.7 4.212 3.705 2.81 5.558 7.5 5.558 14.073 0 3.347-.568 6.096-1.703 8.247-1.136 2.151-2.66 3.854-4.572 5.11-1.912 1.254-4.123 2.15-6.633 2.688-2.51.538-5.139.807-7.888.807H41.146z"/></svg>
\ No newline at end of file
diff --git a/core/images/cancel-button.tid b/core/images/cancel-button.tid
index c55620b06..3bb982bc1 100755
--- a/core/images/cancel-button.tid
+++ b/core/images/cancel-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/cancel-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-cancel-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M64 76.314l-16.97 16.97a7.999 7.999 0 01-11.314 0c-3.118-3.118-3.124-8.19 0-11.313L52.686 65l-16.97-16.97a7.999 7.999 0 010-11.314c3.118-3.118 8.19-3.124 11.313 0L64 53.686l16.97-16.97a7.999 7.999 0 0111.314 0c3.118 3.118 3.124 8.19 0 11.313L75.314 65l16.97 16.97a7.999 7.999 0 010 11.314c-3.118 3.118-8.19 3.124-11.313 0L64 76.314zM64 129c35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64C28.654 1 0 29.654 0 65c0 35.346 28.654 64 64 64zm0-16c26.51 0 48-21.49 48-48S90.51 17 64 17 16 38.49 16 65s21.49 48 48 48z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-cancel-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M64 76.314l-16.97 16.97a7.999 7.999 0 01-11.314 0c-3.118-3.118-3.124-8.19 0-11.313L52.686 65l-16.97-16.97a7.999 7.999 0 010-11.314c3.118-3.118 8.19-3.124 11.313 0L64 53.686l16.97-16.97a7.999 7.999 0 0111.314 0c3.118 3.118 3.124 8.19 0 11.313L75.314 65l16.97 16.97a7.999 7.999 0 010 11.314c-3.118 3.118-8.19 3.124-11.313 0L64 76.314zM64 129c35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64C28.654 1 0 29.654 0 65c0 35.346 28.654 64 64 64zm0-16c26.51 0 48-21.49 48-48S90.51 17 64 17 16 38.49 16 65s21.49 48 48 48z"/></svg>
\ No newline at end of file
diff --git a/core/images/chevron-down.tid b/core/images/chevron-down.tid
index f1b363dfc..df28c87a4 100755
--- a/core/images/chevron-down.tid
+++ b/core/images/chevron-down.tid
@@ -1,4 +1,5 @@
title: $:/core/images/chevron-down
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-chevron-down tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M64.053 85.456a7.889 7.889 0 01-5.6-2.316L2.473 27.16a7.92 7.92 0 010-11.196c3.086-3.085 8.105-3.092 11.196 0L64.05 66.344l50.382-50.382a7.92 7.92 0 0111.195 0c3.085 3.086 3.092 8.105 0 11.196l-55.98 55.98a7.892 7.892 0 01-5.595 2.317z"/><path d="M64.053 124.069a7.889 7.889 0 01-5.6-2.316l-55.98-55.98a7.92 7.92 0 010-11.196c3.086-3.085 8.105-3.092 11.196 0l50.382 50.382 50.382-50.382a7.92 7.92 0 0111.195 0c3.085 3.086 3.092 8.104 0 11.196l-55.98 55.98a7.892 7.892 0 01-5.595 2.316z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-chevron-down tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M64.053 85.456a7.889 7.889 0 01-5.6-2.316L2.473 27.16a7.92 7.92 0 010-11.196c3.086-3.085 8.105-3.092 11.196 0L64.05 66.344l50.382-50.382a7.92 7.92 0 0111.195 0c3.085 3.086 3.092 8.105 0 11.196l-55.98 55.98a7.892 7.892 0 01-5.595 2.317z"/><path d="M64.053 124.069a7.889 7.889 0 01-5.6-2.316l-55.98-55.98a7.92 7.92 0 010-11.196c3.086-3.085 8.105-3.092 11.196 0l50.382 50.382 50.382-50.382a7.92 7.92 0 0111.195 0c3.085 3.086 3.092 8.104 0 11.196l-55.98 55.98a7.892 7.892 0 01-5.595 2.316z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/chevron-left.tid b/core/images/chevron-left.tid
index e4c69d95a..b7f9ad7ae 100755
--- a/core/images/chevron-left.tid
+++ b/core/images/chevron-left.tid
@@ -1,4 +1,5 @@
title: $:/core/images/chevron-left
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-chevron-left tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M47.544 64.053c0-2.027.77-4.054 2.316-5.6l55.98-55.98a7.92 7.92 0 0111.196 0c3.085 3.086 3.092 8.105 0 11.196L66.656 64.05l50.382 50.382a7.92 7.92 0 010 11.195c-3.086 3.085-8.105 3.092-11.196 0l-55.98-55.98a7.892 7.892 0 01-2.317-5.595z"/><path d="M8.931 64.053c0-2.027.77-4.054 2.316-5.6l55.98-55.98a7.92 7.92 0 0111.196 0c3.085 3.086 3.092 8.105 0 11.196L28.041 64.05l50.382 50.382a7.92 7.92 0 010 11.195c-3.086 3.085-8.104 3.092-11.196 0l-55.98-55.98a7.892 7.892 0 01-2.316-5.595z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-chevron-left tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M47.544 64.053c0-2.027.77-4.054 2.316-5.6l55.98-55.98a7.92 7.92 0 0111.196 0c3.085 3.086 3.092 8.105 0 11.196L66.656 64.05l50.382 50.382a7.92 7.92 0 010 11.195c-3.086 3.085-8.105 3.092-11.196 0l-55.98-55.98a7.892 7.892 0 01-2.317-5.595z"/><path d="M8.931 64.053c0-2.027.77-4.054 2.316-5.6l55.98-55.98a7.92 7.92 0 0111.196 0c3.085 3.086 3.092 8.105 0 11.196L28.041 64.05l50.382 50.382a7.92 7.92 0 010 11.195c-3.086 3.085-8.104 3.092-11.196 0l-55.98-55.98a7.892 7.892 0 01-2.316-5.595z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/chevron-right.tid b/core/images/chevron-right.tid
index 6ff5b6c0d..9ec7c96fe 100755
--- a/core/images/chevron-right.tid
+++ b/core/images/chevron-right.tid
@@ -1,4 +1,5 @@
title: $:/core/images/chevron-right
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-chevron-right tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M83.456 63.947c0 2.027-.77 4.054-2.316 5.6l-55.98 55.98a7.92 7.92 0 01-11.196 0c-3.085-3.086-3.092-8.105 0-11.196L64.344 63.95 13.963 13.567a7.92 7.92 0 010-11.195c3.086-3.085 8.105-3.092 11.196 0l55.98 55.98a7.892 7.892 0 012.317 5.595z"/><path d="M122.069 63.947c0 2.027-.77 4.054-2.316 5.6l-55.98 55.98a7.92 7.92 0 01-11.196 0c-3.085-3.086-3.092-8.105 0-11.196l50.382-50.382-50.382-50.382a7.92 7.92 0 010-11.195c3.086-3.085 8.104-3.092 11.196 0l55.98 55.98a7.892 7.892 0 012.316 5.595z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-chevron-right tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M83.456 63.947c0 2.027-.77 4.054-2.316 5.6l-55.98 55.98a7.92 7.92 0 01-11.196 0c-3.085-3.086-3.092-8.105 0-11.196L64.344 63.95 13.963 13.567a7.92 7.92 0 010-11.195c3.086-3.085 8.105-3.092 11.196 0l55.98 55.98a7.892 7.892 0 012.317 5.595z"/><path d="M122.069 63.947c0 2.027-.77 4.054-2.316 5.6l-55.98 55.98a7.92 7.92 0 01-11.196 0c-3.085-3.086-3.092-8.105 0-11.196l50.382-50.382-50.382-50.382a7.92 7.92 0 010-11.195c3.086-3.085 8.104-3.092 11.196 0l55.98 55.98a7.892 7.892 0 012.316 5.595z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/chevron-up.tid b/core/images/chevron-up.tid
index 9acbdec40..45366f286 100755
--- a/core/images/chevron-up.tid
+++ b/core/images/chevron-up.tid
@@ -1,4 +1,5 @@
title: $:/core/images/chevron-up
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-chevron-up tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M63.947 44.544c2.027 0 4.054.77 5.6 2.316l55.98 55.98a7.92 7.92 0 010 11.196c-3.086 3.085-8.105 3.092-11.196 0L63.95 63.656l-50.382 50.382a7.92 7.92 0 01-11.195 0c-3.085-3.086-3.092-8.105 0-11.196l55.98-55.98a7.892 7.892 0 015.595-2.317z"/><path d="M63.947 5.931c2.027 0 4.054.77 5.6 2.316l55.98 55.98a7.92 7.92 0 010 11.196c-3.086 3.085-8.105 3.092-11.196 0L63.95 25.041 13.567 75.423a7.92 7.92 0 01-11.195 0c-3.085-3.086-3.092-8.104 0-11.196l55.98-55.98a7.892 7.892 0 015.595-2.316z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-chevron-up tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M63.947 44.544c2.027 0 4.054.77 5.6 2.316l55.98 55.98a7.92 7.92 0 010 11.196c-3.086 3.085-8.105 3.092-11.196 0L63.95 63.656l-50.382 50.382a7.92 7.92 0 01-11.195 0c-3.085-3.086-3.092-8.105 0-11.196l55.98-55.98a7.892 7.892 0 015.595-2.317z"/><path d="M63.947 5.931c2.027 0 4.054.77 5.6 2.316l55.98 55.98a7.92 7.92 0 010 11.196c-3.086 3.085-8.105 3.092-11.196 0L63.95 25.041 13.567 75.423a7.92 7.92 0 01-11.195 0c-3.085-3.086-3.092-8.104 0-11.196l55.98-55.98a7.892 7.892 0 015.595-2.316z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/clone-button.tid b/core/images/clone-button.tid
index 9ff4903ad..cc0ed7595 100755
--- a/core/images/clone-button.tid
+++ b/core/images/clone-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/clone-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-clone-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M32.265 96v24.002A7.996 7.996 0 0040.263 128h79.74a7.996 7.996 0 007.997-7.998v-79.74a7.996 7.996 0 00-7.998-7.997H96V48h12.859a2.99 2.99 0 012.994 2.994v57.865a2.99 2.99 0 01-2.994 2.994H50.994A2.99 2.99 0 0148 108.859V96H32.265z"/><path d="M40 56h-7.993C27.588 56 24 52.418 24 48c0-4.41 3.585-8 8.007-8H40v-7.993C40 27.588 43.582 24 48 24c4.41 0 8 3.585 8 8.007V40h7.993C68.412 40 72 43.582 72 48c0 4.41-3.585 8-8.007 8H56v7.993C56 68.412 52.418 72 48 72c-4.41 0-8-3.585-8-8.007V56zM8 0C3.58 0 0 3.588 0 8v80c0 4.419 3.588 8 8 8h80c4.419 0 8-3.588 8-8V8c0-4.419-3.588-8-8-8H8zM19 16A2.997 2.997 0 0016 19.001v57.998A2.997 2.997 0 0019.001 80h57.998A2.997 2.997 0 0080 76.999V19.001A2.997 2.997 0 0076.999 16H19.001z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-clone-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M32.265 96v24.002A7.996 7.996 0 0040.263 128h79.74a7.996 7.996 0 007.997-7.998v-79.74a7.996 7.996 0 00-7.998-7.997H96V48h12.859a2.99 2.99 0 012.994 2.994v57.865a2.99 2.99 0 01-2.994 2.994H50.994A2.99 2.99 0 0148 108.859V96H32.265z"/><path d="M40 56h-7.993C27.588 56 24 52.418 24 48c0-4.41 3.585-8 8.007-8H40v-7.993C40 27.588 43.582 24 48 24c4.41 0 8 3.585 8 8.007V40h7.993C68.412 40 72 43.582 72 48c0 4.41-3.585 8-8.007 8H56v7.993C56 68.412 52.418 72 48 72c-4.41 0-8-3.585-8-8.007V56zM8 0C3.58 0 0 3.588 0 8v80c0 4.419 3.588 8 8 8h80c4.419 0 8-3.588 8-8V8c0-4.419-3.588-8-8-8H8zM19 16A2.997 2.997 0 0016 19.001v57.998A2.997 2.997 0 0019.001 80h57.998A2.997 2.997 0 0080 76.999V19.001A2.997 2.997 0 0076.999 16H19.001z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/close-all-button.tid b/core/images/close-all-button.tid
index 3334c5dbc..02d25fa6f 100755
--- a/core/images/close-all-button.tid
+++ b/core/images/close-all-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/close-all-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-close-all-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M28 111.314l-14.144 14.143a8 8 0 01-11.313-11.313L16.686 100 2.543 85.856a8 8 0 0111.313-11.313L28 88.686l14.144-14.143a8 8 0 0111.313 11.313L39.314 100l14.143 14.144a8 8 0 01-11.313 11.313L28 111.314zM28 39.314L13.856 53.457A8 8 0 012.543 42.144L16.686 28 2.543 13.856A8 8 0 0113.856 2.543L28 16.686 42.144 2.543a8 8 0 0111.313 11.313L39.314 28l14.143 14.144a8 8 0 01-11.313 11.313L28 39.314zM100 39.314L85.856 53.457a8 8 0 01-11.313-11.313L88.686 28 74.543 13.856A8 8 0 0185.856 2.543L100 16.686l14.144-14.143a8 8 0 0111.313 11.313L111.314 28l14.143 14.144a8 8 0 01-11.313 11.313L100 39.314zM100 111.314l-14.144 14.143a8 8 0 01-11.313-11.313L88.686 100 74.543 85.856a8 8 0 0111.313-11.313L100 88.686l14.144-14.143a8 8 0 0111.313 11.313L111.314 100l14.143 14.144a8 8 0 01-11.313 11.313L100 111.314z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-close-all-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M28 111.314l-14.144 14.143a8 8 0 01-11.313-11.313L16.686 100 2.543 85.856a8 8 0 0111.313-11.313L28 88.686l14.144-14.143a8 8 0 0111.313 11.313L39.314 100l14.143 14.144a8 8 0 01-11.313 11.313L28 111.314zM28 39.314L13.856 53.457A8 8 0 012.543 42.144L16.686 28 2.543 13.856A8 8 0 0113.856 2.543L28 16.686 42.144 2.543a8 8 0 0111.313 11.313L39.314 28l14.143 14.144a8 8 0 01-11.313 11.313L28 39.314zM100 39.314L85.856 53.457a8 8 0 01-11.313-11.313L88.686 28 74.543 13.856A8 8 0 0185.856 2.543L100 16.686l14.144-14.143a8 8 0 0111.313 11.313L111.314 28l14.143 14.144a8 8 0 01-11.313 11.313L100 39.314zM100 111.314l-14.144 14.143a8 8 0 01-11.313-11.313L88.686 100 74.543 85.856a8 8 0 0111.313-11.313L100 88.686l14.144-14.143a8 8 0 0111.313 11.313L111.314 100l14.143 14.144a8 8 0 01-11.313 11.313L100 111.314z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/close-button.tid b/core/images/close-button.tid
index c462c9bac..a05669ccd 100755
--- a/core/images/close-button.tid
+++ b/core/images/close-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/close-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-close-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M65.086 75.41l-50.113 50.113c-3.121 3.121-8.192 3.126-11.316.002-3.118-3.118-3.123-8.19.002-11.316l50.114-50.114L3.659 13.982C.538 10.86.533 5.79 3.657 2.666c3.118-3.118 8.19-3.123 11.316.002l50.113 50.114L115.2 2.668c3.121-3.121 8.192-3.126 11.316-.002 3.118 3.118 3.123 8.19-.002 11.316L76.4 64.095l50.114 50.114c3.121 3.121 3.126 8.192.002 11.316-3.118 3.118-8.19 3.123-11.316-.002L65.086 75.409z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-close-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M65.086 75.41l-50.113 50.113c-3.121 3.121-8.192 3.126-11.316.002-3.118-3.118-3.123-8.19.002-11.316l50.114-50.114L3.659 13.982C.538 10.86.533 5.79 3.657 2.666c3.118-3.118 8.19-3.123 11.316.002l50.113 50.114L115.2 2.668c3.121-3.121 8.192-3.126 11.316-.002 3.118 3.118 3.123 8.19-.002 11.316L76.4 64.095l50.114 50.114c3.121 3.121 3.126 8.192.002 11.316-3.118 3.118-8.19 3.123-11.316-.002L65.086 75.409z"/></svg>
\ No newline at end of file
diff --git a/core/images/close-others-button.tid b/core/images/close-others-button.tid
index 1cd54d797..6eb779018 100755
--- a/core/images/close-others-button.tid
+++ b/core/images/close-others-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/close-others-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-close-others-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M64 128c35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64C28.654 0 0 28.654 0 64c0 35.346 28.654 64 64 64zm0-16c26.51 0 48-21.49 48-48S90.51 16 64 16 16 37.49 16 64s21.49 48 48 48zm0-16c17.673 0 32-14.327 32-32 0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32 0 17.673 14.327 32 32 32zm0-16c8.837 0 16-7.163 16-16s-7.163-16-16-16-16 7.163-16 16 7.163 16 16 16z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-close-others-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M64 128c35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64C28.654 0 0 28.654 0 64c0 35.346 28.654 64 64 64zm0-16c26.51 0 48-21.49 48-48S90.51 16 64 16 16 37.49 16 64s21.49 48 48 48zm0-16c17.673 0 32-14.327 32-32 0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32 0 17.673 14.327 32 32 32zm0-16c8.837 0 16-7.163 16-16s-7.163-16-16-16-16 7.163-16 16 7.163 16 16 16z"/></svg>
\ No newline at end of file
diff --git a/core/images/copy-clipboard.tid b/core/images/copy-clipboard.tid
index e4e55b6e9..d6514ad7c 100644
--- a/core/images/copy-clipboard.tid
+++ b/core/images/copy-clipboard.tid
@@ -1,4 +1,5 @@
title: $:/core/images/copy-clipboard
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-copy-clipboard tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="33" height="8" x="40" y="40" rx="4"/><rect width="17" height="8" x="40" y="82" rx="4"/><rect width="17" height="8" x="40" y="54" rx="4"/><rect width="33" height="8" x="40" y="96" rx="4"/><rect width="12" height="8" x="40" y="68" rx="4"/><path d="M40 16H24c-4.419 0-8 3.59-8 8a8.031 8.031 0 000 .01v95.98a8.03 8.03 0 000 .01c0 4.41 3.581 8 8 8h80a7.975 7.975 0 005.652-2.34 7.958 7.958 0 002.348-5.652v-16.016c0-4.414-3.582-7.992-8-7.992-4.41 0-8 3.578-8 7.992V112H32V32h64v8.008C96 44.422 99.582 48 104 48c4.41 0 8-3.578 8-7.992V23.992a7.963 7.963 0 00-2.343-5.651A7.995 7.995 0 00104.001 16H88c0-4.41-3.585-8-8.007-8H48.007C43.588 8 40 11.582 40 16zm4-1.004A4.001 4.001 0 0148 11h32c2.21 0 4 1.797 4 3.996v4.008A4.001 4.001 0 0180 23H48c-2.21 0-4-1.797-4-3.996v-4.008z"/><rect width="66" height="16" x="62" y="64" rx="8"/><path d="M84.657 82.343l-16-16v11.314l16-16a8 8 0 10-11.314-11.314l-16 16a8 8 0 000 11.314l16 16a8 8 0 1011.314-11.314z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-copy-clipboard tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="33" height="8" x="40" y="40" rx="4"/><rect width="17" height="8" x="40" y="82" rx="4"/><rect width="17" height="8" x="40" y="54" rx="4"/><rect width="33" height="8" x="40" y="96" rx="4"/><rect width="12" height="8" x="40" y="68" rx="4"/><path d="M40 16H24c-4.419 0-8 3.59-8 8a8.031 8.031 0 000 .01v95.98a8.03 8.03 0 000 .01c0 4.41 3.581 8 8 8h80a7.975 7.975 0 005.652-2.34 7.958 7.958 0 002.348-5.652v-16.016c0-4.414-3.582-7.992-8-7.992-4.41 0-8 3.578-8 7.992V112H32V32h64v8.008C96 44.422 99.582 48 104 48c4.41 0 8-3.578 8-7.992V23.992a7.963 7.963 0 00-2.343-5.651A7.995 7.995 0 00104.001 16H88c0-4.41-3.585-8-8.007-8H48.007C43.588 8 40 11.582 40 16zm4-1.004A4.001 4.001 0 0148 11h32c2.21 0 4 1.797 4 3.996v4.008A4.001 4.001 0 0180 23H48c-2.21 0-4-1.797-4-3.996v-4.008z"/><rect width="66" height="16" x="62" y="64" rx="8"/><path d="M84.657 82.343l-16-16v11.314l16-16a8 8 0 10-11.314-11.314l-16 16a8 8 0 000 11.314l16 16a8 8 0 1011.314-11.314z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/delete-button.tid b/core/images/delete-button.tid
index e8c9b6108..99f83b3ba 100755
--- a/core/images/delete-button.tid
+++ b/core/images/delete-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/delete-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-delete-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd" transform="translate(12)"><rect width="105" height="16" y="11" rx="8"/><rect width="48" height="16" x="28" rx="8"/><rect width="16" height="112" x="8" y="16" rx="8"/><rect width="88" height="16" x="8" y="112" rx="8"/><rect width="16" height="112" x="80" y="16" rx="8"/><rect width="16" height="112" x="56" y="16" rx="8"/><rect width="16" height="112" x="32" y="16" rx="8"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-delete-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd" transform="translate(12)"><rect width="105" height="16" y="11" rx="8"/><rect width="48" height="16" x="28" rx="8"/><rect width="16" height="112" x="8" y="16" rx="8"/><rect width="88" height="16" x="8" y="112" rx="8"/><rect width="16" height="112" x="80" y="16" rx="8"/><rect width="16" height="112" x="56" y="16" rx="8"/><rect width="16" height="112" x="32" y="16" rx="8"/></g></svg>
\ No newline at end of file
diff --git a/core/images/discord.tid b/core/images/discord.tid
new file mode 100644
index 000000000..7510babb4
--- /dev/null
+++ b/core/images/discord.tid
@@ -0,0 +1,5 @@
+title: $:/core/images/discord
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-discord tc-image-button" viewBox="0 -28.5 256 256"><path d="M216.856 16.597A208.502 208.502 0 0 0 164.042 0c-2.275 4.113-4.933 9.645-6.766 14.046-19.692-2.961-39.203-2.961-58.533 0-1.832-4.4-4.55-9.933-6.846-14.046a207.809 207.809 0 0 0-52.855 16.638C5.618 67.147-3.443 116.4 1.087 164.956c22.169 16.555 43.653 26.612 64.775 33.193A161.094 161.094 0 0 0 79.735 175.3a136.413 136.413 0 0 1-21.846-10.632 108.636 108.636 0 0 0 5.356-4.237c42.122 19.702 87.89 19.702 129.51 0a131.66 131.66 0 0 0 5.355 4.237 136.07 136.07 0 0 1-21.886 10.653c4.006 8.02 8.638 15.67 13.873 22.848 21.142-6.58 42.646-16.637 64.815-33.213 5.316-56.288-9.08-105.09-38.056-148.36ZM85.474 135.095c-12.645 0-23.015-11.805-23.015-26.18s10.149-26.2 23.015-26.2c12.867 0 23.236 11.804 23.015 26.2.02 14.375-10.148 26.18-23.015 26.18Zm85.051 0c-12.645 0-23.014-11.805-23.014-26.18s10.148-26.2 23.014-26.2c12.867 0 23.236 11.804 23.015 26.2 0 14.375-10.148 26.18-23.015 26.18Z"/></svg>
\ No newline at end of file
diff --git a/core/images/done-button.tid b/core/images/done-button.tid
index 265528d06..7672b7d27 100755
--- a/core/images/done-button.tid
+++ b/core/images/done-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/done-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-done-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M42.26 111.032c-2.051.001-4.103-.78-5.668-2.345L2.662 74.758a8 8 0 01-.005-11.32c3.118-3.117 8.192-3.12 11.32.007l28.278 28.278 72.124-72.124a8.002 8.002 0 0111.314-.001c3.118 3.118 3.124 8.19 0 11.315l-77.78 77.78a7.978 7.978 0 01-5.658 2.343z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-done-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M42.26 111.032c-2.051.001-4.103-.78-5.668-2.345L2.662 74.758a8 8 0 01-.005-11.32c3.118-3.117 8.192-3.12 11.32.007l28.278 28.278 72.124-72.124a8.002 8.002 0 0111.314-.001c3.118 3.118 3.124 8.19 0 11.315l-77.78 77.78a7.978 7.978 0 01-5.658 2.343z"/></svg>
\ No newline at end of file
diff --git a/core/images/down-arrow.tid b/core/images/down-arrow.tid
index 4cac65a00..7f1273b2c 100755
--- a/core/images/down-arrow.tid
+++ b/core/images/down-arrow.tid
@@ -1,4 +1,5 @@
title: $:/core/images/down-arrow
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-down-arrow tc-image-button" viewBox="0 0 128 128"><path d="M64.177 100.069a7.889 7.889 0 01-5.6-2.316l-55.98-55.98a7.92 7.92 0 010-11.196c3.086-3.085 8.105-3.092 11.196 0l50.382 50.382 50.382-50.382a7.92 7.92 0 0111.195 0c3.086 3.086 3.092 8.104 0 11.196l-55.98 55.98a7.892 7.892 0 01-5.595 2.316z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-down-arrow tc-image-button" viewBox="0 0 128 128"><path d="M64.177 100.069a7.889 7.889 0 01-5.6-2.316l-55.98-55.98a7.92 7.92 0 010-11.196c3.086-3.085 8.105-3.092 11.196 0l50.382 50.382 50.382-50.382a7.92 7.92 0 0111.195 0c3.086 3.086 3.092 8.104 0 11.196l-55.98 55.98a7.892 7.892 0 01-5.595 2.316z"/></svg>
\ No newline at end of file
diff --git a/core/images/download-button.tid b/core/images/download-button.tid
index e3a549639..8b06356ab 100755
--- a/core/images/download-button.tid
+++ b/core/images/download-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/download-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-download-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M64 128c35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64C28.654 0 0 28.654 0 64c0 35.346 28.654 64 64 64zm0-16c26.51 0 48-21.49 48-48S90.51 16 64 16 16 37.49 16 64s21.49 48 48 48z" class="tc-image-download-button-ring"/><path d="M34.35 66.43l26.892 27.205a4.57 4.57 0 006.516 0L94.65 66.43a4.7 4.7 0 000-6.593 4.581 4.581 0 00-3.258-1.365h-8.46c-2.545 0-4.608-2.087-4.608-4.661v-15.15c0-2.575-2.063-4.662-4.608-4.662H55.284c-2.545 0-4.608 2.087-4.608 4.662v15.15c0 2.574-2.063 4.661-4.608 4.661h-8.46c-2.545 0-4.608 2.087-4.608 4.662a4.69 4.69 0 001.35 3.296z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-download-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M64 128c35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64C28.654 0 0 28.654 0 64c0 35.346 28.654 64 64 64zm0-16c26.51 0 48-21.49 48-48S90.51 16 64 16 16 37.49 16 64s21.49 48 48 48z" class="tc-image-download-button-ring"/><path d="M34.35 66.43l26.892 27.205a4.57 4.57 0 006.516 0L94.65 66.43a4.7 4.7 0 000-6.593 4.581 4.581 0 00-3.258-1.365h-8.46c-2.545 0-4.608-2.087-4.608-4.661v-15.15c0-2.575-2.063-4.662-4.608-4.662H55.284c-2.545 0-4.608 2.087-4.608 4.662v15.15c0 2.574-2.063 4.661-4.608 4.661h-8.46c-2.545 0-4.608 2.087-4.608 4.662a4.69 4.69 0 001.35 3.296z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/edit-button.tid b/core/images/edit-button.tid
index 190dffc41..e4644ef7c 100755
--- a/core/images/edit-button.tid
+++ b/core/images/edit-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/edit-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-edit-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M95.627 10.059l-5.656 5.657 11.313 11.313 5.657-5.656-11.314-11.314zm5.657-5.657l1.966-1.966c3.123-3.122 8.194-3.129 11.319-.005 3.117 3.118 3.122 8.192-.005 11.32l-1.966 1.965-11.314-11.314zm-16.97 16.97l-60.25 60.25a8.12 8.12 0 00-.322.342c-.1.087-.198.179-.295.275-5.735 5.735-10.702 22.016-10.702 22.016s16.405-5.09 22.016-10.702c.095-.096.186-.193.272-.292a8.12 8.12 0 00.345-.325l60.25-60.25-11.314-11.313zM35.171 124.19c6.788-.577 13.898-2.272 23.689-5.348 1.825-.573 3.57-1.136 6.336-2.04 16-5.226 21.877-6.807 28.745-7.146 8.358-.413 13.854 2.13 17.58 8.699a4 4 0 006.959-3.946c-5.334-9.406-13.745-13.296-24.933-12.744-7.875.39-14.057 2.052-30.835 7.533-2.739.894-4.46 1.45-6.25 2.012-19.46 6.112-30.77 7.072-39.597 1.747a4 4 0 10-4.132 6.85c6.333 3.82 13.754 5.12 22.438 4.383z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-edit-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M95.627 10.059l-5.656 5.657 11.313 11.313 5.657-5.656-11.314-11.314zm5.657-5.657l1.966-1.966c3.123-3.122 8.194-3.129 11.319-.005 3.117 3.118 3.122 8.192-.005 11.32l-1.966 1.965-11.314-11.314zm-16.97 16.97l-60.25 60.25a8.12 8.12 0 00-.322.342c-.1.087-.198.179-.295.275-5.735 5.735-10.702 22.016-10.702 22.016s16.405-5.09 22.016-10.702c.095-.096.186-.193.272-.292a8.12 8.12 0 00.345-.325l60.25-60.25-11.314-11.313zM35.171 124.19c6.788-.577 13.898-2.272 23.689-5.348 1.825-.573 3.57-1.136 6.336-2.04 16-5.226 21.877-6.807 28.745-7.146 8.358-.413 13.854 2.13 17.58 8.699a4 4 0 006.959-3.946c-5.334-9.406-13.745-13.296-24.933-12.744-7.875.39-14.057 2.052-30.835 7.533-2.739.894-4.46 1.45-6.25 2.012-19.46 6.112-30.77 7.072-39.597 1.747a4 4 0 10-4.132 6.85c6.333 3.82 13.754 5.12 22.438 4.383z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/erase.tid b/core/images/erase.tid
index 22b31e7cc..6cc2011a9 100755
--- a/core/images/erase.tid
+++ b/core/images/erase.tid
@@ -1,4 +1,5 @@
title: $:/core/images/erase
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-erase tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M60.087 127.996l63.015-63.015c6.535-6.535 6.528-17.115-.003-23.646L99.466 17.702c-6.539-6.538-17.117-6.532-23.646-.003L4.898 88.62c-6.535 6.534-6.528 17.115.003 23.646l15.73 15.73h39.456zm-34.95-7.313l-14.324-14.325c-3.267-3.268-3.268-8.564-.008-11.824L46.269 59.07l35.462 35.462-26.15 26.15H25.137z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-erase tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M60.087 127.996l63.015-63.015c6.535-6.535 6.528-17.115-.003-23.646L99.466 17.702c-6.539-6.538-17.117-6.532-23.646-.003L4.898 88.62c-6.535 6.534-6.528 17.115.003 23.646l15.73 15.73h39.456zm-34.95-7.313l-14.324-14.325c-3.267-3.268-3.268-8.564-.008-11.824L46.269 59.07l35.462 35.462-26.15 26.15H25.137z"/></svg>
\ No newline at end of file
diff --git a/core/images/excise.tid b/core/images/excise.tid
index e6c2c9404..fa351baff 100755
--- a/core/images/excise.tid
+++ b/core/images/excise.tid
@@ -1,4 +1,5 @@
title: $:/core/images/excise
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-excise tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M56 107.314l-2.343 2.343a8 8 0 11-11.314-11.314l16-16a8 8 0 0111.314 0l16 16a8 8 0 11-11.314 11.314L72 107.314v14.284c0 3.536-3.582 6.402-8 6.402s-8-2.866-8-6.402v-14.284zM0 40.007C0 35.585 3.59 32 8 32c4.418 0 8 3.588 8 8.007v31.986C16 76.415 12.41 80 8 80c-4.418 0-8-3.588-8-8.007V40.007zm32 0C32 35.585 35.59 32 40 32c4.418 0 8 3.588 8 8.007v31.986C48 76.415 44.41 80 40 80c-4.418 0-8-3.588-8-8.007V40.007zm48 0C80 35.585 83.59 32 88 32c4.418 0 8 3.588 8 8.007v31.986C96 76.415 92.41 80 88 80c-4.418 0-8-3.588-8-8.007V40.007zm-24-32C56 3.585 59.59 0 64 0c4.418 0 8 3.588 8 8.007v31.986C72 44.415 68.41 48 64 48c-4.418 0-8-3.588-8-8.007V8.007zm56 32c0-4.422 3.59-8.007 8-8.007 4.418 0 8 3.588 8 8.007v31.986c0 4.422-3.59 8.007-8 8.007-4.418 0-8-3.588-8-8.007V40.007z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-excise tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M56 107.314l-2.343 2.343a8 8 0 11-11.314-11.314l16-16a8 8 0 0111.314 0l16 16a8 8 0 11-11.314 11.314L72 107.314v14.284c0 3.536-3.582 6.402-8 6.402s-8-2.866-8-6.402v-14.284zM0 40.007C0 35.585 3.59 32 8 32c4.418 0 8 3.588 8 8.007v31.986C16 76.415 12.41 80 8 80c-4.418 0-8-3.588-8-8.007V40.007zm32 0C32 35.585 35.59 32 40 32c4.418 0 8 3.588 8 8.007v31.986C48 76.415 44.41 80 40 80c-4.418 0-8-3.588-8-8.007V40.007zm48 0C80 35.585 83.59 32 88 32c4.418 0 8 3.588 8 8.007v31.986C96 76.415 92.41 80 88 80c-4.418 0-8-3.588-8-8.007V40.007zm-24-32C56 3.585 59.59 0 64 0c4.418 0 8 3.588 8 8.007v31.986C72 44.415 68.41 48 64 48c-4.418 0-8-3.588-8-8.007V8.007zm56 32c0-4.422 3.59-8.007 8-8.007 4.418 0 8 3.588 8 8.007v31.986c0 4.422-3.59 8.007-8 8.007-4.418 0-8-3.588-8-8.007V40.007z"/></svg>
\ No newline at end of file
diff --git a/core/images/export-button.tid b/core/images/export-button.tid
index eb3284c80..b9f0dca7f 100755
--- a/core/images/export-button.tid
+++ b/core/images/export-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/export-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-export-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M8.003 128H119.993a7.984 7.984 0 005.664-2.349v.007A7.975 7.975 0 00128 120V56c0-4.418-3.59-8-8-8-4.418 0-8 3.58-8 8v56H16V56c0-4.418-3.59-8-8-8-4.418 0-8 3.58-8 8v64c0 4.418 3.59 8 8 8h.003zm48.62-100.689l-8.965 8.966c-3.125 3.125-8.195 3.13-11.319.005-3.118-3.118-3.122-8.192.005-11.319L58.962 2.346A7.986 7.986 0 0164.625 0l-.006.002c2.05-.001 4.102.78 5.666 2.344l22.618 22.617c3.124 3.125 3.129 8.195.005 11.319-3.118 3.118-8.192 3.122-11.319-.005l-8.965-8.966v61.256c0 4.411-3.582 8-8 8-4.41 0-8-3.582-8-8V27.311z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-export-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M8.003 128H119.993a7.984 7.984 0 005.664-2.349v.007A7.975 7.975 0 00128 120V56c0-4.418-3.59-8-8-8-4.418 0-8 3.58-8 8v56H16V56c0-4.418-3.59-8-8-8-4.418 0-8 3.58-8 8v64c0 4.418 3.59 8 8 8h.003zm48.62-100.689l-8.965 8.966c-3.125 3.125-8.195 3.13-11.319.005-3.118-3.118-3.122-8.192.005-11.319L58.962 2.346A7.986 7.986 0 0164.625 0l-.006.002c2.05-.001 4.102.78 5.666 2.344l22.618 22.617c3.124 3.125 3.129 8.195.005 11.319-3.118 3.118-8.192 3.122-11.319-.005l-8.965-8.966v61.256c0 4.411-3.582 8-8 8-4.41 0-8-3.582-8-8V27.311z"/></svg>
\ No newline at end of file
diff --git a/core/images/file.tid b/core/images/file.tid
index 67ebc22ac..682796fbf 100755
--- a/core/images/file.tid
+++ b/core/images/file.tid
@@ -1,4 +1,5 @@
title: $:/core/images/file
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-file tc-image-button" viewBox="0 0 128 128"><path d="M111.968 30.5H112V120a8 8 0 01-8 8H24a8 8 0 01-8-8V8a8 8 0 018-8h57v.02a7.978 7.978 0 015.998 2.337l22.627 22.627a7.975 7.975 0 012.343 5.516zM81 8H24v112h80V30.5H89c-4.418 0-8-3.578-8-8V8z"/><rect width="64" height="8" x="32" y="36" rx="4"/><rect width="64" height="8" x="32" y="52" rx="4"/><rect width="64" height="8" x="32" y="68" rx="4"/><rect width="64" height="8" x="32" y="84" rx="4"/><rect width="64" height="8" x="32" y="100" rx="4"/><rect width="40" height="8" x="32" y="20" rx="4"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-file tc-image-button" viewBox="0 0 128 128"><path d="M111.968 30.5H112V120a8 8 0 01-8 8H24a8 8 0 01-8-8V8a8 8 0 018-8h57v.02a7.978 7.978 0 015.998 2.337l22.627 22.627a7.975 7.975 0 012.343 5.516zM81 8H24v112h80V30.5H89c-4.418 0-8-3.578-8-8V8z"/><rect width="64" height="8" x="32" y="36" rx="4"/><rect width="64" height="8" x="32" y="52" rx="4"/><rect width="64" height="8" x="32" y="68" rx="4"/><rect width="64" height="8" x="32" y="84" rx="4"/><rect width="64" height="8" x="32" y="100" rx="4"/><rect width="40" height="8" x="32" y="20" rx="4"/></svg>
\ No newline at end of file
diff --git a/core/images/fixed-height.tid b/core/images/fixed-height.tid
index c15162267..b2b5083b9 100755
--- a/core/images/fixed-height.tid
+++ b/core/images/fixed-height.tid
@@ -1,4 +1,5 @@
title: $:/core/images/fixed-height
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-fixed-height tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M60 35.657l-9.172 9.171a4 4 0 11-5.656-5.656l16-16a4 4 0 015.656 0l16 16a4 4 0 01-5.656 5.656L68 35.657v57.686l9.172-9.171a4 4 0 115.656 5.656l-16 16a4 4 0 01-5.656 0l-16-16a4 4 0 115.656-5.656L60 93.343V35.657zM16 116h96a4 4 0 100-8H16a4 4 0 100 8zm0-96h96a4 4 0 100-8H16a4 4 0 100 8z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-fixed-height tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M60 35.657l-9.172 9.171a4 4 0 11-5.656-5.656l16-16a4 4 0 015.656 0l16 16a4 4 0 01-5.656 5.656L68 35.657v57.686l9.172-9.171a4 4 0 115.656 5.656l-16 16a4 4 0 01-5.656 0l-16-16a4 4 0 115.656-5.656L60 93.343V35.657zM16 116h96a4 4 0 100-8H16a4 4 0 100 8zm0-96h96a4 4 0 100-8H16a4 4 0 100 8z"/></svg>
\ No newline at end of file
diff --git a/core/images/fold-all-button.tid b/core/images/fold-all-button.tid
index edff8b22b..260efe9b8 100755
--- a/core/images/fold-all-button.tid
+++ b/core/images/fold-all-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/fold-all-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-fold-all tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="128" height="16" rx="8"/><rect width="128" height="16" y="64" rx="8"/><path d="M64.03 20.004c-2.05 0-4.102.78-5.667 2.344L35.746 44.966c-3.125 3.124-3.13 8.194-.005 11.318 3.118 3.118 8.192 3.122 11.319-.005l16.965-16.965 16.966 16.965c3.124 3.125 8.194 3.13 11.318.005 3.118-3.118 3.122-8.191-.005-11.318L69.687 22.348a7.986 7.986 0 00-5.663-2.346zM64.03 85.002c-2.05-.001-4.102.78-5.667 2.344l-22.617 22.617c-3.125 3.125-3.13 8.195-.005 11.319 3.118 3.118 8.192 3.122 11.319-.005l16.965-16.966 16.966 16.966c3.124 3.125 8.194 3.13 11.318.005 3.118-3.118 3.122-8.192-.005-11.319L69.687 87.346A7.986 7.986 0 0064.024 85z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-fold-all tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="128" height="16" rx="8"/><rect width="128" height="16" y="64" rx="8"/><path d="M64.03 20.004c-2.05 0-4.102.78-5.667 2.344L35.746 44.966c-3.125 3.124-3.13 8.194-.005 11.318 3.118 3.118 8.192 3.122 11.319-.005l16.965-16.965 16.966 16.965c3.124 3.125 8.194 3.13 11.318.005 3.118-3.118 3.122-8.191-.005-11.318L69.687 22.348a7.986 7.986 0 00-5.663-2.346zM64.03 85.002c-2.05-.001-4.102.78-5.667 2.344l-22.617 22.617c-3.125 3.125-3.13 8.195-.005 11.319 3.118 3.118 8.192 3.122 11.319-.005l16.965-16.966 16.966 16.966c3.124 3.125 8.194 3.13 11.318.005 3.118-3.118 3.122-8.192-.005-11.319L69.687 87.346A7.986 7.986 0 0064.024 85z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/fold-button.tid b/core/images/fold-button.tid
index f0b2b474d..cfc2291a5 100755
--- a/core/images/fold-button.tid
+++ b/core/images/fold-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/fold-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-fold tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="128" height="16" rx="8"/><path d="M64.03 25.004c-2.05 0-4.102.78-5.667 2.344L35.746 49.966c-3.125 3.124-3.13 8.194-.005 11.318 3.118 3.118 8.192 3.122 11.319-.005l16.965-16.965 16.966 16.965c3.124 3.125 8.194 3.13 11.318.005 3.118-3.118 3.122-8.191-.005-11.318L69.687 27.348a7.986 7.986 0 00-5.663-2.346zM64.005 67.379c-2.05 0-4.102.78-5.666 2.344L35.722 92.34c-3.125 3.125-3.13 8.195-.006 11.32 3.118 3.117 8.192 3.121 11.32-.006L64 86.69l16.965 16.965c3.125 3.125 8.195 3.13 11.319.005 3.118-3.118 3.122-8.192-.005-11.319L69.663 69.723A7.986 7.986 0 0064 67.377z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-fold tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="128" height="16" rx="8"/><path d="M64.03 25.004c-2.05 0-4.102.78-5.667 2.344L35.746 49.966c-3.125 3.124-3.13 8.194-.005 11.318 3.118 3.118 8.192 3.122 11.319-.005l16.965-16.965 16.966 16.965c3.124 3.125 8.194 3.13 11.318.005 3.118-3.118 3.122-8.191-.005-11.318L69.687 27.348a7.986 7.986 0 00-5.663-2.346zM64.005 67.379c-2.05 0-4.102.78-5.666 2.344L35.722 92.34c-3.125 3.125-3.13 8.195-.006 11.32 3.118 3.117 8.192 3.121 11.32-.006L64 86.69l16.965 16.965c3.125 3.125 8.195 3.13 11.319.005 3.118-3.118 3.122-8.192-.005-11.319L69.663 69.723A7.986 7.986 0 0064 67.377z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/fold-others-button.tid b/core/images/fold-others-button.tid
index 5cb086f85..a5457c461 100755
--- a/core/images/fold-others-button.tid
+++ b/core/images/fold-others-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/fold-others-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-fold-others tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="128" height="16" y="56.031" rx="8"/><path d="M86.632 79.976c-2.05 0-4.102.78-5.666 2.345L64 99.286 47.034 82.321a7.986 7.986 0 00-5.662-2.346l.005.001c-2.05 0-4.102.78-5.666 2.345l-22.618 22.617c-3.124 3.125-3.129 8.195-.005 11.319 3.118 3.118 8.192 3.122 11.319-.005l16.966-16.966 16.965 16.966a7.986 7.986 0 005.663 2.346l-.005-.002c2.05 0 4.102-.78 5.666-2.344l16.965-16.966 16.966 16.966c3.125 3.124 8.194 3.129 11.319.005 3.118-3.118 3.122-8.192-.005-11.319L92.289 82.321a7.986 7.986 0 00-5.663-2.346zM86.7 48.024c-2.05 0-4.102-.78-5.666-2.345L64.07 28.714 47.103 45.679a7.986 7.986 0 01-5.663 2.346l.005-.001c-2.05 0-4.101-.78-5.666-2.345L13.162 23.062c-3.125-3.125-3.13-8.195-.005-11.319 3.118-3.118 8.192-3.122 11.319.005L41.44 28.714l16.966-16.966a7.986 7.986 0 015.662-2.346l-.005.002c2.05 0 4.102.78 5.666 2.344l16.966 16.966 16.966-16.966c3.124-3.124 8.194-3.129 11.318-.005 3.118 3.118 3.122 8.192-.005 11.319L92.358 45.679a7.986 7.986 0 01-5.663 2.346z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-fold-others tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="128" height="16" y="56.031" rx="8"/><path d="M86.632 79.976c-2.05 0-4.102.78-5.666 2.345L64 99.286 47.034 82.321a7.986 7.986 0 00-5.662-2.346l.005.001c-2.05 0-4.102.78-5.666 2.345l-22.618 22.617c-3.124 3.125-3.129 8.195-.005 11.319 3.118 3.118 8.192 3.122 11.319-.005l16.966-16.966 16.965 16.966a7.986 7.986 0 005.663 2.346l-.005-.002c2.05 0 4.102-.78 5.666-2.344l16.965-16.966 16.966 16.966c3.125 3.124 8.194 3.129 11.319.005 3.118-3.118 3.122-8.192-.005-11.319L92.289 82.321a7.986 7.986 0 00-5.663-2.346zM86.7 48.024c-2.05 0-4.102-.78-5.666-2.345L64.07 28.714 47.103 45.679a7.986 7.986 0 01-5.663 2.346l.005-.001c-2.05 0-4.101-.78-5.666-2.345L13.162 23.062c-3.125-3.125-3.13-8.195-.005-11.319 3.118-3.118 8.192-3.122 11.319.005L41.44 28.714l16.966-16.966a7.986 7.986 0 015.662-2.346l-.005.002c2.05 0 4.102.78 5.666 2.344l16.966 16.966 16.966-16.966c3.124-3.124 8.194-3.129 11.318-.005 3.118 3.118 3.122 8.192-.005 11.319L92.358 45.679a7.986 7.986 0 01-5.663 2.346z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/folder.tid b/core/images/folder.tid
index 4b89418ff..8c5d7efb1 100755
--- a/core/images/folder.tid
+++ b/core/images/folder.tid
@@ -1,4 +1,5 @@
title: $:/core/images/folder
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-folder tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M55.694 128H8C3.58 128 0 124.414 0 119.996V48.004C0 43.584 3.584 40 7.999 40H16v-8c0-4.418 3.578-8 8-8h32a8 8 0 018 8v8h40.001c4.418 0 7.999 3.586 7.999 8.004V59.83l-8-.082v-7.749A4 4 0 0099.997 48H56V36c0-2.21-1.793-4-4.004-4H28.004A4 4 0 0024 36v12H12.003A4 4 0 008 52v64a4 4 0 004.003 4h46.76l-3.069 8z"/><path d="M23.873 55.5h96.003c4.417 0 7.004 4.053 5.774 9.063l-13.344 54.374c-1.228 5.005-5.808 9.063-10.223 9.063H6.08c-4.417 0-7.003-4.053-5.774-9.063L13.65 64.563c1.228-5.005 5.808-9.063 10.223-9.063zm1.78 8.5h87.994c2.211 0 3.504 2.093 2.891 4.666l-11.12 46.668c-.614 2.577-2.902 4.666-5.115 4.666H12.31c-2.211 0-3.504-2.093-2.891-4.666l11.12-46.668C21.152 66.09 23.44 64 25.653 64z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-folder tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M55.694 128H8C3.58 128 0 124.414 0 119.996V48.004C0 43.584 3.584 40 7.999 40H16v-8c0-4.418 3.578-8 8-8h32a8 8 0 018 8v8h40.001c4.418 0 7.999 3.586 7.999 8.004V59.83l-8-.082v-7.749A4 4 0 0099.997 48H56V36c0-2.21-1.793-4-4.004-4H28.004A4 4 0 0024 36v12H12.003A4 4 0 008 52v64a4 4 0 004.003 4h46.76l-3.069 8z"/><path d="M23.873 55.5h96.003c4.417 0 7.004 4.053 5.774 9.063l-13.344 54.374c-1.228 5.005-5.808 9.063-10.223 9.063H6.08c-4.417 0-7.003-4.053-5.774-9.063L13.65 64.563c1.228-5.005 5.808-9.063 10.223-9.063zm1.78 8.5h87.994c2.211 0 3.504 2.093 2.891 4.666l-11.12 46.668c-.614 2.577-2.902 4.666-5.115 4.666H12.31c-2.211 0-3.504-2.093-2.891-4.666l11.12-46.668C21.152 66.09 23.44 64 25.653 64z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/full-screen-button.tid b/core/images/full-screen-button.tid
index 8572ff646..7e20183b7 100755
--- a/core/images/full-screen-button.tid
+++ b/core/images/full-screen-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/full-screen-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-full-screen-button tc-image-button" viewBox="0 0 128 128"><path d="M0 8a8 8 0 018-8h32a8 8 0 110 16H16v24a8 8 0 11-16 0V8zM128 120a8 8 0 01-8 8H88a8 8 0 110-16h24V88a8 8 0 1116 0v32zM8 128a8 8 0 01-8-8V88a8 8 0 1116 0v24h24a8 8 0 110 16H8zM120 0a8 8 0 018 8v32a8 8 0 11-16 0V16H88a8 8 0 110-16h32z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-full-screen-button tc-image-button" viewBox="0 0 128 128"><path d="M0 8a8 8 0 018-8h32a8 8 0 110 16H16v24a8 8 0 11-16 0V8zM128 120a8 8 0 01-8 8H88a8 8 0 110-16h24V88a8 8 0 1116 0v32zM8 128a8 8 0 01-8-8V88a8 8 0 1116 0v24h24a8 8 0 110 16H8zM120 0a8 8 0 018 8v32a8 8 0 11-16 0V16H88a8 8 0 110-16h32z"/></svg>
\ No newline at end of file
diff --git a/core/images/github.tid b/core/images/github.tid
index 6389f5cdc..b82c54e72 100755
--- a/core/images/github.tid
+++ b/core/images/github.tid
@@ -1,4 +1,5 @@
title: $:/core/images/github
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-github tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M63.938 1.607c-35.336 0-63.994 28.69-63.994 64.084 0 28.312 18.336 52.329 43.768 60.802 3.202.59 4.37-1.388 4.37-3.088 0-1.518-.056-5.55-.087-10.897-17.802 3.871-21.558-8.591-21.558-8.591-2.911-7.404-7.108-9.375-7.108-9.375-5.81-3.973.44-3.895.44-3.895 6.424.453 9.803 6.606 9.803 6.606 5.709 9.791 14.981 6.963 18.627 5.322.582-4.138 2.236-6.963 4.063-8.564-14.211-1.617-29.153-7.117-29.153-31.672 0-6.995 2.495-12.718 6.589-17.195-.66-1.621-2.856-8.14.629-16.96 0 0 5.37-1.722 17.597 6.57 5.104-1.424 10.58-2.132 16.022-2.16 5.438.028 10.91.736 16.022 2.16 12.22-8.292 17.582-6.57 17.582-6.57 3.493 8.82 1.297 15.339.64 16.96 4.102 4.477 6.578 10.2 6.578 17.195 0 24.618-14.966 30.035-29.22 31.62 2.295 1.98 4.342 5.89 4.342 11.87 0 8.564-.079 15.476-.079 17.576 0 1.715 1.155 3.71 4.4 3.084 25.413-8.493 43.733-32.494 43.733-60.798 0-35.394-28.657-64.084-64.006-64.084"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-github tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M63.938 1.607c-35.336 0-63.994 28.69-63.994 64.084 0 28.312 18.336 52.329 43.768 60.802 3.202.59 4.37-1.388 4.37-3.088 0-1.518-.056-5.55-.087-10.897-17.802 3.871-21.558-8.591-21.558-8.591-2.911-7.404-7.108-9.375-7.108-9.375-5.81-3.973.44-3.895.44-3.895 6.424.453 9.803 6.606 9.803 6.606 5.709 9.791 14.981 6.963 18.627 5.322.582-4.138 2.236-6.963 4.063-8.564-14.211-1.617-29.153-7.117-29.153-31.672 0-6.995 2.495-12.718 6.589-17.195-.66-1.621-2.856-8.14.629-16.96 0 0 5.37-1.722 17.597 6.57 5.104-1.424 10.58-2.132 16.022-2.16 5.438.028 10.91.736 16.022 2.16 12.22-8.292 17.582-6.57 17.582-6.57 3.493 8.82 1.297 15.339.64 16.96 4.102 4.477 6.578 10.2 6.578 17.195 0 24.618-14.966 30.035-29.22 31.62 2.295 1.98 4.342 5.89 4.342 11.87 0 8.564-.079 15.476-.079 17.576 0 1.715 1.155 3.71 4.4 3.084 25.413-8.493 43.733-32.494 43.733-60.798 0-35.394-28.657-64.084-64.006-64.084"/></svg>
\ No newline at end of file
diff --git a/core/images/gitter.tid b/core/images/gitter.tid
index 876fc3da1..4af54ddba 100644
--- a/core/images/gitter.tid
+++ b/core/images/gitter.tid
@@ -1,4 +1,5 @@
title: $:/core/images/gitter
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-gitter tc-image-button" viewBox="0 0 18 25"><path d="M15 5h2v10h-2zM10 5h2v20h-2zM5 5h2v20H5zM0 0h2v15H0z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-gitter tc-image-button" viewBox="0 0 18 25"><path d="M15 5h2v10h-2zM10 5h2v20h-2zM5 5h2v20H5zM0 0h2v15H0z"/></svg>
\ No newline at end of file
diff --git a/core/images/globe.tid b/core/images/globe.tid
index 9448ed7a4..0e2c56b40 100755
--- a/core/images/globe.tid
+++ b/core/images/globe.tid
@@ -1,4 +1,5 @@
title: $:/core/images/globe
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-globe tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M72.811 37.128v2.554c0 2.196.978 6.881 0 8.832-1.466 2.928-4.65 3.54-6.394 5.867-1.182 1.577-4.618 10.601-3.69 12.92 3.969 9.922 11.534 3.187 17.962 9.293.864.821 2.887 2.273 3.296 3.296 3.29 8.223-7.576 15.009 3.757 26.3 1.245 1.24 3.813-3.817 4.079-4.614.852-2.563 6.725-5.45 9.088-7.053 2.02-1.37 4.873-2.667 6.328-4.745 2.27-3.244 1.48-7.514 3.098-10.745 2.139-4.274 3.828-9.635 5.998-13.966 3.898-7.781 4.721 2.093 5.067 2.439.358.357 1.011 0 1.517 0 .094 0 1.447.099 1.516 0 .65-.935-1.043-17.92-1.318-19.297-1.404-7.01-6.944-15.781-11.865-20.5-6.274-6.015-7.09-16.197-18.259-14.954-.204.022-5.084 10.148-7.777 13.512-3.728 4.657-2.47-4.153-6.526-4.153-.081 0-1.183-.103-1.253 0-.586.88-1.44 3.896-2.306 4.417-.265.16-1.722-.239-1.846 0-2.243 4.3 8.256 2.212 5.792 7.952-2.352 5.481-6.328-1.997-6.328 8.56M44.467 7.01c9.685 6.13.682 12.198 2.694 16.215 1.655 3.303 4.241 5.395 1.714 9.814-2.063 3.608-6.87 3.966-9.623 6.723-3.04 3.044-5.464 8.94-6.79 12.911-1.617 4.843 14.547 6.866 12.063 11.008-1.386 2.311-6.746 1.466-8.437.198-1.165-.873-3.593-.546-4.417-1.78-2.613-3.915-2.26-8.023-3.625-12.128-.938-2.822-6.313-2.12-7.844-.593-.523.522-.33 1.792-.33 2.505 0 5.285 7.12 3.316 7.12 6.46 0 14.636 3.927 6.534 11.14 11.336 10.036 6.683 7.844 7.303 14.946 14.404 3.673 3.673 7.741 3.686 9.425 9.294 1.602 5.331-9.327 5.339-11.716 7.448-1.123.991-2.813 4.146-4.219 4.615-1.792.598-3.234.496-4.944 1.78-2.427 1.82-3.9 4.932-4.02 4.81-2.148-2.147-3.52-15.479-3.89-18.257-.588-4.42-5.59-5.54-6.986-9.03-1.57-3.927 1.524-9.52-1.129-13.761-6.52-10.424-11.821-14.5-15.35-26.292-.942-3.148 3.342-6.529 4.877-8.833 1.877-2.816 2.662-5.854 4.746-8.635C22.147 24.19 40.855 9.461 43.857 8.635l.61-1.625z"/><path d="M64 126c34.242 0 62-27.758 62-62 0-34.242-27.758-62-62-62C29.758 2 2 29.758 2 64c0 34.242 27.758 62 62 62zm0-6c30.928 0 56-25.072 56-56S94.928 8 64 8 8 33.072 8 64s25.072 56 56 56z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-globe tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M72.811 37.128v2.554c0 2.196.978 6.881 0 8.832-1.466 2.928-4.65 3.54-6.394 5.867-1.182 1.577-4.618 10.601-3.69 12.92 3.969 9.922 11.534 3.187 17.962 9.293.864.821 2.887 2.273 3.296 3.296 3.29 8.223-7.576 15.009 3.757 26.3 1.245 1.24 3.813-3.817 4.079-4.614.852-2.563 6.725-5.45 9.088-7.053 2.02-1.37 4.873-2.667 6.328-4.745 2.27-3.244 1.48-7.514 3.098-10.745 2.139-4.274 3.828-9.635 5.998-13.966 3.898-7.781 4.721 2.093 5.067 2.439.358.357 1.011 0 1.517 0 .094 0 1.447.099 1.516 0 .65-.935-1.043-17.92-1.318-19.297-1.404-7.01-6.944-15.781-11.865-20.5-6.274-6.015-7.09-16.197-18.259-14.954-.204.022-5.084 10.148-7.777 13.512-3.728 4.657-2.47-4.153-6.526-4.153-.081 0-1.183-.103-1.253 0-.586.88-1.44 3.896-2.306 4.417-.265.16-1.722-.239-1.846 0-2.243 4.3 8.256 2.212 5.792 7.952-2.352 5.481-6.328-1.997-6.328 8.56M44.467 7.01c9.685 6.13.682 12.198 2.694 16.215 1.655 3.303 4.241 5.395 1.714 9.814-2.063 3.608-6.87 3.966-9.623 6.723-3.04 3.044-5.464 8.94-6.79 12.911-1.617 4.843 14.547 6.866 12.063 11.008-1.386 2.311-6.746 1.466-8.437.198-1.165-.873-3.593-.546-4.417-1.78-2.613-3.915-2.26-8.023-3.625-12.128-.938-2.822-6.313-2.12-7.844-.593-.523.522-.33 1.792-.33 2.505 0 5.285 7.12 3.316 7.12 6.46 0 14.636 3.927 6.534 11.14 11.336 10.036 6.683 7.844 7.303 14.946 14.404 3.673 3.673 7.741 3.686 9.425 9.294 1.602 5.331-9.327 5.339-11.716 7.448-1.123.991-2.813 4.146-4.219 4.615-1.792.598-3.234.496-4.944 1.78-2.427 1.82-3.9 4.932-4.02 4.81-2.148-2.147-3.52-15.479-3.89-18.257-.588-4.42-5.59-5.54-6.986-9.03-1.57-3.927 1.524-9.52-1.129-13.761-6.52-10.424-11.821-14.5-15.35-26.292-.942-3.148 3.342-6.529 4.877-8.833 1.877-2.816 2.662-5.854 4.746-8.635C22.147 24.19 40.855 9.461 43.857 8.635l.61-1.625z"/><path d="M64 126c34.242 0 62-27.758 62-62 0-34.242-27.758-62-62-62C29.758 2 2 29.758 2 64c0 34.242 27.758 62 62 62zm0-6c30.928 0 56-25.072 56-56S94.928 8 64 8 8 33.072 8 64s25.072 56 56 56z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/heading-1.tid b/core/images/heading-1.tid
index f8a98123b..d160284c9 100755
--- a/core/images/heading-1.tid
+++ b/core/images/heading-1.tid
@@ -1,4 +1,5 @@
title: $:/core/images/heading-1
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-heading-1 tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M14 30h13.25v30.104H61.7V30h13.25v75.684H61.7V71.552H27.25v34.132H14V30zm70.335 13.78c2.544 0 5.017-.212 7.42-.636 2.403-.424 4.576-1.13 6.52-2.12 1.942-.99 3.603-2.261 4.981-3.816 1.378-1.555 2.28-3.463 2.703-5.724h9.858v74.2h-13.25V53.32H84.335v-9.54z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-heading-1 tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M14 30h13.25v30.104H61.7V30h13.25v75.684H61.7V71.552H27.25v34.132H14V30zm70.335 13.78c2.544 0 5.017-.212 7.42-.636 2.403-.424 4.576-1.13 6.52-2.12 1.942-.99 3.603-2.261 4.981-3.816 1.378-1.555 2.28-3.463 2.703-5.724h9.858v74.2h-13.25V53.32H84.335v-9.54z"/></svg>
\ No newline at end of file
diff --git a/core/images/heading-2.tid b/core/images/heading-2.tid
index ef0022cc6..8daad0f10 100755
--- a/core/images/heading-2.tid
+++ b/core/images/heading-2.tid
@@ -1,4 +1,5 @@
title: $:/core/images/heading-2
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-heading-2 tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M6 30h13.25v30.104H53.7V30h13.25v75.684H53.7V71.552H19.25v34.132H6V30zm119.52 75.684H74.85c.07-6.148 1.555-11.519 4.452-16.112 2.897-4.593 6.855-8.586 11.872-11.978a133.725 133.725 0 017.526-5.141 59.6 59.6 0 007.208-5.353c2.19-1.908 3.993-3.975 5.406-6.201 1.413-2.226 2.155-4.788 2.226-7.685 0-1.343-.159-2.774-.477-4.293a11.357 11.357 0 00-1.855-4.24c-.919-1.307-2.19-2.403-3.816-3.286-1.625-.883-3.745-1.325-6.36-1.325-2.403 0-4.399.477-5.989 1.431-1.59.954-2.862 2.261-3.816 3.922-.954 1.66-1.66 3.622-2.12 5.883-.46 2.261-.724 4.7-.795 7.314H76.23c0-4.099.548-7.897 1.643-11.395 1.095-3.498 2.738-6.519 4.93-9.063 2.19-2.544 4.857-4.54 8.002-5.989C93.95 30.724 97.606 30 101.775 30c4.523 0 8.303.742 11.342 2.226 3.039 1.484 5.494 3.357 7.367 5.618 1.873 2.261 3.198 4.717 3.975 7.367.777 2.65 1.166 5.176 1.166 7.579 0 2.968-.46 5.653-1.378 8.056a25.942 25.942 0 01-3.71 6.625 37.5 37.5 0 01-5.3 5.565 79.468 79.468 0 01-6.148 4.77 165.627 165.627 0 01-6.36 4.24 94.28 94.28 0 00-5.883 4.028c-1.802 1.343-3.374 2.738-4.717 4.187-1.343 1.449-2.261 2.986-2.756 4.611h36.146v10.812z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-heading-2 tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M6 30h13.25v30.104H53.7V30h13.25v75.684H53.7V71.552H19.25v34.132H6V30zm119.52 75.684H74.85c.07-6.148 1.555-11.519 4.452-16.112 2.897-4.593 6.855-8.586 11.872-11.978a133.725 133.725 0 017.526-5.141 59.6 59.6 0 007.208-5.353c2.19-1.908 3.993-3.975 5.406-6.201 1.413-2.226 2.155-4.788 2.226-7.685 0-1.343-.159-2.774-.477-4.293a11.357 11.357 0 00-1.855-4.24c-.919-1.307-2.19-2.403-3.816-3.286-1.625-.883-3.745-1.325-6.36-1.325-2.403 0-4.399.477-5.989 1.431-1.59.954-2.862 2.261-3.816 3.922-.954 1.66-1.66 3.622-2.12 5.883-.46 2.261-.724 4.7-.795 7.314H76.23c0-4.099.548-7.897 1.643-11.395 1.095-3.498 2.738-6.519 4.93-9.063 2.19-2.544 4.857-4.54 8.002-5.989C93.95 30.724 97.606 30 101.775 30c4.523 0 8.303.742 11.342 2.226 3.039 1.484 5.494 3.357 7.367 5.618 1.873 2.261 3.198 4.717 3.975 7.367.777 2.65 1.166 5.176 1.166 7.579 0 2.968-.46 5.653-1.378 8.056a25.942 25.942 0 01-3.71 6.625 37.5 37.5 0 01-5.3 5.565 79.468 79.468 0 01-6.148 4.77 165.627 165.627 0 01-6.36 4.24 94.28 94.28 0 00-5.883 4.028c-1.802 1.343-3.374 2.738-4.717 4.187-1.343 1.449-2.261 2.986-2.756 4.611h36.146v10.812z"/></svg>
\ No newline at end of file
diff --git a/core/images/heading-3.tid b/core/images/heading-3.tid
index d706d067b..8a489e799 100755
--- a/core/images/heading-3.tid
+++ b/core/images/heading-3.tid
@@ -1,4 +1,5 @@
title: $:/core/images/heading-3
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-heading-3 tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M6 30h13.25v30.104H53.7V30h13.25v75.684H53.7V71.552H19.25v34.132H6V30zm88.885 32.224c1.979.07 3.957-.07 5.936-.424 1.979-.353 3.745-.972 5.3-1.855a10.365 10.365 0 003.763-3.657c.954-1.555 1.431-3.463 1.431-5.724 0-3.18-1.078-5.724-3.233-7.632-2.155-1.908-4.929-2.862-8.32-2.862-2.12 0-3.958.424-5.513 1.272a11.318 11.318 0 00-3.869 3.445c-1.025 1.449-1.784 3.074-2.279 4.876a18.335 18.335 0 00-.636 5.565H75.381c.141-3.604.813-6.943 2.014-10.017 1.201-3.074 2.844-5.742 4.93-8.003 2.084-2.261 4.61-4.028 7.578-5.3C92.871 30.636 96.228 30 99.973 30a29.2 29.2 0 018.533 1.272c2.791.848 5.3 2.085 7.526 3.71s4.01 3.692 5.353 6.201c1.343 2.509 2.014 5.388 2.014 8.639 0 3.745-.848 7.014-2.544 9.805-1.696 2.791-4.346 4.823-7.95 6.095v.212c4.24.848 7.544 2.95 9.911 6.307s3.551 7.438 3.551 12.243c0 3.533-.707 6.696-2.12 9.487a21.538 21.538 0 01-5.724 7.102c-2.403 1.943-5.194 3.445-8.374 4.505-3.18 1.06-6.537 1.59-10.07 1.59-4.31 0-8.074-.618-11.289-1.855s-5.9-2.986-8.056-5.247c-2.155-2.261-3.798-4.982-4.929-8.162-1.13-3.18-1.731-6.713-1.802-10.6h12.084c-.141 4.523.972 8.286 3.34 11.289 2.366 3.003 5.917 4.505 10.652 4.505 4.028 0 7.402-1.148 10.123-3.445 2.72-2.297 4.081-5.565 4.081-9.805 0-2.897-.565-5.194-1.696-6.89a10.97 10.97 0 00-4.452-3.869c-1.837-.883-3.904-1.431-6.2-1.643a58.067 58.067 0 00-7.05-.212v-9.01z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-heading-3 tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M6 30h13.25v30.104H53.7V30h13.25v75.684H53.7V71.552H19.25v34.132H6V30zm88.885 32.224c1.979.07 3.957-.07 5.936-.424 1.979-.353 3.745-.972 5.3-1.855a10.365 10.365 0 003.763-3.657c.954-1.555 1.431-3.463 1.431-5.724 0-3.18-1.078-5.724-3.233-7.632-2.155-1.908-4.929-2.862-8.32-2.862-2.12 0-3.958.424-5.513 1.272a11.318 11.318 0 00-3.869 3.445c-1.025 1.449-1.784 3.074-2.279 4.876a18.335 18.335 0 00-.636 5.565H75.381c.141-3.604.813-6.943 2.014-10.017 1.201-3.074 2.844-5.742 4.93-8.003 2.084-2.261 4.61-4.028 7.578-5.3C92.871 30.636 96.228 30 99.973 30a29.2 29.2 0 018.533 1.272c2.791.848 5.3 2.085 7.526 3.71s4.01 3.692 5.353 6.201c1.343 2.509 2.014 5.388 2.014 8.639 0 3.745-.848 7.014-2.544 9.805-1.696 2.791-4.346 4.823-7.95 6.095v.212c4.24.848 7.544 2.95 9.911 6.307s3.551 7.438 3.551 12.243c0 3.533-.707 6.696-2.12 9.487a21.538 21.538 0 01-5.724 7.102c-2.403 1.943-5.194 3.445-8.374 4.505-3.18 1.06-6.537 1.59-10.07 1.59-4.31 0-8.074-.618-11.289-1.855s-5.9-2.986-8.056-5.247c-2.155-2.261-3.798-4.982-4.929-8.162-1.13-3.18-1.731-6.713-1.802-10.6h12.084c-.141 4.523.972 8.286 3.34 11.289 2.366 3.003 5.917 4.505 10.652 4.505 4.028 0 7.402-1.148 10.123-3.445 2.72-2.297 4.081-5.565 4.081-9.805 0-2.897-.565-5.194-1.696-6.89a10.97 10.97 0 00-4.452-3.869c-1.837-.883-3.904-1.431-6.2-1.643a58.067 58.067 0 00-7.05-.212v-9.01z"/></svg>
\ No newline at end of file
diff --git a/core/images/heading-4.tid b/core/images/heading-4.tid
index 16d4440db..5aee3f3f8 100755
--- a/core/images/heading-4.tid
+++ b/core/images/heading-4.tid
@@ -1,4 +1,5 @@
title: $:/core/images/heading-4
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-heading-4 tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M8 30h13.25v30.104H55.7V30h13.25v75.684H55.7V71.552H21.25v34.132H8V30zm76.59 48.548h22.471V45.9h-.212L84.59 78.548zm43.46 9.54h-9.54v17.596H107.06V88.088h-31.8V76.11l31.8-44.626h11.448v47.064h9.54v9.54z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-heading-4 tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M8 30h13.25v30.104H55.7V30h13.25v75.684H55.7V71.552H21.25v34.132H8V30zm76.59 48.548h22.471V45.9h-.212L84.59 78.548zm43.46 9.54h-9.54v17.596H107.06V88.088h-31.8V76.11l31.8-44.626h11.448v47.064h9.54v9.54z"/></svg>
\ No newline at end of file
diff --git a/core/images/heading-5.tid b/core/images/heading-5.tid
index 8f34b7058..c9a54a335 100755
--- a/core/images/heading-5.tid
+++ b/core/images/heading-5.tid
@@ -1,4 +1,5 @@
title: $:/core/images/heading-5
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-heading-5 tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M6 30h13.25v30.104H53.7V30h13.25v75.684H53.7V71.552H19.25v34.132H6V30zm77.755 1.484h38.372v10.812H92.765L88.95 61.164l.212.212c1.625-1.837 3.692-3.233 6.201-4.187 2.509-.954 5-1.431 7.473-1.431 3.675 0 6.96.618 9.858 1.855 2.897 1.237 5.335 2.968 7.314 5.194s3.48 4.858 4.505 7.897c1.025 3.039 1.537 6.325 1.537 9.858 0 2.968-.477 6.024-1.43 9.169a25.161 25.161 0 01-4.559 8.586c-2.085 2.58-4.752 4.7-8.003 6.36-3.25 1.66-7.137 2.491-11.66 2.491-3.604 0-6.943-.477-10.017-1.431-3.074-.954-5.777-2.385-8.109-4.293-2.332-1.908-4.187-4.258-5.565-7.049-1.378-2.791-2.138-6.06-2.279-9.805h12.084c.353 4.028 1.731 7.12 4.134 9.275 2.403 2.155 5.583 3.233 9.54 3.233 2.544 0 4.7-.424 6.466-1.272 1.767-.848 3.198-2.014 4.293-3.498 1.095-1.484 1.873-3.215 2.332-5.194.46-1.979.69-4.099.69-6.36 0-2.05-.284-4.01-.849-5.883-.565-1.873-1.413-3.516-2.544-4.929-1.13-1.413-2.597-2.544-4.399-3.392-1.802-.848-3.904-1.272-6.307-1.272-2.544 0-4.929.477-7.155 1.431-2.226.954-3.834 2.738-4.823 5.353H75.805l7.95-40.598z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-heading-5 tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M6 30h13.25v30.104H53.7V30h13.25v75.684H53.7V71.552H19.25v34.132H6V30zm77.755 1.484h38.372v10.812H92.765L88.95 61.164l.212.212c1.625-1.837 3.692-3.233 6.201-4.187 2.509-.954 5-1.431 7.473-1.431 3.675 0 6.96.618 9.858 1.855 2.897 1.237 5.335 2.968 7.314 5.194s3.48 4.858 4.505 7.897c1.025 3.039 1.537 6.325 1.537 9.858 0 2.968-.477 6.024-1.43 9.169a25.161 25.161 0 01-4.559 8.586c-2.085 2.58-4.752 4.7-8.003 6.36-3.25 1.66-7.137 2.491-11.66 2.491-3.604 0-6.943-.477-10.017-1.431-3.074-.954-5.777-2.385-8.109-4.293-2.332-1.908-4.187-4.258-5.565-7.049-1.378-2.791-2.138-6.06-2.279-9.805h12.084c.353 4.028 1.731 7.12 4.134 9.275 2.403 2.155 5.583 3.233 9.54 3.233 2.544 0 4.7-.424 6.466-1.272 1.767-.848 3.198-2.014 4.293-3.498 1.095-1.484 1.873-3.215 2.332-5.194.46-1.979.69-4.099.69-6.36 0-2.05-.284-4.01-.849-5.883-.565-1.873-1.413-3.516-2.544-4.929-1.13-1.413-2.597-2.544-4.399-3.392-1.802-.848-3.904-1.272-6.307-1.272-2.544 0-4.929.477-7.155 1.431-2.226.954-3.834 2.738-4.823 5.353H75.805l7.95-40.598z"/></svg>
\ No newline at end of file
diff --git a/core/images/heading-6.tid b/core/images/heading-6.tid
index b348c70af..1034e7116 100755
--- a/core/images/heading-6.tid
+++ b/core/images/heading-6.tid
@@ -1,4 +1,5 @@
title: $:/core/images/heading-6
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-heading-6 tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M6 30h13.25v30.104H53.7V30h13.25v75.684H53.7V71.552H19.25v34.132H6V30zm106.587 20.246c-.283-3.039-1.36-5.494-3.233-7.367-1.873-1.873-4.399-2.809-7.579-2.809-2.19 0-4.08.406-5.67 1.219a12.435 12.435 0 00-4.029 3.233c-1.095 1.343-1.979 2.88-2.65 4.611a37.696 37.696 0 00-1.643 5.459 46.08 46.08 0 00-.9 5.671 722.213 722.213 0 00-.478 5.247l.212.212c1.625-2.968 3.87-5.176 6.731-6.625 2.862-1.449 5.954-2.173 9.275-2.173 3.675 0 6.96.636 9.858 1.908 2.897 1.272 5.353 3.021 7.367 5.247 2.014 2.226 3.551 4.858 4.611 7.897 1.06 3.039 1.59 6.325 1.59 9.858 0 3.604-.583 6.943-1.749 10.017-1.166 3.074-2.844 5.76-5.035 8.056-2.19 2.297-4.805 4.081-7.844 5.353-3.039 1.272-6.395 1.908-10.07 1.908-5.441 0-9.91-1.007-13.409-3.021-3.498-2.014-6.254-4.77-8.268-8.268-2.014-3.498-3.41-7.597-4.187-12.296-.777-4.7-1.166-9.77-1.166-15.211 0-4.452.477-8.94 1.431-13.462.954-4.523 2.526-8.639 4.717-12.349 2.19-3.71 5.07-6.731 8.64-9.063C92.676 31.166 97.075 30 102.304 30c2.968 0 5.76.495 8.374 1.484 2.615.99 4.93 2.367 6.943 4.134 2.014 1.767 3.657 3.887 4.93 6.36 1.271 2.473 1.978 5.23 2.12 8.268h-12.085zm-11.66 46.852c2.19 0 4.099-.442 5.724-1.325a12.869 12.869 0 004.081-3.445c1.095-1.413 1.908-3.056 2.438-4.929.53-1.873.795-3.798.795-5.777s-.265-3.887-.795-5.724c-.53-1.837-1.343-3.445-2.438-4.823-1.095-1.378-2.456-2.491-4.08-3.339-1.626-.848-3.534-1.272-5.725-1.272-2.19 0-4.116.406-5.777 1.219-1.66.813-3.056 1.908-4.187 3.286-1.13 1.378-1.979 2.986-2.544 4.823-.565 1.837-.848 3.78-.848 5.83 0 2.05.283 3.993.848 5.83.565 1.837 1.413 3.48 2.544 4.929a12.39 12.39 0 004.187 3.445c1.66.848 3.586 1.272 5.777 1.272z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-heading-6 tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M6 30h13.25v30.104H53.7V30h13.25v75.684H53.7V71.552H19.25v34.132H6V30zm106.587 20.246c-.283-3.039-1.36-5.494-3.233-7.367-1.873-1.873-4.399-2.809-7.579-2.809-2.19 0-4.08.406-5.67 1.219a12.435 12.435 0 00-4.029 3.233c-1.095 1.343-1.979 2.88-2.65 4.611a37.696 37.696 0 00-1.643 5.459 46.08 46.08 0 00-.9 5.671 722.213 722.213 0 00-.478 5.247l.212.212c1.625-2.968 3.87-5.176 6.731-6.625 2.862-1.449 5.954-2.173 9.275-2.173 3.675 0 6.96.636 9.858 1.908 2.897 1.272 5.353 3.021 7.367 5.247 2.014 2.226 3.551 4.858 4.611 7.897 1.06 3.039 1.59 6.325 1.59 9.858 0 3.604-.583 6.943-1.749 10.017-1.166 3.074-2.844 5.76-5.035 8.056-2.19 2.297-4.805 4.081-7.844 5.353-3.039 1.272-6.395 1.908-10.07 1.908-5.441 0-9.91-1.007-13.409-3.021-3.498-2.014-6.254-4.77-8.268-8.268-2.014-3.498-3.41-7.597-4.187-12.296-.777-4.7-1.166-9.77-1.166-15.211 0-4.452.477-8.94 1.431-13.462.954-4.523 2.526-8.639 4.717-12.349 2.19-3.71 5.07-6.731 8.64-9.063C92.676 31.166 97.075 30 102.304 30c2.968 0 5.76.495 8.374 1.484 2.615.99 4.93 2.367 6.943 4.134 2.014 1.767 3.657 3.887 4.93 6.36 1.271 2.473 1.978 5.23 2.12 8.268h-12.085zm-11.66 46.852c2.19 0 4.099-.442 5.724-1.325a12.869 12.869 0 004.081-3.445c1.095-1.413 1.908-3.056 2.438-4.929.53-1.873.795-3.798.795-5.777s-.265-3.887-.795-5.724c-.53-1.837-1.343-3.445-2.438-4.823-1.095-1.378-2.456-2.491-4.08-3.339-1.626-.848-3.534-1.272-5.725-1.272-2.19 0-4.116.406-5.777 1.219-1.66.813-3.056 1.908-4.187 3.286-1.13 1.378-1.979 2.986-2.544 4.823-.565 1.837-.848 3.78-.848 5.83 0 2.05.283 3.993.848 5.83.565 1.837 1.413 3.48 2.544 4.929a12.39 12.39 0 004.187 3.445c1.66.848 3.586 1.272 5.777 1.272z"/></svg>
\ No newline at end of file
diff --git a/core/images/help.tid b/core/images/help.tid
index 07167ae93..5c0cf13ab 100755
--- a/core/images/help.tid
+++ b/core/images/help.tid
@@ -1,4 +1,5 @@
title: $:/core/images/help
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-help tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M36.055 111.441c-5.24 4.396-15.168 7.362-26.555 7.362-1.635 0-3.24-.06-4.806-.179 7.919-2.64 14.062-8.6 16.367-16.014C8.747 92.845 1.05 78.936 1.05 63.5c0-29.547 28.206-53.5 63-53.5s63 23.953 63 53.5-28.206 53.5-63 53.5c-10.055 0-19.56-2-27.994-5.559zm35.35-33.843a536.471 536.471 0 00.018-4.682 199.02 199.02 0 00-.023-3.042c.008-1.357.595-2.087 3.727-4.235.112-.077 1.085-.74 1.386-.948 3.093-2.133 5.022-3.786 6.762-6.187 2.34-3.228 3.558-7.077 3.558-11.649 0-13.292-9.86-21.952-21.455-21.952-11.103 0-22.499 9.609-24.066 22.295a6.023 6.023 0 1011.956 1.477c.806-6.527 6.972-11.726 12.11-11.726 5.265 0 9.408 3.64 9.408 9.906 0 3.634-1.1 5.153-5.111 7.919l-1.362.93c-2.682 1.84-4.227 3.1-5.7 4.931-2.109 2.62-3.242 5.717-3.258 9.314.013.892.02 1.86.022 2.981a470.766 470.766 0 01-.022 4.943 6.023 6.023 0 1012.046.12l.003-.395zm-6.027 24.499a7.529 7.529 0 100-15.058 7.529 7.529 0 000 15.058z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-help tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M36.055 111.441c-5.24 4.396-15.168 7.362-26.555 7.362-1.635 0-3.24-.06-4.806-.179 7.919-2.64 14.062-8.6 16.367-16.014C8.747 92.845 1.05 78.936 1.05 63.5c0-29.547 28.206-53.5 63-53.5s63 23.953 63 53.5-28.206 53.5-63 53.5c-10.055 0-19.56-2-27.994-5.559zm35.35-33.843a536.471 536.471 0 00.018-4.682 199.02 199.02 0 00-.023-3.042c.008-1.357.595-2.087 3.727-4.235.112-.077 1.085-.74 1.386-.948 3.093-2.133 5.022-3.786 6.762-6.187 2.34-3.228 3.558-7.077 3.558-11.649 0-13.292-9.86-21.952-21.455-21.952-11.103 0-22.499 9.609-24.066 22.295a6.023 6.023 0 1011.956 1.477c.806-6.527 6.972-11.726 12.11-11.726 5.265 0 9.408 3.64 9.408 9.906 0 3.634-1.1 5.153-5.111 7.919l-1.362.93c-2.682 1.84-4.227 3.1-5.7 4.931-2.109 2.62-3.242 5.717-3.258 9.314.013.892.02 1.86.022 2.981a470.766 470.766 0 01-.022 4.943 6.023 6.023 0 1012.046.12l.003-.395zm-6.027 24.499a7.529 7.529 0 100-15.058 7.529 7.529 0 000 15.058z"/></svg>
\ No newline at end of file
diff --git a/core/images/home-button.tid b/core/images/home-button.tid
index 10c00626a..952ab9a60 100755
--- a/core/images/home-button.tid
+++ b/core/images/home-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/home-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-home-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M112.985 119.502c.01-.165.015-.331.015-.499V67.568c3.137 2.948 8.076 2.884 11.134-.174a7.999 7.999 0 00-.002-11.316L70.396 2.343A7.978 7.978 0 0064.734 0a7.957 7.957 0 00-5.656 2.343L33 28.42V8.007C33 3.585 29.41 0 25 0c-4.418 0-8 3.59-8 8.007V44.42L5.342 56.078c-3.125 3.125-3.12 8.198-.002 11.316a7.999 7.999 0 0011.316-.003l.344-.343v52.945a8.11 8.11 0 000 .007c0 4.418 3.588 8 8 8h80c4.419 0 8-3.59 8-8a8.11 8.11 0 00-.015-.498zM97 112V51.574L64.737 19.31 33 51.048V112h64z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-home-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M112.985 119.502c.01-.165.015-.331.015-.499V67.568c3.137 2.948 8.076 2.884 11.134-.174a7.999 7.999 0 00-.002-11.316L70.396 2.343A7.978 7.978 0 0064.734 0a7.957 7.957 0 00-5.656 2.343L33 28.42V8.007C33 3.585 29.41 0 25 0c-4.418 0-8 3.59-8 8.007V44.42L5.342 56.078c-3.125 3.125-3.12 8.198-.002 11.316a7.999 7.999 0 0011.316-.003l.344-.343v52.945a8.11 8.11 0 000 .007c0 4.418 3.588 8 8 8h80c4.419 0 8-3.59 8-8a8.11 8.11 0 00-.015-.498zM97 112V51.574L64.737 19.31 33 51.048V112h64z"/></svg>
\ No newline at end of file
diff --git a/core/images/import-button.tid b/core/images/import-button.tid
index 6850513ef..a42c416e5 100755
--- a/core/images/import-button.tid
+++ b/core/images/import-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/import-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-import-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M114.832 60.436s3.235-3.27 6.921.417c3.686 3.686.231 7.14.231 7.14l-42.153 42.92s-30.765 32.367-58.798 4.333C-7 87.213 24.59 55.623 24.59 55.623L67.363 12.85s22.725-24.6 43.587-3.738c20.862 20.862-3.96 43.09-3.96 43.09l-35.04 35.04S49.903 112.546 36.426 99.07c-13.476-13.477 11.83-35.523 11.83-35.523l35.04-35.04s3.902-3.902 7.78-.023c3.879 3.878.118 7.921.118 7.921l-35.04 35.04s-13.212 13.212-8.872 17.551c4.34 4.34 16.77-9.653 16.77-9.653l35.04-35.04s16.668-14.598 3.966-27.3c-13.893-13.892-27.565 3.702-27.565 3.702l-42.91 42.91s-23.698 23.698-3.658 43.738 43.012-4.385 43.012-4.385l42.895-42.533z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-import-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M114.832 60.436s3.235-3.27 6.921.417c3.686 3.686.231 7.14.231 7.14l-42.153 42.92s-30.765 32.367-58.798 4.333C-7 87.213 24.59 55.623 24.59 55.623L67.363 12.85s22.725-24.6 43.587-3.738c20.862 20.862-3.96 43.09-3.96 43.09l-35.04 35.04S49.903 112.546 36.426 99.07c-13.476-13.477 11.83-35.523 11.83-35.523l35.04-35.04s3.902-3.902 7.78-.023c3.879 3.878.118 7.921.118 7.921l-35.04 35.04s-13.212 13.212-8.872 17.551c4.34 4.34 16.77-9.653 16.77-9.653l35.04-35.04s16.668-14.598 3.966-27.3c-13.893-13.892-27.565 3.702-27.565 3.702l-42.91 42.91s-23.698 23.698-3.658 43.738 43.012-4.385 43.012-4.385l42.895-42.533z"/></svg>
\ No newline at end of file
diff --git a/core/images/info-button.tid b/core/images/info-button.tid
index 2679a135a..e8f8e98c4 100755
--- a/core/images/info-button.tid
+++ b/core/images/info-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/info-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-info-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd" transform="translate(.05)"><path d="M64 128c35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64C28.654 0 0 28.654 0 64c0 35.346 28.654 64 64 64zm0-16c26.51 0 48-21.49 48-48S90.51 16 64 16 16 37.49 16 64s21.49 48 48 48z"/><circle cx="64" cy="32" r="8"/><rect width="16" height="56" x="56" y="48" rx="8"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-info-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd" transform="translate(.05)"><path d="M64 128c35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64C28.654 0 0 28.654 0 64c0 35.346 28.654 64 64 64zm0-16c26.51 0 48-21.49 48-48S90.51 16 64 16 16 37.49 16 64s21.49 48 48 48z"/><circle cx="64" cy="32" r="8"/><rect width="16" height="56" x="56" y="48" rx="8"/></g></svg>
\ No newline at end of file
diff --git a/core/images/input-button.tid b/core/images/input-button.tid
new file mode 100644
index 000000000..731a1e0cd
--- /dev/null
+++ b/core/images/input-button.tid
@@ -0,0 +1,5 @@
+title: $:/core/images/input-button
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-input-button tc-image-button" viewBox="0 0 22 22"><path d="M1.375 22h19.249c.365 0 .716-.145.973-.404v.001c.258-.257.404-.607.403-.972v-11a1.376 1.376 0 0 0-2.75 0v9.625H2.75V9.625a1.376 1.376 0 0 0-2.75 0v11C0 21.384.617 22 1.375 22Z"/><path d="m9.732 11.904-1.541-1.541a1.375 1.375 0 1 0-1.944 1.944l3.887 3.888c.258.258.608.402.973.402h-.001c.353 0 .705-.134.974-.402l3.888-3.889a1.376 1.376 0 0 0 .001-1.944 1.377 1.377 0 0 0-1.946 0l-1.541 1.542V1.376a1.375 1.375 0 1 0-2.75 0v10.528Z"/></svg>
\ No newline at end of file
diff --git a/core/images/italic.tid b/core/images/italic.tid
index 06aada589..766d3707a 100755
--- a/core/images/italic.tid
+++ b/core/images/italic.tid
@@ -1,4 +1,5 @@
title: $:/core/images/italic
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-italic tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M66.711 0h22.41L62.408 128H40z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-italic tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M66.711 0h22.41L62.408 128H40z"/></svg>
\ No newline at end of file
diff --git a/core/images/language.tid b/core/images/language.tid
new file mode 100644
index 000000000..bb4061495
--- /dev/null
+++ b/core/images/language.tid
@@ -0,0 +1,5 @@
+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>
\ No newline at end of file
diff --git a/core/images/layout-button.tid b/core/images/layout-button.tid
new file mode 100755
index 000000000..a859edbc5
--- /dev/null
+++ b/core/images/layout-button.tid
@@ -0,0 +1,5 @@
+title: $:/core/images/layout-button
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-layout-button tc-image-button" viewBox="0 0 24 24" stroke-width="1" stroke="none"><path d="M0 0h24v24H0z" fill="none"/><rect x="2" y="2" width="7" height="7" rx="2"/><rect x="2" y="13" width="7" height="9" rx="2"/><rect x="12" y="2" width="10" height="20" rx="2"/></svg>
\ No newline at end of file
diff --git a/core/images/left-arrow.tid b/core/images/left-arrow.tid
index a418581cd..b64fc2ab6 100755
--- a/core/images/left-arrow.tid
+++ b/core/images/left-arrow.tid
@@ -3,4 +3,5 @@ modified: 20150315235324760
tags: $:/tags/Image
title: $:/core/images/left-arrow
-<svg width="22pt" height="22pt" class="tc-image-left-arrow tc-image-button" viewBox="0 0 128 128"><path d="M0 64.177c0-2.026.771-4.054 2.317-5.6l55.98-55.98a7.92 7.92 0 0111.195.001c3.086 3.085 3.092 8.104.001 11.195L19.111 64.175l50.382 50.382a7.92 7.92 0 010 11.195c-3.086 3.086-8.105 3.092-11.196.001l-55.98-55.98A7.892 7.892 0 010 64.177z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-left-arrow tc-image-button" viewBox="0 0 128 128"><path d="M0 64.177c0-2.026.771-4.054 2.317-5.6l55.98-55.98a7.92 7.92 0 0111.195.001c3.086 3.085 3.092 8.104.001 11.195L19.111 64.175l50.382 50.382a7.92 7.92 0 010 11.195c-3.086 3.086-8.105 3.092-11.196.001l-55.98-55.98A7.892 7.892 0 010 64.177z"/></svg>
\ No newline at end of file
diff --git a/core/images/line-width.tid b/core/images/line-width.tid
index f77763ce6..9cecc33cb 100755
--- a/core/images/line-width.tid
+++ b/core/images/line-width.tid
@@ -1,4 +1,5 @@
title: $:/core/images/line-width
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-line-width tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M16 18h96a2 2 0 000-4H16a2 2 0 100 4zm0 17h96a4 4 0 100-8H16a4 4 0 100 8zm0 21h96a6 6 0 000-12H16a6 6 0 100 12zm0 29h96c5.523 0 10-4.477 10-10s-4.477-10-10-10H16c-5.523 0-10 4.477-10 10s4.477 10 10 10zm0 43h96c8.837 0 16-7.163 16-16s-7.163-16-16-16H16c-8.837 0-16 7.163-16 16s7.163 16 16 16z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-line-width tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M16 18h96a2 2 0 000-4H16a2 2 0 100 4zm0 17h96a4 4 0 100-8H16a4 4 0 100 8zm0 21h96a6 6 0 000-12H16a6 6 0 100 12zm0 29h96c5.523 0 10-4.477 10-10s-4.477-10-10-10H16c-5.523 0-10 4.477-10 10s4.477 10 10 10zm0 43h96c8.837 0 16-7.163 16-16s-7.163-16-16-16H16c-8.837 0-16 7.163-16 16s7.163 16 16 16z"/></svg>
\ No newline at end of file
diff --git a/core/images/link.tid b/core/images/link.tid
index 395307c42..c1d134f7e 100644
--- a/core/images/link.tid
+++ b/core/images/link.tid
@@ -1,4 +1,5 @@
title: $:/core/images/link
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-link tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M42.263 69.38a31.919 31.919 0 006.841 10.13c12.5 12.5 32.758 12.496 45.255 0l22.627-22.628c12.502-12.501 12.497-32.758 0-45.255-12.5-12.5-32.758-12.496-45.254 0L49.104 34.255a32.333 32.333 0 00-2.666 3.019 36.156 36.156 0 0121.94.334l14.663-14.663c6.25-6.25 16.382-6.254 22.632-.004 6.248 6.249 6.254 16.373-.004 22.631l-22.62 22.62c-6.25 6.25-16.381 6.254-22.631.004a15.93 15.93 0 01-4.428-8.433 11.948 11.948 0 00-7.59 3.48l-6.137 6.137z"/><path d="M86.35 59.234a31.919 31.919 0 00-6.84-10.13c-12.5-12.5-32.758-12.497-45.255 0L11.627 71.732c-12.501 12.5-12.496 32.758 0 45.254 12.5 12.5 32.758 12.497 45.255 0L79.51 94.36a32.333 32.333 0 002.665-3.02 36.156 36.156 0 01-21.94-.333l-14.663 14.663c-6.25 6.25-16.381 6.253-22.63.004-6.25-6.249-6.255-16.374.003-22.632l22.62-22.62c6.25-6.25 16.381-6.253 22.631-.003a15.93 15.93 0 014.428 8.432 11.948 11.948 0 007.59-3.48l6.137-6.136z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-link tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M42.263 69.38a31.919 31.919 0 006.841 10.13c12.5 12.5 32.758 12.496 45.255 0l22.627-22.628c12.502-12.501 12.497-32.758 0-45.255-12.5-12.5-32.758-12.496-45.254 0L49.104 34.255a32.333 32.333 0 00-2.666 3.019 36.156 36.156 0 0121.94.334l14.663-14.663c6.25-6.25 16.382-6.254 22.632-.004 6.248 6.249 6.254 16.373-.004 22.631l-22.62 22.62c-6.25 6.25-16.381 6.254-22.631.004a15.93 15.93 0 01-4.428-8.433 11.948 11.948 0 00-7.59 3.48l-6.137 6.137z"/><path d="M86.35 59.234a31.919 31.919 0 00-6.84-10.13c-12.5-12.5-32.758-12.497-45.255 0L11.627 71.732c-12.501 12.5-12.496 32.758 0 45.254 12.5 12.5 32.758 12.497 45.255 0L79.51 94.36a32.333 32.333 0 002.665-3.02 36.156 36.156 0 01-21.94-.333l-14.663 14.663c-6.25 6.25-16.381 6.253-22.63.004-6.25-6.249-6.255-16.374.003-22.632l22.62-22.62c6.25-6.25 16.381-6.253 22.631-.003a15.93 15.93 0 014.428 8.432 11.948 11.948 0 007.59-3.48l6.137-6.136z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/linkify.tid b/core/images/linkify.tid
index 40acdc19a..d616c2ac9 100644
--- a/core/images/linkify.tid
+++ b/core/images/linkify.tid
@@ -1,4 +1,5 @@
title: $:/core/images/linkify
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-linkify-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M17.031 31.919H9.048V96.85h7.983v6.92H0V25h17.031v6.919zm24.66 0h-7.983V96.85h7.983v6.92H24.66V25h17.03v6.919zM67.77 56.422l11.975-3.903 2.306 7.096-12.063 3.903 7.628 10.379-6.12 4.435-7.63-10.467-7.45 10.2-5.943-4.523L58.1 63.518 45.95 59.35l2.306-7.096 12.064 4.17V43.825h7.45v12.596zM86.31 96.85h7.982V31.92H86.31V25h17.031v78.77H86.31v-6.92zm24.659 0h7.983V31.92h-7.983V25H128v78.77h-17.031v-6.92z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-linkify-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M17.031 31.919H9.048V96.85h7.983v6.92H0V25h17.031v6.919zm24.66 0h-7.983V96.85h7.983v6.92H24.66V25h17.03v6.919zM67.77 56.422l11.975-3.903 2.306 7.096-12.063 3.903 7.628 10.379-6.12 4.435-7.63-10.467-7.45 10.2-5.943-4.523L58.1 63.518 45.95 59.35l2.306-7.096 12.064 4.17V43.825h7.45v12.596zM86.31 96.85h7.982V31.92H86.31V25h17.031v78.77H86.31v-6.92zm24.659 0h7.983V31.92h-7.983V25H128v78.77h-17.031v-6.92z"/></svg>
\ No newline at end of file
diff --git a/core/images/list-bullet.tid b/core/images/list-bullet.tid
index 322dd4ae6..065d96c4f 100755
--- a/core/images/list-bullet.tid
+++ b/core/images/list-bullet.tid
@@ -1,4 +1,5 @@
title: $:/core/images/list-bullet
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-list-bullet tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M11.636 40.273c6.427 0 11.637-5.21 11.637-11.637C23.273 22.21 18.063 17 11.636 17 5.21 17 0 22.21 0 28.636c0 6.427 5.21 11.637 11.636 11.637zm0 34.909c6.427 0 11.637-5.21 11.637-11.637 0-6.426-5.21-11.636-11.637-11.636C5.21 51.91 0 57.12 0 63.545c0 6.427 5.21 11.637 11.636 11.637zm0 34.909c6.427 0 11.637-5.21 11.637-11.636 0-6.427-5.21-11.637-11.637-11.637C5.21 86.818 0 92.028 0 98.455c0 6.426 5.21 11.636 11.636 11.636zM34.91 22.818H128v11.637H34.91V22.818zm0 34.91H128v11.636H34.91V57.727zm0 34.908H128v11.637H34.91V92.636z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-list-bullet tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M11.636 40.273c6.427 0 11.637-5.21 11.637-11.637C23.273 22.21 18.063 17 11.636 17 5.21 17 0 22.21 0 28.636c0 6.427 5.21 11.637 11.636 11.637zm0 34.909c6.427 0 11.637-5.21 11.637-11.637 0-6.426-5.21-11.636-11.637-11.636C5.21 51.91 0 57.12 0 63.545c0 6.427 5.21 11.637 11.636 11.637zm0 34.909c6.427 0 11.637-5.21 11.637-11.636 0-6.427-5.21-11.637-11.637-11.637C5.21 86.818 0 92.028 0 98.455c0 6.426 5.21 11.636 11.636 11.636zM34.91 22.818H128v11.637H34.91V22.818zm0 34.91H128v11.636H34.91V57.727zm0 34.908H128v11.637H34.91V92.636z"/></svg>
\ No newline at end of file
diff --git a/core/images/list-number.tid b/core/images/list-number.tid
index 161917823..b70d4db15 100755
--- a/core/images/list-number.tid
+++ b/core/images/list-number.tid
@@ -1,4 +1,5 @@
title: $:/core/images/list-number
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-list-number tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M33.84 22.356H128v11.77H33.84v-11.77zm0 35.31H128v11.77H33.84v-11.77zm0 35.311H128v11.77H33.84v-11.77zM.38 42.631v-2.223h.998c.826 0 1.445-.14 1.858-.42.413-.28.619-.948.619-2.002V22.769c0-1.442-.193-2.336-.58-2.683-.385-.347-1.477-.52-3.275-.52v-2.143c3.502-.147 6.252-.955 8.25-2.423h2.117v22.865c0 .921.15 1.575.449 1.963.3.387.949.58 1.948.58h.998v2.223H.38zm-.3 35.356v-1.902c7.19-6.554 10.786-12.58 10.786-18.08 0-1.562-.326-2.81-.979-3.744-.652-.934-1.524-1.402-2.616-1.402-.893 0-1.655.317-2.287.952-.633.634-.95 1.364-.95 2.192 0 .974.247 1.829.74 2.563.106.16.16.28.16.36 0 .147-.16.28-.48.4-.213.08-.752.308-1.618.681-.839.374-1.358.561-1.558.561-.24 0-.512-.37-.819-1.111A6.2 6.2 0 010 57.064c0-1.949.849-3.544 2.547-4.785 1.698-1.242 3.798-1.862 6.302-1.862 2.463 0 4.53.67 6.202 2.012 1.67 1.341 2.506 3.093 2.506 5.256a8.644 8.644 0 01-.849 3.724c-.566 1.201-1.92 3.053-4.064 5.556a165.471 165.471 0 01-6.272 6.938h11.445l-1.019 5.726h-2.117c.08-.28.12-.534.12-.76 0-.388-.1-.631-.3-.731-.2-.1-.599-.15-1.198-.15H.08zm12.124 19.207c1.745.04 3.236.637 4.474 1.792 1.239 1.154 1.858 2.773 1.858 4.855 0 2.99-1.132 5.393-3.396 7.208-2.263 1.815-5 2.723-8.209 2.723-2.01 0-3.669-.384-4.974-1.151C.652 111.853 0 110.849 0 109.607c0-.774.27-1.398.809-1.872.54-.474 1.128-.71 1.768-.71.639 0 1.162.2 1.568.6.406.4.782 1.055 1.128 1.962.466 1.268 1.239 1.902 2.317 1.902 1.265 0 2.287-.477 3.066-1.431.78-.955 1.169-2.686 1.169-5.196 0-1.709-.12-3.023-.36-3.944-.24-.921-.792-1.382-1.658-1.382-.586 0-1.185.307-1.797.921-.493.494-.932.741-1.319.741-.333 0-.602-.147-.809-.44-.206-.294-.31-.574-.31-.841 0-.32.104-.594.31-.821.207-.227.69-.594 1.449-1.102 2.876-1.922 4.314-4.017 4.314-6.287 0-1.188-.306-2.092-.919-2.713a3.001 3.001 0 00-2.217-.93c-.799 0-1.525.263-2.177.79-.653.528-.979 1.158-.979 1.892 0 .641.253 1.235.76 1.782.172.2.259.367.259.5 0 .121-.57.428-1.708.922-1.139.494-1.854.74-2.147.74-.413 0-.75-.333-1.009-1-.26-.668-.39-1.282-.39-1.842 0-1.749.93-3.224 2.787-4.425 1.858-1.202 3.965-1.802 6.322-1.802 2.064 0 3.851.447 5.363 1.341 1.511.895 2.267 2.116 2.267 3.664 0 1.362-.57 2.623-1.708 3.784a13.387 13.387 0 01-3.945 2.784z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-list-number tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M33.84 22.356H128v11.77H33.84v-11.77zm0 35.31H128v11.77H33.84v-11.77zm0 35.311H128v11.77H33.84v-11.77zM.38 42.631v-2.223h.998c.826 0 1.445-.14 1.858-.42.413-.28.619-.948.619-2.002V22.769c0-1.442-.193-2.336-.58-2.683-.385-.347-1.477-.52-3.275-.52v-2.143c3.502-.147 6.252-.955 8.25-2.423h2.117v22.865c0 .921.15 1.575.449 1.963.3.387.949.58 1.948.58h.998v2.223H.38zm-.3 35.356v-1.902c7.19-6.554 10.786-12.58 10.786-18.08 0-1.562-.326-2.81-.979-3.744-.652-.934-1.524-1.402-2.616-1.402-.893 0-1.655.317-2.287.952-.633.634-.95 1.364-.95 2.192 0 .974.247 1.829.74 2.563.106.16.16.28.16.36 0 .147-.16.28-.48.4-.213.08-.752.308-1.618.681-.839.374-1.358.561-1.558.561-.24 0-.512-.37-.819-1.111A6.2 6.2 0 010 57.064c0-1.949.849-3.544 2.547-4.785 1.698-1.242 3.798-1.862 6.302-1.862 2.463 0 4.53.67 6.202 2.012 1.67 1.341 2.506 3.093 2.506 5.256a8.644 8.644 0 01-.849 3.724c-.566 1.201-1.92 3.053-4.064 5.556a165.471 165.471 0 01-6.272 6.938h11.445l-1.019 5.726h-2.117c.08-.28.12-.534.12-.76 0-.388-.1-.631-.3-.731-.2-.1-.599-.15-1.198-.15H.08zm12.124 19.207c1.745.04 3.236.637 4.474 1.792 1.239 1.154 1.858 2.773 1.858 4.855 0 2.99-1.132 5.393-3.396 7.208-2.263 1.815-5 2.723-8.209 2.723-2.01 0-3.669-.384-4.974-1.151C.652 111.853 0 110.849 0 109.607c0-.774.27-1.398.809-1.872.54-.474 1.128-.71 1.768-.71.639 0 1.162.2 1.568.6.406.4.782 1.055 1.128 1.962.466 1.268 1.239 1.902 2.317 1.902 1.265 0 2.287-.477 3.066-1.431.78-.955 1.169-2.686 1.169-5.196 0-1.709-.12-3.023-.36-3.944-.24-.921-.792-1.382-1.658-1.382-.586 0-1.185.307-1.797.921-.493.494-.932.741-1.319.741-.333 0-.602-.147-.809-.44-.206-.294-.31-.574-.31-.841 0-.32.104-.594.31-.821.207-.227.69-.594 1.449-1.102 2.876-1.922 4.314-4.017 4.314-6.287 0-1.188-.306-2.092-.919-2.713a3.001 3.001 0 00-2.217-.93c-.799 0-1.525.263-2.177.79-.653.528-.979 1.158-.979 1.892 0 .641.253 1.235.76 1.782.172.2.259.367.259.5 0 .121-.57.428-1.708.922-1.139.494-1.854.74-2.147.74-.413 0-.75-.333-1.009-1-.26-.668-.39-1.282-.39-1.842 0-1.749.93-3.224 2.787-4.425 1.858-1.202 3.965-1.802 6.322-1.802 2.064 0 3.851.447 5.363 1.341 1.511.895 2.267 2.116 2.267 3.664 0 1.362-.57 2.623-1.708 3.784a13.387 13.387 0 01-3.945 2.784z"/></svg>
\ No newline at end of file
diff --git a/core/images/list.tid b/core/images/list.tid
index 22b784bfe..793b47957 100644
--- a/core/images/list.tid
+++ b/core/images/list.tid
@@ -1,4 +1,5 @@
title: $:/core/images/list
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-list tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M87.748 128H23.999c-4.418 0-7.999-3.59-7.999-8.007V8.007C16 3.585 19.588 0 24 0h80c4.419 0 8 3.59 8 8.007V104H91.25c-.965 0-1.84.392-2.473 1.025a3.476 3.476 0 00-1.029 2.476V128zm8-.12l15.88-15.88h-15.88v15.88zM40 15.508A3.502 3.502 0 0143.5 12h55c1.933 0 3.5 1.561 3.5 3.509v.982A3.502 3.502 0 0198.5 20h-55a3.498 3.498 0 01-3.5-3.509v-.982zM32 22a6 6 0 100-12 6 6 0 000 12zm8 9.509A3.502 3.502 0 0143.5 28h55c1.933 0 3.5 1.561 3.5 3.509v.982A3.502 3.502 0 0198.5 36h-55a3.498 3.498 0 01-3.5-3.509v-.982zm0 16A3.502 3.502 0 0143.5 44h55c1.933 0 3.5 1.561 3.5 3.509v.982A3.502 3.502 0 0198.5 52h-55a3.498 3.498 0 01-3.5-3.509v-.982zm0 16A3.502 3.502 0 0143.5 60h55c1.933 0 3.5 1.561 3.5 3.509v.982A3.502 3.502 0 0198.5 68h-55a3.498 3.498 0 01-3.5-3.509v-.982zm0 16A3.502 3.502 0 0143.5 76h55c1.933 0 3.5 1.561 3.5 3.509v.982A3.502 3.502 0 0198.5 84h-55a3.498 3.498 0 01-3.5-3.509v-.982zm0 16A3.502 3.502 0 0143.5 92h55c1.933 0 3.5 1.561 3.5 3.509v.982A3.502 3.502 0 0198.5 100h-55a3.498 3.498 0 01-3.5-3.509v-.982zm0 16A3.505 3.505 0 0143.497 108h33.006A3.497 3.497 0 0180 111.509v.982A3.505 3.505 0 0176.503 116H43.497A3.497 3.497 0 0140 112.491v-.982zM32 38a6 6 0 100-12 6 6 0 000 12zm0 16a6 6 0 100-12 6 6 0 000 12zm0 16a6 6 0 100-12 6 6 0 000 12zm0 16a6 6 0 100-12 6 6 0 000 12zm0 16a6 6 0 100-12 6 6 0 000 12zm0 16a6 6 0 100-12 6 6 0 000 12z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-list tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M87.748 128H23.999c-4.418 0-7.999-3.59-7.999-8.007V8.007C16 3.585 19.588 0 24 0h80c4.419 0 8 3.59 8 8.007V104H91.25c-.965 0-1.84.392-2.473 1.025a3.476 3.476 0 00-1.029 2.476V128zm8-.12l15.88-15.88h-15.88v15.88zM40 15.508A3.502 3.502 0 0143.5 12h55c1.933 0 3.5 1.561 3.5 3.509v.982A3.502 3.502 0 0198.5 20h-55a3.498 3.498 0 01-3.5-3.509v-.982zM32 22a6 6 0 100-12 6 6 0 000 12zm8 9.509A3.502 3.502 0 0143.5 28h55c1.933 0 3.5 1.561 3.5 3.509v.982A3.502 3.502 0 0198.5 36h-55a3.498 3.498 0 01-3.5-3.509v-.982zm0 16A3.502 3.502 0 0143.5 44h55c1.933 0 3.5 1.561 3.5 3.509v.982A3.502 3.502 0 0198.5 52h-55a3.498 3.498 0 01-3.5-3.509v-.982zm0 16A3.502 3.502 0 0143.5 60h55c1.933 0 3.5 1.561 3.5 3.509v.982A3.502 3.502 0 0198.5 68h-55a3.498 3.498 0 01-3.5-3.509v-.982zm0 16A3.502 3.502 0 0143.5 76h55c1.933 0 3.5 1.561 3.5 3.509v.982A3.502 3.502 0 0198.5 84h-55a3.498 3.498 0 01-3.5-3.509v-.982zm0 16A3.502 3.502 0 0143.5 92h55c1.933 0 3.5 1.561 3.5 3.509v.982A3.502 3.502 0 0198.5 100h-55a3.498 3.498 0 01-3.5-3.509v-.982zm0 16A3.505 3.505 0 0143.497 108h33.006A3.497 3.497 0 0180 111.509v.982A3.505 3.505 0 0176.503 116H43.497A3.497 3.497 0 0140 112.491v-.982zM32 38a6 6 0 100-12 6 6 0 000 12zm0 16a6 6 0 100-12 6 6 0 000 12zm0 16a6 6 0 100-12 6 6 0 000 12zm0 16a6 6 0 100-12 6 6 0 000 12zm0 16a6 6 0 100-12 6 6 0 000 12zm0 16a6 6 0 100-12 6 6 0 000 12z"/></svg>
\ No newline at end of file
diff --git a/core/images/locked-padlock.tid b/core/images/locked-padlock.tid
index 14d95560c..f6722cddd 100755
--- a/core/images/locked-padlock.tid
+++ b/core/images/locked-padlock.tid
@@ -1,4 +1,5 @@
title: $:/core/images/locked-padlock
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-locked-padlock tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M96.472 64H105v32.01C105 113.674 90.674 128 73.001 128H56C38.318 128 24 113.677 24 96.01V64h8c.003-15.723.303-47.731 32.16-47.731 31.794 0 32.305 32.057 32.312 47.731zm-15.897 0H48.44c.002-16.287.142-32 15.719-32 15.684 0 16.977 16.136 16.415 32zM67.732 92.364A8.503 8.503 0 0064.5 76a8.5 8.5 0 00-3.498 16.25l-5.095 22.77H72.8l-5.07-22.656z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-locked-padlock tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M96.472 64H105v32.01C105 113.674 90.674 128 73.001 128H56C38.318 128 24 113.677 24 96.01V64h8c.003-15.723.303-47.731 32.16-47.731 31.794 0 32.305 32.057 32.312 47.731zm-15.897 0H48.44c.002-16.287.142-32 15.719-32 15.684 0 16.977 16.136 16.415 32zM67.732 92.364A8.503 8.503 0 0064.5 76a8.5 8.5 0 00-3.498 16.25l-5.095 22.77H72.8l-5.07-22.656z"/></svg>
\ No newline at end of file
diff --git a/core/images/mail.tid b/core/images/mail.tid
index cf0f4eab7..9d46d6eff 100755
--- a/core/images/mail.tid
+++ b/core/images/mail.tid
@@ -1,4 +1,5 @@
title: $:/core/images/mail
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-mail tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M122.827 104.894a7.986 7.986 0 01-2.834.516H8.007c-.812 0-1.597-.12-2.335-.345l34.163-34.163 20.842 20.842a3.998 3.998 0 003.418 1.134 4.003 4.003 0 003.395-1.134L88.594 70.64c.075.09.155.176.24.26l33.993 33.994zm5.076-6.237c.064-.406.097-.823.097-1.247v-64c0-.669-.082-1.318-.237-1.94L94.23 65.006c.09.075.177.154.261.239l33.413 33.413zm-127.698.56A8.023 8.023 0 010 97.41v-64c0-.716.094-1.41.271-2.071l33.907 33.906L.205 99.218zM5.93 25.684a8.012 8.012 0 012.078-.273h111.986c.766 0 1.507.108 2.209.308L64.083 83.837 5.93 25.683z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-mail tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M122.827 104.894a7.986 7.986 0 01-2.834.516H8.007c-.812 0-1.597-.12-2.335-.345l34.163-34.163 20.842 20.842a3.998 3.998 0 003.418 1.134 4.003 4.003 0 003.395-1.134L88.594 70.64c.075.09.155.176.24.26l33.993 33.994zm5.076-6.237c.064-.406.097-.823.097-1.247v-64c0-.669-.082-1.318-.237-1.94L94.23 65.006c.09.075.177.154.261.239l33.413 33.413zm-127.698.56A8.023 8.023 0 010 97.41v-64c0-.716.094-1.41.271-2.071l33.907 33.906L.205 99.218zM5.93 25.684a8.012 8.012 0 012.078-.273h111.986c.766 0 1.507.108 2.209.308L64.083 83.837 5.93 25.683z"/></svg>
\ No newline at end of file
diff --git a/core/images/mastodon.tid b/core/images/mastodon.tid
new file mode 100644
index 000000000..a6b41d355
--- /dev/null
+++ b/core/images/mastodon.tid
@@ -0,0 +1,7 @@
+title: $:/core/images/mastodon
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-mastodon tc-image-button" viewBox="0 0 128 128">
+ <path d="M112.716,76.735C111.231,85.764 99.411,95.646 85.836,97.561C78.757,98.559 71.787,99.476 64.355,99.073C52.201,98.415 42.61,95.646 42.61,95.646C42.61,97.044 42.683,98.374 42.829,99.619C44.409,113.79 54.723,114.639 64.493,115.035C74.354,115.434 83.134,112.163 83.134,112.163L83.539,122.695C83.539,122.695 76.642,127.071 64.355,127.875C57.58,128.315 49.167,127.674 39.369,124.61C18.118,117.965 14.463,91.202 13.904,64.048C13.733,55.985 13.839,48.383 13.839,42.024C13.839,14.257 29.238,6.118 29.238,6.118C37.002,1.905 50.326,0.134 64.177,-0L64.517,-0C78.369,0.134 91.701,1.905 99.465,6.118C99.465,6.118 114.864,14.257 114.864,42.024C114.864,42.024 115.057,62.511 112.716,76.735ZM96.7,44.179C96.7,37.307 95.219,31.847 92.245,27.807C89.177,23.767 85.16,21.696 80.174,21.696C74.403,21.696 70.034,24.316 67.146,29.556L64.337,35.118L61.529,29.556C58.64,24.316 54.271,21.696 48.501,21.696C43.514,21.696 39.497,23.767 36.43,27.807C33.455,31.847 31.974,37.307 31.974,44.179L31.974,77.8L43.249,77.8L43.249,45.167C43.249,38.288 45.699,34.796 50.599,34.796C56.017,34.796 58.733,38.938 58.733,47.128L58.733,64.99L69.941,64.99L69.941,47.128C69.941,38.938 72.657,34.796 78.075,34.796C82.975,34.796 85.425,38.288 85.425,45.167L85.425,77.8L96.7,77.8L96.7,44.179Z"/>
+</svg>
diff --git a/core/images/menu-button.tid b/core/images/menu-button.tid
index 6d1872e4c..958721d31 100755
--- a/core/images/menu-button.tid
+++ b/core/images/menu-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/menu-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-menu-button tc-image-button" viewBox="0 0 128 128"><rect width="128" height="16" y="16" rx="8"/><rect width="128" height="16" y="56" rx="8"/><rect width="128" height="16" y="96" rx="8"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-menu-button tc-image-button" viewBox="0 0 128 128"><rect width="128" height="16" y="16" rx="8"/><rect width="128" height="16" y="56" rx="8"/><rect width="128" height="16" y="96" rx="8"/></svg>
\ No newline at end of file
diff --git a/core/images/minus-button.tid b/core/images/minus-button.tid
new file mode 100644
index 000000000..40ee75a8e
--- /dev/null
+++ b/core/images/minus-button.tid
@@ -0,0 +1,5 @@
+title: $:/core/images/minus-button
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-minus-button tc-image-button" viewBox="0 0 128 128"><path d="M64 0c35.346 0 64 28.654 64 64 0 35.346-28.654 64-64 64-35.346 0-64-28.654-64-64C0 28.654 28.654 0 64 0zm.332 16c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48z"/><rect width="80" height="16" x="24" y="56" rx="8"/></svg>
\ No newline at end of file
diff --git a/core/images/mono-block.tid b/core/images/mono-block.tid
index f8695302b..bf58400aa 100755
--- a/core/images/mono-block.tid
+++ b/core/images/mono-block.tid
@@ -1,4 +1,5 @@
title: $:/core/images/mono-block
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-mono-block tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M23.965 32.967h.357c.755 0 1.328.192 1.72.577.39.384.586.947.586 1.688 0 .824-.206 1.418-.618 1.782-.413.363-1.094.545-2.045.545h-6.31c-.965 0-1.65-.178-2.056-.535-.405-.356-.608-.954-.608-1.792 0-.811.203-1.391.608-1.74.406-.35 1.09-.525 2.055-.525h.734l-.86-2.453H8.471l-.902 2.453h.734c.95 0 1.632.178 2.044.535.413.356.619.933.619 1.73 0 .824-.206 1.418-.619 1.782-.412.363-1.094.545-2.044.545h-5.41c-.964 0-1.649-.182-2.054-.545-.406-.364-.608-.958-.608-1.782 0-.741.195-1.304.587-1.688.391-.385.964-.577 1.719-.577h.356l5.62-15.641H6.835c-.95 0-1.632-.182-2.044-.546-.412-.363-.619-.95-.619-1.76 0-.825.207-1.42.619-1.783.412-.363 1.094-.545 2.044-.545h7.863c1.244 0 2.118.67 2.62 2.013v.063l6.647 18.2zM12.98 17.326l-3.04 8.848h6.08l-3.04-8.848zm22.402 9.372v6.395h3.145c2.223 0 3.788-.245 4.697-.734.908-.49 1.362-1.307 1.362-2.453 0-1.16-.433-1.985-1.3-2.474-.866-.49-2.383-.734-4.55-.734h-3.354zm10.693-2.327c1.524.559 2.642 1.324 3.355 2.295.713.972 1.07 2.212 1.07 3.722 0 1.272-.308 2.432-.923 3.48-.615 1.049-1.496 1.909-2.642 2.58a7.499 7.499 0 01-2.254.849c-.832.174-2.01.262-3.533.262H30.202c-.922 0-1.583-.182-1.981-.545-.399-.364-.598-.958-.598-1.782 0-.741.189-1.304.566-1.688.378-.385.93-.577 1.657-.577h.356V17.326h-.356c-.727 0-1.28-.196-1.657-.587-.377-.392-.566-.965-.566-1.72 0-.81.203-1.401.608-1.771.406-.37 1.062-.556 1.971-.556h9.645c2.95 0 5.19.573 6.72 1.72 1.53 1.145 2.296 2.823 2.296 5.031 0 1.09-.234 2.052-.703 2.883-.468.832-1.163 1.513-2.086 2.045zM35.381 17.2v5.284h2.83c1.72 0 2.932-.203 3.638-.609.706-.405 1.06-1.09 1.06-2.054 0-.909-.319-1.573-.955-1.992-.636-.42-1.667-.63-3.093-.63h-3.48zm35.863-3.816c.28-.503.566-.86.86-1.07.293-.21.664-.314 1.111-.314.685 0 1.17.182 1.457.545.287.364.43.986.43 1.866l.042 5.452c0 .964-.157 1.614-.472 1.95-.314.335-.884.503-1.709.503-.587 0-1.037-.14-1.352-.42-.314-.28-.584-.796-.807-1.551-.364-1.328-.944-2.282-1.74-2.862-.797-.58-1.901-.87-3.313-.87-2.153 0-3.802.727-4.948 2.18-1.147 1.454-1.72 3.558-1.72 6.311 0 2.74.58 4.844 1.74 6.311 1.16 1.468 2.817 2.202 4.97 2.202 1.467 0 3.085-.49 4.854-1.468 1.768-.978 2.883-1.467 3.344-1.467.545 0 1.003.23 1.373.692.37.46.556 1.034.556 1.719 0 1.23-1.084 2.39-3.25 3.48-2.167 1.09-4.606 1.636-7.318 1.636-3.662 0-6.625-1.21-8.89-3.627-2.264-2.419-3.396-5.578-3.396-9.478 0-3.76 1.146-6.884 3.438-9.372 2.293-2.488 5.2-3.732 8.723-3.732.992 0 1.97.112 2.935.335.964.224 1.992.574 3.082 1.049zm10.22 19.583V17.326h-.356c-.755 0-1.328-.196-1.72-.587-.39-.392-.586-.965-.586-1.72 0-.81.21-1.401.629-1.771.42-.37 1.097-.556 2.034-.556h5.178c2.922 0 5.06.126 6.416.377 1.356.252 2.51.671 3.46 1.258 1.691 1.007 2.988 2.443 3.89 4.31.9 1.865 1.352 4.021 1.352 6.467 0 2.586-.514 4.847-1.541 6.783-1.028 1.936-2.485 3.4-4.372 4.393-.853.447-1.852.772-2.998.975-1.147.203-2.852.304-5.116.304h-6.269c-.965 0-1.65-.178-2.055-.535-.406-.356-.608-.954-.608-1.792 0-.741.195-1.304.587-1.688.391-.385.964-.577 1.72-.577h.356zm5.41-15.725v15.725h1.195c2.642 0 4.592-.646 5.85-1.94 1.258-1.292 1.887-3.28 1.887-5.965 0-2.641-.64-4.612-1.918-5.912-1.28-1.3-3.205-1.95-5.777-1.95-.335 0-.59.003-.765.01a7.992 7.992 0 00-.472.032zm35.067-.126h-9.75v5.368h3.69v-.252c0-.797.175-1.39.524-1.782.35-.392.88-.587 1.594-.587.629 0 1.142.178 1.54.534.4.357.598.808.598 1.353 0 .028.007.118.021.272.014.154.021.308.021.462v4.34c0 .936-.167 1.607-.503 2.013-.335.405-.88.608-1.635.608-.713 0-1.251-.19-1.615-.567-.363-.377-.545-.936-.545-1.677v-.377h-3.69v6.269h9.75v-2.495c0-.937.178-1.608.534-2.013.357-.405.94-.608 1.75-.608.798 0 1.367.2 1.71.597.342.399.513 1.073.513 2.024v5.074c0 .755-.146 1.258-.44 1.51-.293.251-.873.377-1.74.377h-17.172c-.923 0-1.583-.182-1.982-.545-.398-.364-.597-.958-.597-1.782 0-.741.189-1.304.566-1.688.377-.385.93-.577 1.656-.577h.357V17.326h-.357c-.712 0-1.261-.2-1.646-.598-.384-.398-.576-.968-.576-1.709 0-.81.203-1.401.608-1.771.405-.37 1.062-.556 1.97-.556h17.173c.853 0 1.43.13 1.73.388.3.258.45.772.45 1.54v4.698c0 .95-.174 1.631-.524 2.044-.35.412-.915.618-1.698.618-.81 0-1.394-.21-1.75-.629-.357-.419-.535-1.097-.535-2.033v-2.202zM19.77 47.641c.267-.504.55-.86.85-1.07.3-.21.675-.314 1.122-.314.685 0 1.17.181 1.457.545.287.363.43.985.43 1.866l.042 5.451c0 .965-.157 1.615-.472 1.95-.314.336-.891.504-1.73.504-.587 0-1.045-.144-1.373-.43-.329-.287-.598-.8-.807-1.541-.378-1.342-.958-2.3-1.74-2.873-.783-.573-1.88-.86-3.292-.86-2.153 0-3.799.727-4.938 2.181-1.14 1.454-1.709 3.557-1.709 6.311s.598 4.882 1.793 6.385C10.599 67.248 12.294 68 14.488 68c.503 0 1.077-.06 1.72-.179a23.809 23.809 0 002.264-.555v-3.313h-2.37c-.95 0-1.624-.175-2.023-.524-.398-.35-.597-.93-.597-1.74 0-.84.199-1.437.597-1.793.399-.357 1.073-.535 2.024-.535h7.569c.978 0 1.667.175 2.065.524.398.35.598.937.598 1.762 0 .74-.2 1.31-.598 1.708-.398.399-.975.598-1.73.598h-.335v5.242c0 .447-.05.758-.147.933-.098.174-.293.353-.587.534-.797.476-2.062.895-3.795 1.258a25.576 25.576 0 01-5.263.546c-3.662 0-6.625-1.21-8.89-3.628-2.264-2.418-3.397-5.577-3.397-9.477 0-3.76 1.147-6.884 3.44-9.372 2.292-2.488 5.199-3.732 8.721-3.732.979 0 1.954.112 2.925.335.972.224 2.003.573 3.093 1.049zm15.84 3.941v4.823h6.857v-4.823h-.336c-.754 0-1.331-.195-1.73-.587-.398-.391-.597-.964-.597-1.719 0-.825.206-1.419.619-1.782.412-.364 1.093-.545 2.044-.545h5.41c.95 0 1.624.181 2.023.545.398.363.597.957.597 1.782 0 .755-.192 1.328-.576 1.72-.385.39-.947.586-1.688.586h-.357v15.642h.357c.755 0 1.328.192 1.719.576.391.385.587.947.587 1.688 0 .825-.203 1.419-.608 1.782-.405.364-1.09.546-2.055.546h-5.41c-.964 0-1.649-.179-2.054-.535-.405-.357-.608-.954-.608-1.793 0-.74.2-1.303.598-1.688.398-.384.975-.576 1.73-.576h.335v-6.186h-6.856v6.186h.335c.755 0 1.331.192 1.73.576.398.385.597.947.597 1.688 0 .825-.206 1.419-.618 1.782-.412.364-1.094.546-2.044.546h-5.41c-.964 0-1.65-.179-2.055-.535-.405-.357-.608-.954-.608-1.793 0-.74.196-1.303.587-1.688.392-.384.965-.576 1.72-.576h.356V51.582h-.356c-.741 0-1.304-.195-1.688-.587-.385-.391-.577-.964-.577-1.719 0-.825.2-1.419.598-1.782.398-.364 1.073-.545 2.023-.545h5.41c.936 0 1.614.181 2.033.545.42.363.63.957.63 1.782 0 .755-.2 1.328-.598 1.72-.399.39-.975.586-1.73.586h-.335zm31.754 0v15.642h3.523c.95 0 1.632.178 2.044.534.412.357.618.933.618 1.73 0 .811-.21 1.402-.629 1.772-.419.37-1.097.556-2.033.556H58.433c-.95 0-1.632-.182-2.044-.546-.412-.363-.619-.957-.619-1.782 0-.81.203-1.39.608-1.74.406-.35 1.09-.524 2.055-.524h3.523V51.582h-3.523c-.95 0-1.632-.181-2.044-.545-.412-.363-.619-.95-.619-1.761 0-.825.203-1.412.608-1.761.406-.35 1.09-.524 2.055-.524h12.455c.992 0 1.684.174 2.075.524.392.35.587.936.587 1.761 0 .81-.202 1.398-.608 1.761-.405.364-1.09.545-2.054.545h-3.523zm30.496 0v11.994c0 1.873-.122 3.228-.367 4.067a5.876 5.876 0 01-1.227 2.244c-.74.852-1.768 1.495-3.082 1.929-1.314.433-2.893.65-4.738.65-1.3 0-2.555-.126-3.764-.378a16.843 16.843 0 01-3.491-1.132c-.615-.28-1.017-.643-1.206-1.09-.188-.448-.283-1.175-.283-2.18v-4.32c0-1.202.175-2.04.525-2.516.349-.475.957-.713 1.824-.713 1.244 0 1.929.915 2.054 2.747.014.321.035.566.063.733.168 1.622.545 2.73 1.133 3.324.587.594 1.523.89 2.81.89 1.593 0 2.714-.422 3.364-1.268.65-.845.975-2.386.975-4.623V51.582H88.93c-.95 0-1.632-.181-2.044-.545-.413-.363-.619-.95-.619-1.761 0-.825.2-1.412.598-1.761.398-.35 1.086-.524 2.065-.524h10.693c.979 0 1.667.174 2.065.524.399.35.598.936.598 1.761 0 .81-.206 1.398-.619 1.761-.412.364-1.093.545-2.044.545h-1.761zm14.644 0v6.353l6.48-6.478c-.728-.084-1.238-.29-1.531-.619-.294-.328-.44-.85-.44-1.562 0-.825.198-1.419.597-1.782.398-.364 1.073-.545 2.023-.545h5.137c.95 0 1.625.181 2.023.545.399.363.598.957.598 1.782 0 .769-.2 1.345-.598 1.73-.398.384-.982.576-1.75.576h-.483l-6.101 6.06c1.132.839 2.167 1.94 3.103 3.302.937 1.363 2.034 3.456 3.292 6.28h.692c.825 0 1.44.188 1.845.566.405.377.608.943.608 1.698 0 .825-.206 1.419-.619 1.782-.412.364-1.093.546-2.044.546h-2.579c-1.132 0-2.048-.762-2.746-2.286-.126-.28-.224-.503-.294-.67-.923-1.958-1.768-3.467-2.537-4.53a16.616 16.616 0 00-2.705-2.914l-1.97 1.887v3.92h.335c.755 0 1.331.193 1.73.577.398.385.597.947.597 1.688 0 .825-.206 1.419-.618 1.782-.413.364-1.094.546-2.045.546h-5.41c-.964 0-1.649-.179-2.054-.535-.405-.357-.608-.954-.608-1.793 0-.74.196-1.303.587-1.688.391-.384.965-.576 1.72-.576h.356V51.582h-.357c-.74 0-1.303-.195-1.687-.587-.385-.391-.577-.964-.577-1.719 0-.825.2-1.419.598-1.782.398-.364 1.072-.545 2.023-.545h5.41c.936 0 1.614.181 2.033.545.42.363.63.957.63 1.782 0 .755-.2 1.328-.598 1.72-.399.39-.975.586-1.73.586h-.336zM13.44 96.326l4.005-11.889c.251-.782.6-1.352 1.048-1.709.447-.356 1.041-.534 1.782-.534h3.271c.95 0 1.632.182 2.044.545.413.363.619.957.619 1.782 0 .755-.2 1.328-.598 1.72-.398.39-.975.587-1.73.587h-.335l.587 15.641h.357c.754 0 1.32.192 1.698.577.377.384.566.947.566 1.687 0 .825-.2 1.42-.598 1.783-.398.363-1.072.545-2.023.545h-4.718c-.95 0-1.624-.178-2.023-.535-.398-.356-.597-.954-.597-1.793 0-.74.192-1.303.576-1.687.385-.385.954-.577 1.709-.577h.335l-.293-12.79-3.061 9.52c-.224.712-.542 1.226-.954 1.54-.413.315-.982.472-1.709.472-.727 0-1.303-.157-1.73-.472-.426-.314-.751-.828-.975-1.54l-3.04-9.52-.294 12.79h.336c.755 0 1.324.192 1.709.577.384.384.576.947.576 1.687 0 .825-.202 1.42-.608 1.783-.405.363-1.076.545-2.013.545H2.621c-.937 0-1.608-.182-2.013-.545-.405-.364-.608-.958-.608-1.783 0-.74.192-1.303.577-1.687.384-.385.954-.577 1.708-.577h.336l.608-15.641h-.336c-.754 0-1.331-.196-1.73-.588-.398-.39-.597-.964-.597-1.719 0-.825.206-1.419.619-1.782.412-.363 1.093-.545 2.044-.545h3.27c.728 0 1.311.175 1.752.524.44.35.8.923 1.08 1.72l4.109 11.888zm30.454 2.054V86.828H42.74c-.922 0-1.583-.182-1.981-.546-.398-.363-.598-.95-.598-1.76 0-.812.2-1.402.598-1.773.398-.37 1.059-.555 1.981-.555h5.955c.909 0 1.566.185 1.97.555.406.37.609.961.609 1.772 0 .741-.192 1.31-.577 1.709-.384.398-.933.598-1.646.598h-.356v19.038c0 .657-.07 1.069-.21 1.237-.14.167-.454.251-.943.251h-2.097c-.67 0-1.143-.07-1.415-.21-.273-.14-.507-.384-.703-.733l-8.722-15.327v11.385h1.216c.909 0 1.559.175 1.95.524.392.35.587.93.587 1.74 0 .825-.199 1.42-.597 1.783-.399.363-1.045.545-1.94.545h-6.017c-.909 0-1.566-.182-1.971-.545-.406-.364-.608-.958-.608-1.783 0-.74.188-1.303.566-1.687.377-.385.936-.577 1.677-.577h.336V86.828h-.336c-.713 0-1.265-.2-1.656-.598-.392-.398-.587-.968-.587-1.709 0-.81.206-1.401.618-1.772.413-.37 1.066-.555 1.96-.555h3.44c.824 0 1.383.108 1.677.325.293.216.622.653.985 1.31l7.989 14.551zM64.66 86.366c-1.803 0-3.218.727-4.245 2.18-1.028 1.455-1.541 3.474-1.541 6.06 0 2.586.517 4.613 1.551 6.08 1.034 1.468 2.446 2.202 4.235 2.202 1.804 0 3.222-.73 4.257-2.19 1.034-1.461 1.551-3.492 1.551-6.092 0-2.586-.513-4.605-1.54-6.06-1.028-1.453-2.45-2.18-4.268-2.18zm0-4.864c3.44 0 6.27 1.23 8.492 3.69 2.223 2.46 3.334 5.598 3.334 9.414 0 3.844-1.104 6.99-3.313 9.436-2.208 2.446-5.046 3.669-8.513 3.669-3.424 0-6.255-1.234-8.491-3.701-2.237-2.467-3.355-5.602-3.355-9.404 0-3.83 1.108-6.971 3.323-9.424 2.216-2.454 5.057-3.68 8.523-3.68zM87.461 98.17v4.298h2.16c.908 0 1.555.175 1.94.524.384.35.576.93.576 1.74 0 .825-.196 1.42-.587 1.783-.392.363-1.035.545-1.93.545h-7.254c-.922 0-1.583-.182-1.981-.545-.399-.364-.598-.958-.598-1.783 0-.74.189-1.303.566-1.687.378-.385.93-.577 1.657-.577h.356V86.828h-.356c-.713 0-1.262-.2-1.646-.598-.385-.398-.577-.968-.577-1.709 0-.81.203-1.401.608-1.772.406-.37 1.063-.555 1.971-.555h8.66c3.424 0 6.014.657 7.768 1.97 1.754 1.315 2.631 3.25 2.631 5.809 0 2.697-.873 4.738-2.62 6.122-1.748 1.384-4.34 2.076-7.78 2.076h-3.564zm0-11.343v6.625h2.977c1.65 0 2.89-.28 3.722-.839.832-.559 1.248-1.397 1.248-2.516 0-1.048-.43-1.855-1.29-2.421-.86-.566-2.086-.85-3.68-.85h-2.977zm27.267 20.568l-1.636 1.636a12.37 12.37 0 011.772-.44c.58-.098 1.15-.147 1.709-.147 1.104 0 2.268.164 3.491.492 1.223.329 1.967.493 2.233.493.447 0 1.03-.15 1.75-.45.72-.301 1.206-.452 1.458-.452.517 0 .947.2 1.29.598.342.398.513.898.513 1.5 0 .796-.472 1.474-1.415 2.033-.944.56-2.1.839-3.47.839-.937 0-2.139-.22-3.607-.66-1.467-.441-2.53-.661-3.187-.661-.992 0-2.11.272-3.354.817-1.244.546-2.013.818-2.307.818a2.14 2.14 0 01-1.53-.597c-.42-.399-.63-.878-.63-1.437 0-.391.134-.807.4-1.247.265-.44.733-1.01 1.404-1.709l2.118-2.139c-2.335-.852-4.194-2.386-5.578-4.602-1.384-2.215-2.075-4.763-2.075-7.642 0-3.802 1.104-6.909 3.312-9.32 2.209-2.411 5.053-3.617 8.534-3.617 3.467 0 6.304 1.209 8.513 3.627 2.208 2.418 3.312 5.522 3.312 9.31 0 3.774-1.097 6.884-3.291 9.33-2.195 2.446-4.977 3.67-8.345 3.67a22.5 22.5 0 01-1.384-.043zm1.195-21.03c-1.803 0-3.218.727-4.246 2.18-1.027 1.455-1.54 3.474-1.54 6.06 0 2.586.516 4.613 1.55 6.08 1.035 1.468 2.447 2.202 4.236 2.202 1.803 0 3.222-.73 4.256-2.19 1.035-1.461 1.552-3.492 1.552-6.092 0-2.586-.514-4.605-1.541-6.06-1.028-1.453-2.45-2.18-4.267-2.18z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-mono-block tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M23.965 32.967h.357c.755 0 1.328.192 1.72.577.39.384.586.947.586 1.688 0 .824-.206 1.418-.618 1.782-.413.363-1.094.545-2.045.545h-6.31c-.965 0-1.65-.178-2.056-.535-.405-.356-.608-.954-.608-1.792 0-.811.203-1.391.608-1.74.406-.35 1.09-.525 2.055-.525h.734l-.86-2.453H8.471l-.902 2.453h.734c.95 0 1.632.178 2.044.535.413.356.619.933.619 1.73 0 .824-.206 1.418-.619 1.782-.412.363-1.094.545-2.044.545h-5.41c-.964 0-1.649-.182-2.054-.545-.406-.364-.608-.958-.608-1.782 0-.741.195-1.304.587-1.688.391-.385.964-.577 1.719-.577h.356l5.62-15.641H6.835c-.95 0-1.632-.182-2.044-.546-.412-.363-.619-.95-.619-1.76 0-.825.207-1.42.619-1.783.412-.363 1.094-.545 2.044-.545h7.863c1.244 0 2.118.67 2.62 2.013v.063l6.647 18.2zM12.98 17.326l-3.04 8.848h6.08l-3.04-8.848zm22.402 9.372v6.395h3.145c2.223 0 3.788-.245 4.697-.734.908-.49 1.362-1.307 1.362-2.453 0-1.16-.433-1.985-1.3-2.474-.866-.49-2.383-.734-4.55-.734h-3.354zm10.693-2.327c1.524.559 2.642 1.324 3.355 2.295.713.972 1.07 2.212 1.07 3.722 0 1.272-.308 2.432-.923 3.48-.615 1.049-1.496 1.909-2.642 2.58a7.499 7.499 0 01-2.254.849c-.832.174-2.01.262-3.533.262H30.202c-.922 0-1.583-.182-1.981-.545-.399-.364-.598-.958-.598-1.782 0-.741.189-1.304.566-1.688.378-.385.93-.577 1.657-.577h.356V17.326h-.356c-.727 0-1.28-.196-1.657-.587-.377-.392-.566-.965-.566-1.72 0-.81.203-1.401.608-1.771.406-.37 1.062-.556 1.971-.556h9.645c2.95 0 5.19.573 6.72 1.72 1.53 1.145 2.296 2.823 2.296 5.031 0 1.09-.234 2.052-.703 2.883-.468.832-1.163 1.513-2.086 2.045zM35.381 17.2v5.284h2.83c1.72 0 2.932-.203 3.638-.609.706-.405 1.06-1.09 1.06-2.054 0-.909-.319-1.573-.955-1.992-.636-.42-1.667-.63-3.093-.63h-3.48zm35.863-3.816c.28-.503.566-.86.86-1.07.293-.21.664-.314 1.111-.314.685 0 1.17.182 1.457.545.287.364.43.986.43 1.866l.042 5.452c0 .964-.157 1.614-.472 1.95-.314.335-.884.503-1.709.503-.587 0-1.037-.14-1.352-.42-.314-.28-.584-.796-.807-1.551-.364-1.328-.944-2.282-1.74-2.862-.797-.58-1.901-.87-3.313-.87-2.153 0-3.802.727-4.948 2.18-1.147 1.454-1.72 3.558-1.72 6.311 0 2.74.58 4.844 1.74 6.311 1.16 1.468 2.817 2.202 4.97 2.202 1.467 0 3.085-.49 4.854-1.468 1.768-.978 2.883-1.467 3.344-1.467.545 0 1.003.23 1.373.692.37.46.556 1.034.556 1.719 0 1.23-1.084 2.39-3.25 3.48-2.167 1.09-4.606 1.636-7.318 1.636-3.662 0-6.625-1.21-8.89-3.627-2.264-2.419-3.396-5.578-3.396-9.478 0-3.76 1.146-6.884 3.438-9.372 2.293-2.488 5.2-3.732 8.723-3.732.992 0 1.97.112 2.935.335.964.224 1.992.574 3.082 1.049zm10.22 19.583V17.326h-.356c-.755 0-1.328-.196-1.72-.587-.39-.392-.586-.965-.586-1.72 0-.81.21-1.401.629-1.771.42-.37 1.097-.556 2.034-.556h5.178c2.922 0 5.06.126 6.416.377 1.356.252 2.51.671 3.46 1.258 1.691 1.007 2.988 2.443 3.89 4.31.9 1.865 1.352 4.021 1.352 6.467 0 2.586-.514 4.847-1.541 6.783-1.028 1.936-2.485 3.4-4.372 4.393-.853.447-1.852.772-2.998.975-1.147.203-2.852.304-5.116.304h-6.269c-.965 0-1.65-.178-2.055-.535-.406-.356-.608-.954-.608-1.792 0-.741.195-1.304.587-1.688.391-.385.964-.577 1.72-.577h.356zm5.41-15.725v15.725h1.195c2.642 0 4.592-.646 5.85-1.94 1.258-1.292 1.887-3.28 1.887-5.965 0-2.641-.64-4.612-1.918-5.912-1.28-1.3-3.205-1.95-5.777-1.95-.335 0-.59.003-.765.01a7.992 7.992 0 00-.472.032zm35.067-.126h-9.75v5.368h3.69v-.252c0-.797.175-1.39.524-1.782.35-.392.88-.587 1.594-.587.629 0 1.142.178 1.54.534.4.357.598.808.598 1.353 0 .028.007.118.021.272.014.154.021.308.021.462v4.34c0 .936-.167 1.607-.503 2.013-.335.405-.88.608-1.635.608-.713 0-1.251-.19-1.615-.567-.363-.377-.545-.936-.545-1.677v-.377h-3.69v6.269h9.75v-2.495c0-.937.178-1.608.534-2.013.357-.405.94-.608 1.75-.608.798 0 1.367.2 1.71.597.342.399.513 1.073.513 2.024v5.074c0 .755-.146 1.258-.44 1.51-.293.251-.873.377-1.74.377h-17.172c-.923 0-1.583-.182-1.982-.545-.398-.364-.597-.958-.597-1.782 0-.741.189-1.304.566-1.688.377-.385.93-.577 1.656-.577h.357V17.326h-.357c-.712 0-1.261-.2-1.646-.598-.384-.398-.576-.968-.576-1.709 0-.81.203-1.401.608-1.771.405-.37 1.062-.556 1.97-.556h17.173c.853 0 1.43.13 1.73.388.3.258.45.772.45 1.54v4.698c0 .95-.174 1.631-.524 2.044-.35.412-.915.618-1.698.618-.81 0-1.394-.21-1.75-.629-.357-.419-.535-1.097-.535-2.033v-2.202zM19.77 47.641c.267-.504.55-.86.85-1.07.3-.21.675-.314 1.122-.314.685 0 1.17.181 1.457.545.287.363.43.985.43 1.866l.042 5.451c0 .965-.157 1.615-.472 1.95-.314.336-.891.504-1.73.504-.587 0-1.045-.144-1.373-.43-.329-.287-.598-.8-.807-1.541-.378-1.342-.958-2.3-1.74-2.873-.783-.573-1.88-.86-3.292-.86-2.153 0-3.799.727-4.938 2.181-1.14 1.454-1.709 3.557-1.709 6.311s.598 4.882 1.793 6.385C10.599 67.248 12.294 68 14.488 68c.503 0 1.077-.06 1.72-.179a23.809 23.809 0 002.264-.555v-3.313h-2.37c-.95 0-1.624-.175-2.023-.524-.398-.35-.597-.93-.597-1.74 0-.84.199-1.437.597-1.793.399-.357 1.073-.535 2.024-.535h7.569c.978 0 1.667.175 2.065.524.398.35.598.937.598 1.762 0 .74-.2 1.31-.598 1.708-.398.399-.975.598-1.73.598h-.335v5.242c0 .447-.05.758-.147.933-.098.174-.293.353-.587.534-.797.476-2.062.895-3.795 1.258a25.576 25.576 0 01-5.263.546c-3.662 0-6.625-1.21-8.89-3.628-2.264-2.418-3.397-5.577-3.397-9.477 0-3.76 1.147-6.884 3.44-9.372 2.292-2.488 5.199-3.732 8.721-3.732.979 0 1.954.112 2.925.335.972.224 2.003.573 3.093 1.049zm15.84 3.941v4.823h6.857v-4.823h-.336c-.754 0-1.331-.195-1.73-.587-.398-.391-.597-.964-.597-1.719 0-.825.206-1.419.619-1.782.412-.364 1.093-.545 2.044-.545h5.41c.95 0 1.624.181 2.023.545.398.363.597.957.597 1.782 0 .755-.192 1.328-.576 1.72-.385.39-.947.586-1.688.586h-.357v15.642h.357c.755 0 1.328.192 1.719.576.391.385.587.947.587 1.688 0 .825-.203 1.419-.608 1.782-.405.364-1.09.546-2.055.546h-5.41c-.964 0-1.649-.179-2.054-.535-.405-.357-.608-.954-.608-1.793 0-.74.2-1.303.598-1.688.398-.384.975-.576 1.73-.576h.335v-6.186h-6.856v6.186h.335c.755 0 1.331.192 1.73.576.398.385.597.947.597 1.688 0 .825-.206 1.419-.618 1.782-.412.364-1.094.546-2.044.546h-5.41c-.964 0-1.65-.179-2.055-.535-.405-.357-.608-.954-.608-1.793 0-.74.196-1.303.587-1.688.392-.384.965-.576 1.72-.576h.356V51.582h-.356c-.741 0-1.304-.195-1.688-.587-.385-.391-.577-.964-.577-1.719 0-.825.2-1.419.598-1.782.398-.364 1.073-.545 2.023-.545h5.41c.936 0 1.614.181 2.033.545.42.363.63.957.63 1.782 0 .755-.2 1.328-.598 1.72-.399.39-.975.586-1.73.586h-.335zm31.754 0v15.642h3.523c.95 0 1.632.178 2.044.534.412.357.618.933.618 1.73 0 .811-.21 1.402-.629 1.772-.419.37-1.097.556-2.033.556H58.433c-.95 0-1.632-.182-2.044-.546-.412-.363-.619-.957-.619-1.782 0-.81.203-1.39.608-1.74.406-.35 1.09-.524 2.055-.524h3.523V51.582h-3.523c-.95 0-1.632-.181-2.044-.545-.412-.363-.619-.95-.619-1.761 0-.825.203-1.412.608-1.761.406-.35 1.09-.524 2.055-.524h12.455c.992 0 1.684.174 2.075.524.392.35.587.936.587 1.761 0 .81-.202 1.398-.608 1.761-.405.364-1.09.545-2.054.545h-3.523zm30.496 0v11.994c0 1.873-.122 3.228-.367 4.067a5.876 5.876 0 01-1.227 2.244c-.74.852-1.768 1.495-3.082 1.929-1.314.433-2.893.65-4.738.65-1.3 0-2.555-.126-3.764-.378a16.843 16.843 0 01-3.491-1.132c-.615-.28-1.017-.643-1.206-1.09-.188-.448-.283-1.175-.283-2.18v-4.32c0-1.202.175-2.04.525-2.516.349-.475.957-.713 1.824-.713 1.244 0 1.929.915 2.054 2.747.014.321.035.566.063.733.168 1.622.545 2.73 1.133 3.324.587.594 1.523.89 2.81.89 1.593 0 2.714-.422 3.364-1.268.65-.845.975-2.386.975-4.623V51.582H88.93c-.95 0-1.632-.181-2.044-.545-.413-.363-.619-.95-.619-1.761 0-.825.2-1.412.598-1.761.398-.35 1.086-.524 2.065-.524h10.693c.979 0 1.667.174 2.065.524.399.35.598.936.598 1.761 0 .81-.206 1.398-.619 1.761-.412.364-1.093.545-2.044.545h-1.761zm14.644 0v6.353l6.48-6.478c-.728-.084-1.238-.29-1.531-.619-.294-.328-.44-.85-.44-1.562 0-.825.198-1.419.597-1.782.398-.364 1.073-.545 2.023-.545h5.137c.95 0 1.625.181 2.023.545.399.363.598.957.598 1.782 0 .769-.2 1.345-.598 1.73-.398.384-.982.576-1.75.576h-.483l-6.101 6.06c1.132.839 2.167 1.94 3.103 3.302.937 1.363 2.034 3.456 3.292 6.28h.692c.825 0 1.44.188 1.845.566.405.377.608.943.608 1.698 0 .825-.206 1.419-.619 1.782-.412.364-1.093.546-2.044.546h-2.579c-1.132 0-2.048-.762-2.746-2.286-.126-.28-.224-.503-.294-.67-.923-1.958-1.768-3.467-2.537-4.53a16.616 16.616 0 00-2.705-2.914l-1.97 1.887v3.92h.335c.755 0 1.331.193 1.73.577.398.385.597.947.597 1.688 0 .825-.206 1.419-.618 1.782-.413.364-1.094.546-2.045.546h-5.41c-.964 0-1.649-.179-2.054-.535-.405-.357-.608-.954-.608-1.793 0-.74.196-1.303.587-1.688.391-.384.965-.576 1.72-.576h.356V51.582h-.357c-.74 0-1.303-.195-1.687-.587-.385-.391-.577-.964-.577-1.719 0-.825.2-1.419.598-1.782.398-.364 1.072-.545 2.023-.545h5.41c.936 0 1.614.181 2.033.545.42.363.63.957.63 1.782 0 .755-.2 1.328-.598 1.72-.399.39-.975.586-1.73.586h-.336zM13.44 96.326l4.005-11.889c.251-.782.6-1.352 1.048-1.709.447-.356 1.041-.534 1.782-.534h3.271c.95 0 1.632.182 2.044.545.413.363.619.957.619 1.782 0 .755-.2 1.328-.598 1.72-.398.39-.975.587-1.73.587h-.335l.587 15.641h.357c.754 0 1.32.192 1.698.577.377.384.566.947.566 1.687 0 .825-.2 1.42-.598 1.783-.398.363-1.072.545-2.023.545h-4.718c-.95 0-1.624-.178-2.023-.535-.398-.356-.597-.954-.597-1.793 0-.74.192-1.303.576-1.687.385-.385.954-.577 1.709-.577h.335l-.293-12.79-3.061 9.52c-.224.712-.542 1.226-.954 1.54-.413.315-.982.472-1.709.472-.727 0-1.303-.157-1.73-.472-.426-.314-.751-.828-.975-1.54l-3.04-9.52-.294 12.79h.336c.755 0 1.324.192 1.709.577.384.384.576.947.576 1.687 0 .825-.202 1.42-.608 1.783-.405.363-1.076.545-2.013.545H2.621c-.937 0-1.608-.182-2.013-.545-.405-.364-.608-.958-.608-1.783 0-.74.192-1.303.577-1.687.384-.385.954-.577 1.708-.577h.336l.608-15.641h-.336c-.754 0-1.331-.196-1.73-.588-.398-.39-.597-.964-.597-1.719 0-.825.206-1.419.619-1.782.412-.363 1.093-.545 2.044-.545h3.27c.728 0 1.311.175 1.752.524.44.35.8.923 1.08 1.72l4.109 11.888zm30.454 2.054V86.828H42.74c-.922 0-1.583-.182-1.981-.546-.398-.363-.598-.95-.598-1.76 0-.812.2-1.402.598-1.773.398-.37 1.059-.555 1.981-.555h5.955c.909 0 1.566.185 1.97.555.406.37.609.961.609 1.772 0 .741-.192 1.31-.577 1.709-.384.398-.933.598-1.646.598h-.356v19.038c0 .657-.07 1.069-.21 1.237-.14.167-.454.251-.943.251h-2.097c-.67 0-1.143-.07-1.415-.21-.273-.14-.507-.384-.703-.733l-8.722-15.327v11.385h1.216c.909 0 1.559.175 1.95.524.392.35.587.93.587 1.74 0 .825-.199 1.42-.597 1.783-.399.363-1.045.545-1.94.545h-6.017c-.909 0-1.566-.182-1.971-.545-.406-.364-.608-.958-.608-1.783 0-.74.188-1.303.566-1.687.377-.385.936-.577 1.677-.577h.336V86.828h-.336c-.713 0-1.265-.2-1.656-.598-.392-.398-.587-.968-.587-1.709 0-.81.206-1.401.618-1.772.413-.37 1.066-.555 1.96-.555h3.44c.824 0 1.383.108 1.677.325.293.216.622.653.985 1.31l7.989 14.551zM64.66 86.366c-1.803 0-3.218.727-4.245 2.18-1.028 1.455-1.541 3.474-1.541 6.06 0 2.586.517 4.613 1.551 6.08 1.034 1.468 2.446 2.202 4.235 2.202 1.804 0 3.222-.73 4.257-2.19 1.034-1.461 1.551-3.492 1.551-6.092 0-2.586-.513-4.605-1.54-6.06-1.028-1.453-2.45-2.18-4.268-2.18zm0-4.864c3.44 0 6.27 1.23 8.492 3.69 2.223 2.46 3.334 5.598 3.334 9.414 0 3.844-1.104 6.99-3.313 9.436-2.208 2.446-5.046 3.669-8.513 3.669-3.424 0-6.255-1.234-8.491-3.701-2.237-2.467-3.355-5.602-3.355-9.404 0-3.83 1.108-6.971 3.323-9.424 2.216-2.454 5.057-3.68 8.523-3.68zM87.461 98.17v4.298h2.16c.908 0 1.555.175 1.94.524.384.35.576.93.576 1.74 0 .825-.196 1.42-.587 1.783-.392.363-1.035.545-1.93.545h-7.254c-.922 0-1.583-.182-1.981-.545-.399-.364-.598-.958-.598-1.783 0-.74.189-1.303.566-1.687.378-.385.93-.577 1.657-.577h.356V86.828h-.356c-.713 0-1.262-.2-1.646-.598-.385-.398-.577-.968-.577-1.709 0-.81.203-1.401.608-1.772.406-.37 1.063-.555 1.971-.555h8.66c3.424 0 6.014.657 7.768 1.97 1.754 1.315 2.631 3.25 2.631 5.809 0 2.697-.873 4.738-2.62 6.122-1.748 1.384-4.34 2.076-7.78 2.076h-3.564zm0-11.343v6.625h2.977c1.65 0 2.89-.28 3.722-.839.832-.559 1.248-1.397 1.248-2.516 0-1.048-.43-1.855-1.29-2.421-.86-.566-2.086-.85-3.68-.85h-2.977zm27.267 20.568l-1.636 1.636a12.37 12.37 0 011.772-.44c.58-.098 1.15-.147 1.709-.147 1.104 0 2.268.164 3.491.492 1.223.329 1.967.493 2.233.493.447 0 1.03-.15 1.75-.45.72-.301 1.206-.452 1.458-.452.517 0 .947.2 1.29.598.342.398.513.898.513 1.5 0 .796-.472 1.474-1.415 2.033-.944.56-2.1.839-3.47.839-.937 0-2.139-.22-3.607-.66-1.467-.441-2.53-.661-3.187-.661-.992 0-2.11.272-3.354.817-1.244.546-2.013.818-2.307.818a2.14 2.14 0 01-1.53-.597c-.42-.399-.63-.878-.63-1.437 0-.391.134-.807.4-1.247.265-.44.733-1.01 1.404-1.709l2.118-2.139c-2.335-.852-4.194-2.386-5.578-4.602-1.384-2.215-2.075-4.763-2.075-7.642 0-3.802 1.104-6.909 3.312-9.32 2.209-2.411 5.053-3.617 8.534-3.617 3.467 0 6.304 1.209 8.513 3.627 2.208 2.418 3.312 5.522 3.312 9.31 0 3.774-1.097 6.884-3.291 9.33-2.195 2.446-4.977 3.67-8.345 3.67a22.5 22.5 0 01-1.384-.043zm1.195-21.03c-1.803 0-3.218.727-4.246 2.18-1.027 1.455-1.54 3.474-1.54 6.06 0 2.586.516 4.613 1.55 6.08 1.035 1.468 2.447 2.202 4.236 2.202 1.803 0 3.222-.73 4.256-2.19 1.035-1.461 1.552-3.492 1.552-6.092 0-2.586-.514-4.605-1.541-6.06-1.028-1.453-2.45-2.18-4.267-2.18z"/></svg>
\ No newline at end of file
diff --git a/core/images/mono-line.tid b/core/images/mono-line.tid
index 09cfe513e..1ab73b829 100755
--- a/core/images/mono-line.tid
+++ b/core/images/mono-line.tid
@@ -1,4 +1,5 @@
title: $:/core/images/mono-line
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-mono-line tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M60.437 84.523h.908c1.922 0 3.381.489 4.378 1.468.997.979 1.495 2.411 1.495 4.298 0 2.1-.525 3.612-1.575 4.538-1.05.925-2.785 1.388-5.206 1.388h-16.07c-2.456 0-4.2-.454-5.232-1.361-1.032-.908-1.548-2.43-1.548-4.565 0-2.065.516-3.542 1.548-4.432 1.032-.89 2.776-1.334 5.232-1.334h1.869l-2.19-6.247H20.983l-2.296 6.247h1.87c2.42 0 4.155.453 5.205 1.361 1.05.908 1.575 2.376 1.575 4.405 0 2.1-.525 3.612-1.575 4.538-1.05.925-2.785 1.388-5.206 1.388H6.781c-2.456 0-4.2-.463-5.233-1.388C.516 93.9 0 92.389 0 90.289c0-1.887.498-3.32 1.495-4.298.997-.979 2.456-1.468 4.378-1.468h.908l14.308-39.83h-4.271c-2.42 0-4.156-.462-5.206-1.387-1.05-.926-1.575-2.42-1.575-4.485 0-2.1.525-3.613 1.575-4.538 1.05-.926 2.785-1.388 5.206-1.388h20.021c3.168 0 5.392 1.708 6.674 5.125v.16l16.924 46.343zm-27.976-39.83L24.72 67.225h15.483l-7.742-22.53zM89.506 68.56v16.284h8.008c5.66 0 9.646-.623 11.96-1.869 2.313-1.245 3.47-3.328 3.47-6.246 0-2.955-1.103-5.055-3.31-6.3-2.207-1.246-6.069-1.869-11.586-1.869h-8.542zm27.229-5.926c3.88 1.423 6.727 3.372 8.542 5.846 1.815 2.474 2.723 5.633 2.723 9.477 0 3.239-.783 6.193-2.35 8.862-1.565 2.67-3.808 4.859-6.726 6.567-1.709.997-3.622 1.718-5.74 2.163-2.118.445-5.116.667-8.996.667h-27.87c-2.349 0-4.03-.463-5.045-1.388-1.014-.926-1.521-2.438-1.521-4.538 0-1.887.48-3.32 1.441-4.298.961-.979 2.367-1.468 4.218-1.468h.907v-39.83h-.907c-1.851 0-3.257-.498-4.218-1.494-.961-.997-1.441-2.456-1.441-4.378 0-2.065.516-3.568 1.548-4.512 1.032-.943 2.705-1.414 5.018-1.414h24.56c7.51 0 13.214 1.459 17.111 4.377 3.898 2.92 5.847 7.19 5.847 12.814 0 2.776-.597 5.223-1.789 7.341-1.192 2.118-2.963 3.853-5.312 5.206zm-27.23-18.26v13.455h7.208c4.378 0 7.466-.516 9.264-1.549 1.797-1.032 2.696-2.776 2.696-5.232 0-2.313-.81-4.004-2.43-5.072-1.619-1.068-4.244-1.602-7.874-1.602h-8.863z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-mono-line tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M60.437 84.523h.908c1.922 0 3.381.489 4.378 1.468.997.979 1.495 2.411 1.495 4.298 0 2.1-.525 3.612-1.575 4.538-1.05.925-2.785 1.388-5.206 1.388h-16.07c-2.456 0-4.2-.454-5.232-1.361-1.032-.908-1.548-2.43-1.548-4.565 0-2.065.516-3.542 1.548-4.432 1.032-.89 2.776-1.334 5.232-1.334h1.869l-2.19-6.247H20.983l-2.296 6.247h1.87c2.42 0 4.155.453 5.205 1.361 1.05.908 1.575 2.376 1.575 4.405 0 2.1-.525 3.612-1.575 4.538-1.05.925-2.785 1.388-5.206 1.388H6.781c-2.456 0-4.2-.463-5.233-1.388C.516 93.9 0 92.389 0 90.289c0-1.887.498-3.32 1.495-4.298.997-.979 2.456-1.468 4.378-1.468h.908l14.308-39.83h-4.271c-2.42 0-4.156-.462-5.206-1.387-1.05-.926-1.575-2.42-1.575-4.485 0-2.1.525-3.613 1.575-4.538 1.05-.926 2.785-1.388 5.206-1.388h20.021c3.168 0 5.392 1.708 6.674 5.125v.16l16.924 46.343zm-27.976-39.83L24.72 67.225h15.483l-7.742-22.53zM89.506 68.56v16.284h8.008c5.66 0 9.646-.623 11.96-1.869 2.313-1.245 3.47-3.328 3.47-6.246 0-2.955-1.103-5.055-3.31-6.3-2.207-1.246-6.069-1.869-11.586-1.869h-8.542zm27.229-5.926c3.88 1.423 6.727 3.372 8.542 5.846 1.815 2.474 2.723 5.633 2.723 9.477 0 3.239-.783 6.193-2.35 8.862-1.565 2.67-3.808 4.859-6.726 6.567-1.709.997-3.622 1.718-5.74 2.163-2.118.445-5.116.667-8.996.667h-27.87c-2.349 0-4.03-.463-5.045-1.388-1.014-.926-1.521-2.438-1.521-4.538 0-1.887.48-3.32 1.441-4.298.961-.979 2.367-1.468 4.218-1.468h.907v-39.83h-.907c-1.851 0-3.257-.498-4.218-1.494-.961-.997-1.441-2.456-1.441-4.378 0-2.065.516-3.568 1.548-4.512 1.032-.943 2.705-1.414 5.018-1.414h24.56c7.51 0 13.214 1.459 17.111 4.377 3.898 2.92 5.847 7.19 5.847 12.814 0 2.776-.597 5.223-1.789 7.341-1.192 2.118-2.963 3.853-5.312 5.206zm-27.23-18.26v13.455h7.208c4.378 0 7.466-.516 9.264-1.549 1.797-1.032 2.696-2.776 2.696-5.232 0-2.313-.81-4.004-2.43-5.072-1.619-1.068-4.244-1.602-7.874-1.602h-8.863z"/></svg>
\ No newline at end of file
diff --git a/core/images/network-activity.tid b/core/images/network-activity.tid
new file mode 100644
index 000000000..2efdfd4d4
--- /dev/null
+++ b/core/images/network-activity.tid
@@ -0,0 +1,11 @@
+title: $:/core/images/network-activity
+tags: $:/tags/Image
+
+<svg width="22pt" height="22pt" class="tc-image-network-activity tc-image-button" viewBox="0 0 128 128"><g class={{{ [{$:/state/http-requests}match[0]then[]else[tc-network-activity-background]] }}}>
+<$list filter="[{$:/state/http-requests}match[0]]" variable="ignore">
+<path d="M64.043 45.153a4.002 4.002 0 0 1 4.367 2.21l.084.188 30.403 73.4a4 4 0 0 1-7.307 3.25l-.084-.188-3.103-7.49-8.898 8.899a3.985 3.985 0 0 1-2.624 1.166l-.205.005a3.987 3.987 0 0 1-2.828-1.171l-9.849-9.848-9.847 9.848a3.985 3.985 0 0 1-2.624 1.166l-.204.005a3.987 3.987 0 0 1-2.829-1.171l-8.899-8.9-3.102 7.491a4 4 0 1 1-7.391-3.062l30.403-73.4a4.001 4.001 0 0 1 4.495-2.39l.042-.008Zm13.636 56.74-8.023 8.024 7.02 7.019 8.023-8.022-7.02-7.02Zm-27.353.008-7.019 7.019 8.016 8.016 7.019-7.02-8.016-8.015Zm13.68-13.68-8.023 8.023 8.016 8.016 8.023-8.023-8.016-8.016Zm-8.971-8.971-4.687 11.315 8.001-8.001-3.314-3.314Zm17.933.009-3.305 3.305 7.979 7.979-4.674-11.284ZM64 57.607l-5.666 13.68c.096.072.188.15.278.232l.133.126 5.261 5.262 5.262-5.262c.128-.127.261-.244.4-.35L64 57.607Zm0-34.69a8 8 0 1 1 0 16 8 8 0 0 1 0-16Z"/>
+</$list>
+<$list filter="[{$:/state/http-requests}!match[0]]" variable="ignore">
+<path d="M109.395.952a4.002 4.002 0 0 1 3.787 2.708C117.529 11.62 120 20.753 120 30.462c0 15.186-6.044 28.96-15.858 39.047a4 4 0 1 1-6.47-4.626l-.12-.094C106.466 56.074 112 43.914 112 30.462c0-8.492-2.205-16.469-6.074-23.39l.054-.036a4 4 0 0 1 3.415-6.084Zm-90.762 0a4 4 0 0 1 3.072 6.562l.093.06A47.786 47.786 0 0 0 16 30.463c0 13.315 5.42 25.363 14.176 34.058l-.01.007a4 4 0 1 1-6.312 4.863l-.063.05C14.017 59.359 8 45.613 8 30.462c0-9.77 2.502-18.956 6.9-26.952A4.002 4.002 0 0 1 18.634.952Z"/><path d="M64.043 44.698a4.002 4.002 0 0 1 4.367 2.21l.084.188 30.403 73.4a4 4 0 0 1-7.307 3.25l-.084-.188-3.103-7.49-8.898 8.9a3.985 3.985 0 0 1-2.624 1.166l-.205.005a3.987 3.987 0 0 1-2.828-1.172l-9.849-9.848-9.847 9.848a3.985 3.985 0 0 1-2.624 1.167l-.204.005a3.987 3.987 0 0 1-2.829-1.172l-8.899-8.899-3.102 7.49a4 4 0 0 1-7.391-3.061l30.403-73.4a4.001 4.001 0 0 1 4.495-2.39l.042-.009ZM77.68 101.44l-8.023 8.023 7.02 7.019 8.023-8.022-7.02-7.02Zm-27.353.007-7.019 7.019 8.016 8.016 7.019-7.019-8.016-8.016Zm13.68-13.68-8.023 8.023 8.016 8.016 8.023-8.023-8.016-8.016Zm-8.971-8.971L50.348 90.11l8.001-8.001-3.314-3.314Zm17.933.009-3.305 3.305 7.979 7.979-4.674-11.284ZM64 57.152l-5.666 13.68c.096.073.188.15.278.232l.133.127 5.261 5.261 5.262-5.261c.128-.128.261-.244.4-.351L64 57.152ZM38.503 1.058a4 4 0 0 1 2.7 6.952l.17-.175C35.582 13.625 32 21.625 32 30.462c0 8.838 3.582 16.838 9.374 22.629a4 4 0 0 1-5.659 5.658l-.01.01C28.473 51.52 24 41.526 24 30.485 24 19.567 28.374 9.67 35.466 2.453a3.995 3.995 0 0 1 3.037-1.395ZM89.369.952c1.14 0 2.17.478 2.899 1.244l.005-.006C99.518 9.43 104 19.434 104 30.485c0 10.826-4.3 20.648-11.287 27.85a4 4 0 1 1-6.054-5.213l-.032-.032C92.418 47.299 96 39.299 96 30.462c0-8.73-3.496-16.643-9.164-22.416A4 4 0 0 1 89.368.952Zm-39.282 11.14a4 4 0 0 1 2.59 7.048l.01.009A15.95 15.95 0 0 0 48 30.462a15.95 15.95 0 0 0 4.687 11.315l-.01.01a4 4 0 1 1-5.82 5.47l.173.177A23.925 23.925 0 0 1 40 30.462a23.925 23.925 0 0 1 7.03-16.97l.01.01a3.991 3.991 0 0 1 3.047-1.41Zm27.895.07a3.99 3.99 0 0 1 2.984 1.336l.006-.005A23.925 23.925 0 0 1 88 30.463a23.92 23.92 0 0 1-6.707 16.642l-.3.305a4 4 0 1 1-5.679-5.632v-.002A15.95 15.95 0 0 0 80 30.462a15.95 15.95 0 0 0-4.685-11.312 4.012 4.012 0 0 1-1.333-2.987 4 4 0 0 1 4-4ZM64 22.463a8 8 0 1 1 0 16 8 8 0 0 1 0-16Z"/>
+</$list>
+</g></svg>
\ No newline at end of file
diff --git a/core/images/new-button.tid b/core/images/new-button.tid
index 6e592ada9..d4cfd34f6 100755
--- a/core/images/new-button.tid
+++ b/core/images/new-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/new-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-new-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M56 72H8.007C3.591 72 0 68.418 0 64c0-4.41 3.585-8 8.007-8H56V8.007C56 3.591 59.582 0 64 0c4.41 0 8 3.585 8 8.007V56h47.993c4.416 0 8.007 3.582 8.007 8 0 4.41-3.585 8-8.007 8H72v47.993c0 4.416-3.582 8.007-8 8.007-4.41 0-8-3.585-8-8.007V72z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-new-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M56 72H8.007C3.591 72 0 68.418 0 64c0-4.41 3.585-8 8.007-8H56V8.007C56 3.591 59.582 0 64 0c4.41 0 8 3.585 8 8.007V56h47.993c4.416 0 8.007 3.582 8.007 8 0 4.41-3.585 8-8.007 8H72v47.993c0 4.416-3.582 8.007-8 8.007-4.41 0-8-3.585-8-8.007V72z"/></svg>
\ No newline at end of file
diff --git a/core/images/new-here-button.tid b/core/images/new-here-button.tid
index ab0f7a6f3..8e304f5e7 100755
--- a/core/images/new-here-button.tid
+++ b/core/images/new-here-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/new-here-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-new-here-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M55.838 20.935l-3.572.938c-3.688.968-8.23 4.43-10.136 7.731L3.37 96.738c-1.905 3.3-.771 7.524 2.534 9.432l33.717 19.466c3.297 1.904 7.53.78 9.435-2.521l38.76-67.134c1.905-3.3 2.632-8.963 1.623-12.646L83.285 20.88c-1.009-3.68-4.821-5.884-8.513-4.915l-7.603 1.995.043.287c.524 3.394 2.053 7.498 4.18 11.55.418.163.829.36 1.23.59a8.864 8.864 0 014.438 8.169c.104.132.21.264.316.395l-.386.318a8.663 8.663 0 01-1.082 3.137c-2.42 4.192-7.816 5.608-12.051 3.163-4.12-2.379-5.624-7.534-3.476-11.671-2.177-4.394-3.788-8.874-4.543-12.964z"/><path d="M69.554 44.76c-5.944-7.476-10.74-17.196-11.955-25.059-1.68-10.875 3.503-18.216 15.082-18.04 10.407.158 19.975 5.851 24.728 13.785 5.208 8.695 2.95 17.868-6.855 20.496l-2.037-7.601c4.232-1.134 4.999-4.248 2.24-8.853-3.37-5.626-10.465-9.848-18.146-9.965-6.392-.097-8.31 2.62-7.323 9.01.999 6.465 5.318 15.138 10.582 21.65l-.072.06c.559 1.553-4.17 6.44-5.938 4.888l-.005.004-.028-.034a1.323 1.323 0 01-.124-.135 2.618 2.618 0 01-.149-.205z"/><rect width="16" height="48" x="96" y="80" rx="8"/><rect width="48" height="16" x="80" y="96" rx="8"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-new-here-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M55.838 20.935l-3.572.938c-3.688.968-8.23 4.43-10.136 7.731L3.37 96.738c-1.905 3.3-.771 7.524 2.534 9.432l33.717 19.466c3.297 1.904 7.53.78 9.435-2.521l38.76-67.134c1.905-3.3 2.632-8.963 1.623-12.646L83.285 20.88c-1.009-3.68-4.821-5.884-8.513-4.915l-7.603 1.995.043.287c.524 3.394 2.053 7.498 4.18 11.55.418.163.829.36 1.23.59a8.864 8.864 0 014.438 8.169c.104.132.21.264.316.395l-.386.318a8.663 8.663 0 01-1.082 3.137c-2.42 4.192-7.816 5.608-12.051 3.163-4.12-2.379-5.624-7.534-3.476-11.671-2.177-4.394-3.788-8.874-4.543-12.964z"/><path d="M69.554 44.76c-5.944-7.476-10.74-17.196-11.955-25.059-1.68-10.875 3.503-18.216 15.082-18.04 10.407.158 19.975 5.851 24.728 13.785 5.208 8.695 2.95 17.868-6.855 20.496l-2.037-7.601c4.232-1.134 4.999-4.248 2.24-8.853-3.37-5.626-10.465-9.848-18.146-9.965-6.392-.097-8.31 2.62-7.323 9.01.999 6.465 5.318 15.138 10.582 21.65l-.072.06c.559 1.553-4.17 6.44-5.938 4.888l-.005.004-.028-.034a1.323 1.323 0 01-.124-.135 2.618 2.618 0 01-.149-.205z"/><rect width="16" height="48" x="96" y="80" rx="8"/><rect width="48" height="16" x="80" y="96" rx="8"/></g></svg>
\ No newline at end of file
diff --git a/core/images/new-image-button.tid b/core/images/new-image-button.tid
index 16b63c3c3..53b10d481 100755
--- a/core/images/new-image-button.tid
+++ b/core/images/new-image-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/new-image-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-new-image-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M81.362 73.627l15.826-27.41a2.626 2.626 0 00-.962-3.59l-50.01-28.872a2.626 2.626 0 00-3.588.961L30.058 36.49l10.04-5.261c3.042-1.595 6.771.114 7.55 3.46l3.607 17.702 9.88.85a5.25 5.25 0 014.571 3.77c.034.115.1.344.199.671.165.553.353 1.172.562 1.843.595 1.914 1.23 3.85 1.872 5.678.207.588.412 1.156.614 1.701.625 1.685 1.209 3.114 1.725 4.207.255.54.485.977.726 1.427.214.212.547.425 1.011.622 1.141.482 2.784.74 4.657.758.864.008 1.71-.034 2.492-.11.448-.043.753-.085.871-.104.315-.053.625-.077.927-.076zM37.47 2.649A5.257 5.257 0 0144.649.725l63.645 36.746a5.257 5.257 0 011.923 7.178L73.47 108.294a5.257 5.257 0 01-7.177 1.923L2.649 73.47a5.257 5.257 0 01-1.924-7.177L37.471 2.649zm42.837 50.49a5.25 5.25 0 105.25-9.092 5.25 5.25 0 00-5.25 9.093zM96 112h-7.993c-4.419 0-8.007-3.582-8.007-8 0-4.41 3.585-8 8.007-8H96v-7.993C96 83.588 99.582 80 104 80c4.41 0 8 3.585 8 8.007V96h7.993c4.419 0 8.007 3.582 8.007 8 0 4.41-3.585 8-8.007 8H112v7.993c0 4.419-3.582 8.007-8 8.007-4.41 0-8-3.585-8-8.007V112zM33.347 51.791c7.428 7.948 9.01 10.69 7.449 13.394-1.56 2.703-13.838-2.328-16.094 1.58-2.256 3.908-.907 3.258-2.437 5.908l19.73 11.39s-5.605-8.255-4.235-10.628c2.515-4.356 8.77-1.256 10.365-4.019 2.414-4.181-5.103-9.639-14.778-17.625z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-new-image-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M81.362 73.627l15.826-27.41a2.626 2.626 0 00-.962-3.59l-50.01-28.872a2.626 2.626 0 00-3.588.961L30.058 36.49l10.04-5.261c3.042-1.595 6.771.114 7.55 3.46l3.607 17.702 9.88.85a5.25 5.25 0 014.571 3.77c.034.115.1.344.199.671.165.553.353 1.172.562 1.843.595 1.914 1.23 3.85 1.872 5.678.207.588.412 1.156.614 1.701.625 1.685 1.209 3.114 1.725 4.207.255.54.485.977.726 1.427.214.212.547.425 1.011.622 1.141.482 2.784.74 4.657.758.864.008 1.71-.034 2.492-.11.448-.043.753-.085.871-.104.315-.053.625-.077.927-.076zM37.47 2.649A5.257 5.257 0 0144.649.725l63.645 36.746a5.257 5.257 0 011.923 7.178L73.47 108.294a5.257 5.257 0 01-7.177 1.923L2.649 73.47a5.257 5.257 0 01-1.924-7.177L37.471 2.649zm42.837 50.49a5.25 5.25 0 105.25-9.092 5.25 5.25 0 00-5.25 9.093zM96 112h-7.993c-4.419 0-8.007-3.582-8.007-8 0-4.41 3.585-8 8.007-8H96v-7.993C96 83.588 99.582 80 104 80c4.41 0 8 3.585 8 8.007V96h7.993c4.419 0 8.007 3.582 8.007 8 0 4.41-3.585 8-8.007 8H112v7.993c0 4.419-3.582 8.007-8 8.007-4.41 0-8-3.585-8-8.007V112zM33.347 51.791c7.428 7.948 9.01 10.69 7.449 13.394-1.56 2.703-13.838-2.328-16.094 1.58-2.256 3.908-.907 3.258-2.437 5.908l19.73 11.39s-5.605-8.255-4.235-10.628c2.515-4.356 8.77-1.256 10.365-4.019 2.414-4.181-5.103-9.639-14.778-17.625z"/></svg>
\ No newline at end of file
diff --git a/core/images/new-journal-button.tid b/core/images/new-journal-button.tid
index fb67c8007..5b793deb5 100755
--- a/core/images/new-journal-button.tid
+++ b/core/images/new-journal-button.tid
@@ -1,4 +1,4 @@
title: $:/core/images/new-journal-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-new-journal-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M102.545 112.818v11.818c0 1.306 1.086 2.364 2.425 2.364h6.06c1.34 0 2.425-1.058 2.425-2.364v-11.818h12.12c1.34 0 2.425-1.058 2.425-2.363v-5.91c0-1.305-1.085-2.363-2.424-2.363h-12.121V90.364c0-1.306-1.086-2.364-2.425-2.364h-6.06c-1.34 0-2.425 1.058-2.425 2.364v11.818h-12.12c-1.34 0-2.425 1.058-2.425 2.363v5.91c0 1.305 1.085 2.363 2.424 2.363h12.121zM60.016 4.965c-4.781-2.76-10.897-1.118-13.656 3.66L5.553 79.305A9.993 9.993 0 009.21 92.963l51.04 29.468c4.78 2.76 10.897 1.118 13.655-3.66l40.808-70.681a9.993 9.993 0 00-3.658-13.656L60.016 4.965zm-3.567 27.963a6 6 0 106-10.393 6 6 0 00-6 10.393zm31.697 17.928a6 6 0 106-10.392 6 6 0 00-6 10.392z"/><text class="tc-fill-background" font-family="Helvetica" font-size="47.172" font-weight="bold" transform="rotate(30 25.742 95.82)"><tspan x="42" y="77.485" text-anchor="middle"><<now "DD">></tspan></text></g></svg>
\ No newline at end of file
+<$parameters size="22pt" day=<<now "DD">>><svg width=<<size>> height=<<size>> class="tc-image-new-journal-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M102.545 112.818v11.818c0 1.306 1.086 2.364 2.425 2.364h6.06c1.34 0 2.425-1.058 2.425-2.364v-11.818h12.12c1.34 0 2.425-1.058 2.425-2.363v-5.91c0-1.305-1.085-2.363-2.424-2.363h-12.121V90.364c0-1.306-1.086-2.364-2.425-2.364h-6.06c-1.34 0-2.425 1.058-2.425 2.364v11.818h-12.12c-1.34 0-2.425 1.058-2.425 2.363v5.91c0 1.305 1.085 2.363 2.424 2.363h12.121zM60.016 4.965c-4.781-2.76-10.897-1.118-13.656 3.66L5.553 79.305A9.993 9.993 0 009.21 92.963l51.04 29.468c4.78 2.76 10.897 1.118 13.655-3.66l40.808-70.681a9.993 9.993 0 00-3.658-13.656L60.016 4.965zm-3.567 27.963a6 6 0 106-10.393 6 6 0 00-6 10.393zm31.697 17.928a6 6 0 106-10.392 6 6 0 00-6 10.392z"/><text class="tc-fill-background" font-family="Helvetica" font-size="47.172" font-weight="bold" transform="rotate(30 25.742 95.82)"><tspan x="42" y="77.485" text-anchor="middle"><$text text=<<day>>/></tspan></text></g></svg></$parameters>
\ No newline at end of file
diff --git a/core/images/opacity.tid b/core/images/opacity.tid
index e9a29aea2..0211644f9 100755
--- a/core/images/opacity.tid
+++ b/core/images/opacity.tid
@@ -1,4 +1,5 @@
title: $:/core/images/opacity
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-opacity tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M102.362 65a51.595 51.595 0 01-1.942 6H82.584a35.867 35.867 0 002.997-6h16.78zm.472-2c.423-1.961.734-3.963.929-6H87.656a35.78 35.78 0 01-1.368 6h16.546zm-3.249 10a51.847 51.847 0 01-3.135 6H75.812a36.205 36.205 0 005.432-6h18.341zm-4.416 8c-1.424 2.116-3 4.12-4.71 6H60.46a35.843 35.843 0 0012.874-6h21.834zm-7.513-34h16.107C101.247 20.627 79.033 0 52 0 23.281 0 0 23.281 0 52c0 25.228 17.965 46.26 41.8 51h20.4a51.66 51.66 0 0015.875-6H39v-2h42.25a52.257 52.257 0 007.288-6H39v-2h4.539C27.739 83.194 16 68.968 16 52c0-19.882 16.118-36 36-36 18.186 0 33.222 13.484 35.656 31zm.22 2h16.039a52.823 52.823 0 010 6H87.877a36.483 36.483 0 000-6z"/><path d="M76 128c28.719 0 52-23.281 52-52s-23.281-52-52-52-52 23.281-52 52 23.281 52 52 52zm0-16c19.882 0 36-16.118 36-36S95.882 40 76 40 40 56.118 40 76s16.118 36 36 36z"/><path d="M37 58h53v4H37v-4zm3-8h53v4H40v-4zm0-8h53v4H40v-4zm-8 24h53v4H32v-4zm-2 8h53v4H30v-4zm-3 8h53v4H27v-4z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-opacity tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M102.362 65a51.595 51.595 0 01-1.942 6H82.584a35.867 35.867 0 002.997-6h16.78zm.472-2c.423-1.961.734-3.963.929-6H87.656a35.78 35.78 0 01-1.368 6h16.546zm-3.249 10a51.847 51.847 0 01-3.135 6H75.812a36.205 36.205 0 005.432-6h18.341zm-4.416 8c-1.424 2.116-3 4.12-4.71 6H60.46a35.843 35.843 0 0012.874-6h21.834zm-7.513-34h16.107C101.247 20.627 79.033 0 52 0 23.281 0 0 23.281 0 52c0 25.228 17.965 46.26 41.8 51h20.4a51.66 51.66 0 0015.875-6H39v-2h42.25a52.257 52.257 0 007.288-6H39v-2h4.539C27.739 83.194 16 68.968 16 52c0-19.882 16.118-36 36-36 18.186 0 33.222 13.484 35.656 31zm.22 2h16.039a52.823 52.823 0 010 6H87.877a36.483 36.483 0 000-6z"/><path d="M76 128c28.719 0 52-23.281 52-52s-23.281-52-52-52-52 23.281-52 52 23.281 52 52 52zm0-16c19.882 0 36-16.118 36-36S95.882 40 76 40 40 56.118 40 76s16.118 36 36 36z"/><path d="M37 58h53v4H37v-4zm3-8h53v4H40v-4zm0-8h53v4H40v-4zm-8 24h53v4H32v-4zm-2 8h53v4H30v-4zm-3 8h53v4H27v-4z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/open-window.tid b/core/images/open-window.tid
index 14b556484..d918b1fc8 100755
--- a/core/images/open-window.tid
+++ b/core/images/open-window.tid
@@ -1,4 +1,5 @@
title: $:/core/images/open-window
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-open-window tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M16 112h88.994c3.87 0 7.006 3.59 7.006 8 0 4.418-3.142 8-7.006 8H7.006C3.136 128 0 124.41 0 120a9.321 9.321 0 010-.01V24.01C0 19.586 3.59 16 8 16c4.418 0 8 3.584 8 8.01V112z"/><path d="M96 43.196V56a8 8 0 1016 0V24c0-4.41-3.585-8-8.007-8H72.007C67.588 16 64 19.582 64 24c0 4.41 3.585 8 8.007 8H84.57l-36.3 36.299a8 8 0 00-.001 11.316c3.117 3.117 8.19 3.123 11.316-.003L96 43.196zM32 7.999C32 3.581 35.588 0 40 0h80c4.419 0 8 3.588 8 8v80c0 4.419-3.588 8-8 8H40c-4.419 0-8-3.588-8-8V8z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-open-window tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M16 112h88.994c3.87 0 7.006 3.59 7.006 8 0 4.418-3.142 8-7.006 8H7.006C3.136 128 0 124.41 0 120a9.321 9.321 0 010-.01V24.01C0 19.586 3.59 16 8 16c4.418 0 8 3.584 8 8.01V112z"/><path d="M96 43.196V56a8 8 0 1016 0V24c0-4.41-3.585-8-8.007-8H72.007C67.588 16 64 19.582 64 24c0 4.41 3.585 8 8.007 8H84.57l-36.3 36.299a8 8 0 00-.001 11.316c3.117 3.117 8.19 3.123 11.316-.003L96 43.196zM32 7.999C32 3.581 35.588 0 40 0h80c4.419 0 8 3.588 8 8v80c0 4.419-3.588 8-8 8H40c-4.419 0-8-3.588-8-8V8z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/options-button.tid b/core/images/options-button.tid
index bd0ffcb1a..18fbf8b00 100755
--- a/core/images/options-button.tid
+++ b/core/images/options-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/options-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-options-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M110.488 76a47.712 47.712 0 01-5.134 12.384l6.724 6.724c3.123 3.123 3.132 8.192.011 11.313l-5.668 5.668c-3.12 3.12-8.186 3.117-11.313-.01l-6.724-6.725c-3.82 2.258-7.98 4-12.384 5.134v9.505c0 4.417-3.578 8.007-7.992 8.007h-8.016C55.58 128 52 124.415 52 119.993v-9.505a47.712 47.712 0 01-12.384-5.134l-6.724 6.725c-3.123 3.122-8.192 3.131-11.313.01l-5.668-5.668c-3.12-3.12-3.116-8.186.01-11.313l6.725-6.724c-2.257-3.82-4-7.98-5.134-12.384H8.007C3.591 76 0 72.422 0 68.01v-8.017C0 55.58 3.585 52 8.007 52h9.505a47.712 47.712 0 015.134-12.383l-6.724-6.725c-3.123-3.122-3.132-8.191-.011-11.312l5.668-5.669c3.12-3.12 8.186-3.116 11.313.01l6.724 6.725c3.82-2.257 7.98-4 12.384-5.134V8.007C52 3.591 55.578 0 59.992 0h8.016C72.42 0 76 3.585 76 8.007v9.505a47.712 47.712 0 0112.384 5.134l6.724-6.724c3.123-3.123 8.192-3.132 11.313-.01l5.668 5.668c3.12 3.12 3.116 8.186-.01 11.312l-6.725 6.725c2.257 3.82 4 7.979 5.134 12.383h9.505c4.416 0 8.007 3.578 8.007 7.992v8.017c0 4.411-3.585 7.991-8.007 7.991h-9.505zM64 96c17.673 0 32-14.327 32-32 0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32 0 17.673 14.327 32 32 32z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-options-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M110.488 76a47.712 47.712 0 01-5.134 12.384l6.724 6.724c3.123 3.123 3.132 8.192.011 11.313l-5.668 5.668c-3.12 3.12-8.186 3.117-11.313-.01l-6.724-6.725c-3.82 2.258-7.98 4-12.384 5.134v9.505c0 4.417-3.578 8.007-7.992 8.007h-8.016C55.58 128 52 124.415 52 119.993v-9.505a47.712 47.712 0 01-12.384-5.134l-6.724 6.725c-3.123 3.122-8.192 3.131-11.313.01l-5.668-5.668c-3.12-3.12-3.116-8.186.01-11.313l6.725-6.724c-2.257-3.82-4-7.98-5.134-12.384H8.007C3.591 76 0 72.422 0 68.01v-8.017C0 55.58 3.585 52 8.007 52h9.505a47.712 47.712 0 015.134-12.383l-6.724-6.725c-3.123-3.122-3.132-8.191-.011-11.312l5.668-5.669c3.12-3.12 8.186-3.116 11.313.01l6.724 6.725c3.82-2.257 7.98-4 12.384-5.134V8.007C52 3.591 55.578 0 59.992 0h8.016C72.42 0 76 3.585 76 8.007v9.505a47.712 47.712 0 0112.384 5.134l6.724-6.724c3.123-3.123 8.192-3.132 11.313-.01l5.668 5.668c3.12 3.12 3.116 8.186-.01 11.312l-6.725 6.725c2.257 3.82 4 7.979 5.134 12.383h9.505c4.416 0 8.007 3.578 8.007 7.992v8.017c0 4.411-3.585 7.991-8.007 7.991h-9.505zM64 96c17.673 0 32-14.327 32-32 0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32 0 17.673 14.327 32 32 32z"/></svg>
\ No newline at end of file
diff --git a/core/images/paint.tid b/core/images/paint.tid
index bb536b53a..660fda2bf 100755
--- a/core/images/paint.tid
+++ b/core/images/paint.tid
@@ -1,4 +1,5 @@
title: $:/core/images/paint
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-paint tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M83.527 76.19C90.43 69.287 91.892 59 87.91 50.665l37.903-37.902c2.919-2.92 2.913-7.659 0-10.572a7.474 7.474 0 00-10.572 0L77.338 40.093c-8.335-3.982-18.622-2.521-25.526 4.383l31.715 31.715zm-2.643 2.644L49.169 47.119S8.506 81.243 0 80.282c0 0 3.782 5.592 6.827 8.039 14.024-5.69 37.326-24.6 37.326-24.6l.661.66S19.45 90.222 9.18 92.047c1.222 1.44 4.354 4.053 6.247 5.776 5.417-1.488 34.733-28.57 34.733-28.57l.661.66-32.407 31.022 5.285 5.286L56.106 75.2l.662.66s-27.864 30.536-28.684 32.432c0 0 6.032 6.853 7.569 7.824.702-2.836 27.884-33.485 27.884-33.485l.661.66s-20.597 23.755-24.964 36.732c3.21 3.549 7.5 5.137 10.926 6.298-2.19-11.817 30.724-47.487 30.724-47.487z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-paint tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M83.527 76.19C90.43 69.287 91.892 59 87.91 50.665l37.903-37.902c2.919-2.92 2.913-7.659 0-10.572a7.474 7.474 0 00-10.572 0L77.338 40.093c-8.335-3.982-18.622-2.521-25.526 4.383l31.715 31.715zm-2.643 2.644L49.169 47.119S8.506 81.243 0 80.282c0 0 3.782 5.592 6.827 8.039 14.024-5.69 37.326-24.6 37.326-24.6l.661.66S19.45 90.222 9.18 92.047c1.222 1.44 4.354 4.053 6.247 5.776 5.417-1.488 34.733-28.57 34.733-28.57l.661.66-32.407 31.022 5.285 5.286L56.106 75.2l.662.66s-27.864 30.536-28.684 32.432c0 0 6.032 6.853 7.569 7.824.702-2.836 27.884-33.485 27.884-33.485l.661.66s-20.597 23.755-24.964 36.732c3.21 3.549 7.5 5.137 10.926 6.298-2.19-11.817 30.724-47.487 30.724-47.487z"/></svg>
\ No newline at end of file
diff --git a/core/images/palette.tid b/core/images/palette.tid
index d605fd853..1c7903549 100755
--- a/core/images/palette.tid
+++ b/core/images/palette.tid
@@ -1,4 +1,5 @@
title: $:/core/images/palette
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-palette tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M80.247 39.182a93.52 93.52 0 00-16.228-1.4C28.662 37.781 0 57.131 0 81.002c0 9.642 4.676 18.546 12.58 25.735C23.504 91.19 26.34 72.395 36.89 63.562c15.183-12.713 26.538-7.828 26.538-7.828l16.82-16.552zm26.535 9.655c13.049 7.913 21.257 19.392 21.257 32.166 0 9.35.519 17.411-11.874 25.08-10.797 6.681-3.824-6.536-11.844-10.898s-19.946 1.308-18.213 7.906c3.2 12.181 19.422 11.455 6.314 16.658-13.107 5.202-18.202 4.476-28.403 4.476-7.821 0-15.315-.947-22.243-2.68 9.844-4.197 27.88-12.539 33.354-19.456C82.788 92.409 87.37 80 83.324 72.484c-.194-.359 11.215-11.668 23.458-23.647zM1.134 123.867l-.66.002c33.479-14.94 22.161-64.226 58.818-64.226.317 1.418.644 2.944 1.062 4.494-25.907-4.166-23.567 48.031-59.22 59.73zm.713-.007c38.872-.506 78.152-22.347 78.152-44.813-9.27 0-14.073-3.48-16.816-7.942-16.597-7.003-30.365 45.715-61.336 52.755zm65.351-64.008c-4.45 4.115 4.886 16.433 11.318 11.318l45.27-45.27c11.317-11.318 0-22.635-11.318-11.318-11.317 11.318-33.518 34.405-45.27 45.27z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-palette tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M80.247 39.182a93.52 93.52 0 00-16.228-1.4C28.662 37.781 0 57.131 0 81.002c0 9.642 4.676 18.546 12.58 25.735C23.504 91.19 26.34 72.395 36.89 63.562c15.183-12.713 26.538-7.828 26.538-7.828l16.82-16.552zm26.535 9.655c13.049 7.913 21.257 19.392 21.257 32.166 0 9.35.519 17.411-11.874 25.08-10.797 6.681-3.824-6.536-11.844-10.898s-19.946 1.308-18.213 7.906c3.2 12.181 19.422 11.455 6.314 16.658-13.107 5.202-18.202 4.476-28.403 4.476-7.821 0-15.315-.947-22.243-2.68 9.844-4.197 27.88-12.539 33.354-19.456C82.788 92.409 87.37 80 83.324 72.484c-.194-.359 11.215-11.668 23.458-23.647zM1.134 123.867l-.66.002c33.479-14.94 22.161-64.226 58.818-64.226.317 1.418.644 2.944 1.062 4.494-25.907-4.166-23.567 48.031-59.22 59.73zm.713-.007c38.872-.506 78.152-22.347 78.152-44.813-9.27 0-14.073-3.48-16.816-7.942-16.597-7.003-30.365 45.715-61.336 52.755zm65.351-64.008c-4.45 4.115 4.886 16.433 11.318 11.318l45.27-45.27c11.317-11.318 0-22.635-11.318-11.318-11.317 11.318-33.518 34.405-45.27 45.27z"/></svg>
\ No newline at end of file
diff --git a/core/images/permalink-button.tid b/core/images/permalink-button.tid
index e8fd0aecd..f1cf38b41 100755
--- a/core/images/permalink-button.tid
+++ b/core/images/permalink-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/permalink-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-permalink-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M80.483 48l-7.387 32h-25.58l7.388-32h25.58zm3.694-16l5.624-24.358c.993-4.303 5.29-6.996 9.596-6.002 4.296.992 6.988 5.293 5.994 9.602L100.598 32h3.403c4.41 0 7.999 3.582 7.999 8 0 4.41-3.581 8-8 8h-7.096l-7.387 32H104c4.41 0 7.999 3.582 7.999 8 0 4.41-3.581 8-8 8H85.824l-5.624 24.358c-.993 4.303-5.29 6.996-9.596 6.002-4.296-.992-6.988-5.293-5.994-9.602L69.402 96h-25.58L38.2 120.358c-.993 4.303-5.29 6.996-9.596 6.002-4.296-.992-6.988-5.293-5.994-9.602L27.402 96h-3.403C19.59 96 16 92.418 16 88c0-4.41 3.581-8 8-8h7.096l7.387-32H24C19.59 48 16 44.418 16 40c0-4.41 3.581-8 8-8h18.177l5.624-24.358c.993-4.303 5.29-6.996 9.596-6.002 4.296.992 6.988 5.293 5.994 9.602L58.598 32h25.58z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-permalink-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M80.483 48l-7.387 32h-25.58l7.388-32h25.58zm3.694-16l5.624-24.358c.993-4.303 5.29-6.996 9.596-6.002 4.296.992 6.988 5.293 5.994 9.602L100.598 32h3.403c4.41 0 7.999 3.582 7.999 8 0 4.41-3.581 8-8 8h-7.096l-7.387 32H104c4.41 0 7.999 3.582 7.999 8 0 4.41-3.581 8-8 8H85.824l-5.624 24.358c-.993 4.303-5.29 6.996-9.596 6.002-4.296-.992-6.988-5.293-5.994-9.602L69.402 96h-25.58L38.2 120.358c-.993 4.303-5.29 6.996-9.596 6.002-4.296-.992-6.988-5.293-5.994-9.602L27.402 96h-3.403C19.59 96 16 92.418 16 88c0-4.41 3.581-8 8-8h7.096l7.387-32H24C19.59 48 16 44.418 16 40c0-4.41 3.581-8 8-8h18.177l5.624-24.358c.993-4.303 5.29-6.996 9.596-6.002 4.296.992 6.988 5.293 5.994 9.602L58.598 32h25.58z"/></svg>
\ No newline at end of file
diff --git a/core/images/permaview-button.tid b/core/images/permaview-button.tid
index b2ad9a408..82e533475 100755
--- a/core/images/permaview-button.tid
+++ b/core/images/permaview-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/permaview-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-permaview-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M81.483 48l-1.846 8h-5.58l1.847-8h5.58zm3.694-16l5.624-24.358c.993-4.303 5.29-6.996 9.596-6.002 4.296.992 6.988 5.293 5.994 9.602L101.598 32h2.403c4.41 0 7.999 3.582 7.999 8 0 4.41-3.581 8-8 8h-6.096l-1.847 8h7.944c4.41 0 7.999 3.582 7.999 8 0 4.41-3.581 8-8 8H92.364l-1.846 8H104c4.41 0 7.999 3.582 7.999 8 0 4.41-3.581 8-8 8H86.824l-5.624 24.358c-.993 4.303-5.29 6.996-9.596 6.002-4.296-.992-6.988-5.293-5.994-9.602L70.402 96h-5.58L59.2 120.358c-.993 4.303-5.29 6.996-9.596 6.002-4.296-.992-6.988-5.293-5.994-9.602L48.402 96h-5.58L37.2 120.358c-.993 4.303-5.29 6.996-9.596 6.002-4.296-.992-6.988-5.293-5.994-9.602L26.402 96h-2.403C19.59 96 16 92.418 16 88c0-4.41 3.581-8 8-8h6.096l1.847-8h-7.944C19.59 72 16 68.418 16 64c0-4.41 3.581-8 8-8h11.637l1.846-8H24C19.59 48 16 44.418 16 40c0-4.41 3.581-8 8-8h17.177l5.624-24.358c.993-4.303 5.29-6.996 9.596-6.002 4.296.992 6.988 5.293 5.994 9.602L57.598 32h5.58L68.8 7.642c.993-4.303 5.29-6.996 9.596-6.002 4.296.992 6.988 5.293 5.994 9.602L79.598 32h5.58zM53.904 48l-1.847 8h5.58l1.846-8h-5.579zm22.039 24l-1.847 8h-5.58l1.847-8h5.58zm-27.58 0l-1.846 8h5.579l1.847-8h-5.58z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-permaview-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M81.483 48l-1.846 8h-5.58l1.847-8h5.58zm3.694-16l5.624-24.358c.993-4.303 5.29-6.996 9.596-6.002 4.296.992 6.988 5.293 5.994 9.602L101.598 32h2.403c4.41 0 7.999 3.582 7.999 8 0 4.41-3.581 8-8 8h-6.096l-1.847 8h7.944c4.41 0 7.999 3.582 7.999 8 0 4.41-3.581 8-8 8H92.364l-1.846 8H104c4.41 0 7.999 3.582 7.999 8 0 4.41-3.581 8-8 8H86.824l-5.624 24.358c-.993 4.303-5.29 6.996-9.596 6.002-4.296-.992-6.988-5.293-5.994-9.602L70.402 96h-5.58L59.2 120.358c-.993 4.303-5.29 6.996-9.596 6.002-4.296-.992-6.988-5.293-5.994-9.602L48.402 96h-5.58L37.2 120.358c-.993 4.303-5.29 6.996-9.596 6.002-4.296-.992-6.988-5.293-5.994-9.602L26.402 96h-2.403C19.59 96 16 92.418 16 88c0-4.41 3.581-8 8-8h6.096l1.847-8h-7.944C19.59 72 16 68.418 16 64c0-4.41 3.581-8 8-8h11.637l1.846-8H24C19.59 48 16 44.418 16 40c0-4.41 3.581-8 8-8h17.177l5.624-24.358c.993-4.303 5.29-6.996 9.596-6.002 4.296.992 6.988 5.293 5.994 9.602L57.598 32h5.58L68.8 7.642c.993-4.303 5.29-6.996 9.596-6.002 4.296.992 6.988 5.293 5.994 9.602L79.598 32h5.58zM53.904 48l-1.847 8h5.58l1.846-8h-5.579zm22.039 24l-1.847 8h-5.58l1.847-8h5.58zm-27.58 0l-1.846 8h5.579l1.847-8h-5.58z"/></svg>
\ No newline at end of file
diff --git a/core/images/picture.tid b/core/images/picture.tid
index 7d035e2fc..2af427e2e 100755
--- a/core/images/picture.tid
+++ b/core/images/picture.tid
@@ -1,4 +1,5 @@
title: $:/core/images/picture
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-picture tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M112 68.233v-48.23A4.001 4.001 0 00107.997 16H20.003A4.001 4.001 0 0016 20.003v38.31l9.241-14.593c2.8-4.422 9.023-5.008 12.6-1.186l18.247 20.613 13.687-6.407a8 8 0 018.903 1.492 264.97 264.97 0 002.92 2.739 249.44 249.44 0 006.798 6.066 166.5 166.5 0 002.106 1.778c2.108 1.747 3.967 3.188 5.482 4.237.748.518 1.383.92 2.044 1.33.444.117 1.046.144 1.809.05 1.873-.233 4.238-1.144 6.723-2.547a36.016 36.016 0 003.205-2.044c.558-.4.93-.686 1.07-.802.376-.31.765-.577 1.165-.806zM0 8.007A8.01 8.01 0 018.007 0h111.986A8.01 8.01 0 01128 8.007v111.986a8.01 8.01 0 01-8.007 8.007H8.007A8.01 8.01 0 010 119.993V8.007zM95 42a8 8 0 100-16 8 8 0 000 16zM32 76c15.859 4.83 20.035 7.244 20.035 12S32 95.471 32 102.347c0 6.876 1.285 4.99 1.285 9.653H68s-13.685-6.625-13.685-10.8c0-7.665 10.615-8.34 10.615-13.2 0-7.357-14.078-8.833-32.93-12z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-picture tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M112 68.233v-48.23A4.001 4.001 0 00107.997 16H20.003A4.001 4.001 0 0016 20.003v38.31l9.241-14.593c2.8-4.422 9.023-5.008 12.6-1.186l18.247 20.613 13.687-6.407a8 8 0 018.903 1.492 264.97 264.97 0 002.92 2.739 249.44 249.44 0 006.798 6.066 166.5 166.5 0 002.106 1.778c2.108 1.747 3.967 3.188 5.482 4.237.748.518 1.383.92 2.044 1.33.444.117 1.046.144 1.809.05 1.873-.233 4.238-1.144 6.723-2.547a36.016 36.016 0 003.205-2.044c.558-.4.93-.686 1.07-.802.376-.31.765-.577 1.165-.806zM0 8.007A8.01 8.01 0 018.007 0h111.986A8.01 8.01 0 01128 8.007v111.986a8.01 8.01 0 01-8.007 8.007H8.007A8.01 8.01 0 010 119.993V8.007zM95 42a8 8 0 100-16 8 8 0 000 16zM32 76c15.859 4.83 20.035 7.244 20.035 12S32 95.471 32 102.347c0 6.876 1.285 4.99 1.285 9.653H68s-13.685-6.625-13.685-10.8c0-7.665 10.615-8.34 10.615-13.2 0-7.357-14.078-8.833-32.93-12z"/></svg>
\ No newline at end of file
diff --git a/core/images/plugin-generic-language.tid b/core/images/plugin-generic-language.tid
index 5c777d98d..d663d1563 100755
--- a/core/images/plugin-generic-language.tid
+++ b/core/images/plugin-generic-language.tid
@@ -1,4 +1,5 @@
title: $:/core/images/plugin-generic-language
tags: $:/tags/Image
-<svg width="22pt" height="22pt" viewBox="0 0 128 128" class="tc-image-plugin-generic-language tc-image-button"><path fill-rule="evenodd" d="M61.207 68.137c-4.324 2.795-6.999 6.656-6.999 10.921 0 7.906 9.19 14.424 21.042 15.336 2.162 3.902 8.598 6.785 16.318 7.01-5.126-1.125-9.117-3.742-10.62-7.01C92.805 93.487 102 86.967 102 79.059c0-8.53-10.699-15.445-23.896-15.445-6.599 0-12.572 1.729-16.897 4.524zm12.794-14.158c-4.324 2.795-10.298 4.524-16.897 4.524-2.619 0-5.14-.272-7.497-.775-3.312 2.25-8.383 3.69-14.067 3.69l-.255-.002c4.119-.892 7.511-2.747 9.478-5.13-6.925-2.704-11.555-7.617-11.555-13.228 0-8.53 10.699-15.445 23.896-15.445C70.301 27.613 81 34.528 81 43.058c0 4.265-2.675 8.126-6.999 10.921zM64 0l54.56 32v64L64 128 9.44 96V32L64 0z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> viewBox="0 0 128 128" class="tc-image-plugin-generic-language tc-image-button"><path fill-rule="evenodd" d="M61.207 68.137c-4.324 2.795-6.999 6.656-6.999 10.921 0 7.906 9.19 14.424 21.042 15.336 2.162 3.902 8.598 6.785 16.318 7.01-5.126-1.125-9.117-3.742-10.62-7.01C92.805 93.487 102 86.967 102 79.059c0-8.53-10.699-15.445-23.896-15.445-6.599 0-12.572 1.729-16.897 4.524zm12.794-14.158c-4.324 2.795-10.298 4.524-16.897 4.524-2.619 0-5.14-.272-7.497-.775-3.312 2.25-8.383 3.69-14.067 3.69l-.255-.002c4.119-.892 7.511-2.747 9.478-5.13-6.925-2.704-11.555-7.617-11.555-13.228 0-8.53 10.699-15.445 23.896-15.445C70.301 27.613 81 34.528 81 43.058c0 4.265-2.675 8.126-6.999 10.921zM64 0l54.56 32v64L64 128 9.44 96V32L64 0z"/></svg>
\ No newline at end of file
diff --git a/core/images/plugin-generic-plugin.tid b/core/images/plugin-generic-plugin.tid
index ab2e6670e..06073dd7c 100755
--- a/core/images/plugin-generic-plugin.tid
+++ b/core/images/plugin-generic-plugin.tid
@@ -1,4 +1,5 @@
title: $:/core/images/plugin-generic-plugin
tags: $:/tags/Image
-<svg width="22pt" height="22pt" viewBox="0 0 128 128" class="tc-image-plugin-generic-plugin tc-image-button"><path fill-rule="evenodd" d="M40.397 76.446V95.34h14.12l-.001-.005a6.912 6.912 0 005.364-11.593l.046-.023a6.912 6.912 0 119.979.526l.086.055a6.914 6.914 0 004.408 10.948l-.023.092h21.32V75.568l-.15.038a6.912 6.912 0 00-11.593-5.364l-.022-.046a6.912 6.912 0 11.526-9.979l.055-.086a6.914 6.914 0 0010.948-4.408c.079.018.158.038.236.059v-15.74h-21.32l.023-.094a6.914 6.914 0 01-4.408-10.947 10.23 10.23 0 00-.086-.055 6.912 6.912 0 10-9.979-.526l-.046.023a6.912 6.912 0 01-5.364 11.593l.001.005h-14.12v12.847A6.912 6.912 0 0129.5 59.843l-.054.086a6.912 6.912 0 10-.526 9.979l.023.046a6.912 6.912 0 0111.455 6.492zM64 0l54.56 32v64L64 128 9.44 96V32L64 0z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> viewBox="0 0 128 128" class="tc-image-plugin-generic-plugin tc-image-button"><path fill-rule="evenodd" d="M40.397 76.446V95.34h14.12l-.001-.005a6.912 6.912 0 005.364-11.593l.046-.023a6.912 6.912 0 119.979.526l.086.055a6.914 6.914 0 004.408 10.948l-.023.092h21.32V75.568l-.15.038a6.912 6.912 0 00-11.593-5.364l-.022-.046a6.912 6.912 0 11.526-9.979l.055-.086a6.914 6.914 0 0010.948-4.408c.079.018.158.038.236.059v-15.74h-21.32l.023-.094a6.914 6.914 0 01-4.408-10.947 10.23 10.23 0 00-.086-.055 6.912 6.912 0 10-9.979-.526l-.046.023a6.912 6.912 0 01-5.364 11.593l.001.005h-14.12v12.847A6.912 6.912 0 0129.5 59.843l-.054.086a6.912 6.912 0 10-.526 9.979l.023.046a6.912 6.912 0 0111.455 6.492zM64 0l54.56 32v64L64 128 9.44 96V32L64 0z"/></svg>
\ No newline at end of file
diff --git a/core/images/plugin-generic-theme.tid b/core/images/plugin-generic-theme.tid
index 9ae3cd779..ab899b3e4 100755
--- a/core/images/plugin-generic-theme.tid
+++ b/core/images/plugin-generic-theme.tid
@@ -1,4 +1,5 @@
title: $:/core/images/plugin-generic-theme
tags: $:/tags/Image
-<svg width="22pt" height="22pt" viewBox="0 0 128 128" class="tc-image-plugin-generic-theme tc-image-button"><path fill-rule="evenodd" d="M29.408 91.472L51.469 69.41l-.004-.005a2.22 2.22 0 01.004-3.146c.87-.87 2.281-.872 3.147-.005l9.465 9.464a2.22 2.22 0 01-.005 3.147c-.87.87-2.28.871-3.147.005l-.005-.005-22.061 22.062a6.686 6.686 0 11-9.455-9.455zM60.802 66.38c-2.436-2.704-4.465-5.091-5.817-6.869-6.855-9.014-10.313-4.268-14.226 0-3.913 4.268 1.03 7.726-2.683 10.741-3.713 3.015-3.484 4.06-9.752-1.455-6.267-5.516-6.7-7.034-3.823-10.181 2.877-3.147 5.281 1.808 11.159-3.785 5.877-5.593.94-10.55.94-10.55s12.237-25.014 28.588-23.167c16.351 1.848-6.186-2.392-11.792 17.226-2.4 8.4.447 6.42 4.998 9.968 1.394 1.086 6.03 4.401 11.794 8.685l20.677-20.676 1.615-4.766 7.84-4.689 3.151 3.152-4.688 7.84-4.766 1.615-20.224 20.223c12.663 9.547 28.312 22.146 28.312 26.709 0 7.217-3.071 11.526-9.535 9.164-4.693-1.715-18.768-15.192-28.753-25.897l-2.893 2.893-3.151-3.152 3.029-3.029zM63.953 0l54.56 32v64l-54.56 32-54.56-32V32l54.56-32z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> viewBox="0 0 128 128" class="tc-image-plugin-generic-theme tc-image-button"><path fill-rule="evenodd" d="M29.408 91.472L51.469 69.41l-.004-.005a2.22 2.22 0 01.004-3.146c.87-.87 2.281-.872 3.147-.005l9.465 9.464a2.22 2.22 0 01-.005 3.147c-.87.87-2.28.871-3.147.005l-.005-.005-22.061 22.062a6.686 6.686 0 11-9.455-9.455zM60.802 66.38c-2.436-2.704-4.465-5.091-5.817-6.869-6.855-9.014-10.313-4.268-14.226 0-3.913 4.268 1.03 7.726-2.683 10.741-3.713 3.015-3.484 4.06-9.752-1.455-6.267-5.516-6.7-7.034-3.823-10.181 2.877-3.147 5.281 1.808 11.159-3.785 5.877-5.593.94-10.55.94-10.55s12.237-25.014 28.588-23.167c16.351 1.848-6.186-2.392-11.792 17.226-2.4 8.4.447 6.42 4.998 9.968 1.394 1.086 6.03 4.401 11.794 8.685l20.677-20.676 1.615-4.766 7.84-4.689 3.151 3.152-4.688 7.84-4.766 1.615-20.224 20.223c12.663 9.547 28.312 22.146 28.312 26.709 0 7.217-3.071 11.526-9.535 9.164-4.693-1.715-18.768-15.192-28.753-25.897l-2.893 2.893-3.151-3.152 3.029-3.029zM63.953 0l54.56 32v64l-54.56 32-54.56-32V32l54.56-32z"/></svg>
\ No newline at end of file
diff --git a/core/images/plus-button.tid b/core/images/plus-button.tid
new file mode 100644
index 000000000..c9a696d43
--- /dev/null
+++ b/core/images/plus-button.tid
@@ -0,0 +1,5 @@
+title: $:/core/images/plus-button
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-plus-button tc-image-button" viewBox="0 0 128 128"><path d="M64-.333c35.346 0 64 28.654 64 64 0 35.346-28.654 64-64 64-35.346 0-64-28.654-64-64 0-35.346 28.654-64 64-64zM64 16c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48z"/><rect width="80" height="16" x="24" y="56" rx="8"/><rect width="16" height="80" x="56" y="24" rx="8"/></svg>
\ No newline at end of file
diff --git a/core/images/preview-closed.tid b/core/images/preview-closed.tid
index 5986d8966..cf17730d5 100755
--- a/core/images/preview-closed.tid
+++ b/core/images/preview-closed.tid
@@ -1,4 +1,5 @@
title: $:/core/images/preview-closed
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-preview-closed tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M.088 64a7.144 7.144 0 001.378 5.458C16.246 88.818 39.17 100.414 64 100.414c24.83 0 47.753-11.596 62.534-30.956A7.144 7.144 0 00127.912 64C110.582 78.416 88.304 87.086 64 87.086 39.696 87.086 17.418 78.416.088 64z"/><rect width="4" height="16" x="62" y="96" rx="4"/><rect width="4" height="16" x="78" y="93" rx="4" transform="rotate(-5 80 101)"/><rect width="4" height="16" x="46" y="93" rx="4" transform="rotate(5 48 101)"/><rect width="4" height="16" x="30" y="88" rx="4" transform="rotate(10 32 96)"/><rect width="4" height="16" x="94" y="88" rx="4" transform="rotate(-10 96 96)"/><rect width="4" height="16" x="110" y="80" rx="4" transform="rotate(-20 112 88)"/><rect width="4" height="16" x="14" y="80" rx="4" transform="rotate(20 16 88)"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-preview-closed tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M.088 64a7.144 7.144 0 001.378 5.458C16.246 88.818 39.17 100.414 64 100.414c24.83 0 47.753-11.596 62.534-30.956A7.144 7.144 0 00127.912 64C110.582 78.416 88.304 87.086 64 87.086 39.696 87.086 17.418 78.416.088 64z"/><rect width="4" height="16" x="62" y="96" rx="4"/><rect width="4" height="16" x="78" y="93" rx="4" transform="rotate(-5 80 101)"/><rect width="4" height="16" x="46" y="93" rx="4" transform="rotate(5 48 101)"/><rect width="4" height="16" x="30" y="88" rx="4" transform="rotate(10 32 96)"/><rect width="4" height="16" x="94" y="88" rx="4" transform="rotate(-10 96 96)"/><rect width="4" height="16" x="110" y="80" rx="4" transform="rotate(-20 112 88)"/><rect width="4" height="16" x="14" y="80" rx="4" transform="rotate(20 16 88)"/></g></svg>
\ No newline at end of file
diff --git a/core/images/preview-open.tid b/core/images/preview-open.tid
index 4664990b4..cb30bf474 100755
--- a/core/images/preview-open.tid
+++ b/core/images/preview-open.tid
@@ -1,4 +1,5 @@
title: $:/core/images/preview-open
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-preview-open tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M64.11 99.588c-24.83 0-47.754-11.596-62.534-30.957a7.148 7.148 0 010-8.675C16.356 40.596 39.28 29 64.11 29c24.83 0 47.753 11.596 62.534 30.956a7.148 7.148 0 010 8.675c-14.78 19.36-37.703 30.957-62.534 30.957zm46.104-32.007c1.44-1.524 1.44-3.638 0-5.162C99.326 50.9 82.439 44 64.147 44S28.968 50.9 18.08 62.42c-1.44 1.523-1.44 3.637 0 5.16C28.968 79.1 45.855 86 64.147 86s35.179-6.9 46.067-18.42z"/><path d="M63.5 88C76.479 88 87 77.479 87 64.5S76.479 41 63.5 41 40 51.521 40 64.5 50.521 88 63.5 88z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-preview-open tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M64.11 99.588c-24.83 0-47.754-11.596-62.534-30.957a7.148 7.148 0 010-8.675C16.356 40.596 39.28 29 64.11 29c24.83 0 47.753 11.596 62.534 30.956a7.148 7.148 0 010 8.675c-14.78 19.36-37.703 30.957-62.534 30.957zm46.104-32.007c1.44-1.524 1.44-3.638 0-5.162C99.326 50.9 82.439 44 64.147 44S28.968 50.9 18.08 62.42c-1.44 1.523-1.44 3.637 0 5.16C28.968 79.1 45.855 86 64.147 86s35.179-6.9 46.067-18.42z"/><path d="M63.5 88C76.479 88 87 77.479 87 64.5S76.479 41 63.5 41 40 51.521 40 64.5 50.521 88 63.5 88z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/print-button.tid b/core/images/print-button.tid
index 55b33c896..12bffd41d 100644
--- a/core/images/print-button.tid
+++ b/core/images/print-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/print-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-print-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M112 71V30.5h-.032c-.035-2-.816-3.99-2.343-5.516L86.998 2.357A7.978 7.978 0 0081 .02V0H24a8 8 0 00-8 8v63h8V8h57v14.5c0 4.422 3.582 8 8 8h15V71h8z"/><rect width="64" height="8" x="32" y="36" rx="4"/><rect width="64" height="8" x="32" y="52" rx="4"/><rect width="40" height="8" x="32" y="20" rx="4"/><path d="M0 80.005C0 71.165 7.156 64 16 64h96c8.836 0 16 7.155 16 16.005v31.99c0 8.84-7.156 16.005-16 16.005H16c-8.836 0-16-7.155-16-16.005v-31.99zM104 96a8 8 0 100-16 8 8 0 000 16z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-print-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M112 71V30.5h-.032c-.035-2-.816-3.99-2.343-5.516L86.998 2.357A7.978 7.978 0 0081 .02V0H24a8 8 0 00-8 8v63h8V8h57v14.5c0 4.422 3.582 8 8 8h15V71h8z"/><rect width="64" height="8" x="32" y="36" rx="4"/><rect width="64" height="8" x="32" y="52" rx="4"/><rect width="40" height="8" x="32" y="20" rx="4"/><path d="M0 80.005C0 71.165 7.156 64 16 64h96c8.836 0 16 7.155 16 16.005v31.99c0 8.84-7.156 16.005-16 16.005H16c-8.836 0-16-7.155-16-16.005v-31.99zM104 96a8 8 0 100-16 8 8 0 000 16z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/quote.tid b/core/images/quote.tid
index 7134306a6..0c4fcf25a 100755
--- a/core/images/quote.tid
+++ b/core/images/quote.tid
@@ -1,4 +1,5 @@
title: $:/core/images/quote
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-quote tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M51.219 117.713V62.199H27.427c0-8.891 1.683-16.401 5.047-22.53 3.365-6.127 9.613-10.754 18.745-13.878V2c-7.45.961-14.36 3.184-20.728 6.669-6.368 3.484-11.835 7.87-16.401 13.157C9.524 27.113 5.98 33.241 3.456 40.21.933 47.18-.21 54.63.03 62.56v55.153H51.22zm76.781 0V62.199h-23.791c0-8.891 1.682-16.401 5.046-22.53 3.365-6.127 9.613-10.754 18.745-13.878V2c-7.45.961-14.359 3.184-20.727 6.669-6.369 3.484-11.836 7.87-16.402 13.157-4.566 5.287-8.11 11.415-10.634 18.384-2.523 6.97-3.665 14.42-3.424 22.35v55.153H128z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-quote tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M51.219 117.713V62.199H27.427c0-8.891 1.683-16.401 5.047-22.53 3.365-6.127 9.613-10.754 18.745-13.878V2c-7.45.961-14.36 3.184-20.728 6.669-6.368 3.484-11.835 7.87-16.401 13.157C9.524 27.113 5.98 33.241 3.456 40.21.933 47.18-.21 54.63.03 62.56v55.153H51.22zm76.781 0V62.199h-23.791c0-8.891 1.682-16.401 5.046-22.53 3.365-6.127 9.613-10.754 18.745-13.878V2c-7.45.961-14.359 3.184-20.727 6.669-6.369 3.484-11.836 7.87-16.402 13.157-4.566 5.287-8.11 11.415-10.634 18.384-2.523 6.97-3.665 14.42-3.424 22.35v55.153H128z"/></svg>
\ No newline at end of file
diff --git a/core/images/refresh-button.tid b/core/images/refresh-button.tid
index 2422b0679..f8e3fc69e 100755
--- a/core/images/refresh-button.tid
+++ b/core/images/refresh-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/refresh-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-refresh-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M106.369 39.433c10.16 20.879 6.57 46.764-10.771 64.106-21.87 21.87-57.327 21.87-79.196 0-21.87-21.87-21.87-57.326 0-79.196a8 8 0 1111.314 11.314c-15.621 15.62-15.621 40.947 0 56.568 15.62 15.621 40.947 15.621 56.568 0C97.72 78.79 99.6 58.175 89.924 42.73l-6.44 12.264a8 8 0 11-14.166-7.437L84.435 18.76a8 8 0 0110.838-3.345l28.873 15.345a8 8 0 11-7.51 14.129l-10.267-5.457zm-8.222-12.368c-.167-.19-.336-.38-.506-.57l.96-.296-.454.866z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-refresh-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M106.369 39.433c10.16 20.879 6.57 46.764-10.771 64.106-21.87 21.87-57.327 21.87-79.196 0-21.87-21.87-21.87-57.326 0-79.196a8 8 0 1111.314 11.314c-15.621 15.62-15.621 40.947 0 56.568 15.62 15.621 40.947 15.621 56.568 0C97.72 78.79 99.6 58.175 89.924 42.73l-6.44 12.264a8 8 0 11-14.166-7.437L84.435 18.76a8 8 0 0110.838-3.345l28.873 15.345a8 8 0 11-7.51 14.129l-10.267-5.457zm-8.222-12.368c-.167-.19-.336-.38-.506-.57l.96-.296-.454.866z"/></svg>
\ No newline at end of file
diff --git a/core/images/right-arrow.tid b/core/images/right-arrow.tid
index 42e7dea56..64f839b55 100755
--- a/core/images/right-arrow.tid
+++ b/core/images/right-arrow.tid
@@ -1,4 +1,5 @@
title: $:/core/images/right-arrow
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-right-arrow tc-image-button" viewBox="0 0 128 128"><path d="M99.069 64.173c0 2.027-.77 4.054-2.316 5.6l-55.98 55.98a7.92 7.92 0 01-11.196 0c-3.085-3.086-3.092-8.105 0-11.196l50.382-50.382-50.382-50.382a7.92 7.92 0 010-11.195c3.086-3.085 8.104-3.092 11.196 0l55.98 55.98a7.892 7.892 0 012.316 5.595z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-right-arrow tc-image-button" viewBox="0 0 128 128"><path d="M99.069 64.173c0 2.027-.77 4.054-2.316 5.6l-55.98 55.98a7.92 7.92 0 01-11.196 0c-3.085-3.086-3.092-8.105 0-11.196l50.382-50.382-50.382-50.382a7.92 7.92 0 010-11.195c3.086-3.085 8.104-3.092 11.196 0l55.98 55.98a7.892 7.892 0 012.316 5.595z"/></svg>
\ No newline at end of file
diff --git a/core/images/rotate-left.tid b/core/images/rotate-left.tid
index 188d3b45c..da6034b19 100644
--- a/core/images/rotate-left.tid
+++ b/core/images/rotate-left.tid
@@ -1,4 +1,5 @@
title: $:/core/images/rotate-left
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-rotate-left tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="32" height="80" rx="8"/><rect width="80" height="32" x="48" y="96" rx="8"/><path d="M61.32 36.65c19.743 2.45 35.023 19.287 35.023 39.693a4 4 0 01-8 0c0-15.663-11.254-28.698-26.117-31.46l3.916 3.916a4 4 0 11-5.657 5.657L49.172 43.142a4 4 0 010-5.657l11.313-11.313a4 4 0 115.657 5.656l-4.821 4.822z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-rotate-left tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="32" height="80" rx="8"/><rect width="80" height="32" x="48" y="96" rx="8"/><path d="M61.32 36.65c19.743 2.45 35.023 19.287 35.023 39.693a4 4 0 01-8 0c0-15.663-11.254-28.698-26.117-31.46l3.916 3.916a4 4 0 11-5.657 5.657L49.172 43.142a4 4 0 010-5.657l11.313-11.313a4 4 0 115.657 5.656l-4.821 4.822z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/save-button-dynamic.tid b/core/images/save-button-dynamic.tid
new file mode 100644
index 000000000..7a351d617
--- /dev/null
+++ b/core/images/save-button-dynamic.tid
@@ -0,0 +1,13 @@
+title: $:/core/images/save-button-dynamic
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-save-button-dynamic tc-image-button" viewBox="0 0 128 128">
+<g class="tc-image-save-button-dynamic-clean">
+<path fill-rule="evenodd" d="M120.783 34.33c4.641 8.862 7.266 18.948 7.266 29.646 0 35.347-28.653 64-64 64-35.346 0-64-28.653-64-64 0-35.346 28.654-64 64-64 18.808 0 35.72 8.113 47.43 21.03l2.68-2.68c3.13-3.13 8.197-3.132 11.321-.008 3.118 3.118 3.121 8.193-.007 11.32l-4.69 4.691zm-12.058 12.058a47.876 47.876 0 013.324 17.588c0 26.51-21.49 48-48 48s-48-21.49-48-48 21.49-48 48-48c14.39 0 27.3 6.332 36.098 16.362L58.941 73.544 41.976 56.578c-3.127-3.127-8.201-3.123-11.32-.005-3.123 3.124-3.119 8.194.006 11.319l22.617 22.617a7.992 7.992 0 005.659 2.347c2.05 0 4.101-.783 5.667-2.349l44.12-44.12z"/>
+</g>
+<g class="tc-image-save-button-dynamic-dirty">
+<path d="M64.856912,0 C100.203136,0 128.856912,28.653776 128.856912,64 C128.856912,99.346224 100.203136,128 64.856912,128 C29.510688,128 0.856911958,99.346224 0.856911958,64 C0.856911958,28.653776 29.510688,0 64.856912,0 Z M64.856912,16 C38.347244,16 16.856912,37.490332 16.856912,64 C16.856912,90.509668 38.347244,112 64.856912,112 C91.3665799,112 112.856912,90.509668 112.856912,64 C112.856912,37.490332 91.3665799,16 64.856912,16 Z"></path>
+<circle cx="65" cy="64" r="32"></circle>
+</g>
+</svg>
\ No newline at end of file
diff --git a/core/images/save-button.tid b/core/images/save-button.tid
index a66756616..912ad248c 100755
--- a/core/images/save-button.tid
+++ b/core/images/save-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/save-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-save-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M120.783 34.33c4.641 8.862 7.266 18.948 7.266 29.646 0 35.347-28.653 64-64 64-35.346 0-64-28.653-64-64 0-35.346 28.654-64 64-64 18.808 0 35.72 8.113 47.43 21.03l2.68-2.68c3.13-3.13 8.197-3.132 11.321-.008 3.118 3.118 3.121 8.193-.007 11.32l-4.69 4.691zm-12.058 12.058a47.876 47.876 0 013.324 17.588c0 26.51-21.49 48-48 48s-48-21.49-48-48 21.49-48 48-48c14.39 0 27.3 6.332 36.098 16.362L58.941 73.544 41.976 56.578c-3.127-3.127-8.201-3.123-11.32-.005-3.123 3.124-3.119 8.194.006 11.319l22.617 22.617a7.992 7.992 0 005.659 2.347c2.05 0 4.101-.783 5.667-2.349l44.12-44.12z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-save-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M120.783 34.33c4.641 8.862 7.266 18.948 7.266 29.646 0 35.347-28.653 64-64 64-35.346 0-64-28.653-64-64 0-35.346 28.654-64 64-64 18.808 0 35.72 8.113 47.43 21.03l2.68-2.68c3.13-3.13 8.197-3.132 11.321-.008 3.118 3.118 3.121 8.193-.007 11.32l-4.69 4.691zm-12.058 12.058a47.876 47.876 0 013.324 17.588c0 26.51-21.49 48-48 48s-48-21.49-48-48 21.49-48 48-48c14.39 0 27.3 6.332 36.098 16.362L58.941 73.544 41.976 56.578c-3.127-3.127-8.201-3.123-11.32-.005-3.123 3.124-3.119 8.194.006 11.319l22.617 22.617a7.992 7.992 0 005.659 2.347c2.05 0 4.101-.783 5.667-2.349l44.12-44.12z"/></svg>
\ No newline at end of file
diff --git a/core/images/size.tid b/core/images/size.tid
index db84ecf9b..ea9aa1094 100755
--- a/core/images/size.tid
+++ b/core/images/size.tid
@@ -1,4 +1,5 @@
title: $:/core/images/size
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-size tc-image-button" viewBox="0 0 128 128"><path d="M92.343 26l-9.171 9.172a4 4 0 105.656 5.656l16-16a4 4 0 000-5.656l-16-16a4 4 0 10-5.656 5.656L92.343 18H22a4 4 0 00-4 4v70.343l-9.172-9.171a4 4 0 10-5.656 5.656l16 16a4 4 0 005.656 0l16-16a4 4 0 10-5.656-5.656L26 92.343V22l-4 4h70.343zM112 52v64l4-4H52a4 4 0 100 8h64a4 4 0 004-4V52a4 4 0 10-8 0z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-size tc-image-button" viewBox="0 0 128 128"><path d="M92.343 26l-9.171 9.172a4 4 0 105.656 5.656l16-16a4 4 0 000-5.656l-16-16a4 4 0 10-5.656 5.656L92.343 18H22a4 4 0 00-4 4v70.343l-9.172-9.171a4 4 0 10-5.656 5.656l16 16a4 4 0 005.656 0l16-16a4 4 0 10-5.656-5.656L26 92.343V22l-4 4h70.343zM112 52v64l4-4H52a4 4 0 100 8h64a4 4 0 004-4V52a4 4 0 10-8 0z"/></svg>
\ No newline at end of file
diff --git a/core/images/spiral.tid b/core/images/spiral.tid
index ca4684cab..f3a5271ac 100755
--- a/core/images/spiral.tid
+++ b/core/images/spiral.tid
@@ -1,4 +1,5 @@
title: $:/core/images/spiral
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-spiral tc-image-button" viewBox="0 0 128 128"><path d="M64.534 68.348c3.39 0 6.097-2.62 6.476-5.968l-4.755-.538 4.75.583c.377-3.07-1.194-6.054-3.89-7.78-2.757-1.773-6.34-2.01-9.566-.7-3.46 1.403-6.14 4.392-7.35 8.148l-.01.026c-1.3 4.08-.72 8.64 1.58 12.52 2.5 4.2 6.77 7.2 11.76 8.27 5.37 1.15 11.11-.05 15.83-3.31 5.04-3.51 8.46-9.02 9.45-15.3 1.05-6.7-.72-13.63-4.92-19.19l.02.02c-4.42-5.93-11.2-9.82-18.78-10.78-7.96-1.01-16.13 1.31-22.59 6.43-6.81 5.39-11.18 13.41-12.11 22.26-.98 9.27 1.87 18.65 7.93 26.02 6.32 7.69 15.6 12.56 25.74 13.48 10.54.96 21.15-2.42 29.45-9.4l.01-.01c8.58-7.25 13.94-17.78 14.86-29.21.94-11.84-2.96-23.69-10.86-32.9-8.19-9.5-19.95-15.36-32.69-16.27-13.16-.94-26.24 3.49-36.34 12.34l.01-.01c-10.41 9.08-16.78 22.1-17.68 36.15-.93 14.44 4.03 28.77 13.79 39.78 10.03 11.32 24.28 18.2 39.6 19.09 15.73.92 31.31-4.56 43.24-15.234 12.23-10.954 19.61-26.44 20.5-43.074a4.785 4.785 0 00-4.52-5.03 4.778 4.778 0 00-5.03 4.52c-.75 14.1-7 27.2-17.33 36.45-10.03 8.98-23.11 13.58-36.3 12.81-12.79-.75-24.67-6.48-33-15.89-8.07-9.11-12.17-20.94-11.41-32.827.74-11.52 5.942-22.15 14.43-29.54l.01-.01c8.18-7.17 18.74-10.75 29.35-9.998 10.21.726 19.6 5.41 26.11 12.96 6.24 7.273 9.32 16.61 8.573 25.894-.718 8.9-4.88 17.064-11.504 22.66l.01-.007c-6.36 5.342-14.44 7.92-22.425 7.19-7.604-.68-14.52-4.314-19.21-10.027-4.44-5.4-6.517-12.23-5.806-18.94.67-6.3 3.76-11.977 8.54-15.766 4.46-3.54 10.05-5.128 15.44-4.44 5.03.63 9.46 3.18 12.32 7.01l.02.024c2.65 3.5 3.75 7.814 3.1 11.92-.59 3.71-2.58 6.925-5.45 8.924-2.56 1.767-5.61 2.403-8.38 1.81-2.42-.516-4.42-1.92-5.53-3.79-.93-1.56-1.15-3.3-.69-4.75l-4.56-1.446L59.325 65c.36-1.12 1.068-1.905 1.84-2.22.25-.103.48-.14.668-.13.06.006.11.015.14.025.01 0 .01 0-.01-.01a1.047 1.047 0 01-.264-.332c-.15-.29-.23-.678-.18-1.11l-.005.04c.15-1.332 1.38-2.523 3.035-2.523-2.65 0-4.79 2.144-4.79 4.787s2.14 4.785 4.78 4.785z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-spiral tc-image-button" viewBox="0 0 128 128"><path d="M64.534 68.348c3.39 0 6.097-2.62 6.476-5.968l-4.755-.538 4.75.583c.377-3.07-1.194-6.054-3.89-7.78-2.757-1.773-6.34-2.01-9.566-.7-3.46 1.403-6.14 4.392-7.35 8.148l-.01.026c-1.3 4.08-.72 8.64 1.58 12.52 2.5 4.2 6.77 7.2 11.76 8.27 5.37 1.15 11.11-.05 15.83-3.31 5.04-3.51 8.46-9.02 9.45-15.3 1.05-6.7-.72-13.63-4.92-19.19l.02.02c-4.42-5.93-11.2-9.82-18.78-10.78-7.96-1.01-16.13 1.31-22.59 6.43-6.81 5.39-11.18 13.41-12.11 22.26-.98 9.27 1.87 18.65 7.93 26.02 6.32 7.69 15.6 12.56 25.74 13.48 10.54.96 21.15-2.42 29.45-9.4l.01-.01c8.58-7.25 13.94-17.78 14.86-29.21.94-11.84-2.96-23.69-10.86-32.9-8.19-9.5-19.95-15.36-32.69-16.27-13.16-.94-26.24 3.49-36.34 12.34l.01-.01c-10.41 9.08-16.78 22.1-17.68 36.15-.93 14.44 4.03 28.77 13.79 39.78 10.03 11.32 24.28 18.2 39.6 19.09 15.73.92 31.31-4.56 43.24-15.234 12.23-10.954 19.61-26.44 20.5-43.074a4.785 4.785 0 00-4.52-5.03 4.778 4.778 0 00-5.03 4.52c-.75 14.1-7 27.2-17.33 36.45-10.03 8.98-23.11 13.58-36.3 12.81-12.79-.75-24.67-6.48-33-15.89-8.07-9.11-12.17-20.94-11.41-32.827.74-11.52 5.942-22.15 14.43-29.54l.01-.01c8.18-7.17 18.74-10.75 29.35-9.998 10.21.726 19.6 5.41 26.11 12.96 6.24 7.273 9.32 16.61 8.573 25.894-.718 8.9-4.88 17.064-11.504 22.66l.01-.007c-6.36 5.342-14.44 7.92-22.425 7.19-7.604-.68-14.52-4.314-19.21-10.027-4.44-5.4-6.517-12.23-5.806-18.94.67-6.3 3.76-11.977 8.54-15.766 4.46-3.54 10.05-5.128 15.44-4.44 5.03.63 9.46 3.18 12.32 7.01l.02.024c2.65 3.5 3.75 7.814 3.1 11.92-.59 3.71-2.58 6.925-5.45 8.924-2.56 1.767-5.61 2.403-8.38 1.81-2.42-.516-4.42-1.92-5.53-3.79-.93-1.56-1.15-3.3-.69-4.75l-4.56-1.446L59.325 65c.36-1.12 1.068-1.905 1.84-2.22.25-.103.48-.14.668-.13.06.006.11.015.14.025.01 0 .01 0-.01-.01a1.047 1.047 0 01-.264-.332c-.15-.29-.23-.678-.18-1.11l-.005.04c.15-1.332 1.38-2.523 3.035-2.523-2.65 0-4.79 2.144-4.79 4.787s2.14 4.785 4.78 4.785z"/></svg>
\ No newline at end of file
diff --git a/core/images/stamp.tid b/core/images/stamp.tid
index ba385aaae..8511a457f 100755
--- a/core/images/stamp.tid
+++ b/core/images/stamp.tid
@@ -1,4 +1,5 @@
title: $:/core/images/stamp
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-stamp tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M49.733 64H16.01C11.584 64 8 67.583 8 72.003V97h112V72.003A8 8 0 00111.99 64H78.267A22.813 22.813 0 0175.5 53.077c0-6.475 2.687-12.324 7.009-16.497A22.818 22.818 0 0087 22.952C87 10.276 76.703 0 64 0S41 10.276 41 22.952c0 5.103 1.669 9.817 4.491 13.628 4.322 4.173 7.009 10.022 7.009 16.497 0 3.954-1.002 7.675-2.767 10.923zM8 104h112v8H8v-8z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-stamp tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M49.733 64H16.01C11.584 64 8 67.583 8 72.003V97h112V72.003A8 8 0 00111.99 64H78.267A22.813 22.813 0 0175.5 53.077c0-6.475 2.687-12.324 7.009-16.497A22.818 22.818 0 0087 22.952C87 10.276 76.703 0 64 0S41 10.276 41 22.952c0 5.103 1.669 9.817 4.491 13.628 4.322 4.173 7.009 10.022 7.009 16.497 0 3.954-1.002 7.675-2.767 10.923zM8 104h112v8H8v-8z"/></svg>
\ No newline at end of file
diff --git a/core/images/standard-layout.tid b/core/images/standard-layout.tid
new file mode 100644
index 000000000..1b83375c9
--- /dev/null
+++ b/core/images/standard-layout.tid
@@ -0,0 +1,7 @@
+title: $:/core/images/standard-layout
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-standard-layout tc-image-button" viewBox="0 0 128 128">
+ <path d="M71.93 72A8.07 8.07 0 0 1 80 80.07v7.86A8.071 8.071 0 0 1 71.93 96H8.07A8.067 8.067 0 0 1 0 87.93v-7.86A8.072 8.072 0 0 1 8.07 72h63.86Zm0 32a8.07 8.07 0 0 1 8.07 8.07v7.86a8.071 8.071 0 0 1-8.07 8.07H8.07A8.067 8.067 0 0 1 0 119.93v-7.86A8.072 8.072 0 0 1 8.07 104h63.86Zm0-104A8.068 8.068 0 0 1 80 8.07v47.86A8.073 8.073 0 0 1 71.93 64H8.07A8.07 8.07 0 0 1 0 55.93V8.07A8.072 8.072 0 0 1 8.07 0h63.86Zm48 0c2.14 0 4.193.85 5.706 2.364A8.067 8.067 0 0 1 128 8.07v111.86c0 2.14-.85 4.193-2.364 5.706A8.067 8.067 0 0 1 119.93 128H96.07c-2.14 0-4.193-.85-5.706-2.364A8.067 8.067 0 0 1 88 119.93V8.07c0-2.14.85-4.193 2.364-5.706A8.067 8.067 0 0 1 96.07 0h23.86ZM116 24h-16a3.995 3.995 0 0 0-2.828 1.172 3.995 3.995 0 0 0 0 5.656A3.995 3.995 0 0 0 100 32h16a3.995 3.995 0 0 0 2.828-1.172 3.995 3.995 0 0 0 0-5.656A3.995 3.995 0 0 0 116 24Z"/>
+</svg>
\ No newline at end of file
diff --git a/core/images/star-filled.tid b/core/images/star-filled.tid
index 10b8f1c3d..262448d51 100755
--- a/core/images/star-filled.tid
+++ b/core/images/star-filled.tid
@@ -1,4 +1,5 @@
title: $:/core/images/star-filled
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-star-filled tc-image-button" viewBox="0 0 128 128"><path d="M61.836 96.823l37.327 27.287c2.72 1.99 6.379-.69 5.343-3.912L90.29 75.988l-1.26 3.91 37.285-27.345c2.718-1.993 1.32-6.327-2.041-6.33l-46.113-.036 3.3 2.416L67.176 4.416c-1.04-3.221-5.563-3.221-6.604 0L46.29 48.603l3.3-2.416-46.113.036c-3.362.003-4.759 4.337-2.04 6.33L38.72 79.898l-1.26-3.91-14.216 44.21c-1.036 3.223 2.622 5.901 5.343 3.912l37.326-27.287h-4.078z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-star-filled tc-image-button" viewBox="0 0 128 128"><path d="M61.836 96.823l37.327 27.287c2.72 1.99 6.379-.69 5.343-3.912L90.29 75.988l-1.26 3.91 37.285-27.345c2.718-1.993 1.32-6.327-2.041-6.33l-46.113-.036 3.3 2.416L67.176 4.416c-1.04-3.221-5.563-3.221-6.604 0L46.29 48.603l3.3-2.416-46.113.036c-3.362.003-4.759 4.337-2.04 6.33L38.72 79.898l-1.26-3.91-14.216 44.21c-1.036 3.223 2.622 5.901 5.343 3.912l37.326-27.287h-4.078z"/></svg>
\ No newline at end of file
diff --git a/core/images/storyview-classic.tid b/core/images/storyview-classic.tid
index 86872817b..457434bc9 100755
--- a/core/images/storyview-classic.tid
+++ b/core/images/storyview-classic.tid
@@ -1,4 +1,5 @@
title: $:/core/images/storyview-classic
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-storyview-classic tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M8.007 0A8.01 8.01 0 000 8.007v111.986A8.01 8.01 0 008.007 128h111.986a8.01 8.01 0 008.007-8.007V8.007A8.01 8.01 0 00119.993 0H8.007zm15.992 16C19.581 16 16 19.578 16 23.992v16.016C16 44.422 19.588 48 24 48h80c4.419 0 8-3.578 8-7.992V23.992c0-4.414-3.588-7.992-8-7.992H24zm0 48C19.581 64 16 67.59 16 72c0 4.418 3.588 8 8 8h80c4.419 0 8-3.59 8-8 0-4.418-3.588-8-8-8H24zm0 32C19.581 96 16 99.59 16 104c0 4.418 3.588 8 8 8h80c4.419 0 8-3.59 8-8 0-4.418-3.588-8-8-8H24z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-storyview-classic tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M8.007 0A8.01 8.01 0 000 8.007v111.986A8.01 8.01 0 008.007 128h111.986a8.01 8.01 0 008.007-8.007V8.007A8.01 8.01 0 00119.993 0H8.007zm15.992 16C19.581 16 16 19.578 16 23.992v16.016C16 44.422 19.588 48 24 48h80c4.419 0 8-3.578 8-7.992V23.992c0-4.414-3.588-7.992-8-7.992H24zm0 48C19.581 64 16 67.59 16 72c0 4.418 3.588 8 8 8h80c4.419 0 8-3.59 8-8 0-4.418-3.588-8-8-8H24zm0 32C19.581 96 16 99.59 16 104c0 4.418 3.588 8 8 8h80c4.419 0 8-3.59 8-8 0-4.418-3.588-8-8-8H24z"/></svg>
\ No newline at end of file
diff --git a/core/images/storyview-pop.tid b/core/images/storyview-pop.tid
index a610c89d5..a4a9fb9ee 100755
--- a/core/images/storyview-pop.tid
+++ b/core/images/storyview-pop.tid
@@ -1,4 +1,5 @@
title: $:/core/images/storyview-pop
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-storyview-pop tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M8.007 0A8.01 8.01 0 000 8.007v111.986A8.01 8.01 0 008.007 128h111.986a8.01 8.01 0 008.007-8.007V8.007A8.01 8.01 0 00119.993 0H8.007zm15.992 16C19.581 16 16 19.578 16 23.992v16.016C16 44.422 19.588 48 24 48h80c4.419 0 8-3.578 8-7.992V23.992c0-4.414-3.588-7.992-8-7.992H24zm-7.99 40C11.587 56 8 59.578 8 63.992v16.016C8 84.422 11.584 88 16.01 88h95.98c4.424 0 8.01-3.578 8.01-7.992V63.992c0-4.414-3.584-7.992-8.01-7.992H16.01zM24 96C19.581 96 16 99.59 16 104c0 4.418 3.588 8 8 8h80c4.419 0 8-3.59 8-8 0-4.418-3.588-8-8-8H24zm0-32C19.581 64 16 67.59 16 72c0 4.418 3.588 8 8 8h80c4.419 0 8-3.59 8-8 0-4.418-3.588-8-8-8H24z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-storyview-pop tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M8.007 0A8.01 8.01 0 000 8.007v111.986A8.01 8.01 0 008.007 128h111.986a8.01 8.01 0 008.007-8.007V8.007A8.01 8.01 0 00119.993 0H8.007zm15.992 16C19.581 16 16 19.578 16 23.992v16.016C16 44.422 19.588 48 24 48h80c4.419 0 8-3.578 8-7.992V23.992c0-4.414-3.588-7.992-8-7.992H24zm-7.99 40C11.587 56 8 59.578 8 63.992v16.016C8 84.422 11.584 88 16.01 88h95.98c4.424 0 8.01-3.578 8.01-7.992V63.992c0-4.414-3.584-7.992-8.01-7.992H16.01zM24 96C19.581 96 16 99.59 16 104c0 4.418 3.588 8 8 8h80c4.419 0 8-3.59 8-8 0-4.418-3.588-8-8-8H24zm0-32C19.581 64 16 67.59 16 72c0 4.418 3.588 8 8 8h80c4.419 0 8-3.59 8-8 0-4.418-3.588-8-8-8H24z"/></svg>
\ No newline at end of file
diff --git a/core/images/storyview-zoomin.tid b/core/images/storyview-zoomin.tid
index 61b7ff273..725f36e71 100755
--- a/core/images/storyview-zoomin.tid
+++ b/core/images/storyview-zoomin.tid
@@ -1,4 +1,5 @@
title: $:/core/images/storyview-zoomin
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-storyview-zoomin tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M8.007 0A8.01 8.01 0 000 8.007v111.986A8.01 8.01 0 008.007 128h111.986a8.01 8.01 0 008.007-8.007V8.007A8.01 8.01 0 00119.993 0H8.007zm15.992 16A8 8 0 0016 24.009V71.99C16 76.414 19.588 80 24 80h80a8 8 0 008-8.009V24.01c0-4.423-3.588-8.009-8-8.009H24z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-storyview-zoomin tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M8.007 0A8.01 8.01 0 000 8.007v111.986A8.01 8.01 0 008.007 128h111.986a8.01 8.01 0 008.007-8.007V8.007A8.01 8.01 0 00119.993 0H8.007zm15.992 16A8 8 0 0016 24.009V71.99C16 76.414 19.588 80 24 80h80a8 8 0 008-8.009V24.01c0-4.423-3.588-8.009-8-8.009H24z"/></svg>
\ No newline at end of file
diff --git a/core/images/strikethrough.tid b/core/images/strikethrough.tid
index 1f7a1c202..de4eefeec 100755
--- a/core/images/strikethrough.tid
+++ b/core/images/strikethrough.tid
@@ -1,4 +1,5 @@
title: $:/core/images/strikethrough
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-strikethrough tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M92.794 38.726h15.422c-.229-6.74-1.514-12.538-3.856-17.393-2.342-4.855-5.54-8.881-9.596-12.08-4.055-3.199-8.767-5.54-14.136-7.025C75.258.743 69.433 0 63.15 0a62.76 62.76 0 00-16.364 2.142C41.474 3.57 36.733 5.74 32.564 8.653c-4.17 2.913-7.511 6.626-10.025 11.138-2.513 4.512-3.77 9.853-3.77 16.022 0 5.597 1.115 10.252 3.342 13.965 2.228 3.712 5.198 6.74 8.91 9.081 3.713 2.342 7.911 4.227 12.595 5.655a194.641 194.641 0 0014.308 3.77c4.855 1.085 9.624 2.142 14.308 3.17 4.683 1.028 8.881 2.37 12.594 4.027 3.713 1.656 6.683 3.798 8.91 6.425 2.228 2.628 3.342 6.055 3.342 10.281 0 4.456-.914 8.111-2.742 10.967a19.953 19.953 0 01-7.197 6.768c-2.97 1.657-6.311 2.828-10.024 3.513a60.771 60.771 0 01-11.052 1.028c-4.57 0-9.025-.571-13.366-1.713-4.34-1.143-8.139-2.913-11.394-5.312-3.256-2.4-5.884-5.455-7.883-9.168-1.999-3.712-2.998-8.139-2.998-13.28H15c0 7.426 1.342 13.852 4.027 19.278 2.684 5.426 6.34 9.881 10.966 13.365 4.627 3.484 9.996 6.083 16.107 7.797 6.112 1.713 12.595 2.57 19.449 2.57 5.597 0 11.223-.657 16.878-1.97 5.655-1.314 10.767-3.428 15.336-6.34 4.57-2.914 8.31-6.683 11.224-11.31 2.913-4.626 4.37-10.195 4.37-16.707 0-6.054-1.115-11.08-3.342-15.079-2.228-3.998-5.198-7.31-8.91-9.938-3.713-2.627-7.911-4.712-12.595-6.254a170.83 170.83 0 00-14.308-4.027 549.669 549.669 0 00-14.308-3.17c-4.683-.971-8.881-2.2-12.594-3.684-3.713-1.485-6.683-3.399-8.91-5.74-2.228-2.342-3.342-5.398-3.342-9.168 0-3.998.771-7.34 2.313-10.024 1.543-2.685 3.599-4.826 6.17-6.426 2.57-1.599 5.51-2.741 8.824-3.427a49.767 49.767 0 0110.11-1.028c8.453 0 15.393 1.97 20.819 5.912 5.426 3.94 8.596 10.31 9.51 19.106z"/><path d="M5 54h118v16H5z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-strikethrough tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M92.794 38.726h15.422c-.229-6.74-1.514-12.538-3.856-17.393-2.342-4.855-5.54-8.881-9.596-12.08-4.055-3.199-8.767-5.54-14.136-7.025C75.258.743 69.433 0 63.15 0a62.76 62.76 0 00-16.364 2.142C41.474 3.57 36.733 5.74 32.564 8.653c-4.17 2.913-7.511 6.626-10.025 11.138-2.513 4.512-3.77 9.853-3.77 16.022 0 5.597 1.115 10.252 3.342 13.965 2.228 3.712 5.198 6.74 8.91 9.081 3.713 2.342 7.911 4.227 12.595 5.655a194.641 194.641 0 0014.308 3.77c4.855 1.085 9.624 2.142 14.308 3.17 4.683 1.028 8.881 2.37 12.594 4.027 3.713 1.656 6.683 3.798 8.91 6.425 2.228 2.628 3.342 6.055 3.342 10.281 0 4.456-.914 8.111-2.742 10.967a19.953 19.953 0 01-7.197 6.768c-2.97 1.657-6.311 2.828-10.024 3.513a60.771 60.771 0 01-11.052 1.028c-4.57 0-9.025-.571-13.366-1.713-4.34-1.143-8.139-2.913-11.394-5.312-3.256-2.4-5.884-5.455-7.883-9.168-1.999-3.712-2.998-8.139-2.998-13.28H15c0 7.426 1.342 13.852 4.027 19.278 2.684 5.426 6.34 9.881 10.966 13.365 4.627 3.484 9.996 6.083 16.107 7.797 6.112 1.713 12.595 2.57 19.449 2.57 5.597 0 11.223-.657 16.878-1.97 5.655-1.314 10.767-3.428 15.336-6.34 4.57-2.914 8.31-6.683 11.224-11.31 2.913-4.626 4.37-10.195 4.37-16.707 0-6.054-1.115-11.08-3.342-15.079-2.228-3.998-5.198-7.31-8.91-9.938-3.713-2.627-7.911-4.712-12.595-6.254a170.83 170.83 0 00-14.308-4.027 549.669 549.669 0 00-14.308-3.17c-4.683-.971-8.881-2.2-12.594-3.684-3.713-1.485-6.683-3.399-8.91-5.74-2.228-2.342-3.342-5.398-3.342-9.168 0-3.998.771-7.34 2.313-10.024 1.543-2.685 3.599-4.826 6.17-6.426 2.57-1.599 5.51-2.741 8.824-3.427a49.767 49.767 0 0110.11-1.028c8.453 0 15.393 1.97 20.819 5.912 5.426 3.94 8.596 10.31 9.51 19.106z"/><path d="M5 54h118v16H5z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/subscript.tid b/core/images/subscript.tid
index 96548bdb5..76ec35399 100755
--- a/core/images/subscript.tid
+++ b/core/images/subscript.tid
@@ -1,4 +1,5 @@
title: $:/core/images/subscript
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-subscript tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M2.272 16h19.91l21.649 33.675L66.414 16h18.708L53.585 61.969l33.809 49.443H67.082L43.296 74.93l-24.187 36.48H0L33.808 61.97 2.272 16zM127.91 128.412H85.328c.059-5.168 1.306-9.681 3.741-13.542 2.435-3.86 5.761-7.216 9.978-10.066a112.388 112.388 0 016.325-4.321 50.09 50.09 0 006.058-4.499c1.841-1.603 3.356-3.34 4.543-5.211 1.188-1.871 1.812-4.024 1.871-6.46 0-1.128-.133-2.33-.4-3.607a9.545 9.545 0 00-1.56-3.564c-.772-1.098-1.84-2.019-3.207-2.761-1.366-.743-3.148-1.114-5.345-1.114-2.02 0-3.697.4-5.033 1.203-1.337.801-2.406 1.9-3.208 3.296-.801 1.396-1.395 3.044-1.781 4.944-.386 1.9-.609 3.95-.668 6.147H86.486c0-3.445.46-6.637 1.38-9.577.921-2.94 2.302-5.478 4.143-7.617 1.841-2.138 4.083-3.815 6.726-5.033 2.643-1.217 5.716-1.826 9.22-1.826 3.802 0 6.979.623 9.533 1.87 2.554 1.248 4.617 2.822 6.191 4.722 1.574 1.9 2.688 3.965 3.341 6.192.653 2.227.98 4.35.98 6.37 0 2.494-.386 4.75-1.158 6.77a21.803 21.803 0 01-3.118 5.568 31.516 31.516 0 01-4.454 4.677 66.788 66.788 0 01-5.167 4.009 139.198 139.198 0 01-5.346 3.563 79.237 79.237 0 00-4.944 3.386c-1.514 1.128-2.836 2.3-3.964 3.518-1.129 1.218-1.9 2.51-2.317 3.876h30.379v9.087z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-subscript tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M2.272 16h19.91l21.649 33.675L66.414 16h18.708L53.585 61.969l33.809 49.443H67.082L43.296 74.93l-24.187 36.48H0L33.808 61.97 2.272 16zM127.91 128.412H85.328c.059-5.168 1.306-9.681 3.741-13.542 2.435-3.86 5.761-7.216 9.978-10.066a112.388 112.388 0 016.325-4.321 50.09 50.09 0 006.058-4.499c1.841-1.603 3.356-3.34 4.543-5.211 1.188-1.871 1.812-4.024 1.871-6.46 0-1.128-.133-2.33-.4-3.607a9.545 9.545 0 00-1.56-3.564c-.772-1.098-1.84-2.019-3.207-2.761-1.366-.743-3.148-1.114-5.345-1.114-2.02 0-3.697.4-5.033 1.203-1.337.801-2.406 1.9-3.208 3.296-.801 1.396-1.395 3.044-1.781 4.944-.386 1.9-.609 3.95-.668 6.147H86.486c0-3.445.46-6.637 1.38-9.577.921-2.94 2.302-5.478 4.143-7.617 1.841-2.138 4.083-3.815 6.726-5.033 2.643-1.217 5.716-1.826 9.22-1.826 3.802 0 6.979.623 9.533 1.87 2.554 1.248 4.617 2.822 6.191 4.722 1.574 1.9 2.688 3.965 3.341 6.192.653 2.227.98 4.35.98 6.37 0 2.494-.386 4.75-1.158 6.77a21.803 21.803 0 01-3.118 5.568 31.516 31.516 0 01-4.454 4.677 66.788 66.788 0 01-5.167 4.009 139.198 139.198 0 01-5.346 3.563 79.237 79.237 0 00-4.944 3.386c-1.514 1.128-2.836 2.3-3.964 3.518-1.129 1.218-1.9 2.51-2.317 3.876h30.379v9.087z"/></svg>
\ No newline at end of file
diff --git a/core/images/superscript.tid b/core/images/superscript.tid
index 149e44893..ab0d0d1b2 100755
--- a/core/images/superscript.tid
+++ b/core/images/superscript.tid
@@ -1,4 +1,5 @@
title: $:/core/images/superscript
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-superscript tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M2.272 16h19.91l21.649 33.675L66.414 16h18.708L53.585 61.969l33.809 49.443H67.082L43.296 74.93l-24.187 36.48H0L33.808 61.97 2.272 16zM127.91 63.412H85.328c.059-5.168 1.306-9.681 3.741-13.542 2.435-3.86 5.761-7.216 9.978-10.066a112.388 112.388 0 016.325-4.321 50.09 50.09 0 006.058-4.499c1.841-1.603 3.356-3.34 4.543-5.211 1.188-1.871 1.812-4.024 1.871-6.46 0-1.128-.133-2.33-.4-3.607a9.545 9.545 0 00-1.56-3.564c-.772-1.098-1.84-2.019-3.207-2.761-1.366-.743-3.148-1.114-5.345-1.114-2.02 0-3.697.4-5.033 1.203-1.337.801-2.406 1.9-3.208 3.296-.801 1.396-1.395 3.044-1.781 4.944-.386 1.9-.609 3.95-.668 6.147H86.486c0-3.445.46-6.637 1.38-9.577.921-2.94 2.302-5.478 4.143-7.617 1.841-2.138 4.083-3.815 6.726-5.033 2.643-1.217 5.716-1.826 9.22-1.826 3.802 0 6.979.623 9.533 1.87 2.554 1.248 4.617 2.822 6.191 4.722 1.574 1.9 2.688 3.965 3.341 6.192.653 2.227.98 4.35.98 6.37 0 2.494-.386 4.75-1.158 6.77a21.803 21.803 0 01-3.118 5.568 31.516 31.516 0 01-4.454 4.677 66.788 66.788 0 01-5.167 4.009 139.198 139.198 0 01-5.346 3.563 79.237 79.237 0 00-4.944 3.386c-1.514 1.128-2.836 2.3-3.964 3.518-1.129 1.218-1.9 2.51-2.317 3.876h30.379v9.087z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-superscript tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M2.272 16h19.91l21.649 33.675L66.414 16h18.708L53.585 61.969l33.809 49.443H67.082L43.296 74.93l-24.187 36.48H0L33.808 61.97 2.272 16zM127.91 63.412H85.328c.059-5.168 1.306-9.681 3.741-13.542 2.435-3.86 5.761-7.216 9.978-10.066a112.388 112.388 0 016.325-4.321 50.09 50.09 0 006.058-4.499c1.841-1.603 3.356-3.34 4.543-5.211 1.188-1.871 1.812-4.024 1.871-6.46 0-1.128-.133-2.33-.4-3.607a9.545 9.545 0 00-1.56-3.564c-.772-1.098-1.84-2.019-3.207-2.761-1.366-.743-3.148-1.114-5.345-1.114-2.02 0-3.697.4-5.033 1.203-1.337.801-2.406 1.9-3.208 3.296-.801 1.396-1.395 3.044-1.781 4.944-.386 1.9-.609 3.95-.668 6.147H86.486c0-3.445.46-6.637 1.38-9.577.921-2.94 2.302-5.478 4.143-7.617 1.841-2.138 4.083-3.815 6.726-5.033 2.643-1.217 5.716-1.826 9.22-1.826 3.802 0 6.979.623 9.533 1.87 2.554 1.248 4.617 2.822 6.191 4.722 1.574 1.9 2.688 3.965 3.341 6.192.653 2.227.98 4.35.98 6.37 0 2.494-.386 4.75-1.158 6.77a21.803 21.803 0 01-3.118 5.568 31.516 31.516 0 01-4.454 4.677 66.788 66.788 0 01-5.167 4.009 139.198 139.198 0 01-5.346 3.563 79.237 79.237 0 00-4.944 3.386c-1.514 1.128-2.836 2.3-3.964 3.518-1.129 1.218-1.9 2.51-2.317 3.876h30.379v9.087z"/></svg>
\ No newline at end of file
diff --git a/core/images/tag-button.tid b/core/images/tag-button.tid
index 9f6cad8b4..ab407f780 100755
--- a/core/images/tag-button.tid
+++ b/core/images/tag-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/tag-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-tag-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M18.164 47.66l.004 4.105c.003 3.823 2.19 9.097 4.885 11.792l61.85 61.85c2.697 2.697 7.068 2.69 9.769-.01L125.767 94.3a6.903 6.903 0 00.01-9.77L63.928 22.683c-2.697-2.697-7.976-4.88-11.796-4.881l-27.076-.007a6.902 6.902 0 00-6.91 6.91l.008 9.96.287.033c3.73.411 8.489-.044 13.365-1.153a9.702 9.702 0 0111.14-3.662l.291-.13.128.285a9.7 9.7 0 013.3 2.17c3.796 3.796 3.801 9.945.012 13.734-3.618 3.618-9.386 3.777-13.204.482-5.365 1.122-10.674 1.596-15.309 1.237z"/><path d="M47.633 39.532l.023.051c-9.689 4.356-21.584 6.799-30.396 5.828C5.273 44.089-1.028 36.43 2.443 24.078 5.562 12.976 14.3 4.361 24.047 1.548c10.68-3.083 19.749 1.968 19.749 13.225h-8.623c0-4.859-3.078-6.573-8.735-4.94-6.91 1.995-13.392 8.383-15.694 16.577-1.915 6.818.417 9.653 7.46 10.43 7.126.785 17.531-1.352 25.917-5.121l.027.06.036-.017c1.76-.758 6.266 6.549 3.524 7.74a2.8 2.8 0 01-.075.03z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-tag-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M18.164 47.66l.004 4.105c.003 3.823 2.19 9.097 4.885 11.792l61.85 61.85c2.697 2.697 7.068 2.69 9.769-.01L125.767 94.3a6.903 6.903 0 00.01-9.77L63.928 22.683c-2.697-2.697-7.976-4.88-11.796-4.881l-27.076-.007a6.902 6.902 0 00-6.91 6.91l.008 9.96.287.033c3.73.411 8.489-.044 13.365-1.153a9.702 9.702 0 0111.14-3.662l.291-.13.128.285a9.7 9.7 0 013.3 2.17c3.796 3.796 3.801 9.945.012 13.734-3.618 3.618-9.386 3.777-13.204.482-5.365 1.122-10.674 1.596-15.309 1.237z"/><path d="M47.633 39.532l.023.051c-9.689 4.356-21.584 6.799-30.396 5.828C5.273 44.089-1.028 36.43 2.443 24.078 5.562 12.976 14.3 4.361 24.047 1.548c10.68-3.083 19.749 1.968 19.749 13.225h-8.623c0-4.859-3.078-6.573-8.735-4.94-6.91 1.995-13.392 8.383-15.694 16.577-1.915 6.818.417 9.653 7.46 10.43 7.126.785 17.531-1.352 25.917-5.121l.027.06.036-.017c1.76-.758 6.266 6.549 3.524 7.74a2.8 2.8 0 01-.075.03z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/theme-button.tid b/core/images/theme-button.tid
index d80a0e82a..6b7aab2af 100755
--- a/core/images/theme-button.tid
+++ b/core/images/theme-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/theme-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-theme-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M55.854 66.945a122.626 122.626 0 01-3.9-4.819c-11.064-14.548-16.645-6.888-22.96 0-6.315 6.888 1.664 12.47-4.33 17.335-5.993 4.866-5.623 6.552-15.737-2.35-10.115-8.9-10.815-11.351-6.172-16.43 4.644-5.08 8.524 2.918 18.01-6.108 9.485-9.026 1.517-17.026 1.517-17.026S42.03-2.824 68.42.157c26.39 2.982-9.984-3.86-19.031 27.801-3.874 13.556.72 10.362 8.066 16.087 1.707 1.33 6.428 4.732 12.671 9.318-6.129 5.879-11.157 10.669-14.273 13.582zm11.641 12.947c16.013 17.036 37.742 37.726 45.117 40.42 10.432 3.813 15.388-3.141 15.388-14.79 0-7.151-23.83-26.542-43.924-41.769-7.408 7.156-13.376 12.953-16.58 16.139z"/><path d="M11.069 109.828L46.31 74.587a3.56 3.56 0 115.037-5.032l15.098 15.098a3.56 3.56 0 11-5.032 5.037l-35.24 35.241c-4.171 4.17-10.933 4.17-15.104 0-4.17-4.17-4.17-10.933 0-15.103zM124.344 6.622l5.034 5.034-7.49 12.524-7.613 2.58L61.413 79.62l-5.034-5.034 52.861-52.862 2.58-7.614 12.524-7.49z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-theme-button tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M55.854 66.945a122.626 122.626 0 01-3.9-4.819c-11.064-14.548-16.645-6.888-22.96 0-6.315 6.888 1.664 12.47-4.33 17.335-5.993 4.866-5.623 6.552-15.737-2.35-10.115-8.9-10.815-11.351-6.172-16.43 4.644-5.08 8.524 2.918 18.01-6.108 9.485-9.026 1.517-17.026 1.517-17.026S42.03-2.824 68.42.157c26.39 2.982-9.984-3.86-19.031 27.801-3.874 13.556.72 10.362 8.066 16.087 1.707 1.33 6.428 4.732 12.671 9.318-6.129 5.879-11.157 10.669-14.273 13.582zm11.641 12.947c16.013 17.036 37.742 37.726 45.117 40.42 10.432 3.813 15.388-3.141 15.388-14.79 0-7.151-23.83-26.542-43.924-41.769-7.408 7.156-13.376 12.953-16.58 16.139z"/><path d="M11.069 109.828L46.31 74.587a3.56 3.56 0 115.037-5.032l15.098 15.098a3.56 3.56 0 11-5.032 5.037l-35.24 35.241c-4.171 4.17-10.933 4.17-15.104 0-4.17-4.17-4.17-10.933 0-15.103zM124.344 6.622l5.034 5.034-7.49 12.524-7.613 2.58L61.413 79.62l-5.034-5.034 52.861-52.862 2.58-7.614 12.524-7.49z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/timestamp-off.tid b/core/images/timestamp-off.tid
index 0d20f28d6..33e018f3a 100644
--- a/core/images/timestamp-off.tid
+++ b/core/images/timestamp-off.tid
@@ -1,4 +1,5 @@
title: $:/core/images/timestamp-off
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-timestamp-off tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M58.25 11C26.08 11 0 37.082 0 69.25s26.08 58.25 58.25 58.25c32.175 0 58.25-26.082 58.25-58.25S90.425 11 58.25 11zm0 100.5C34.914 111.5 16 92.586 16 69.25 16 45.92 34.914 27 58.25 27s42.25 18.92 42.25 42.25c0 23.336-18.914 42.25-42.25 42.25zM49.704 10a5 5 0 010-10H66.69a5 5 0 015 5c.006 2.757-2.238 5-5 5H49.705z"/><path d="M58.25 35.88c-18.777 0-33.998 15.224-33.998 33.998 0 18.773 15.22 34.002 33.998 34.002 18.784 0 34.002-15.23 34.002-34.002 0-18.774-15.218-33.998-34.002-33.998zm-3.03 50.123H44.196v-34H55.22v34zm16.976 0H61.17v-34h11.025v34z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-timestamp-off tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M58.25 11C26.08 11 0 37.082 0 69.25s26.08 58.25 58.25 58.25c32.175 0 58.25-26.082 58.25-58.25S90.425 11 58.25 11zm0 100.5C34.914 111.5 16 92.586 16 69.25 16 45.92 34.914 27 58.25 27s42.25 18.92 42.25 42.25c0 23.336-18.914 42.25-42.25 42.25zM49.704 10a5 5 0 010-10H66.69a5 5 0 015 5c.006 2.757-2.238 5-5 5H49.705z"/><path d="M58.25 35.88c-18.777 0-33.998 15.224-33.998 33.998 0 18.773 15.22 34.002 33.998 34.002 18.784 0 34.002-15.23 34.002-34.002 0-18.774-15.218-33.998-34.002-33.998zm-3.03 50.123H44.196v-34H55.22v34zm16.976 0H61.17v-34h11.025v34z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/timestamp-on.tid b/core/images/timestamp-on.tid
index 3a16df7eb..cad04aada 100644
--- a/core/images/timestamp-on.tid
+++ b/core/images/timestamp-on.tid
@@ -1,4 +1,5 @@
title: $:/core/images/timestamp-on
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-timestamp-on tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M58.25 11C26.08 11 0 37.082 0 69.25s26.08 58.25 58.25 58.25c32.175 0 58.25-26.082 58.25-58.25S90.425 11 58.25 11zm0 100.5C34.914 111.5 16 92.586 16 69.25 16 45.92 34.914 27 58.25 27s42.25 18.92 42.25 42.25c0 23.336-18.914 42.25-42.25 42.25zM49.704 10a5 5 0 010-10H66.69a5 5 0 015 5c.006 2.757-2.238 5-5 5H49.705z"/><path d="M13.41 27.178a5.005 5.005 0 01-7.045-.613 5.008 5.008 0 01.616-7.047l9.95-8.348a5 5 0 016.429 7.661l-9.95 8.348zm89.573 0a5.005 5.005 0 007.045-.613 5.008 5.008 0 00-.616-7.047l-9.95-8.348a5 5 0 00-6.428 7.661l9.95 8.348zM65.097 71.072c0 3.826-3.09 6.928-6.897 6.928-3.804.006-6.9-3.102-6.903-6.928 0 0 4.76-39.072 6.903-39.072s6.897 39.072 6.897 39.072z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-timestamp-on tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><path d="M58.25 11C26.08 11 0 37.082 0 69.25s26.08 58.25 58.25 58.25c32.175 0 58.25-26.082 58.25-58.25S90.425 11 58.25 11zm0 100.5C34.914 111.5 16 92.586 16 69.25 16 45.92 34.914 27 58.25 27s42.25 18.92 42.25 42.25c0 23.336-18.914 42.25-42.25 42.25zM49.704 10a5 5 0 010-10H66.69a5 5 0 015 5c.006 2.757-2.238 5-5 5H49.705z"/><path d="M13.41 27.178a5.005 5.005 0 01-7.045-.613 5.008 5.008 0 01.616-7.047l9.95-8.348a5 5 0 016.429 7.661l-9.95 8.348zm89.573 0a5.005 5.005 0 007.045-.613 5.008 5.008 0 00-.616-7.047l-9.95-8.348a5 5 0 00-6.428 7.661l9.95 8.348zM65.097 71.072c0 3.826-3.09 6.928-6.897 6.928-3.804.006-6.9-3.102-6.903-6.928 0 0 4.76-39.072 6.903-39.072s6.897 39.072 6.897 39.072z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/tip.tid b/core/images/tip.tid
index f8109ada4..025918306 100755
--- a/core/images/tip.tid
+++ b/core/images/tip.tid
@@ -1,4 +1,5 @@
title: $:/core/images/tip
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-tip tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M64 128.242c35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64 0 35.346 28.654 64 64 64zm11.936-36.789c-.624 4.129-5.73 7.349-11.936 7.349-6.206 0-11.312-3.22-11.936-7.349C54.33 94.05 58.824 95.82 64 95.82c5.175 0 9.67-1.769 11.936-4.366zm0 4.492c-.624 4.13-5.73 7.349-11.936 7.349-6.206 0-11.312-3.22-11.936-7.349 2.266 2.597 6.76 4.366 11.936 4.366 5.175 0 9.67-1.769 11.936-4.366zm0 4.456c-.624 4.129-5.73 7.349-11.936 7.349-6.206 0-11.312-3.22-11.936-7.349 2.266 2.597 6.76 4.366 11.936 4.366 5.175 0 9.67-1.769 11.936-4.366zm0 4.492c-.624 4.13-5.73 7.349-11.936 7.349-6.206 0-11.312-3.22-11.936-7.349 2.266 2.597 6.76 4.366 11.936 4.366 5.175 0 9.67-1.769 11.936-4.366zM64.3 24.242c11.618 0 23.699 7.82 23.699 24.2S75.92 71.754 75.92 83.576c0 5.873-5.868 9.26-11.92 9.26s-12.027-3.006-12.027-9.26C51.973 71.147 40 65.47 40 48.442s12.683-24.2 24.301-24.2z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-tip tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M64 128.242c35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64 0 35.346 28.654 64 64 64zm11.936-36.789c-.624 4.129-5.73 7.349-11.936 7.349-6.206 0-11.312-3.22-11.936-7.349C54.33 94.05 58.824 95.82 64 95.82c5.175 0 9.67-1.769 11.936-4.366zm0 4.492c-.624 4.13-5.73 7.349-11.936 7.349-6.206 0-11.312-3.22-11.936-7.349 2.266 2.597 6.76 4.366 11.936 4.366 5.175 0 9.67-1.769 11.936-4.366zm0 4.456c-.624 4.129-5.73 7.349-11.936 7.349-6.206 0-11.312-3.22-11.936-7.349 2.266 2.597 6.76 4.366 11.936 4.366 5.175 0 9.67-1.769 11.936-4.366zm0 4.492c-.624 4.13-5.73 7.349-11.936 7.349-6.206 0-11.312-3.22-11.936-7.349 2.266 2.597 6.76 4.366 11.936 4.366 5.175 0 9.67-1.769 11.936-4.366zM64.3 24.242c11.618 0 23.699 7.82 23.699 24.2S75.92 71.754 75.92 83.576c0 5.873-5.868 9.26-11.92 9.26s-12.027-3.006-12.027-9.26C51.973 71.147 40 65.47 40 48.442s12.683-24.2 24.301-24.2z"/></svg>
\ No newline at end of file
diff --git a/core/images/transcludify.tid b/core/images/transcludify.tid
index 0579feb10..5102d1370 100644
--- a/core/images/transcludify.tid
+++ b/core/images/transcludify.tid
@@ -1,4 +1,5 @@
title: $:/core/images/transcludify
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-transcludify-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M0 59.482c.591 0 1.36-.089 2.306-.266a10.417 10.417 0 002.75-.932 6.762 6.762 0 002.306-1.907c.651-.828.976-1.863.976-3.104V35.709c0-2.01.414-3.74 1.242-5.19.828-1.448 1.833-2.66 3.016-3.636s2.425-1.7 3.726-2.173c1.3-.473 2.424-.71 3.37-.71h8.073v7.451h-4.88c-1.241 0-2.232.207-2.97.621-.74.414-1.302.932-1.686 1.552a4.909 4.909 0 00-.71 1.996c-.089.71-.133 1.39-.133 2.04v16.677c0 1.715-.325 3.134-.976 4.258-.65 1.123-1.434 2.025-2.35 2.705-.917.68-1.863 1.168-2.839 1.464-.976.296-1.818.473-2.528.532v.178c.71.059 1.552.207 2.528.443.976.237 1.922.68 2.839 1.33.916.651 1.7 1.583 2.35 2.795.65 1.212.976 2.853.976 4.923v16.144c0 .65.044 1.33.133 2.04.089.71.325 1.375.71 1.996.384.621.946 1.139 1.685 1.553.74.414 1.73.62 2.972.62h4.879v7.452h-8.073c-.946 0-2.07-.237-3.37-.71-1.301-.473-2.543-1.197-3.726-2.173-1.183-.976-2.188-2.188-3.016-3.637-.828-1.449-1.242-3.179-1.242-5.19V74.119c0-1.42-.325-2.572-.976-3.46-.65-.886-1.419-1.581-2.306-2.084a8.868 8.868 0 00-2.75-1.02C1.36 67.377.591 67.288 0 67.288v-7.806zm24.66 0c.591 0 1.36-.089 2.306-.266a10.417 10.417 0 002.75-.932 6.762 6.762 0 002.306-1.907c.65-.828.976-1.863.976-3.104V35.709c0-2.01.414-3.74 1.242-5.19.828-1.448 1.833-2.66 3.016-3.636s2.425-1.7 3.726-2.173c1.3-.473 2.424-.71 3.37-.71h8.073v7.451h-4.88c-1.241 0-2.232.207-2.97.621-.74.414-1.302.932-1.686 1.552a4.909 4.909 0 00-.71 1.996c-.089.71-.133 1.39-.133 2.04v16.677c0 1.715-.325 3.134-.976 4.258-.65 1.123-1.434 2.025-2.35 2.705-.917.68-1.863 1.168-2.839 1.464-.976.296-1.818.473-2.528.532v.178c.71.059 1.552.207 2.528.443.976.237 1.922.68 2.839 1.33.916.651 1.7 1.583 2.35 2.795.65 1.212.976 2.853.976 4.923v16.144c0 .65.044 1.33.133 2.04.089.71.325 1.375.71 1.996.384.621.946 1.139 1.685 1.553.74.414 1.73.62 2.972.62h4.879v7.452h-8.073c-.946 0-2.07-.237-3.37-.71-1.301-.473-2.543-1.197-3.726-2.173-1.183-.976-2.188-2.188-3.016-3.637-.828-1.449-1.242-3.179-1.242-5.19V74.119c0-1.42-.325-2.572-.976-3.46-.65-.886-1.419-1.581-2.306-2.084a8.868 8.868 0 00-2.75-1.02c-.946-.177-1.715-.266-2.306-.266v-7.806zm43.965-3.538L80.6 52.041l2.306 7.097-12.063 3.903 7.628 10.378-6.12 4.435-7.63-10.467-7.45 10.201-5.943-4.524 7.628-10.023-12.152-4.17 2.306-7.096 12.064 4.17V43.347h7.451v12.596zm34.425 11.344c-.65 0-1.449.089-2.395.266-.946.177-1.863.488-2.75.931a6.356 6.356 0 00-2.262 1.908c-.62.828-.931 1.862-.931 3.104v17.564c0 2.01-.414 3.74-1.242 5.189-.828 1.449-1.833 2.661-3.016 3.637s-2.425 1.7-3.726 2.173c-1.3.473-2.424.71-3.37.71h-8.073v-7.451h4.88c1.241 0 2.232-.207 2.97-.621.74-.414 1.302-.932 1.686-1.553a4.9 4.9 0 00.71-1.995c.089-.71.133-1.39.133-2.04V72.432c0-1.715.325-3.134.976-4.258.65-1.124 1.434-2.01 2.35-2.661.917-.65 1.863-1.124 2.839-1.42.976-.295 1.818-.502 2.528-.62v-.178c-.71-.059-1.552-.207-2.528-.443-.976-.237-1.922-.68-2.839-1.33-.916-.651-1.7-1.583-2.35-2.795-.65-1.212-.976-2.853-.976-4.923V37.66c0-.651-.044-1.331-.133-2.04a4.909 4.909 0 00-.71-1.997c-.384-.62-.946-1.138-1.685-1.552-.74-.414-1.73-.62-2.972-.62h-4.879V24h8.073c.946 0 2.07.237 3.37.71 1.301.473 2.543 1.197 3.726 2.173 1.183.976 2.188 2.188 3.016 3.637.828 1.449 1.242 3.178 1.242 5.189v16.943c0 1.419.31 2.572.931 3.46a6.897 6.897 0 002.262 2.084 8.868 8.868 0 002.75 1.02c.946.177 1.745.266 2.395.266v7.806zm24.66 0c-.65 0-1.449.089-2.395.266-.946.177-1.863.488-2.75.931a6.356 6.356 0 00-2.262 1.908c-.62.828-.931 1.862-.931 3.104v17.564c0 2.01-.414 3.74-1.242 5.189-.828 1.449-1.833 2.661-3.016 3.637s-2.425 1.7-3.726 2.173c-1.3.473-2.424.71-3.37.71h-8.073v-7.451h4.88c1.241 0 2.232-.207 2.97-.621.74-.414 1.302-.932 1.686-1.553a4.9 4.9 0 00.71-1.995c.089-.71.133-1.39.133-2.04V72.432c0-1.715.325-3.134.976-4.258.65-1.124 1.434-2.01 2.35-2.661.917-.65 1.863-1.124 2.839-1.42.976-.295 1.818-.502 2.528-.62v-.178c-.71-.059-1.552-.207-2.528-.443-.976-.237-1.922-.68-2.839-1.33-.916-.651-1.7-1.583-2.35-2.795-.65-1.212-.976-2.853-.976-4.923V37.66c0-.651-.044-1.331-.133-2.04a4.909 4.909 0 00-.71-1.997c-.384-.62-.946-1.138-1.685-1.552-.74-.414-1.73-.62-2.972-.62h-4.879V24h8.073c.946 0 2.07.237 3.37.71 1.301.473 2.543 1.197 3.726 2.173 1.183.976 2.188 2.188 3.016 3.637.828 1.449 1.242 3.178 1.242 5.189v16.943c0 1.419.31 2.572.931 3.46a6.897 6.897 0 002.262 2.084 8.868 8.868 0 002.75 1.02c.946.177 1.745.266 2.395.266v7.806z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-transcludify-button tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M0 59.482c.591 0 1.36-.089 2.306-.266a10.417 10.417 0 002.75-.932 6.762 6.762 0 002.306-1.907c.651-.828.976-1.863.976-3.104V35.709c0-2.01.414-3.74 1.242-5.19.828-1.448 1.833-2.66 3.016-3.636s2.425-1.7 3.726-2.173c1.3-.473 2.424-.71 3.37-.71h8.073v7.451h-4.88c-1.241 0-2.232.207-2.97.621-.74.414-1.302.932-1.686 1.552a4.909 4.909 0 00-.71 1.996c-.089.71-.133 1.39-.133 2.04v16.677c0 1.715-.325 3.134-.976 4.258-.65 1.123-1.434 2.025-2.35 2.705-.917.68-1.863 1.168-2.839 1.464-.976.296-1.818.473-2.528.532v.178c.71.059 1.552.207 2.528.443.976.237 1.922.68 2.839 1.33.916.651 1.7 1.583 2.35 2.795.65 1.212.976 2.853.976 4.923v16.144c0 .65.044 1.33.133 2.04.089.71.325 1.375.71 1.996.384.621.946 1.139 1.685 1.553.74.414 1.73.62 2.972.62h4.879v7.452h-8.073c-.946 0-2.07-.237-3.37-.71-1.301-.473-2.543-1.197-3.726-2.173-1.183-.976-2.188-2.188-3.016-3.637-.828-1.449-1.242-3.179-1.242-5.19V74.119c0-1.42-.325-2.572-.976-3.46-.65-.886-1.419-1.581-2.306-2.084a8.868 8.868 0 00-2.75-1.02C1.36 67.377.591 67.288 0 67.288v-7.806zm24.66 0c.591 0 1.36-.089 2.306-.266a10.417 10.417 0 002.75-.932 6.762 6.762 0 002.306-1.907c.65-.828.976-1.863.976-3.104V35.709c0-2.01.414-3.74 1.242-5.19.828-1.448 1.833-2.66 3.016-3.636s2.425-1.7 3.726-2.173c1.3-.473 2.424-.71 3.37-.71h8.073v7.451h-4.88c-1.241 0-2.232.207-2.97.621-.74.414-1.302.932-1.686 1.552a4.909 4.909 0 00-.71 1.996c-.089.71-.133 1.39-.133 2.04v16.677c0 1.715-.325 3.134-.976 4.258-.65 1.123-1.434 2.025-2.35 2.705-.917.68-1.863 1.168-2.839 1.464-.976.296-1.818.473-2.528.532v.178c.71.059 1.552.207 2.528.443.976.237 1.922.68 2.839 1.33.916.651 1.7 1.583 2.35 2.795.65 1.212.976 2.853.976 4.923v16.144c0 .65.044 1.33.133 2.04.089.71.325 1.375.71 1.996.384.621.946 1.139 1.685 1.553.74.414 1.73.62 2.972.62h4.879v7.452h-8.073c-.946 0-2.07-.237-3.37-.71-1.301-.473-2.543-1.197-3.726-2.173-1.183-.976-2.188-2.188-3.016-3.637-.828-1.449-1.242-3.179-1.242-5.19V74.119c0-1.42-.325-2.572-.976-3.46-.65-.886-1.419-1.581-2.306-2.084a8.868 8.868 0 00-2.75-1.02c-.946-.177-1.715-.266-2.306-.266v-7.806zm43.965-3.538L80.6 52.041l2.306 7.097-12.063 3.903 7.628 10.378-6.12 4.435-7.63-10.467-7.45 10.201-5.943-4.524 7.628-10.023-12.152-4.17 2.306-7.096 12.064 4.17V43.347h7.451v12.596zm34.425 11.344c-.65 0-1.449.089-2.395.266-.946.177-1.863.488-2.75.931a6.356 6.356 0 00-2.262 1.908c-.62.828-.931 1.862-.931 3.104v17.564c0 2.01-.414 3.74-1.242 5.189-.828 1.449-1.833 2.661-3.016 3.637s-2.425 1.7-3.726 2.173c-1.3.473-2.424.71-3.37.71h-8.073v-7.451h4.88c1.241 0 2.232-.207 2.97-.621.74-.414 1.302-.932 1.686-1.553a4.9 4.9 0 00.71-1.995c.089-.71.133-1.39.133-2.04V72.432c0-1.715.325-3.134.976-4.258.65-1.124 1.434-2.01 2.35-2.661.917-.65 1.863-1.124 2.839-1.42.976-.295 1.818-.502 2.528-.62v-.178c-.71-.059-1.552-.207-2.528-.443-.976-.237-1.922-.68-2.839-1.33-.916-.651-1.7-1.583-2.35-2.795-.65-1.212-.976-2.853-.976-4.923V37.66c0-.651-.044-1.331-.133-2.04a4.909 4.909 0 00-.71-1.997c-.384-.62-.946-1.138-1.685-1.552-.74-.414-1.73-.62-2.972-.62h-4.879V24h8.073c.946 0 2.07.237 3.37.71 1.301.473 2.543 1.197 3.726 2.173 1.183.976 2.188 2.188 3.016 3.637.828 1.449 1.242 3.178 1.242 5.189v16.943c0 1.419.31 2.572.931 3.46a6.897 6.897 0 002.262 2.084 8.868 8.868 0 002.75 1.02c.946.177 1.745.266 2.395.266v7.806zm24.66 0c-.65 0-1.449.089-2.395.266-.946.177-1.863.488-2.75.931a6.356 6.356 0 00-2.262 1.908c-.62.828-.931 1.862-.931 3.104v17.564c0 2.01-.414 3.74-1.242 5.189-.828 1.449-1.833 2.661-3.016 3.637s-2.425 1.7-3.726 2.173c-1.3.473-2.424.71-3.37.71h-8.073v-7.451h4.88c1.241 0 2.232-.207 2.97-.621.74-.414 1.302-.932 1.686-1.553a4.9 4.9 0 00.71-1.995c.089-.71.133-1.39.133-2.04V72.432c0-1.715.325-3.134.976-4.258.65-1.124 1.434-2.01 2.35-2.661.917-.65 1.863-1.124 2.839-1.42.976-.295 1.818-.502 2.528-.62v-.178c-.71-.059-1.552-.207-2.528-.443-.976-.237-1.922-.68-2.839-1.33-.916-.651-1.7-1.583-2.35-2.795-.65-1.212-.976-2.853-.976-4.923V37.66c0-.651-.044-1.331-.133-2.04a4.909 4.909 0 00-.71-1.997c-.384-.62-.946-1.138-1.685-1.552-.74-.414-1.73-.62-2.972-.62h-4.879V24h8.073c.946 0 2.07.237 3.37.71 1.301.473 2.543 1.197 3.726 2.173 1.183.976 2.188 2.188 3.016 3.637.828 1.449 1.242 3.178 1.242 5.189v16.943c0 1.419.31 2.572.931 3.46a6.897 6.897 0 002.262 2.084 8.868 8.868 0 002.75 1.02c.946.177 1.745.266 2.395.266v7.806z"/></svg>
\ No newline at end of file
diff --git a/core/images/twitter.tid b/core/images/twitter.tid
index 28cfccdbd..e3ae13dc1 100755
--- a/core/images/twitter.tid
+++ b/core/images/twitter.tid
@@ -1,4 +1,5 @@
title: $:/core/images/twitter
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-twitter tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M41.626 115.803A73.376 73.376 0 012 104.235c2.022.238 4.08.36 6.166.36 12.111 0 23.258-4.117 32.105-11.023-11.312-.208-20.859-7.653-24.148-17.883a25.98 25.98 0 0011.674-.441C15.971 72.881 7.061 62.474 7.061 49.997c0-.108 0-.216.002-.323a25.824 25.824 0 0011.709 3.22c-6.936-4.617-11.5-12.5-11.5-21.433 0-4.719 1.274-9.142 3.5-12.945 12.75 15.579 31.797 25.83 53.281 26.904-.44-1.884-.67-3.85-.67-5.868 0-14.22 11.575-25.75 25.852-25.75a25.865 25.865 0 0118.869 8.132 51.892 51.892 0 0016.415-6.248c-1.93 6.012-6.029 11.059-11.366 14.246A51.844 51.844 0 00128 25.878a52.428 52.428 0 01-12.9 13.33c.05 1.104.075 2.214.075 3.33 0 34.028-26 73.265-73.549 73.265"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-twitter tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M41.626 115.803A73.376 73.376 0 012 104.235c2.022.238 4.08.36 6.166.36 12.111 0 23.258-4.117 32.105-11.023-11.312-.208-20.859-7.653-24.148-17.883a25.98 25.98 0 0011.674-.441C15.971 72.881 7.061 62.474 7.061 49.997c0-.108 0-.216.002-.323a25.824 25.824 0 0011.709 3.22c-6.936-4.617-11.5-12.5-11.5-21.433 0-4.719 1.274-9.142 3.5-12.945 12.75 15.579 31.797 25.83 53.281 26.904-.44-1.884-.67-3.85-.67-5.868 0-14.22 11.575-25.75 25.852-25.75a25.865 25.865 0 0118.869 8.132 51.892 51.892 0 0016.415-6.248c-1.93 6.012-6.029 11.059-11.366 14.246A51.844 51.844 0 00128 25.878a52.428 52.428 0 01-12.9 13.33c.05 1.104.075 2.214.075 3.33 0 34.028-26 73.265-73.549 73.265"/></svg>
\ No newline at end of file
diff --git a/core/images/underline.tid b/core/images/underline.tid
index 768d2a199..341b27cfa 100755
--- a/core/images/underline.tid
+++ b/core/images/underline.tid
@@ -1,4 +1,5 @@
title: $:/core/images/underline
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-underline tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M7 117.421h114.248V128H7v-10.579zm97.871-18.525V0h-16.26v55.856c0 4.463-.605 8.576-1.816 12.338-1.212 3.762-3.03 7.046-5.452 9.851-2.423 2.806-5.452 4.974-9.086 6.504-3.635 1.53-7.939 2.296-12.912 2.296-6.25 0-11.159-1.786-14.73-5.356-3.57-3.571-5.356-8.417-5.356-14.538V0H23v65.038c0 5.356.542 10.234 1.626 14.633 1.084 4.4 2.965 8.194 5.643 11.382 2.678 3.188 6.185 5.643 10.52 7.365 4.337 1.721 9.756 2.582 16.26 2.582 7.27 0 13.582-1.435 18.938-4.304 5.356-2.87 9.755-7.365 13.199-13.486h.382v15.686h15.303z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-underline tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M7 117.421h114.248V128H7v-10.579zm97.871-18.525V0h-16.26v55.856c0 4.463-.605 8.576-1.816 12.338-1.212 3.762-3.03 7.046-5.452 9.851-2.423 2.806-5.452 4.974-9.086 6.504-3.635 1.53-7.939 2.296-12.912 2.296-6.25 0-11.159-1.786-14.73-5.356-3.57-3.571-5.356-8.417-5.356-14.538V0H23v65.038c0 5.356.542 10.234 1.626 14.633 1.084 4.4 2.965 8.194 5.643 11.382 2.678 3.188 6.185 5.643 10.52 7.365 4.337 1.721 9.756 2.582 16.26 2.582 7.27 0 13.582-1.435 18.938-4.304 5.356-2.87 9.755-7.365 13.199-13.486h.382v15.686h15.303z"/></svg>
\ No newline at end of file
diff --git a/core/images/unfold-all-button.tid b/core/images/unfold-all-button.tid
index e496bdd89..e44000b18 100755
--- a/core/images/unfold-all-button.tid
+++ b/core/images/unfold-all-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/unfold-all-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-unfold-all tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="128" height="16" rx="8"/><rect width="128" height="16" y="64" rx="8"/><path d="M63.945 60.624c-2.05 0-4.101-.78-5.666-2.345L35.662 35.662c-3.125-3.125-3.13-8.195-.005-11.319 3.118-3.118 8.192-3.122 11.319.005L63.94 41.314l16.966-16.966c3.124-3.124 8.194-3.129 11.318-.005 3.118 3.118 3.122 8.192-.005 11.319L69.603 58.279a7.986 7.986 0 01-5.663 2.346zM64.004 124.565c-2.05 0-4.102-.78-5.666-2.345L35.721 99.603c-3.125-3.125-3.13-8.195-.005-11.319 3.118-3.118 8.191-3.122 11.318.005L64 105.255l16.966-16.966c3.124-3.124 8.194-3.129 11.318-.005 3.118 3.118 3.122 8.192-.005 11.319L69.662 122.22a7.986 7.986 0 01-5.663 2.346z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-unfold-all tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="128" height="16" rx="8"/><rect width="128" height="16" y="64" rx="8"/><path d="M63.945 60.624c-2.05 0-4.101-.78-5.666-2.345L35.662 35.662c-3.125-3.125-3.13-8.195-.005-11.319 3.118-3.118 8.192-3.122 11.319.005L63.94 41.314l16.966-16.966c3.124-3.124 8.194-3.129 11.318-.005 3.118 3.118 3.122 8.192-.005 11.319L69.603 58.279a7.986 7.986 0 01-5.663 2.346zM64.004 124.565c-2.05 0-4.102-.78-5.666-2.345L35.721 99.603c-3.125-3.125-3.13-8.195-.005-11.319 3.118-3.118 8.191-3.122 11.318.005L64 105.255l16.966-16.966c3.124-3.124 8.194-3.129 11.318-.005 3.118 3.118 3.122 8.192-.005 11.319L69.662 122.22a7.986 7.986 0 01-5.663 2.346z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/unfold-button.tid b/core/images/unfold-button.tid
index cfad70570..57f53fd6f 100755
--- a/core/images/unfold-button.tid
+++ b/core/images/unfold-button.tid
@@ -1,4 +1,5 @@
title: $:/core/images/unfold-button
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-unfold tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="128" height="16" rx="8"/><path d="M63.945 63.624c-2.05 0-4.101-.78-5.666-2.345L35.662 38.662c-3.125-3.125-3.13-8.195-.005-11.319 3.118-3.118 8.192-3.122 11.319.005L63.94 44.314l16.966-16.966c3.124-3.124 8.194-3.129 11.318-.005 3.118 3.118 3.122 8.192-.005 11.319L69.603 61.279a7.986 7.986 0 01-5.663 2.346zM64.004 105.682c-2.05.001-4.102-.78-5.666-2.344L35.721 80.721c-3.125-3.125-3.13-8.195-.005-11.319 3.118-3.118 8.191-3.122 11.318.005L64 86.373l16.966-16.966c3.124-3.125 8.194-3.13 11.318-.005 3.118 3.118 3.122 8.192-.005 11.319l-22.617 22.617a7.986 7.986 0 01-5.663 2.346z"/></g></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-unfold tc-image-button" viewBox="0 0 128 128"><g fill-rule="evenodd"><rect width="128" height="16" rx="8"/><path d="M63.945 63.624c-2.05 0-4.101-.78-5.666-2.345L35.662 38.662c-3.125-3.125-3.13-8.195-.005-11.319 3.118-3.118 8.192-3.122 11.319.005L63.94 44.314l16.966-16.966c3.124-3.124 8.194-3.129 11.318-.005 3.118 3.118 3.122 8.192-.005 11.319L69.603 61.279a7.986 7.986 0 01-5.663 2.346zM64.004 105.682c-2.05.001-4.102-.78-5.666-2.344L35.721 80.721c-3.125-3.125-3.13-8.195-.005-11.319 3.118-3.118 8.191-3.122 11.318.005L64 86.373l16.966-16.966c3.124-3.125 8.194-3.13 11.318-.005 3.118 3.118 3.122 8.192-.005 11.319l-22.617 22.617a7.986 7.986 0 01-5.663 2.346z"/></g></svg>
\ No newline at end of file
diff --git a/core/images/unlocked-padlock.tid b/core/images/unlocked-padlock.tid
index c5367c085..941f7bec5 100755
--- a/core/images/unlocked-padlock.tid
+++ b/core/images/unlocked-padlock.tid
@@ -1,4 +1,5 @@
title: $:/core/images/unlocked-padlock
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-unlocked-padlock tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M48.627 64H105v32.01C105 113.674 90.674 128 73.001 128H56C38.318 128 24 113.677 24 96.01V64h6.136c-10.455-12.651-27.364-35.788-4.3-55.142 24.636-20.672 45.835 4.353 55.777 16.201 9.943 11.85-2.676 22.437-12.457 9.892-9.78-12.545-21.167-24.146-33.207-14.043-12.041 10.104-1.757 22.36 8.813 34.958 2.467 2.94 3.641 5.732 3.865 8.134zm19.105 28.364A8.503 8.503 0 0064.5 76a8.5 8.5 0 00-3.498 16.25l-5.095 22.77H72.8l-5.07-22.656z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-unlocked-padlock tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M48.627 64H105v32.01C105 113.674 90.674 128 73.001 128H56C38.318 128 24 113.677 24 96.01V64h6.136c-10.455-12.651-27.364-35.788-4.3-55.142 24.636-20.672 45.835 4.353 55.777 16.201 9.943 11.85-2.676 22.437-12.457 9.892-9.78-12.545-21.167-24.146-33.207-14.043-12.041 10.104-1.757 22.36 8.813 34.958 2.467 2.94 3.641 5.732 3.865 8.134zm19.105 28.364A8.503 8.503 0 0064.5 76a8.5 8.5 0 00-3.498 16.25l-5.095 22.77H72.8l-5.07-22.656z"/></svg>
\ No newline at end of file
diff --git a/core/images/up-arrow.tid b/core/images/up-arrow.tid
index a1bd132bf..4d157352b 100755
--- a/core/images/up-arrow.tid
+++ b/core/images/up-arrow.tid
@@ -3,4 +3,5 @@ modified: 20150316000831867
tags: $:/tags/Image
title: $:/core/images/up-arrow
-<svg width="22pt" height="22pt" class="tc-image-up-arrow tc-image-button" viewBox="0 0 128 128"><path d="M63.892.281c2.027 0 4.054.77 5.6 2.316l55.98 55.98a7.92 7.92 0 010 11.196c-3.086 3.085-8.104 3.092-11.196 0L63.894 19.393 13.513 69.774a7.92 7.92 0 01-11.196 0c-3.085-3.086-3.092-8.105 0-11.196l55.98-55.98A7.892 7.892 0 0163.893.28z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-up-arrow tc-image-button" viewBox="0 0 128 128"><path d="M63.892.281c2.027 0 4.054.77 5.6 2.316l55.98 55.98a7.92 7.92 0 010 11.196c-3.086 3.085-8.104 3.092-11.196 0L63.894 19.393 13.513 69.774a7.92 7.92 0 01-11.196 0c-3.085-3.086-3.092-8.105 0-11.196l55.98-55.98A7.892 7.892 0 0163.893.28z"/></svg>
\ No newline at end of file
diff --git a/core/images/video.tid b/core/images/video.tid
index 3bf0bb259..b4fef628d 100755
--- a/core/images/video.tid
+++ b/core/images/video.tid
@@ -1,4 +1,5 @@
title: $:/core/images/video
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-video tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M64 12c-34.91 0-55.273 2.917-58.182 5.833C2.91 20.75 0 41.167 0 64.5c0 23.333 2.91 43.75 5.818 46.667C8.728 114.083 29.091 117 64 117c34.91 0 55.273-2.917 58.182-5.833C125.09 108.25 128 87.833 128 64.5c0-23.333-2.91-43.75-5.818-46.667C119.272 14.917 98.909 12 64 12zm-9.084 32.618c-3.813-2.542-6.905-.879-6.905 3.698v31.368c0 4.585 3.099 6.235 6.905 3.698l22.168-14.779c3.813-2.542 3.806-6.669 0-9.206L54.916 44.618z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-video tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M64 12c-34.91 0-55.273 2.917-58.182 5.833C2.91 20.75 0 41.167 0 64.5c0 23.333 2.91 43.75 5.818 46.667C8.728 114.083 29.091 117 64 117c34.91 0 55.273-2.917 58.182-5.833C125.09 108.25 128 87.833 128 64.5c0-23.333-2.91-43.75-5.818-46.667C119.272 14.917 98.909 12 64 12zm-9.084 32.618c-3.813-2.542-6.905-.879-6.905 3.698v31.368c0 4.585 3.099 6.235 6.905 3.698l22.168-14.779c3.813-2.542 3.806-6.669 0-9.206L54.916 44.618z"/></svg>
\ No newline at end of file
diff --git a/core/images/warning.tid b/core/images/warning.tid
index 53bff59ec..1822da89f 100755
--- a/core/images/warning.tid
+++ b/core/images/warning.tid
@@ -1,4 +1,5 @@
title: $:/core/images/warning
tags: $:/tags/Image
-<svg width="22pt" height="22pt" class="tc-image-warning tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M57.072 11c3.079-5.333 10.777-5.333 13.856 0l55.426 96c3.079 5.333-.77 12-6.928 12H8.574c-6.158 0-10.007-6.667-6.928-12l55.426-96zM64 37c-4.418 0-8 3.582-8 7.994v28.012C56 77.421 59.59 81 64 81c4.418 0 8-3.582 8-7.994V44.994C72 40.579 68.41 37 64 37zm0 67a8 8 0 100-16 8 8 0 000 16z"/></svg>
\ No newline at end of file
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-warning tc-image-button" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M57.072 11c3.079-5.333 10.777-5.333 13.856 0l55.426 96c3.079 5.333-.77 12-6.928 12H8.574c-6.158 0-10.007-6.667-6.928-12l55.426-96zM64 37c-4.418 0-8 3.582-8 7.994v28.012C56 77.421 59.59 81 64 81c4.418 0 8-3.582 8-7.994V44.994C72 40.579 68.41 37 64 37zm0 67a8 8 0 100-16 8 8 0 000 16z"/></svg>
\ No newline at end of file
diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids
index 83598f410..2fa732fd9 100644
--- a/core/language/en-GB/Buttons.multids
+++ b/core/language/en-GB/Buttons.multids
@@ -18,6 +18,8 @@ CopyToClipboard/Caption: copy to clipboard
CopyToClipboard/Hint: Copy this text to the clipboard
Delete/Caption: delete
Delete/Hint: Delete this tiddler
+DeleteTiddlers/Caption: delete tiddlers
+DeleteTiddlers/Hint: Delete tiddlers
Edit/Caption: edit
Edit/Hint: Edit this tiddler
Encryption/Caption: encryption
@@ -26,6 +28,7 @@ Encryption/ClearPassword/Caption: clear password
Encryption/ClearPassword/Hint: Clear the password and save this wiki without encryption
Encryption/SetPassword/Caption: set password
Encryption/SetPassword/Hint: Set a password for saving this wiki with encryption
+EmergencyDownload/Caption: download tiddlers as json
ExportPage/Caption: export all
ExportPage/Hint: Export all tiddlers
ExportTiddler/Caption: export tiddler
@@ -57,12 +60,16 @@ Home/Caption: home
Home/Hint: Open the default tiddlers
Language/Caption: language
Language/Hint: Choose the user interface language
+LayoutSwitcher/Hint: Open layout switcher
+LayoutSwitcher/Caption: layout
Manager/Caption: tiddler manager
Manager/Hint: Open tiddler manager
More/Caption: more
More/Hint: More actions
NewHere/Caption: new here
NewHere/Hint: Create a new tiddler tagged with this one
+NetworkActivity/Caption: network activity
+NetworkActivity/Hint: Cancel all network activity
NewJournal/Caption: new journal
NewJournal/Hint: Create a new journal tiddler
NewJournalHere/Caption: new journal here
@@ -73,6 +80,7 @@ NewMarkdown/Caption: new Markdown tiddler
NewMarkdown/Hint: Create a new Markdown tiddler
NewTiddler/Caption: new tiddler
NewTiddler/Hint: Create a new tiddler
+OpenControlPanel/Hint: Open control panel
OpenWindow/Caption: open in new window
OpenWindow/Hint: Open tiddler in new window
Palette/Caption: palette
@@ -97,6 +105,8 @@ ShowSideBar/Caption: show sidebar
ShowSideBar/Hint: Show sidebar
TagManager/Caption: tag manager
TagManager/Hint: Open tag manager
+TestCaseImport/Caption: import tiddlers
+TestCaseImport/Hint: Import tiddlers
Timestamp/Caption: timestamps
Timestamp/Hint: Choose whether modifications update timestamps
Timestamp/On/Caption: timestamps are on
@@ -123,6 +133,7 @@ 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
diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index 6fc42e954..ce0a5b3cf 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -7,7 +7,7 @@ Appearance/Hint: Ways to customise the appearance of your TiddlyWiki.
Basics/AnimDuration/Prompt: Animation duration
Basics/AutoFocus/Prompt: Default focus field for new tiddlers
Basics/Caption: Basics
-Basics/DefaultTiddlers/BottomHint: Use [[double square brackets]] for titles with spaces. Or you can choose to <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">retain story ordering</$button>
+Basics/DefaultTiddlers/BottomHint: Use [[double square brackets]] for titles with spaces. Or you can choose to {{retain story ordering||$:/snippets/retain-story-ordering-button}}
Basics/DefaultTiddlers/Prompt: Default tiddlers
Basics/DefaultTiddlers/TopHint: Choose which tiddlers are displayed at startup
Basics/Language/Prompt: Hello! Current language:
@@ -27,10 +27,17 @@ Basics/Tiddlers/Prompt: Number of tiddlers
Basics/Title/Prompt: Title of this ~TiddlyWiki
Basics/Username/Prompt: Username for signing edits
Basics/Version/Prompt: ~TiddlyWiki version
+Cascades/Caption: Cascades
+Cascades/Hint: These global rules are used to dynamically choose certain templates. The result of the cascade is the result of the first filter in the sequence that returns a result
+Cascades/TagPrompt: Filters tagged <$macrocall $name="tag" tag=<<currentTiddler>>/>
EditorTypes/Caption: Editor Types
EditorTypes/Editor/Caption: Editor
EditorTypes/Hint: These tiddlers determine which editor is used to edit specific tiddler types.
EditorTypes/Type/Caption: Type
+EditTemplateBody/Caption: Edit Template Body
+EditTemplateBody/Hint: This rule cascade is used by the default edit template to dynamically choose the template for editing the body of a tiddler.
+FieldEditor/Caption: Field Editor
+FieldEditor/Hint: This rules cascade is used to dynamically choose the template for rendering a tiddler field based on its name. It is used within the Edit Template.
Info/Caption: Info
Info/Hint: Information about this TiddlyWiki
KeyboardShortcuts/Add/Prompt: Type shortcut here
@@ -83,12 +90,16 @@ Plugins/Languages/Caption: Languages
Plugins/Languages/Hint: Language pack plugins
Plugins/NoInfoFound/Hint: No ''"<$text text=<<currentTab>>/>"'' found
Plugins/NotInstalled/Hint: This plugin is not currently installed
-Plugins/OpenPluginLibrary: open plugin library
-Plugins/ClosePluginLibrary: close plugin library
+Plugins/OpenPluginLibrary: Open plugin library
+Plugins/ClosePluginLibrary: Close plugin library
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
@@ -120,15 +131,14 @@ Saving/GitService/Gitea/Caption: Gitea Saver
Saving/GitService/Gitea/Password: Personal access token for API (via Gitea’s web interface: `Settings | Applications | Generate New Token`)
Saving/TiddlySpot/Advanced/Heading: Advanced Settings
Saving/TiddlySpot/BackupDir: Backup Directory
-Saving/TiddlySpot/ControlPanel: ~TiddlySpot Control Panel
+Saving/TiddlySpot/ControlPanel: ~TiddlyHost Control Panel
Saving/TiddlySpot/Backups: Backups
-Saving/TiddlySpot/Caption: ~TiddlySpot Saver
-Saving/TiddlySpot/Description: These settings are only used when saving to http://tiddlyspot.com or a compatible remote server
+Saving/TiddlySpot/Caption: ~TiddlyHost Saver
+Saving/TiddlySpot/Description: These settings are only used when saving to [[TiddlyHost|https://tiddlyhost.com]] or a compatible remote server. See [[here|https://github.com/simonbaird/tiddlyhost/wiki/TiddlySpot-Saver-configuration-for-Tiddlyhost-and-Tiddlyspot]] for information on ~TiddlyHost saving configuration
Saving/TiddlySpot/Filename: Upload Filename
-Saving/TiddlySpot/Heading: ~TiddlySpot
-Saving/TiddlySpot/Hint: //The server URL defaults to `http://<wikiname>.tiddlyspot.com/store.cgi` and can be changed to use a custom server address, e.g. `http://example.com/store.php`.//
+Saving/TiddlySpot/Heading: ~TiddlyHost
+Saving/TiddlySpot/Hint: //The server URL defaults to `http://<wikiname>.tiddlyspot.com/` and can be changed to use a custom server address, e.g. `http://example.com/store.php`.//
Saving/TiddlySpot/Password: Password
-Saving/TiddlySpot/ReadOnly: The ~TiddlySpot service is currently only available in read-only form. Please see http://tiddlyspot.com/ for the latest details. The ~TiddlySpot saver can still be used to save to compatible servers.
Saving/TiddlySpot/ServerURL: Server URL
Saving/TiddlySpot/UploadDir: Upload Directory
Saving/TiddlySpot/UserName: Wiki Name
@@ -137,7 +147,7 @@ Settings/AutoSave/Disabled/Description: Do not save changes automatically
Settings/AutoSave/Enabled/Description: Save changes automatically
Settings/AutoSave/Hint: Attempt to automatically save changes during editing when using a supporting saver
Settings/CamelCase/Caption: Camel Case Wiki Links
-Settings/CamelCase/Hint: You can globally disable automatic linking of ~CamelCase phrases. Requires reload to take effect
+Settings/CamelCase/Hint: Requires reload to take effect
Settings/CamelCase/Description: Enable automatic ~CamelCase linking
Settings/Caption: Settings
Settings/EditorToolbar/Caption: Editor Toolbar
@@ -164,6 +174,8 @@ 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
@@ -177,6 +189,8 @@ Settings/DefaultSidebarTab/Caption: Default Sidebar Tab
Settings/DefaultSidebarTab/Hint: Specify which sidebar tab is displayed by default
Settings/DefaultMoreSidebarTab/Caption: Default More Sidebar Tab
Settings/DefaultMoreSidebarTab/Hint: Specify which More sidebar tab is displayed by default
+Settings/DefaultTiddlerInfoTab/Caption: Default Tiddler Info Tab
+Settings/DefaultTiddlerInfoTab/Hint: Specify which tab is displayed by default when tiddler info panel is opened
Settings/LinkToBehaviour/Caption: Tiddler Opening Behaviour
Settings/LinkToBehaviour/InsideRiver/Hint: Navigation from //within// the story river
Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation from //outside// the story river
@@ -191,16 +205,34 @@ Settings/TitleLinks/Yes/Description: Display tiddler titles as links
Settings/MissingLinks/Caption: Wiki Links
Settings/MissingLinks/Hint: Choose whether to link to tiddlers that do not exist yet
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/PreviewUrl/Preview: Preview image:
+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
StoryView/Prompt: Current view:
Stylesheets/Caption: Stylesheets
Stylesheets/Expand/Caption: Expand All
Stylesheets/Hint: This is the rendered CSS of the current stylesheet tiddlers tagged with <<tag "$:/tags/Stylesheet">>
Stylesheets/Restore/Caption: Restore
+TestCases/Caption: Test Cases
+TestCases/Hint: Test cases are self contained examples for testing and learning
+TestCases/All/Caption: All Test Cases
+TestCases/All/Hint: All Test Cases
+TestCases/Failed/Caption: Failed Test Cases
+TestCases/Failed/Hint: Only Failed Test Cases
Theme/Caption: Theme
Theme/Prompt: Current theme:
TiddlerFields/Caption: Tiddler Fields
TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
+TiddlerColour/Caption: Tiddler Colour
+TiddlerColour/Hint: This rules cascade is used to dynamically choose the colour for a tiddler (used for the icon and the associated tag pill).
+TiddlerIcon/Caption: Tiddler Icon
+TiddlerIcon/Hint: This rules cascade is used to dynamically choose the icon for a tiddler.
Toolbars/Caption: Toolbars
Toolbars/EditToolbar/Caption: Edit Toolbar
Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode. Drag and drop to change the ordering
@@ -212,3 +244,14 @@ Toolbars/EditorToolbar/Hint: Choose which buttons are displayed in the editor to
Toolbars/ViewToolbar/Caption: View Toolbar
Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode. Drag and drop to change the ordering
Tools/Download/Full/Caption: Download full wiki
+ViewTemplateBody/Caption: View Template Body
+ViewTemplateBody/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the body of a tiddler.
+ViewTemplateTitle/Caption: View Template Title
+ViewTemplateTitle/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the title of a tiddler.
+ViewTemplateSubtitle/Caption: View Template Subtitle
+ViewTemplateSubtitle/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the subtitle of a tiddler.
+ViewTemplateTags/Caption: View Template Tags
+ViewTemplateTags/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the tags area of a tiddler.
+WikiInformation/Caption: Wiki Information
+WikiInformation/Hint: This page summarises high level information about the configuration of this ~TiddlyWiki. It is designed to enable users to quickly share relevant aspects of the configuration of their ~TiddlyWiki with others, for example when seeking help in one of the forums. No private or personal information is included, and nothing is shared without being explicitly copied and pasted elsewhere
+WikiInformation/Drag/Caption: Drag this link to copy this tool to another wiki
\ No newline at end of file
diff --git a/core/language/en-GB/Docs/ModuleTypes.multids b/core/language/en-GB/Docs/ModuleTypes.multids
index 9a03d8887..5d5902c76 100644
--- a/core/language/en-GB/Docs/ModuleTypes.multids
+++ b/core/language/en-GB/Docs/ModuleTypes.multids
@@ -9,7 +9,7 @@ config: Data to be inserted into `$tw.config`.
filteroperator: Individual filter operator methods.
global: Global data to be inserted into `$tw`.
info: Publishes system information via the [[$:/temp/info-plugin]] pseudo-plugin.
-isfilteroperator: Operands for the ''is'' filter operator.
+isfilteroperator: Parameters for the ''is'' filter operator.
library: Generic module type for general purpose JavaScript modules.
macro: JavaScript macro definitions.
parser: Parsers for different content types.
diff --git a/core/language/en-GB/Docs/PaletteColours.multids b/core/language/en-GB/Docs/PaletteColours.multids
index 98addbf85..bc1b36c3d 100644
--- a/core/language/en-GB/Docs/PaletteColours.multids
+++ b/core/language/en-GB/Docs/PaletteColours.multids
@@ -65,6 +65,13 @@ sidebar-tab-foreground-selected: Sidebar tab foreground for selected tabs
sidebar-tab-foreground: Sidebar tab foreground
sidebar-tiddler-link-foreground-hover: Sidebar tiddler link foreground hover
sidebar-tiddler-link-foreground: Sidebar tiddler link foreground
+stability-stable: Badge for stability level "stable"
+stability-experimental: Badge for stability level "experimental"
+stability-deprecated: Badge for stability level "deprecated"
+stability-legacy: Badge for stability level "legacy"
+testcase-accent-level-1: Test case accent colour with no nesting
+testcase-accent-level-2: Test case accent colour with 2nd level nesting
+testcase-accent-level-3: Test case accent colour with 3rd level nesting or higher
site-title-foreground: Site title foreground
static-alert-foreground: Static alert foreground
tab-background-selected: Tab background for selected tabs
diff --git a/core/language/en-GB/EditTemplate.multids b/core/language/en-GB/EditTemplate.multids
index 8072ba42d..8b2e6e17a 100644
--- a/core/language/en-GB/EditTemplate.multids
+++ b/core/language/en-GB/EditTemplate.multids
@@ -1,8 +1,11 @@
title: $:/language/EditTemplate/
+Caption: Editor
Body/External/Hint: This tiddler shows content stored outside of the main TiddlyWiki file. You can edit the tags and fields but cannot directly edit the content itself
Body/Placeholder: Type the text for this tiddler
Body/Preview/Type/Output: output
+Body/Preview/Type/DiffShadow: differences from shadow (if any)
+Body/Preview/Type/DiffCurrent: differences from current
Field/Remove/Caption: remove field
Field/Remove/Hint: Remove field
Field/Dropdown/Caption: field list
@@ -23,6 +26,8 @@ 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
diff --git a/core/language/en-GB/Exporters.multids b/core/language/en-GB/Exporters.multids
index e455b8bf1..6ac52efe7 100644
--- a/core/language/en-GB/Exporters.multids
+++ b/core/language/en-GB/Exporters.multids
@@ -3,4 +3,4 @@ title: $:/language/Exporters/
StaticRiver: Static HTML
JsonFile: JSON file
CsvFile: CSV file
-TidFile: ".tid" file
+TidFile: TID text file
diff --git a/core/language/en-GB/Fields.multids b/core/language/en-GB/Fields.multids
index d1eeabd42..61835821a 100644
--- a/core/language/en-GB/Fields.multids
+++ b/core/language/en-GB/Fields.multids
@@ -1,38 +1,45 @@
title: $:/language/Docs/Fields/
_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
+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|AlertMechanism]]
-current-tiddler: Used to cache the top tiddler in a [[history list|HistoryMechanism]]
+component: The name of the component responsible for an alert tiddler
+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
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
description: The descriptive text for a plugin, or a modal dialogue
draft.of: For draft tiddlers, contains the title of the tiddler of which this is a draft
draft.title: For draft tiddlers, contains the proposed new title of the tiddler
-footer: The footer text for a wizard
-hide-body: The view template will hide bodies of tiddlers if set to: ''yes''
+footer: The footer text for a modal
+hide-body: The view template will hide bodies of tiddlers if set to ''yes''
icon: The title of the tiddler containing the icon associated with a tiddler
-library: Indicates that a tiddler should be saved as a JavaScript library if set to: ''yes''
+library: Indicates that a tiddler should be saved as a JavaScript library if set to ''yes''
list: An ordered list of tiddler titles associated with a tiddler
list-before: If set, the title of a tiddler before which this tiddler should be added to the ordered list of tiddler titles, or at the start of the list if this field is present but empty
list-after: If set, the title of the tiddler after which this tiddler should be added to the ordered list of tiddler titles, or at the end of the list if this field is present but empty
modified: The date and time at which a tiddler was last modified
modifier: The tiddler title associated with the person who last modified a tiddler
+module-type: For javascript tiddlers, specifies what kind of module it is
name: The human readable name associated with a plugin tiddler
+parent-plugin: For a plugin, specifies which plugin of which it is a sub-plugin
plugin-priority: A numerical value indicating the priority of a plugin tiddler
plugin-type: The type of plugin in a plugin tiddler
+stability: The development status of a plugin: deprecated, experimental, stable, or legacy
revision: The revision of the tiddler held at the server
released: Date of a TiddlyWiki release
source: The source URL associated with a tiddler
-subtitle: The subtitle text for a wizard
+subtitle: The subtitle text for a modal
tags: A list of tags associated with a tiddler
text: The body text of a tiddler
throttle.refresh: If present, throttles refreshes of this tiddler
title: The unique name of a tiddler
-toc-link: Suppresses the tiddler's link in a Table of Contents tree if set to: ''no''
+toc-link: Suppresses the tiddler's link in a Table of Contents tree if set to ''no''
type: The content type of a tiddler
version: Version information for a plugin
_is_skinny: If present, indicates that the tiddler text field must be loaded from the server
diff --git a/core/language/en-GB/GettingStarted.tid b/core/language/en-GB/GettingStarted.tid
index ae6e3b167..a3073a521 100644
--- a/core/language/en-GB/GettingStarted.tid
+++ b/core/language/en-GB/GettingStarted.tid
@@ -9,9 +9,10 @@ Before you start storing important information in ~TiddlyWiki it is vital to mak
<div class="tc-control-panel">
-|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
-|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|tc-table-no-border tc-first-col-min-width tc-first-link-nowrap|k
+| <$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link>|<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+| <$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link>|<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|^ <$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link><br><<lingo DefaultTiddlers/TopHint>>|<$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
</div>
See the [[control panel|$:/ControlPanel]] for more options.
diff --git a/core/language/en-GB/Help/commands.tid b/core/language/en-GB/Help/commands.tid
new file mode 100644
index 000000000..7551885f0
--- /dev/null
+++ b/core/language/en-GB/Help/commands.tid
@@ -0,0 +1,18 @@
+title: $:/language/Help/commands
+description: Run commands returned from a filter
+
+Sequentially run the command tokens returned from a filter
+
+```
+--commands <filter>
+```
+
+Examples
+
+```
+--commands "[enlist:raw{$:/build-commands-as-text}]"
+```
+
+```
+--commands "[{$:/build-commands-as-json}jsonindexes[]] :map[{$:/build-commands-as-json}jsonget<currentTiddler>]"
+```
diff --git a/core/language/en-GB/Help/default.tid b/core/language/en-GB/Help/default.tid
index 0a8fce44c..1ca0926a9 100644
--- a/core/language/en-GB/Help/default.tid
+++ b/core/language/en-GB/Help/default.tid
@@ -3,6 +3,7 @@ title: $:/language/Help/default
\define commandTitle()
$:/language/Help/$(command)$
\end
+\whitespace trim
```
usage: tiddlywiki [<wikifolder>] [--<command> [<args>...]...]
```
@@ -11,7 +12,9 @@ Available commands:
<ul>
<$list filter="[commands[]sort[title]]" variable="command">
-<li><$link to=<<commandTitle>>><$macrocall $name="command" $type="text/plain" $output="text/plain"/></$link>: <$transclude tiddler=<<commandTitle>> field="description"/></li>
+<li><$link to=<<commandTitle>>><$macrocall $name="command" $type="text/plain" $output="text/plain"/></$link>:
+
+<$transclude tiddler=<<commandTitle>> field="description"/></li>
</$list>
</ul>
diff --git a/core/language/en-GB/Help/listen.tid b/core/language/en-GB/Help/listen.tid
index 7b2c78cbe..d9f6a247f 100644
--- a/core/language/en-GB/Help/listen.tid
+++ b/core/language/en-GB/Help/listen.tid
@@ -18,11 +18,10 @@ All parameters are optional with safe defaults, and can be specified in any orde
* ''anon-username'' - the username for signing edits for anonymous users
* ''username'' - optional username for basic authentication
* ''password'' - optional password for basic authentication
-* ''authenticated-user-header'' - optional name of header to be used for trusted authentication
-* ''readers'' - comma separated list of principals allowed to read from this wiki
-* ''writers'' - comma separated list of principals allowed to write to this wiki
+* ''authenticated-user-header'' - optional name of request header to be used for trusted authentication.
+* ''readers'' - comma-separated list of principals allowed to read from this wiki
+* ''writers'' - comma-separated list of principals allowed to write to this wiki
* ''csrf-disable'' - set to "yes" to disable CSRF checks (defaults to "no")
-* ''sse-enabled'' - set to "yes" to enable Server-sent events (defaults to "no")
* ''root-tiddler'' - the tiddler to serve at the root (defaults to "$:/core/save/all")
* ''root-render-type'' - the content type to which the root tiddler should be rendered (defaults to "text/plain")
* ''root-serve-type'' - the content type with which the root tiddler should be served (defaults to "text/html")
@@ -30,6 +29,7 @@ All parameters are optional with safe defaults, and can be specified in any orde
* ''tls-key'' - pathname of TLS key file (relative to wiki folder)
* ''debug-level'' - optional debug level; set to "debug" to view request details (defaults to "none")
* ''gzip'' - set to "yes" to enable gzip compression for some http endpoints (defaults to "no")
+* ''use-browser-cache'' - set to "yes" to allow the browser to cache responses to save bandwidth (defaults to "no")
For information on opening up your instance to the entire local network, and possible security concerns, see the WebServer tiddler at TiddlyWiki.com.
diff --git a/core/language/en-GB/Help/render.tid b/core/language/en-GB/Help/render.tid
index 2b7b168c9..f25390fea 100644
--- a/core/language/en-GB/Help/render.tid
+++ b/core/language/en-GB/Help/render.tid
@@ -8,15 +8,15 @@ Optionally, the title of a template tiddler can be specified. In this case, inst
A name and value for an additional variable may optionally also be specified.
```
---render <tiddler-filter> [<filename-filter>] [<render-type>] [<template>] [<name>] [<value>]
+--render <tiddler-filter> [<filename-filter>] [<render-type>] [<template>] [ [<name>] [<value>] ]*
```
* ''tiddler-filter'': A filter identifying the tiddler(s) to be rendered
* ''filename-filter'': Optional filter transforming tiddler titles into pathnames. If omitted, defaults to `[is[tiddler]addsuffix[.html]]`, which uses the unchanged tiddler title as the filename
* ''render-type'': Optional render type: `text/html` (the default) returns the full HTML text and `text/plain` just returns the text content (ie it ignores HTML tags and other unprintable material)
* ''template'': Optional template through which each tiddler is rendered
-* ''name'': Name of optional variable
-* ''value'': Value of optional variable
+* ''name'': Name of optional variables
+* ''value'': Value of optional variables
By default, the filename is resolved relative to the `output` subdirectory of the edition directory. The `--output` command can be used to direct output to a different directory.
@@ -24,11 +24,12 @@ Notes:
* The output directory is not cleared of any existing files
* Any missing directories in the path to the filename are automatically created.
-* When referring to a tiddler with spaces in its title, take care to use both the quotes required by your shell and also TiddlyWiki's double square brackets : `--render "[[Motovun Jack.jpg]]"`
+* When referring to a tiddler with spaces in its title, take care to use both the quotes required by your shell and also TiddlyWiki's double square brackets: `--render "[[Motovun Jack.jpg]]"`
* The filename filter is evaluated with the selected items being set to the title of the tiddler currently being rendered, allowing the title to be used as the basis for computing the filename. For example `[encodeuricomponent[]addprefix[static/]]` applies URI encoding to each title, and then adds the prefix `static/`
+* Multiple ''name''/''value'' pairs can be used to pass more than one variable
* The `--render` command is a more flexible replacement for both the `--rendertiddler` and `--rendertiddlers` commands, which are deprecated
Examples:
-* `--render "[!is[system]]" "[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]"` -- renders all non-system tiddlers as files in the subdirectory "tiddlers" with URL-encoded titles and the extension HTML
-
+* `--render '[!is[system]]' '[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]'` -- renders all non-system tiddlers as files in the subdirectory "tiddlers" with URL-encoded titles and the extension HTML
+* `--render '.' 'tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[HelloThere]]'` -- renders the tiddlers tagged "HelloThere" to a JSON file named "tiddlers.json"
diff --git a/core/language/en-GB/Help/save.tid b/core/language/en-GB/Help/save.tid
index cb9971cf9..c178a5314 100644
--- a/core/language/en-GB/Help/save.tid
+++ b/core/language/en-GB/Help/save.tid
@@ -16,7 +16,7 @@ Notes:
* The output directory is not cleared of any existing files
* Any missing directories in the path to the filename are automatically created.
-* When saving a tiddler with spaces in its title, take care to use both the quotes required by your shell and also TiddlyWiki's double square brackets : `--save "[[Motovun Jack.jpg]]"`
+* When saving a tiddler with spaces in its title, take care to use both the quotes required by your shell and also TiddlyWiki's double square brackets: `--save "[[Motovun Jack.jpg]]"`
* The filename filter is evaluated with the selected items being set to the title of the tiddler currently being saved, allowing the title to be used as the basis for computing the filename. For example `[encodeuricomponent[]addprefix[static/]]` applies URI encoding to each title, and then adds the prefix `static/`
* The `--save` command is a more flexible replacement for both the `--savetiddler` and `--savetiddlers` commands, which are deprecated
diff --git a/core/language/en-GB/Help/savewikifolder.tid b/core/language/en-GB/Help/savewikifolder.tid
index bda1d19a3..82565f7bc 100644
--- a/core/language/en-GB/Help/savewikifolder.tid
+++ b/core/language/en-GB/Help/savewikifolder.tid
@@ -4,7 +4,7 @@ description: Saves a wiki to a new wiki folder
<<.from-version "5.1.20">> Saves the current wiki as a wiki folder, including tiddlers, plugins and configuration:
```
---savewikifolder <wikifolderpath> [<filter>]
+--savewikifolder <wikifolderpath> [<filter>] [ [<name>=<value>] ]*
```
* The target wiki folder must be empty or non-existent
@@ -12,8 +12,23 @@ description: Saves a wiki to a new wiki folder
* Plugins from the official plugin library are replaced with references to those plugins in the `tiddlywiki.info` file
* Custom plugins are unpacked into their own folder
+The following options are supported:
+
+* ''filter'': a filter expression that defines the tiddlers to include in the output.
+* ''explodePlugins'': defaults to "yes"
+** ''yes'' will "explode" plugins into separate tiddler files and save them to the plugin directory within the wiki folder
+** ''no'' will suppress exploding plugins into their constituent tiddler files. It will save the plugin as a single JSON tiddler in the tiddlers folder
+
+Note that both ''explodePlugins'' options will produce wiki folders that build the exact same original wiki. The difference lies in how plugins are represented in the wiki folder.
+
A common usage is to convert a TiddlyWiki HTML file into a wiki folder:
```
tiddlywiki --load ./mywiki.html --savewikifolder ./mywikifolder
```
+
+Save the plugin to the tiddlers directory of the target wiki folder:
+
+```
+tiddlywiki --load ./mywiki.html --savewikifolder ./mywikifolder explodePlugins=no
+```
diff --git a/core/language/en-GB/Help/server.tid b/core/language/en-GB/Help/server.tid
index 78e9c8ab1..da6865031 100644
--- a/core/language/en-GB/Help/server.tid
+++ b/core/language/en-GB/Help/server.tid
@@ -1,5 +1,5 @@
title: $:/language/Help/server
-description: Provides an HTTP server interface to TiddlyWiki (deprecated in favour of the new listen command)
+description: (deprecated: see 'listen' command) Provides an HTTP server interface to TiddlyWiki
Legacy command to serve a wiki over HTTP.
diff --git a/core/language/en-GB/Import.multids b/core/language/en-GB/Import.multids
index 3b3308ad5..57c2d09be 100644
--- a/core/language/en-GB/Import.multids
+++ b/core/language/en-GB/Import.multids
@@ -1,7 +1,9 @@
title: $:/language/Import/
+Editor/Import/Heading: Import images and insert them into the editor.
Imported/Hint: The following tiddlers were imported:
Listing/Cancel/Caption: Cancel
+Listing/Cancel/Warning: Do you wish to cancel the import?
Listing/Hint: These tiddlers are ready to import:
Listing/Import/Caption: Import
Listing/Select/Caption: Select
@@ -22,7 +24,11 @@ Upgrader/Plugins/Suppressed/Incompatible: Blocked incompatible or obsolete plugi
Upgrader/Plugins/Suppressed/Version: Blocked plugin (due to incoming <<incoming>> not being newer than existing <<existing>>).
Upgrader/Plugins/Upgraded: Upgraded plugin from <<incoming>> to <<upgraded>>.
Upgrader/State/Suppressed: Blocked temporary state tiddler.
+Upgrader/System/Disabled: Disabled system tiddler.
Upgrader/System/Suppressed: Blocked system tiddler.
Upgrader/System/Warning: Core module tiddler.
Upgrader/System/Alert: You are about to import a tiddler that will overwrite a core module tiddler. This is not recommended as it may make the system unstable.
Upgrader/ThemeTweaks/Created: Migrated theme tweak from <$text text=<<from>>/>.
+Upgrader/Tiddler/Disabled: Disabled tiddler.
+Upgrader/Tiddler/Selected: Selected tiddler.
+Upgrader/Tiddler/Unselected: Unselected tiddler.
diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids
index 81c5758cc..d8c091375 100644
--- a/core/language/en-GB/Misc.multids
+++ b/core/language/en-GB/Misc.multids
@@ -8,13 +8,14 @@ CloseAll/Button: close all
ColourPicker/Recent: Recent:
ConfirmCancelTiddler: Do you wish to discard changes to the tiddler "<$text text=<<title>>/>"?
ConfirmDeleteTiddler: Do you wish to delete the tiddler "<$text text=<<title>>/>"?
+ConfirmDeleteTiddlers: Are you sure you wish to delete <<resultCount>> tiddler(s)?
ConfirmOverwriteTiddler: Do you wish to overwrite the tiddler "<$text text=<<title>>/>"?
ConfirmEditShadowTiddler: You are about to edit a ShadowTiddler. Any changes will override the default system making future upgrades non-trivial. Are you sure you want to edit "<$text text=<<title>>/>"?
ConfirmAction: Do you wish to proceed?
Count: count
DefaultNewTiddlerTitle: New Tiddler
Diffs/CountMessage: <<diff-count>> differences
-DropMessage: Drop here (or use the 'Escape' key to cancel)
+DropMessage: Drop now (or use the 'Escape' key to cancel)
Encryption/Cancel: Cancel
Encryption/ConfirmClearPassword: Do you wish to clear the password? This will remove the encryption applied when saving this wiki
Encryption/PromptSetPassword: Set a new password for this TiddlyWiki
@@ -24,22 +25,26 @@ Encryption/RepeatPassword: Repeat password
Encryption/PasswordNoMatch: Passwords do not match
Encryption/SetPassword: Set password
Error/Caption: Error
-Error/EditConflict: File changed on server
+Error/DeserializeOperator/MissingOperand: Filter Error: Missing operand for 'deserialize' operator
+Error/DeserializeOperator/UnknownDeserializer: Filter Error: Unknown deserializer provided as operand for the 'deserialize' operator
Error/Filter: Filter error
Error/FilterSyntax: Syntax error in filter expression
Error/FilterRunPrefix: Filter Error: Unknown prefix for filter run
-Error/IsFilterOperator: Filter Error: Unknown operand for the 'is' filter operator
+Error/IsFilterOperator: Filter Error: Unknown parameter for the 'is' filter operator
Error/FormatFilterOperator: Filter Error: Unknown suffix for the 'format' filter operator
Error/LoadingPluginLibrary: Error loading plugin library
Error/NetworkErrorAlert: `<h2>''Network Error''</h2>It looks like the connection to the server has been lost. This may indicate a problem with your network connection. Please attempt to restore network connectivity before continuing.<br><br>''Any unsaved changes will be automatically synchronised when connectivity is restored''.`
+Error/PutEditConflict: File changed on server
+Error/PutForbidden: Permission denied
+Error/PutUnauthorized: Authentication required
Error/RecursiveTransclusion: Recursive transclusion error in transclude widget
Error/RetrievingSkinny: Error retrieving skinny tiddler list
Error/SavingToTWEdit: Error saving to TWEdit
Error/WhileSaving: Error while saving
Error/XMLHttpRequest: XMLHttpRequest error code
+Error/ZoominTextNode: Story View Error: It appears you tried to interact with a tiddler that displays in a custom container. This is most likely caused by using `$:/tags/StoryTiddlerTemplateFilter` with a template that contains text or whitespace at the start. Please use the pragma `\whitespace trim` and ensure the whole contents of the tiddler is wrapped in a single HTML element. The text that caused this issue:
InternalJavaScriptError/Title: Internal JavaScript Error
InternalJavaScriptError/Hint: Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser
-InvalidFieldName: Illegal characters in field name "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`)
LayoutSwitcher/Description: Open the layout switcher
LazyLoadingWarning: <p>Trying to load external content from ''<$text text={{!!_canonical_uri}}/>''</p><p>If this message doesn't disappear, either the tiddler content type doesn't match the type of the external content, or you may be using a browser that doesn't support external content for wikis loaded as standalone files. See https://tiddlywiki.com/#ExternalText</p>
LoginToTiddlySpace: Login to TiddlySpace
@@ -65,7 +70,7 @@ No: No
OfficialPluginLibrary: Official ~TiddlyWiki Plugin Library
OfficialPluginLibrary/Hint: The official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
PageTemplate/Description: the default ~TiddlyWiki layout
-PageTemplate/Name: Default ~PageTemplate
+PageTemplate/Name: Standard Layout
PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$:/core/ui/Buttons/refresh}} to allow changes to ~JavaScript plugins to take effect
RecentChanges/DateFormat: DDth MMM YYYY
Shortcuts/Input/AdvancedSearch/Hint: Open the ~AdvancedSearch panel from within the sidebar search field
diff --git a/core/language/en-GB/Modals/SaveInstructions.tid b/core/language/en-GB/Modals/SaveInstructions.tid
deleted file mode 100644
index 45028fc45..000000000
--- a/core/language/en-GB/Modals/SaveInstructions.tid
+++ /dev/null
@@ -1,21 +0,0 @@
-title: $:/language/Modals/SaveInstructions
-subtitle: Save your work
-footer: <$button message="tm-close-tiddler">Close</$button>
-help: https://tiddlywiki.com/static/SavingChanges.html
-
-Your changes to this wiki need to be saved as a ~TiddlyWiki HTML file.
-
-!!! Desktop browsers
-
-# Select ''Save As'' from the ''File'' menu
-# Choose a filename and location
-#* Some browsers also require you to explicitly specify the file saving format as ''Webpage, HTML only'' or similar
-# Close this tab
-
-!!! Smartphone browsers
-
-# Create a bookmark to this page
-#* If you've got iCloud or Google Sync set up then the bookmark will automatically sync to your desktop where you can open it and save it as above
-# Close this tab
-
-//If you open the bookmark again in Mobile Safari you will see this message again. If you want to go ahead and use the file, just click the ''close'' button below//
diff --git a/core/language/en-GB/Search.multids b/core/language/en-GB/Search.multids
index 2a57a6416..f5aa478bf 100644
--- a/core/language/en-GB/Search.multids
+++ b/core/language/en-GB/Search.multids
@@ -6,6 +6,8 @@ Filter/Hint: Search via a [[filter expression|https://tiddlywiki.com/static/Filt
Filter/Matches: //<small><<resultCount>> matches</small>//
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
diff --git a/core/language/en-GB/SideBar.multids b/core/language/en-GB/SideBar.multids
index b109f3a9b..c4fda9c81 100644
--- a/core/language/en-GB/SideBar.multids
+++ b/core/language/en-GB/SideBar.multids
@@ -1,5 +1,6 @@
title: $:/language/SideBar/
+Caption: Sidebar
All/Caption: All
Contents/Caption: Contents
Drafts/Caption: Drafts
diff --git a/core/language/en-GB/SiteTitle.tid b/core/language/en-GB/SiteTitle.tid
index 9f522664a..a32da7dfe 100644
--- a/core/language/en-GB/SiteTitle.tid
+++ b/core/language/en-GB/SiteTitle.tid
@@ -1,3 +1,3 @@
title: $:/SiteTitle
-My ~TiddlyWiki
\ No newline at end of file
+My TiddlyWiki
\ No newline at end of file
diff --git a/core/language/en-GB/Snippets/FunctionDefinition.tid b/core/language/en-GB/Snippets/FunctionDefinition.tid
new file mode 100644
index 000000000..e000e38b1
--- /dev/null
+++ b/core/language/en-GB/Snippets/FunctionDefinition.tid
@@ -0,0 +1,7 @@
+title: $:/language/Snippets/FunctionDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: Function definition
+
+\function f.name(param1,param2:"default value") [<param1>!is[blank]else<param2>]
+
+<<f.name>>
diff --git a/core/language/en-GB/Snippets/ProcedureDefinition.tid b/core/language/en-GB/Snippets/ProcedureDefinition.tid
new file mode 100644
index 000000000..632abcc01
--- /dev/null
+++ b/core/language/en-GB/Snippets/ProcedureDefinition.tid
@@ -0,0 +1,7 @@
+title: $:/language/Snippets/ProcedureDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: Procedure definition
+
+\procedure procName(param1:"default value",param2)
+Your text comes here.
+\end
diff --git a/core/language/en-GB/Types/image_svg_xml.tid b/core/language/en-GB/Types/image_svg_xml.tid
index 9f7c23ba3..94c3ea949 100644
--- a/core/language/en-GB/Types/image_svg_xml.tid
+++ b/core/language/en-GB/Types/image_svg_xml.tid
@@ -1,5 +1,5 @@
title: $:/language/Docs/Types/image/svg+xml
-description: Structured Vector Graphics image
+description: SVG image
name: image/svg+xml
group: Image
group-sort: 1
diff --git a/core/language/en-GB/Types/image_x-icon.tid b/core/language/en-GB/Types/image_x-icon.tid
deleted file mode 100644
index 6ae32331c..000000000
--- a/core/language/en-GB/Types/image_x-icon.tid
+++ /dev/null
@@ -1,5 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO format icon file
-name: image/x-icon
-group: Image
-group-sort: 1
diff --git a/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid b/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid
new file mode 100644
index 000000000..af15d7ac3
--- /dev/null
+++ b/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid
@@ -0,0 +1,5 @@
+title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple
+description: Compound tiddler
+name: text/vnd.tiddlywiki-multiple
+group: Developer
+group-sort: 2
diff --git a/core/language/en-GB/icon.tid b/core/language/en-GB/icon.tid
deleted file mode 100644
index 1967b895f..000000000
--- a/core/language/en-GB/icon.tid
+++ /dev/null
@@ -1,13 +0,0 @@
-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>
diff --git a/core/modules/commands/makelibrary.js b/core/modules/commands/makelibrary.js
deleted file mode 100644
index 36a1399a2..000000000
--- a/core/modules/commands/makelibrary.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/*\
-title: $:/core/modules/commands/makelibrary.js
-type: application/javascript
-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 = {
- name: "makelibrary",
- synchronous: true
-};
-
-var UPGRADE_LIBRARY_TITLE = "$:/UpgradeLibrary";
-
-var Command = function(params,commander,callback) {
- this.params = params;
- this.commander = commander;
- this.callback = callback;
-};
-
-Command.prototype.execute = function() {
- var wiki = this.commander.wiki,
- fs = require("fs"),
- path = require("path"),
- upgradeLibraryTitle = this.params[0] || UPGRADE_LIBRARY_TITLE,
- tiddlers = {};
- // Collect up the library plugins
- var collectPlugins = function(folder) {
- var pluginFolders = $tw.utils.getSubdirectories(folder) || [];
- for(var p=0; p<pluginFolders.length; p++) {
- if(!$tw.boot.excludeRegExp.test(pluginFolders[p])) {
- pluginFields = $tw.loadPluginFolder(path.resolve(folder,"./" + pluginFolders[p]));
- if(pluginFields && pluginFields.title) {
- tiddlers[pluginFields.title] = pluginFields;
- }
- }
- }
- },
- collectPublisherPlugins = function(folder) {
- var publisherFolders = $tw.utils.getSubdirectories(folder) || [];
- for(var t=0; t<publisherFolders.length; t++) {
- if(!$tw.boot.excludeRegExp.test(publisherFolders[t])) {
- collectPlugins(path.resolve(folder,"./" + publisherFolders[t]));
- }
- }
- };
- $tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.pluginsPath,$tw.config.pluginsEnvVar),collectPublisherPlugins);
- $tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.themesPath,$tw.config.themesEnvVar),collectPublisherPlugins);
- $tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.languagesPath,$tw.config.languagesEnvVar),collectPlugins);
- // Save the upgrade library tiddler
- var pluginFields = {
- title: upgradeLibraryTitle,
- type: "application/json",
- "plugin-type": "library",
- "text": JSON.stringify({tiddlers: tiddlers})
- };
- wiki.addTiddler(new $tw.Tiddler(pluginFields));
- return null;
-};
-
-exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/render.js b/core/modules/commands/render.js
deleted file mode 100644
index e9321c2b0..000000000
--- a/core/modules/commands/render.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/*\
-title: $:/core/modules/commands/render.js
-type: application/javascript
-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");
-
-exports.info = {
- name: "render",
- synchronous: true
-};
-
-var Command = function(params,commander,callback) {
- this.params = params;
- this.commander = commander;
- this.callback = callback;
-};
-
-Command.prototype.execute = function() {
- if(this.params.length < 1) {
- return "Missing tiddler filter";
- }
- var self = this,
- fs = require("fs"),
- path = require("path"),
- wiki = this.commander.wiki,
- tiddlerFilter = this.params[0],
- filenameFilter = this.params[1] || "[is[tiddler]addsuffix[.html]]",
- type = this.params[2] || "text/html",
- template = this.params[3],
- varName = this.params[4],
- varValue = this.params[5],
- tiddlers = wiki.filterTiddlers(tiddlerFilter);
- $tw.utils.each(tiddlers,function(title) {
- var parser = wiki.parseTiddler(template || title),
- variables = {currentTiddler: title};
- if(varName) {
- variables[varName] = varValue || "";
- }
- var widgetNode = wiki.makeWidget(parser,{variables: variables}),
- container = $tw.fakeDocument.createElement("div");
- widgetNode.render(container,null);
- var text = type === "text/html" ? container.innerHTML : container.textContent,
- filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]);
- if(self.commander.verbose) {
- console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
- }
- $tw.utils.createFileDirectories(filepath);
- fs.writeFileSync(filepath,text,"utf8");
- });
- return null;
-};
-
-exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/save.js b/core/modules/commands/save.js
deleted file mode 100644
index d8c44e1f3..000000000
--- a/core/modules/commands/save.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/*\
-title: $:/core/modules/commands/save.js
-type: application/javascript
-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 = {
- name: "save",
- synchronous: true
-};
-
-var Command = function(params,commander,callback) {
- this.params = params;
- this.commander = commander;
- this.callback = callback;
-};
-
-Command.prototype.execute = function() {
- if(this.params.length < 1) {
- return "Missing filename filter";
- }
- var self = this,
- fs = require("fs"),
- path = require("path"),
- wiki = this.commander.wiki,
- tiddlerFilter = this.params[0],
- filenameFilter = this.params[1] || "[is[tiddler]]",
- tiddlers = wiki.filterTiddlers(tiddlerFilter);
- $tw.utils.each(tiddlers,function(title) {
- var tiddler = self.commander.wiki.getTiddler(title),
- type = tiddler.fields.type || "text/vnd.tiddlywiki",
- contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"},
- filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]);
- if(self.commander.verbose) {
- console.log("Saving \"" + title + "\" to \"" + filepath + "\"");
- }
- $tw.utils.createFileDirectories(filepath);
- fs.writeFileSync(filepath,tiddler.fields.text,contentTypeInfo.encoding);
- });
- return null;
-};
-
-exports.Command = Command;
-
-})();
diff --git a/core/modules/commands/server.js b/core/modules/commands/server.js
deleted file mode 100644
index 507d1281d..000000000
--- a/core/modules/commands/server.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*\
-title: $:/core/modules/commands/server.js
-type: application/javascript
-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;
-
-exports.info = {
- name: "server",
- synchronous: true
-};
-
-var Command = function(params,commander,callback) {
- var self = this;
- this.params = params;
- this.commander = commander;
- this.callback = callback;
-};
-
-Command.prototype.execute = function() {
- if(!$tw.boot.wikiTiddlersPath) {
- $tw.utils.warning("Warning: Wiki folder '" + $tw.boot.wikiPath + "' does not exist or is missing a tiddlywiki.info file");
- }
- // Set up server
- this.server = new Server({
- wiki: this.commander.wiki,
- variables: {
- port: this.params[0],
- host: this.params[6],
- "root-tiddler": this.params[1],
- "root-render-type": this.params[2],
- "root-serve-type": this.params[3],
- username: this.params[4],
- password: this.params[5],
- "path-prefix": this.params[7],
- "debug-level": this.params[8]
- }
- });
- var nodeServer = this.server.listen();
- $tw.hooks.invokeHook("th-server-command-post-start",this.server,nodeServer,"tiddlywiki");
- return null;
-};
-
-exports.Command = Command;
-
-})();
diff --git a/core/modules/config.js b/core/modules/config.js
index 25c27c7ca..3546a21bc 100644
--- a/core/modules/config.js
+++ b/core/modules/config.js
@@ -6,10 +6,7 @@ module-type: config
Core configuration constants
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.preferences = {};
@@ -30,12 +27,10 @@ exports.textPrimitives.wikiLink = exports.textPrimitives.upperLetter + "+" +
exports.textPrimitives.upperLetter +
exports.textPrimitives.anyLetter + "*";
-exports.htmlEntities = {quot:34, amp:38, apos:39, lt:60, gt:62, nbsp:160, iexcl:161, cent:162, pound:163, curren:164, yen:165, brvbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not:172, shy:173, reg:174, macr:175, deg:176, plusmn:177, sup2:178, sup3:179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde:213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml:255, OElig:338, oelig:339, Scaron:352, scaron:353, Yuml:376, fnof:402, circ:710, tilde:732, Alpha:913, Beta:914, Gamma:915, Delta:916, Epsilon:917, Zeta:918, Eta:919, Theta:920, Iota:921, Kappa:922, Lambda:923, Mu:924, Nu:925, Xi:926, Omicron:927, Pi:928, Rho:929, Sigma:931, Tau:932, Upsilon:933, Phi:934, Chi:935, Psi:936, Omega:937, alpha:945, beta:946, gamma:947, delta:948, epsilon:949, zeta:950, eta:951, theta:952, iota:953, kappa:954, lambda:955, mu:956, nu:957, xi:958, omicron:959, pi:960, rho:961, sigmaf:962, sigma:963, tau:964, upsilon:965, phi:966, chi:967, psi:968, omega:969, thetasym:977, upsih:978, piv:982, ensp:8194, emsp:8195, thinsp:8201, zwnj:8204, zwj:8205, lrm:8206, rlm:8207, ndash:8211, mdash:8212, lsquo:8216, rsquo:8217, sbquo:8218, ldquo:8220, rdquo:8221, bdquo:8222, dagger:8224, Dagger:8225, bull:8226, hellip:8230, permil:8240, prime:8242, Prime:8243, lsaquo:8249, rsaquo:8250, oline:8254, frasl:8260, euro:8364, image:8465, weierp:8472, real:8476, trade:8482, alefsym:8501, larr:8592, uarr:8593, rarr:8594, darr:8595, harr:8596, crarr:8629, lArr:8656, uArr:8657, rArr:8658, dArr:8659, hArr:8660, forall:8704, part:8706, exist:8707, empty:8709, nabla:8711, isin:8712, notin:8713, ni:8715, prod:8719, sum:8721, minus:8722, lowast:8727, radic:8730, prop:8733, infin:8734, ang:8736, and:8743, or:8744, cap:8745, cup:8746, int:8747, there4:8756, sim:8764, cong:8773, asymp:8776, ne:8800, equiv:8801, le:8804, ge:8805, sub:8834, sup:8835, nsub:8836, sube:8838, supe:8839, oplus:8853, otimes:8855, perp:8869, sdot:8901, lceil:8968, rceil:8969, lfloor:8970, rfloor:8971, lang:9001, rang:9002, loz:9674, spades:9824, clubs:9827, hearts:9829, diams:9830 };
+exports.htmlEntities = {quot:34, dollar:36, amp:38, apos:39, lt:60, gt:62, nbsp:160, iexcl:161, cent:162, pound:163, curren:164, yen:165, brvbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not:172, shy:173, reg:174, macr:175, deg:176, plusmn:177, sup2:178, sup3:179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde:213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml:255, OElig:338, oelig:339, Scaron:352, scaron:353, Yuml:376, fnof:402, circ:710, tilde:732, Alpha:913, Beta:914, Gamma:915, Delta:916, Epsilon:917, Zeta:918, Eta:919, Theta:920, Iota:921, Kappa:922, Lambda:923, Mu:924, Nu:925, Xi:926, Omicron:927, Pi:928, Rho:929, Sigma:931, Tau:932, Upsilon:933, Phi:934, Chi:935, Psi:936, Omega:937, alpha:945, beta:946, gamma:947, delta:948, epsilon:949, zeta:950, eta:951, theta:952, iota:953, kappa:954, lambda:955, mu:956, nu:957, xi:958, omicron:959, pi:960, rho:961, sigmaf:962, sigma:963, tau:964, upsilon:965, phi:966, chi:967, psi:968, omega:969, thetasym:977, upsih:978, piv:982, ensp:8194, emsp:8195, thinsp:8201, zwnj:8204, zwj:8205, lrm:8206, rlm:8207, ndash:8211, mdash:8212, lsquo:8216, rsquo:8217, sbquo:8218, ldquo:8220, rdquo:8221, bdquo:8222, dagger:8224, Dagger:8225, bull:8226, hellip:8230, permil:8240, prime:8242, Prime:8243, lsaquo:8249, rsaquo:8250, oline:8254, frasl:8260, nobreak:8288, NoBreak:8288, euro:8364, image:8465, weierp:8472, real:8476, trade:8482, alefsym:8501, larr:8592, uarr:8593, rarr:8594, darr:8595, harr:8596, crarr:8629, lArr:8656, uArr:8657, rArr:8658, dArr:8659, hArr:8660, forall:8704, part:8706, exist:8707, empty:8709, nabla:8711, isin:8712, notin:8713, ni:8715, prod:8719, sum:8721, minus:8722, lowast:8727, radic:8730, prop:8733, infin:8734, ang:8736, and:8743, or:8744, cap:8745, cup:8746, int:8747, there4:8756, sim:8764, cong:8773, asymp:8776, ne:8800, equiv:8801, le:8804, ge:8805, sub:8834, sup:8835, nsub:8836, sube:8838, supe:8839, oplus:8853, otimes:8855, perp:8869, sdot:8901, lceil:8968, rceil:8969, lfloor:8970, rfloor:8971, lang:9001, rang:9002, loz:9674, spades:9824, clubs:9827, hearts:9829, diams:9830 };
exports.htmlVoidElements = "area,base,br,col,command,embed,hr,img,input,keygen,link,meta,param,source,track,wbr".split(",");
-exports.htmlBlockElements = "address,article,aside,audio,blockquote,canvas,dd,div,dl,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,hr,li,noscript,ol,output,p,pre,section,table,tfoot,ul,video".split(",");
+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(",");
-
-})();
diff --git a/core/modules/deserializers.js b/core/modules/deserializers.js
index 3139a2611..972a41bb0 100644
--- a/core/modules/deserializers.js
+++ b/core/modules/deserializers.js
@@ -6,12 +6,124 @@ 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) {
+ return [deserializeTiddlerDiv(text,fields)];
+};
+
+exports["application/json"] = function(text,fields) {
+ var results = [],
+ incoming = $tw.utils.parseJSONSafe(text,function(err) {
+ return [{
+ title: "JSON error: " + err,
+ text: ""
+ }];
+ });
+ if(!$tw.utils.isArray(incoming)) {
+ incoming = [incoming];
+ }
+ for(var t=0; t<incoming.length; t++) {
+ var incomingFields = incoming[t],
+ fields = {};
+ for(var f in incomingFields) {
+ if(typeof incomingFields[f] === "string") {
+ fields[f] = incomingFields[f];
+ }
+ }
+ results.push(fields);
+ }
+ return results;
+};
+
+/*
+Parse an HTML file into tiddlers. There are three possibilities:
+# A TiddlyWiki classic HTML file containing `text/x-tiddlywiki` tiddlers
+# A TiddlyWiki5 HTML file containing `text/vnd.tiddlywiki` tiddlers
+# An ordinary HTML file
+*/
+exports["text/html"] = function(text,fields) {
+ var results = [];
+ // Check if we've got an old-style store area
+ var storeAreaMarkerRegExp = /<div id=["']?storeArea['"]?( style=["']?display:none;["']?)?>/gi,
+ storeAreaMatch = storeAreaMarkerRegExp.exec(text);
+ if(storeAreaMatch) {
+ // If so, we've got tiddlers in classic TiddlyWiki format or unencrypted old-style TW5 format
+ results.push.apply(results,deserializeStoreArea(text,storeAreaMarkerRegExp.lastIndex,!!storeAreaMatch[1],fields));
+ }
+ // Check for new-style store areas
+ var newStoreAreaMarkerRegExp = /<script class="tiddlywiki-tiddler-store" type="([^"]*)">/gi,
+ newStoreAreaMatch = newStoreAreaMarkerRegExp.exec(text),
+ haveHadNewStoreArea = !!newStoreAreaMatch;
+ while(newStoreAreaMatch) {
+ results.push.apply(results,deserializeNewStoreArea(text,newStoreAreaMarkerRegExp.lastIndex,newStoreAreaMatch[1],fields));
+ newStoreAreaMatch = newStoreAreaMarkerRegExp.exec(text);
+ }
+ // Return if we had either an old-style or a new-style store area
+ if(storeAreaMatch || haveHadNewStoreArea) {
+ return results;
+ }
+ // Otherwise, check whether we've got an encrypted file
+ var encryptedStoreArea = $tw.utils.extractEncryptedStoreArea(text);
+ if(encryptedStoreArea) {
+ // If so, attempt to decrypt it using the current password
+ return $tw.utils.decryptStoreArea(encryptedStoreArea);
+ } else {
+ // It's not a TiddlyWiki so we'll return the entire HTML file as a tiddler
+ return deserializeHtmlFile(text,fields);
+ }
+};
+
+function deserializeHtmlFile(text,fields) {
+ var result = {};
+ $tw.utils.each(fields,function(value,name) {
+ result[name] = value;
+ });
+ result.text = text;
+ result.type = "text/html";
+ return [result];
+}
+
+function deserializeNewStoreArea(text,storeAreaEnd,type,fields) {
+ var endOfScriptRegExp = /<\/script>/gi;
+ endOfScriptRegExp.lastIndex = storeAreaEnd;
+ var match = endOfScriptRegExp.exec(text);
+ if(match) {
+ var scriptContent = text.substring(storeAreaEnd,match.index);
+ return $tw.wiki.deserializeTiddlers(type,scriptContent);
+ } else {
+ return [];
+ }
+}
+
+function deserializeStoreArea(text,storeAreaEnd,isTiddlyWiki5,fields) {
+ var results = [],
+ endOfDivRegExp = /(<\/div>\s*)/gi,
+ startPos = storeAreaEnd,
+ defaultType = isTiddlyWiki5 ? undefined : "text/x-tiddlywiki";
+ endOfDivRegExp.lastIndex = startPos;
+ var match = endOfDivRegExp.exec(text);
+ while(match) {
+ var endPos = endOfDivRegExp.lastIndex,
+ tiddlerFields = deserializeTiddlerDiv(text.substring(startPos,endPos),fields,{type: defaultType});
+ if(!tiddlerFields) {
+ break;
+ }
+ $tw.utils.each(tiddlerFields,function(value,name) {
+ if(typeof value === "string") {
+ tiddlerFields[name] = $tw.utils.htmlDecode(value);
+ }
+ });
+ if(tiddlerFields.text !== null) {
+ results.push(tiddlerFields);
+ }
+ startPos = endPos;
+ match = endOfDivRegExp.exec(text);
+ }
+ return results;
+}
+
/*
Utility function to parse an old-style tiddler DIV in a *.tid file. It looks like this:
@@ -24,7 +136,7 @@ Note that the field attributes are HTML encoded, but that the body of the <PRE>
When these tiddler DIVs are encountered within a TiddlyWiki HTML file then the body is encoded in the usual way.
*/
-var parseTiddlerDiv = function(text /* [,fields] */) {
+var deserializeTiddlerDiv = function(text /* [,fields] */) {
// Slot together the default results
var result = {};
if(arguments.length > 1) {
@@ -66,107 +178,3 @@ var parseTiddlerDiv = function(text /* [,fields] */) {
}
return undefined;
};
-
-exports["application/x-tiddler-html-div"] = function(text,fields) {
- return [parseTiddlerDiv(text,fields)];
-};
-
-exports["application/json"] = function(text,fields) {
- var incoming,
- results = [];
- try {
- incoming = JSON.parse(text);
- } catch(e) {
- incoming = [{
- title: "JSON error: " + e,
- text: ""
- }]
- }
- if(!$tw.utils.isArray(incoming)) {
- incoming = [incoming];
- }
- for(var t=0; t<incoming.length; t++) {
- var incomingFields = incoming[t],
- fields = {};
- for(var f in incomingFields) {
- if(typeof incomingFields[f] === "string") {
- fields[f] = incomingFields[f];
- }
- }
- results.push(fields);
- }
- return results;
-};
-
-/*
-Parse an HTML file into tiddlers. There are three possibilities:
-# A TiddlyWiki classic HTML file containing `text/x-tiddlywiki` tiddlers
-# A TiddlyWiki5 HTML file containing `text/vnd.tiddlywiki` tiddlers
-# An ordinary HTML file
-*/
-exports["text/html"] = function(text,fields) {
- // Check if we've got a store area
- var storeAreaMarkerRegExp = /<div id=["']?storeArea['"]?( style=["']?display:none;["']?)?>/gi,
- match = storeAreaMarkerRegExp.exec(text);
- if(match) {
- // If so, it's either a classic TiddlyWiki file or an unencrypted TW5 file
- // First read the normal tiddlers
- var results = deserializeTiddlyWikiFile(text,storeAreaMarkerRegExp.lastIndex,!!match[1],fields);
- // Then any system tiddlers
- var systemAreaMarkerRegExp = /<div id=["']?systemArea['"]?( style=["']?display:none;["']?)?>/gi,
- sysMatch = systemAreaMarkerRegExp.exec(text);
- if(sysMatch) {
- results.push.apply(results,deserializeTiddlyWikiFile(text,systemAreaMarkerRegExp.lastIndex,!!sysMatch[1],fields));
- }
- return results;
- } else {
- // Check whether we've got an encrypted file
- var encryptedStoreArea = $tw.utils.extractEncryptedStoreArea(text);
- if(encryptedStoreArea) {
- // If so, attempt to decrypt it using the current password
- return $tw.utils.decryptStoreArea(encryptedStoreArea);
- } else {
- // It's not a TiddlyWiki so we'll return the entire HTML file as a tiddler
- return deserializeHtmlFile(text,fields);
- }
- }
-};
-
-function deserializeHtmlFile(text,fields) {
- var result = {};
- $tw.utils.each(fields,function(value,name) {
- result[name] = value;
- });
- result.text = text;
- result.type = "text/html";
- return [result];
-}
-
-function deserializeTiddlyWikiFile(text,storeAreaEnd,isTiddlyWiki5,fields) {
- var results = [],
- endOfDivRegExp = /(<\/div>\s*)/gi,
- startPos = storeAreaEnd,
- defaultType = isTiddlyWiki5 ? undefined : "text/x-tiddlywiki";
- endOfDivRegExp.lastIndex = startPos;
- var match = endOfDivRegExp.exec(text);
- while(match) {
- var endPos = endOfDivRegExp.lastIndex,
- tiddlerFields = parseTiddlerDiv(text.substring(startPos,endPos),fields,{type: defaultType});
- if(!tiddlerFields) {
- break;
- }
- $tw.utils.each(tiddlerFields,function(value,name) {
- if(typeof value === "string") {
- tiddlerFields[name] = $tw.utils.htmlDecode(value);
- }
- });
- if(tiddlerFields.text !== null) {
- results.push(tiddlerFields);
- }
- startPos = endPos;
- match = endOfDivRegExp.exec(text);
- }
- return results;
-}
-
-})();
diff --git a/core/modules/editor/engines/framed.js b/core/modules/editor/engines/framed.js
index c70167f6c..1a4b11c45 100644
--- a/core/modules/editor/engines/framed.js
+++ b/core/modules/editor/engines/framed.js
@@ -6,10 +6,7 @@ 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";
@@ -34,8 +31,10 @@ function FramedEngine(options) {
this.parentNode.insertBefore(this.iframeNode,this.nextSibling);
this.iframeDoc = this.iframeNode.contentWindow.document;
// (Firefox requires us to put some empty content in the iframe)
+ var paletteTitle = this.widget.wiki.getTiddlerText("$:/palette");
+ var colorScheme = (this.widget.wiki.getTiddler(paletteTitle) || {fields: {}}).fields["color-scheme"] || "light";
this.iframeDoc.open();
- this.iframeDoc.write("");
+ this.iframeDoc.write("<!DOCTYPE html><html><head><meta name='color-scheme' content='" + colorScheme + "'></head><body></body></html>");
this.iframeDoc.close();
// Style the iframe
this.iframeNode.className = this.dummyTextArea.className;
@@ -58,7 +57,7 @@ function FramedEngine(options) {
this.domNode.value = this.value;
}
// Set the attributes
- if(this.widget.editType) {
+ if(this.widget.editType && this.widget.editTag !== "textarea") {
this.domNode.setAttribute("type",this.widget.editType);
}
if(this.widget.editPlaceholder) {
@@ -78,16 +77,28 @@ function FramedEngine(options) {
}
if(this.widget.isDisabled === "yes") {
this.domNode.setAttribute("disabled",true);
- }
+ }
// Copy the styles from the dummy textarea
this.copyStyles();
// Add event listeners
$tw.utils.addEventListeners(this.domNode,[
{name: "click",handlerObject: this,handlerMethod: "handleClickEvent"},
{name: "input",handlerObject: this,handlerMethod: "handleInputEvent"},
- {name: "keydown",handlerObject: this.widget,handlerMethod: "handleKeydownEvent"},
+ {name: "keydown",handlerObject: this,handlerMethod: "handleKeydownEvent"},
{name: "focus",handlerObject: this,handlerMethod: "handleFocusEvent"}
]);
+ // Add drag and drop event listeners if fileDrop is enabled
+ if(this.widget.isFileDropEnabled) {
+ $tw.utils.addEventListeners(this.domNode,[
+ {name: "dragenter",handlerObject: this.widget,handlerMethod: "handleDragEnterEvent"},
+ {name: "dragover",handlerObject: this.widget,handlerMethod: "handleDragOverEvent"},
+ {name: "dragleave",handlerObject: this.widget,handlerMethod: "handleDragLeaveEvent"},
+ {name: "dragend",handlerObject: this.widget,handlerMethod: "handleDragEndEvent"},
+ {name: "drop", handlerObject: this.widget,handlerMethod: "handleDropEvent"},
+ {name: "paste", handlerObject: this.widget,handlerMethod: "handlePasteEvent"},
+ {name: "click",handlerObject: this.widget,handlerMethod: "handleClickEvent"}
+ ]);
+ }
// Insert the element into the DOM
this.iframeDoc.body.appendChild(this.domNode);
}
@@ -104,6 +115,8 @@ FramedEngine.prototype.copyStyles = function() {
this.domNode.style.margin = "0";
// In Chrome setting -webkit-text-fill-color overrides the placeholder text colour
this.domNode.style["-webkit-text-fill-color"] = "currentcolor";
+ // Ensure we don't force text direction to LTR
+ this.domNode.style.removeProperty("direction");
};
/*
@@ -123,7 +136,11 @@ FramedEngine.prototype.setText = function(text,type) {
Update the DomNode with the new text
*/
FramedEngine.prototype.updateDomNodeText = function(text) {
- this.domNode.value = text;
+ try {
+ this.domNode.value = text;
+ } catch(e) {
+ // Ignore
+ }
};
/*
@@ -144,13 +161,13 @@ FramedEngine.prototype.fixHeight = function() {
if(this.widget.editAutoHeight) {
if(this.domNode && !this.domNode.isTiddlyWikiFakeDom) {
var newHeight = $tw.utils.resizeTextAreaToFit(this.domNode,this.widget.editMinHeight);
- this.iframeNode.style.height = (newHeight + 14) + "px"; // +14 for the border on the textarea
+ this.iframeNode.style.height = newHeight + "px";
}
} else {
var fixedHeight = parseInt(this.widget.wiki.getTiddlerText(HEIGHT_VALUE_TITLE,"400px"),10);
fixedHeight = Math.max(fixedHeight,20);
this.domNode.style.height = fixedHeight + "px";
- this.iframeNode.style.height = (fixedHeight + 14) + "px";
+ this.iframeNode.style.height = fixedHeight + "px";
}
}
};
@@ -159,9 +176,11 @@ FramedEngine.prototype.fixHeight = function() {
Focus the engine node
*/
FramedEngine.prototype.focus = function() {
- if(this.domNode.focus && this.domNode.select) {
+ if(this.domNode.focus) {
this.domNode.focus();
- this.domNode.select();
+ }
+ if(this.domNode.select) {
+ $tw.utils.setSelectionByPosition(this.domNode,this.widget.editFocusSelectFromStart,this.widget.editFocusSelectFromEnd);
}
};
@@ -170,10 +189,21 @@ Handle a focus event
*/
FramedEngine.prototype.handleFocusEvent = function(event) {
if(this.widget.editCancelPopups) {
- $tw.popup.cancel(0);
+ $tw.popup.cancel(0);
}
};
+/*
+Handle a keydown event
+ */
+FramedEngine.prototype.handleKeydownEvent = function(event) {
+ if ($tw.keyboardManager.handleKeydownEvent(event, {onlyPriority: true})) {
+ return true;
+ }
+
+ return this.widget.handleKeydownEvent(event);
+};
+
/*
Handle a click
*/
@@ -189,7 +219,7 @@ FramedEngine.prototype.handleInputEvent = function(event) {
this.widget.saveChanges(this.getText());
this.fixHeight();
if(this.widget.editInputActions) {
- this.widget.invokeActionString(this.widget.editInputActions);
+ this.widget.invokeActionString(this.widget.editInputActions,this,event,{actionValue: this.getText()});
}
return true;
};
@@ -240,5 +270,3 @@ FramedEngine.prototype.executeTextOperation = function(operation) {
};
exports.FramedEngine = FramedEngine;
-
-})();
diff --git a/core/modules/editor/engines/simple.js b/core/modules/editor/engines/simple.js
index fe65d1fd9..93f021522 100644
--- a/core/modules/editor/engines/simple.js
+++ b/core/modules/editor/engines/simple.js
@@ -6,10 +6,7 @@ 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";
@@ -34,7 +31,7 @@ function SimpleEngine(options) {
this.domNode.value = this.value;
}
// Set the attributes
- if(this.widget.editType) {
+ if(this.widget.editType && this.widget.editTag !== "textarea") {
this.domNode.setAttribute("type",this.widget.editType);
}
if(this.widget.editPlaceholder) {
@@ -85,7 +82,11 @@ SimpleEngine.prototype.setText = function(text,type) {
Update the DomNode with the new text
*/
SimpleEngine.prototype.updateDomNodeText = function(text) {
- this.domNode.value = text;
+ try {
+ this.domNode.value = text;
+ } catch(e) {
+ // Ignore
+ }
};
/*
@@ -115,10 +116,12 @@ SimpleEngine.prototype.fixHeight = function() {
/*
Focus the engine node
*/
-SimpleEngine.prototype.focus = function() {
- if(this.domNode.focus && this.domNode.select) {
+SimpleEngine.prototype.focus = function() {
+ if(this.domNode.focus) {
this.domNode.focus();
- this.domNode.select();
+ }
+ if(this.domNode.select) {
+ $tw.utils.setSelectionByPosition(this.domNode,this.widget.editFocusSelectFromStart,this.widget.editFocusSelectFromEnd);
}
};
@@ -129,7 +132,7 @@ SimpleEngine.prototype.handleInputEvent = function(event) {
this.widget.saveChanges(this.getText());
this.fixHeight();
if(this.widget.editInputActions) {
- this.widget.invokeActionString(this.widget.editInputActions);
+ this.widget.invokeActionString(this.widget.editInputActions,this,event,{actionValue: this.getText()});
}
return true;
};
@@ -166,5 +169,3 @@ SimpleEngine.prototype.executeTextOperation = function(operation) {
};
exports.SimpleEngine = SimpleEngine;
-
-})();
diff --git a/core/modules/editor/factory.js b/core/modules/editor/factory.js
index 3cf595371..2fd323c0b 100644
--- a/core/modules/editor/factory.js
+++ b/core/modules/editor/factory.js
@@ -6,10 +6,7 @@ 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
@@ -71,7 +68,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
// Fix height
this.engine.fixHeight();
// Focus if required
- if(this.editFocus === "true" || this.editFocus === "yes") {
+ if($tw.browser && (this.editFocus === "true" || this.editFocus === "yes") && !$tw.utils.hasClass(this.parentDomNode.ownerDocument.activeElement,"tc-keep-focus")) {
this.engine.focus();
}
// Add widget message listeners
@@ -103,7 +100,11 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
var tiddler = this.wiki.getTiddler(this.editTitle);
if(tiddler) {
// If we've got a tiddler, the value to display is the field string value
- value = tiddler.getFieldString(this.editField);
+ if(tiddler.hasField(this.editField)) {
+ value = tiddler.getFieldString(this.editField);
+ } else {
+ value = this.editDefault || "";
+ }
if(this.editField === "text") {
type = tiddler.fields.type || "text/vnd.tiddlywiki";
}
@@ -111,7 +112,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
// Otherwise, we need to construct a default value for the editor
switch(this.editField) {
case "text":
- value = "Type the text for the tiddler '" + this.editTitle + "'";
+ value = "";
type = "text/vnd.tiddlywiki";
break;
case "title":
@@ -176,12 +177,15 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
this.editMinHeight = this.getAttribute("minHeight",DEFAULT_MIN_TEXT_AREA_HEIGHT);
this.editFocusPopup = this.getAttribute("focusPopup");
this.editFocus = this.getAttribute("focus");
+ this.editFocusSelectFromStart = $tw.utils.parseNumber(this.getAttribute("focusSelectFromStart","0"));
+ this.editFocusSelectFromEnd = $tw.utils.parseNumber(this.getAttribute("focusSelectFromEnd","0"));
this.editTabIndex = this.getAttribute("tabindex");
this.editCancelPopups = this.getAttribute("cancelPopups","") === "yes";
this.editInputActions = this.getAttribute("inputActions");
this.editRefreshTitle = this.getAttribute("refreshTitle");
this.editAutoComplete = this.getAttribute("autocomplete");
this.isDisabled = this.getAttribute("disabled","no");
+ this.isFileDropEnabled = this.getAttribute("fileDrop","no") === "yes";
// Get the default editor element tag and type
var tag,type;
if(this.editField === "text") {
@@ -213,7 +217,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
EditTextWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
// Completely rerender if any of our attributes have changed
- if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup || changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE] || changedAttributes.disabled) {
+ if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup || changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE] || changedTiddlers["$:/palette"] || changedAttributes.disabled || changedAttributes.fileDrop) {
this.refreshSelf();
return true;
} else if (changedTiddlers[this.editRefreshTitle]) {
@@ -293,23 +297,89 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
Propogate keydown events to our container for the keyboard widgets benefit
*/
EditTextWidget.prototype.propogateKeydownEvent = function(event) {
- var newEvent = this.document.createEventObject ? this.document.createEventObject() : this.document.createEvent("Events");
- if(newEvent.initEvent) {
- newEvent.initEvent("keydown", true, true);
- }
- newEvent.keyCode = event.keyCode;
- newEvent.which = event.which;
- newEvent.metaKey = event.metaKey;
- newEvent.ctrlKey = event.ctrlKey;
- newEvent.altKey = event.altKey;
- newEvent.shiftKey = event.shiftKey;
+ var newEvent = this.cloneEvent(event,["keyCode","code","which","key","metaKey","ctrlKey","altKey","shiftKey"]);
return !this.parentDomNode.dispatchEvent(newEvent);
};
- return EditTextWidget;
+ EditTextWidget.prototype.cloneEvent = function(event,propertiesToCopy) {
+ var propertiesToCopy = propertiesToCopy || [],
+ newEvent = this.document.createEventObject ? this.document.createEventObject() : this.document.createEvent("Events");
+ if(newEvent.initEvent) {
+ newEvent.initEvent(event.type, true, true);
+ }
+ $tw.utils.each(propertiesToCopy,function(prop){
+ newEvent[prop] = event[prop];
+ });
+ return newEvent;
+ };
+ EditTextWidget.prototype.dispatchDOMEvent = function(newEvent) {
+ var dispatchNode = this.engine.iframeNode || this.engine.parentNode;
+ return dispatchNode.dispatchEvent(newEvent);
+ };
+
+ /*
+ Propogate drag and drop events with File data to our container for the dropzone widgets benefit.
+ If there are no Files, let the browser handle it.
+ */
+ EditTextWidget.prototype.handleDropEvent = function(event) {
+ if($tw.utils.dragEventContainsFiles(event)) {
+ event.preventDefault();
+ event.stopPropagation();
+ this.dispatchDOMEvent(this.cloneEvent(event,["dataTransfer"]));
+ }
+ };
+
+ EditTextWidget.prototype.handlePasteEvent = function(event) {
+ if(event.clipboardData && event.clipboardData.files && event.clipboardData.files.length) {
+ event.preventDefault();
+ event.stopPropagation();
+ this.dispatchDOMEvent(this.cloneEvent(event,["clipboardData"]));
+ }
+ };
+
+ EditTextWidget.prototype.handleDragEnterEvent = function(event) {
+ if($tw.utils.dragEventContainsFiles(event)) {
+ // Ignore excessive events fired by FF when entering and leaving text nodes in a text area.
+ if( event.relatedTarget && (event.relatedTarget.nodeType === 3 || event.target === event.relatedTarget)) {
+ return true;
+ }
+ event.preventDefault();
+ return this.dispatchDOMEvent(this.cloneEvent(event,["dataTransfer"]));
+ }
+ return true;
+ };
+
+ EditTextWidget.prototype.handleDragOverEvent = function(event) {
+ if($tw.utils.dragEventContainsFiles(event)) {
+ // Call preventDefault() in browsers that default to not allowing drop events on textarea
+ if($tw.browser.isFirefox || $tw.browser.isIE) {
+ event.preventDefault();
+ }
+ event.dataTransfer.dropEffect = "copy";
+ return this.dispatchDOMEvent(this.cloneEvent(event,["dataTransfer"]));
+ }
+ return true;
+ };
+
+ EditTextWidget.prototype.handleDragLeaveEvent = function(event) {
+ // Ignore excessive events fired by FF when entering and leaving text nodes in a text area.
+ if(event.relatedTarget && ((event.relatedTarget.nodeType === 3) || (event.target === event.relatedTarget))) {
+ return true;
+ }
+ event.preventDefault();
+ this.dispatchDOMEvent(this.cloneEvent(event,["dataTransfer"]));
+ };
+
+ EditTextWidget.prototype.handleDragEndEvent = function(event) {
+ this.dispatchDOMEvent(this.cloneEvent(event));
+ };
+
+ EditTextWidget.prototype.handleClickEvent = function(event) {
+ return !this.dispatchDOMEvent(this.cloneEvent(event));
+ };
+
+ return EditTextWidget;
}
exports.editTextWidgetFactory = editTextWidgetFactory;
-
-})();
diff --git a/core/modules/editor/operations/bitmap/clear.js b/core/modules/editor/operations/bitmap/clear.js
index cb86b43a1..48d5772d5 100644
--- a/core/modules/editor/operations/bitmap/clear.js
+++ b/core/modules/editor/operations/bitmap/clear.js
@@ -6,10 +6,7 @@ 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) {
@@ -20,5 +17,3 @@ exports["clear"] = function(event) {
// Save changes
this.strokeEnd();
};
-
-})();
diff --git a/core/modules/editor/operations/bitmap/resize.js b/core/modules/editor/operations/bitmap/resize.js
index 12059a5cb..683cfa11a 100644
--- a/core/modules/editor/operations/bitmap/resize.js
+++ b/core/modules/editor/operations/bitmap/resize.js
@@ -6,10 +6,7 @@ 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) {
@@ -25,5 +22,3 @@ exports["resize"] = function(event) {
// Save the image into the tiddler
this.saveChanges();
};
-
-})();
diff --git a/core/modules/editor/operations/bitmap/rotate-left.js b/core/modules/editor/operations/bitmap/rotate-left.js
index 6e1b15d3e..25aa77300 100644
--- a/core/modules/editor/operations/bitmap/rotate-left.js
+++ b/core/modules/editor/operations/bitmap/rotate-left.js
@@ -6,10 +6,7 @@ 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) {
@@ -20,5 +17,3 @@ exports["rotate-left"] = function(event) {
// Save the image into the tiddler
this.saveChanges();
};
-
-})();
diff --git a/core/modules/editor/operations/text/excise.js b/core/modules/editor/operations/text/excise.js
index ced771719..c0920cf09 100644
--- a/core/modules/editor/operations/text/excise.js
+++ b/core/modules/editor/operations/text/excise.js
@@ -6,26 +6,30 @@ 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;
+ editTiddlerTitle = this.editTitle,
+ wikiLinks = !isMarkdown(editTiddler.fields.type),
+ excisionBaseTitle = $tw.language.getString("Buttons/Excise/DefaultTitle");
if(editTiddler && editTiddler.fields["draft.of"]) {
editTiddlerTitle = editTiddler.fields["draft.of"];
}
- var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle("New Excision");
+ var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle(excisionBaseTitle);
this.wiki.addTiddler(new $tw.Tiddler(
this.wiki.getCreationFields(),
this.wiki.getModificationFields(),
{
title: excisionTitle,
text: operation.selection,
- tags: event.paramObject.tagnew === "yes" ? [editTiddlerTitle] : []
+ tags: event.paramObject.tagnew === "yes" ? [editTiddlerTitle] : [],
+ type: editTiddler.fields.type
}
));
operation.replacement = excisionTitle;
@@ -34,7 +38,8 @@ exports["excise"] = function(event,operation) {
operation.replacement = "{{" + operation.replacement+ "}}";
break;
case "link":
- operation.replacement = "[[" + operation.replacement+ "]]";
+ operation.replacement = wikiLinks ? "[[" + operation.replacement+ "]]"
+ : ("[" + operation.replacement + "](<#" + operation.replacement + ">)");
break;
case "macro":
operation.replacement = "<<" + (event.paramObject.macro || "translink") + " \"\"\"" + operation.replacement + "\"\"\">>";
@@ -45,5 +50,3 @@ exports["excise"] = function(event,operation) {
operation.newSelStart = operation.selStart;
operation.newSelEnd = operation.selStart + operation.replacement.length;
};
-
-})();
diff --git a/core/modules/editor/operations/text/focus-editor.js b/core/modules/editor/operations/text/focus-editor.js
new file mode 100644
index 000000000..19e4a8997
--- /dev/null
+++ b/core/modules/editor/operations/text/focus-editor.js
@@ -0,0 +1,12 @@
+/*\
+title: $:/core/modules/editor/operations/text/focus-editor.js
+type: application/javascript
+module-type: texteditoroperation
+Simply focus the Text editor
+\*/
+
+"use strict";
+
+exports["focus-editor"] = function(event,operation) {
+ operation = null;
+};
diff --git a/core/modules/editor/operations/text/insert-text.js b/core/modules/editor/operations/text/insert-text.js
new file mode 100644
index 000000000..0e24d7413
--- /dev/null
+++ b/core/modules/editor/operations/text/insert-text.js
@@ -0,0 +1,18 @@
+/*\
+title: $:/core/modules/editor/operations/text/insert-text.js
+type: application/javascript
+module-type: texteditoroperation
+
+Text editor operation insert text at the caret position. If there is a selection it is replaced.
+
+\*/
+
+"use strict";
+
+exports["insert-text"] = function(event,operation) {
+ operation.replacement = event.paramObject.text;
+ operation.cutStart = operation.selStart;
+ operation.cutEnd = operation.selEnd;
+ operation.newSelStart = operation.selStart + operation.replacement.length;
+ operation.newSelEnd = operation.newSelStart;
+};
diff --git a/core/modules/editor/operations/text/make-link.js b/core/modules/editor/operations/text/make-link.js
index e8caf21c5..ca11f34c6 100644
--- a/core/modules/editor/operations/text/make-link.js
+++ b/core/modules/editor/operations/text/make-link.js
@@ -6,10 +6,7 @@ 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) {
@@ -25,5 +22,3 @@ exports["make-link"] = function(event,operation) {
operation.newSelStart = operation.selStart + operation.replacement.length;
operation.newSelEnd = operation.newSelStart;
};
-
-})();
diff --git a/core/modules/editor/operations/text/prefix-lines.js b/core/modules/editor/operations/text/prefix-lines.js
index fd483a983..0f3412b67 100644
--- a/core/modules/editor/operations/text/prefix-lines.js
+++ b/core/modules/editor/operations/text/prefix-lines.js
@@ -6,10 +6,7 @@ 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) {
@@ -25,8 +22,8 @@ exports["prefix-lines"] = function(event,operation) {
$tw.utils.each(lines,function(line,index) {
// Remove and count any existing prefix characters
var count = 0;
- while(line.charAt(0) === event.paramObject.character) {
- line = line.substring(1);
+ while($tw.utils.startsWith(line,event.paramObject.character)) {
+ line = line.substring(event.paramObject.character.length);
count++;
}
// Remove any whitespace
@@ -51,5 +48,3 @@ exports["prefix-lines"] = function(event,operation) {
operation.newSelEnd = operation.newSelStart + operation.replacement.length;
}
};
-
-})();
diff --git a/core/modules/editor/operations/text/replace-all.js b/core/modules/editor/operations/text/replace-all.js
index fc1541935..f6fe0b24c 100644
--- a/core/modules/editor/operations/text/replace-all.js
+++ b/core/modules/editor/operations/text/replace-all.js
@@ -6,10 +6,7 @@ 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) {
@@ -19,5 +16,3 @@ exports["replace-all"] = function(event,operation) {
operation.newSelStart = 0;
operation.newSelEnd = operation.replacement.length;
};
-
-})();
diff --git a/core/modules/editor/operations/text/replace-selection.js b/core/modules/editor/operations/text/replace-selection.js
index 740a41fb1..24ef9c70f 100644
--- a/core/modules/editor/operations/text/replace-selection.js
+++ b/core/modules/editor/operations/text/replace-selection.js
@@ -6,10 +6,7 @@ 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) {
@@ -19,5 +16,3 @@ exports["replace-selection"] = function(event,operation) {
operation.newSelStart = operation.selStart;
operation.newSelEnd = operation.selStart + operation.replacement.length;
};
-
-})();
diff --git a/core/modules/editor/operations/text/save-selection.js b/core/modules/editor/operations/text/save-selection.js
index 484e6ff3c..00b7174b6 100644
--- a/core/modules/editor/operations/text/save-selection.js
+++ b/core/modules/editor/operations/text/save-selection.js
@@ -6,10 +6,7 @@ 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) {
@@ -19,5 +16,3 @@ exports["save-selection"] = function(event,operation) {
this.wiki.setText(tiddler,field,null,operation.text.substring(operation.selStart,operation.selEnd));
}
};
-
-})();
diff --git a/core/modules/editor/operations/text/wrap-lines.js b/core/modules/editor/operations/text/wrap-lines.js
index 521811f50..9e85d50ca 100644
--- a/core/modules/editor/operations/text/wrap-lines.js
+++ b/core/modules/editor/operations/text/wrap-lines.js
@@ -6,23 +6,37 @@ 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) {
- // Cut just past the preceding line break, or the start of the text
- operation.cutStart = $tw.utils.findPrecedingLineBreak(operation.text,operation.selStart);
- // Cut to just past the following line break, or to the end of the text
- operation.cutEnd = $tw.utils.findFollowingLineBreak(operation.text,operation.selEnd);
- // Add the prefix and suffix
- operation.replacement = event.paramObject.prefix + "\n" +
- operation.text.substring(operation.cutStart,operation.cutEnd) + "\n" +
- event.paramObject.suffix + "\n";
- operation.newSelStart = operation.cutStart + event.paramObject.prefix.length + 1;
- operation.newSelEnd = operation.newSelStart + (operation.cutEnd - operation.cutStart);
+ var prefix = event.paramObject.prefix || "",
+ suffix = event.paramObject.suffix || "";
+ if($tw.utils.endsWith(operation.text.substring(0,operation.selStart), prefix + "\n") &&
+ $tw.utils.startsWith(operation.text.substring(operation.selEnd), "\n" + suffix)) {
+ // Selected text is already surrounded by prefix and suffix: Remove them
+ // Cut selected text plus prefix and suffix
+ operation.cutStart = operation.selStart - (prefix.length + 1);
+ operation.cutEnd = operation.selEnd + suffix.length + 1;
+ // Also cut the following newline (if there is any)
+ if (operation.text[operation.cutEnd] === "\n") {
+ operation.cutEnd++;
+ }
+ // Replace with selection
+ operation.replacement = operation.text.substring(operation.selStart,operation.selEnd);
+ // Select text that was in between prefix and suffix
+ operation.newSelStart = operation.cutStart;
+ operation.newSelEnd = operation.selEnd - (prefix.length + 1);
+ } else {
+ // Cut just past the preceding line break, or the start of the text
+ operation.cutStart = $tw.utils.findPrecedingLineBreak(operation.text,operation.selStart);
+ // Cut to just past the following line break, or to the end of the text
+ operation.cutEnd = $tw.utils.findFollowingLineBreak(operation.text,operation.selEnd);
+ // Add the prefix and suffix
+ operation.replacement = prefix + "\n" +
+ operation.text.substring(operation.cutStart,operation.cutEnd) + "\n" +
+ suffix + "\n";
+ operation.newSelStart = operation.cutStart + prefix.length + 1;
+ operation.newSelEnd = operation.newSelStart + (operation.cutEnd - operation.cutStart);
+ }
};
-
-})();
diff --git a/core/modules/editor/operations/text/wrap-selection.js b/core/modules/editor/operations/text/wrap-selection.js
index 6800cbe5b..4fb463b74 100644
--- a/core/modules/editor/operations/text/wrap-selection.js
+++ b/core/modules/editor/operations/text/wrap-selection.js
@@ -6,45 +6,128 @@ 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) {
- 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) {
+ 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) {
// Remove the prefix and suffix
- 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;
+ o.cutStart = o.selStart - prefix.length;
+ o.cutEnd = o.selEnd + suffix.length;
+ o.replacement = "";
+ o.newSelStart = o.cutStart;
+ o.newSelEnd = o.newSelStart;
} else {
// Wrap the cursor instead
- 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;
+ o.cutStart = o.selStart;
+ o.cutEnd = o.selEnd;
+ o.replacement = prefix + suffix;
+ o.newSelStart = o.selStart + prefix.length;
+ o.newSelEnd = o.newSelStart;
}
- } 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) {
+ }
+
+ // 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) {
// Prefix and suffix are already present, so remove them
- 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;
+ 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});
} else {
// Add the prefix and suffix
- 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;
+ addPrefixSuffix();
}
};
-
-})();
diff --git a/core/modules/filterrunprefixes/all.js b/core/modules/filterrunprefixes/all.js
index 652936de0..7d57ce408 100644
--- a/core/modules/filterrunprefixes/all.js
+++ b/core/modules/filterrunprefixes/all.js
@@ -7,10 +7,7 @@ Union of sets without de-duplication.
Equivalent to = filter run prefix.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -21,5 +18,3 @@ exports.all = function(operationSubFunction) {
results.push.apply(results, operationSubFunction(source,widget));
};
};
-
-})();
diff --git a/core/modules/filterrunprefixes/and.js b/core/modules/filterrunprefixes/and.js
index 309c228e6..c394b243e 100644
--- a/core/modules/filterrunprefixes/and.js
+++ b/core/modules/filterrunprefixes/and.js
@@ -7,10 +7,7 @@ Intersection of sets.
Equivalent to + filter run prefix.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -24,5 +21,3 @@ exports.and = function(operationSubFunction,options) {
results.pushTop(operationSubFunction(source,widget));
};
};
-
-})();
diff --git a/core/modules/filterrunprefixes/cascade.js b/core/modules/filterrunprefixes/cascade.js
new file mode 100644
index 000000000..98044579c
--- /dev/null
+++ b/core/modules/filterrunprefixes/cascade.js
@@ -0,0 +1,38 @@
+/*\
+title: $:/core/modules/filterrunprefixes/cascade.js
+type: application/javascript
+module-type: filterrunprefix
+\*/
+
+"use strict";
+
+/*
+Export our filter prefix function
+*/
+exports.cascade = function(operationSubFunction,options) {
+ return function(results,source,widget) {
+ if(results.length !== 0) {
+ var filterList = operationSubFunction(source,widget),
+ filterFnList = [];
+ var inputResults = results.toArray();
+ results.clear();
+ $tw.utils.each(inputResults,function(title) {
+ var result = ""; // If no filter matches, we return an empty string
+ $tw.utils.each(filterList,function(filter,index) {
+ if(!filterFnList[index]) {
+ filterFnList[index] = options.wiki.compileFilter(filter);
+ }
+ var output = filterFnList[index](options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
+ "currentTiddler": "" + title,
+ "..currentTiddler": widget.getVariable("currentTiddler","")
+ }));
+ if(output.length !== 0) {
+ result = output[0];
+ return false;
+ }
+ });
+ results.push(result);
+ });
+ }
+ }
+};
diff --git a/core/modules/filterrunprefixes/else.js b/core/modules/filterrunprefixes/else.js
index 6e9ef29b3..89635069c 100644
--- a/core/modules/filterrunprefixes/else.js
+++ b/core/modules/filterrunprefixes/else.js
@@ -6,10 +6,7 @@ module-type: filterrunprefix
Equivalent to ~ filter run prefix.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -23,5 +20,3 @@ exports.else = function(operationSubFunction) {
}
};
};
-
-})();
diff --git a/core/modules/filterrunprefixes/except.js b/core/modules/filterrunprefixes/except.js
index 659f14228..5ebed7fea 100644
--- a/core/modules/filterrunprefixes/except.js
+++ b/core/modules/filterrunprefixes/except.js
@@ -7,10 +7,7 @@ Difference of sets.
Equivalent to - filter run prefix.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -21,5 +18,3 @@ exports.except = function(operationSubFunction) {
results.remove(operationSubFunction(source,widget));
};
};
-
-})();
diff --git a/core/modules/filterrunprefixes/filter.js b/core/modules/filterrunprefixes/filter.js
index 555f8981b..0c6ed150f 100644
--- a/core/modules/filterrunprefixes/filter.js
+++ b/core/modules/filterrunprefixes/filter.js
@@ -4,10 +4,7 @@ type: application/javascript
module-type: filterrunprefix
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -16,16 +13,22 @@ Export our filter function
exports.filter = function(operationSubFunction,options) {
return function(results,source,widget) {
if(results.length > 0) {
- var resultsToRemove = [];
- results.each(function(result) {
- var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([result]),widget);
+ var resultsToRemove = [],
+ index = 0;
+ results.each(function(title) {
+ var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
+ "currentTiddler": "" + title,
+ "..currentTiddler": widget.getVariable("currentTiddler",""),
+ "index": "" + index,
+ "revIndex": "" + (results.length - 1 - index),
+ "length": "" + results.length
+ }));
if(filtered.length === 0) {
- resultsToRemove.push(result);
+ resultsToRemove.push(title);
}
+ ++index;
});
results.remove(resultsToRemove);
}
}
};
-
-})();
diff --git a/core/modules/filterrunprefixes/intersection.js b/core/modules/filterrunprefixes/intersection.js
index 34d36066f..ce9ea4546 100644
--- a/core/modules/filterrunprefixes/intersection.js
+++ b/core/modules/filterrunprefixes/intersection.js
@@ -4,10 +4,7 @@ type: application/javascript
module-type: filterrunprefix
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -27,5 +24,3 @@ exports.intersection = function(operationSubFunction) {
}
};
};
-
-})();
diff --git a/core/modules/filterrunprefixes/map.js b/core/modules/filterrunprefixes/map.js
new file mode 100644
index 000000000..c7f1ae5eb
--- /dev/null
+++ b/core/modules/filterrunprefixes/map.js
@@ -0,0 +1,39 @@
+/*\
+title: $:/core/modules/filterrunprefixes/map.js
+type: application/javascript
+module-type: filterrunprefix
+\*/
+
+"use strict";
+
+/*
+Export our filter prefix function
+*/
+exports.map = function(operationSubFunction,options) {
+ return function(results,source,widget) {
+ if(results.length > 0) {
+ var inputTitles = results.toArray(),
+ index = 0,
+ suffixes = options.suffixes,
+ flatten = (suffixes[0] && suffixes[0][0] === "flat") ? true : false;
+ results.clear();
+ $tw.utils.each(inputTitles,function(title) {
+ var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
+ "currentTiddler": "" + title,
+ "..currentTiddler": widget.getVariable("currentTiddler",""),
+ "index": "" + index,
+ "revIndex": "" + (inputTitles.length - 1 - index),
+ "length": "" + inputTitles.length
+ }));
+ if(filtered.length && flatten) {
+ $tw.utils.each(filtered,function(value) {
+ results.push(value);
+ })
+ } else {
+ results.push(filtered[0]||"");
+ }
+ ++index;
+ });
+ }
+ }
+};
diff --git a/core/modules/filterrunprefixes/or.js b/core/modules/filterrunprefixes/or.js
index 82eff083a..c4ffb2014 100644
--- a/core/modules/filterrunprefixes/or.js
+++ b/core/modules/filterrunprefixes/or.js
@@ -6,10 +6,7 @@ module-type: filterrunprefix
Equivalent to a filter run with no prefix.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -20,5 +17,3 @@ exports.or = function(operationSubFunction) {
results.pushTop(operationSubFunction(source,widget));
};
};
-
-})();
diff --git a/core/modules/filterrunprefixes/reduce.js b/core/modules/filterrunprefixes/reduce.js
index 534c3e450..351d976bd 100644
--- a/core/modules/filterrunprefixes/reduce.js
+++ b/core/modules/filterrunprefixes/reduce.js
@@ -3,10 +3,7 @@ title: $:/core/modules/filterrunprefixes/reduce.js
type: application/javascript
module-type: filterrunprefix
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -15,36 +12,24 @@ Export our filter prefix function
exports.reduce = function(operationSubFunction,options) {
return function(results,source,widget) {
if(results.length > 0) {
- var accumulator = "";
- var index = 0;
+ var accumulator = "",
+ index = 0;
results.each(function(title) {
- var list = operationSubFunction(options.wiki.makeTiddlerIterator([title]),{
- getVariable: function(name) {
- switch(name) {
- case "currentTiddler":
- return "" + title;
- case "accumulator":
- return "" + accumulator;
- case "index":
- return "" + index;
- case "revIndex":
- return "" + (results.length - 1 - index);
- case "length":
- return "" + results.length;
- default:
- return widget.getVariable(name);
- }
- }
- });
+ var list = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
+ "currentTiddler": "" + title,
+ "..currentTiddler": widget.getVariable("currentTiddler"),
+ "index": "" + index,
+ "revIndex": "" + (results.length - 1 - index),
+ "length": "" + results.length,
+ "accumulator": "" + accumulator
+ }));
if(list.length > 0) {
accumulator = "" + list[0];
}
++index;
});
results.clear();
- results.push(accumulator);
+ results.push(accumulator);
}
}
};
-
-})();
diff --git a/core/modules/filterrunprefixes/sort.js b/core/modules/filterrunprefixes/sort.js
new file mode 100644
index 000000000..126376887
--- /dev/null
+++ b/core/modules/filterrunprefixes/sort.js
@@ -0,0 +1,47 @@
+/*\
+title: $:/core/modules/filterrunprefixes/sort.js
+type: application/javascript
+module-type: filterrunprefix
+
+\*/
+
+"use strict";
+
+/*
+Export our filter prefix function
+*/
+exports.sort = function(operationSubFunction,options) {
+ return function(results,source,widget) {
+ if(results.length > 0) {
+ var suffixes = options.suffixes,
+ sortType = (suffixes[0] && suffixes[0][0]) ? suffixes[0][0] : "string",
+ invert = suffixes[1] ? (suffixes[1].indexOf("reverse") !== -1) : false,
+ isCaseSensitive = suffixes[1] ? (suffixes[1].indexOf("casesensitive") !== -1) : false,
+ inputTitles = results.toArray(),
+ sortKeys = [],
+ indexes = new Array(inputTitles.length),
+ compareFn;
+ results.each(function(title) {
+ var key = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
+ "currentTiddler": "" + title,
+ "..currentTiddler": widget.getVariable("currentTiddler")
+ }));
+ sortKeys.push(key[0] || "");
+ });
+ results.clear();
+ // Prepare an array of indexes to sort
+ for(var t=0; t<inputTitles.length; t++) {
+ indexes[t] = t;
+ }
+ // Sort the indexes
+ compareFn = $tw.utils.makeCompareFunction(sortType,{defaultType: "string", invert:invert, isCaseSensitive:isCaseSensitive});
+ indexes = indexes.sort(function(a,b) {
+ return compareFn(sortKeys[a],sortKeys[b]);
+ });
+ // Add to results in correct order
+ $tw.utils.each(indexes,function(index) {
+ results.push(inputTitles[index]);
+ });
+ }
+ }
+};
diff --git a/core/modules/filterrunprefixes/then.js b/core/modules/filterrunprefixes/then.js
new file mode 100644
index 000000000..0f37fb37f
--- /dev/null
+++ b/core/modules/filterrunprefixes/then.js
@@ -0,0 +1,27 @@
+/*\
+title: $:/core/modules/filterrunprefixes/then.js
+type: application/javascript
+module-type: filterrunprefix
+
+Replace results of previous runs unless empty
+
+\*/
+
+"use strict";
+
+/*
+Export our filter prefix function
+*/
+exports.then = function(operationSubFunction) {
+ return function(results,source,widget) {
+ if(results.length !== 0) {
+ // Only run if previous run(s) produced results
+ var thisRunResult = operationSubFunction(source,widget);
+ if(thisRunResult.length !== 0) {
+ // Replace results only if this run actually produces a result
+ results.clear();
+ results.pushTop(thisRunResult);
+ }
+ }
+ };
+};
diff --git a/core/modules/filters.js b/core/modules/filters.js
index 1a3c6f451..213268b1a 100644
--- a/core/modules/filters.js
+++ b/core/modules/filters.js
@@ -6,12 +6,14 @@ 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;
+
+/* Maximum permitted filter recursion depth */
+var MAX_FILTER_DEPTH = 300;
+
/*
Parses an operation (i.e. a run) within a filter string
operators: Array of array of operator nodes into which results should be inserted
@@ -63,7 +65,7 @@ function parseFilterOperation(operators,filterString,p) {
operator.operator = "title";
}
operator.operands = [];
- function parseOperand(bracketType) {
+ var parseOperand = function(bracketType) {
var operand = {};
switch (bracketType) {
case "{": // Curly brackets
@@ -95,16 +97,18 @@ function parseFilterOperation(operators,filterString,p) {
if(nextBracketPos === -1) {
throw "Missing closing bracket in filter expression";
}
- if(!operator.regexp) {
+ if(operator.regexp) {
+ operand.text = "";
+ } else {
operand.text = filterString.substring(p,nextBracketPos);
- operator.operands.push(operand);
}
+ operator.operands.push(operand);
p = nextBracketPos + 1;
}
-
+
p = nextBracketPos + 1;
parseOperand(bracket);
-
+
// Check for multiple operands
while(filterString.charAt(p) === ",") {
p++;
@@ -116,7 +120,7 @@ function parseFilterOperation(operators,filterString,p) {
throw "Missing [ in filter expression";
}
}
-
+
// Push this operator
operators.push(operator);
} while(filterString.charAt(p) !== "]");
@@ -137,7 +141,7 @@ exports.parseFilter = function(filterString) {
p = 0, // Current position in the filter string
match;
var whitespaceRegExp = /(\s+)/mg,
- operandRegExp = /((?:\+|\-|~|=|\:(\w+))?)(?:(\[)|(?:"([^"]*)")|(?:'([^']*)')|([^\s\[\]]+))/mg;
+ operandRegExp = /((?:\+|\-|~|=|\:(\w+)(?:\:([\w\:, ]*))?)?)(?:(\[)|(?:"([^"]*)")|(?:'([^']*)')|([^\s\[\]]+))/mg;
while(p < filterString.length) {
// Skip any whitespace
whitespaceRegExp.lastIndex = p;
@@ -162,15 +166,27 @@ exports.parseFilter = function(filterString) {
if(match[2]) {
operation.namedPrefix = match[2];
}
+ if(match[3]) {
+ operation.suffixes = [];
+ $tw.utils.each(match[3].split(":"),function(subsuffix) {
+ operation.suffixes.push([]);
+ $tw.utils.each(subsuffix.split(","),function(entry) {
+ entry = $tw.utils.trim(entry);
+ if(entry) {
+ operation.suffixes[operation.suffixes.length -1].push(entry);
+ }
+ });
+ });
+ }
}
- if(match[3]) { // Opening square bracket
+ if(match[4]) { // Opening square bracket
p = parseFilterOperation(operation.operators,filterString,p);
} else {
p = match.index + match[0].length;
}
- if(match[4] || match[5] || match[6]) { // Double quoted string, single quoted string or unquoted title
+ if(match[5] || match[6] || match[7]) { // Double quoted string, single quoted string or unquoted title
operation.operators.push(
- {operator: "title", operands: [{text: match[4] || match[5] || match[6]}]}
+ {operator: "title", operands: [{text: match[5] || match[6] || match[7]}]}
);
}
results.push(operation);
@@ -206,10 +222,18 @@ source: an iterator function for the source tiddlers, called source(iterator), w
widget: an optional widget node for retrieving the current tiddler etc.
*/
exports.compileFilter = function(filterString) {
+ if(!this.filterCache) {
+ this.filterCache = Object.create(null);
+ this.filterCacheCount = 0;
+ }
+ if(this.filterCache[filterString] !== undefined) {
+ return this.filterCache[filterString];
+ }
var filterParseTree;
try {
filterParseTree = this.parseFilter(filterString);
} catch(e) {
+ // We do not cache this result, so it adjusts along with localization changes
return function(source,widget) {
return [$tw.language.getString("Error/Filter") + ": " + e];
};
@@ -224,24 +248,27 @@ exports.compileFilter = function(filterString) {
// Create a function for the chain of operators in the operation
var operationSubFunction = function(source,widget) {
var accumulator = source,
- results = [],
- currTiddlerTitle = widget && widget.getVariable("currentTiddler");
+ results = [];
$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]) {
- operatorFunction = filterOperators.field;
+ // 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) {
+ var currTiddlerTitle = widget && widget.getVariable("currentTiddler");
operand.value = self.getTextReference(operand.text,"",currTiddlerTitle);
} else if(operand.variable) {
- operand.value = widget.getVariable(operand.text,{defaultValue: ""});
+ 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;
}
@@ -280,7 +307,7 @@ exports.compileFilter = function(filterString) {
var filterRunPrefixes = self.getFilterRunPrefixes();
// Wrap the operator functions in a wrapper function that depends on the prefix
operationFunctions.push((function() {
- var options = {wiki: self};
+ var options = {wiki: self, suffixes: operation.suffixes || []};
switch(operation.prefix || "") {
case "": // No prefix means that the operation is unioned into the result
return filterRunPrefixes["or"](operationSubFunction, options);
@@ -305,18 +332,35 @@ exports.compileFilter = function(filterString) {
})());
});
// Return a function that applies the operations to a source iterator of tiddler titles
- return $tw.perf.measure("filter: " + filterString,function filterFunction(source,widget) {
+ var fnMeasured = $tw.perf.measure("filter: " + filterString,function filterFunction(source,widget) {
if(!source) {
source = self.each;
} else if(typeof source === "object") { // Array or hashmap
source = self.makeTiddlerIterator(source);
}
+ if(!widget) {
+ widget = $tw.rootWidget;
+ }
var results = new $tw.utils.LinkedList();
- $tw.utils.each(operationFunctions,function(operationFunction) {
- operationFunction(results,source,widget);
- });
+ self.filterRecursionCount = (self.filterRecursionCount || 0) + 1;
+ if(self.filterRecursionCount < MAX_FILTER_DEPTH) {
+ $tw.utils.each(operationFunctions,function(operationFunction) {
+ operationFunction(results,source,widget);
+ });
+ } else {
+ results.push("/**-- Excessive filter recursion --**/");
+ }
+ self.filterRecursionCount = self.filterRecursionCount - 1;
return results.toArray();
});
+ if(this.filterCacheCount >= 2000) {
+ // To prevent memory leak, we maintain an upper limit for cache size.
+ // Reset if exceeded. This should give us 95% of the benefit
+ // that no cache limit would give us.
+ this.filterCache = Object.create(null);
+ this.filterCacheCount = 0;
+ }
+ this.filterCache[filterString] = fnMeasured;
+ this.filterCacheCount++;
+ return fnMeasured;
};
-
-})();
diff --git a/core/modules/filters/addprefix.js b/core/modules/filters/addprefix.js
index d1f0a822b..497af1f3b 100644
--- a/core/modules/filters/addprefix.js
+++ b/core/modules/filters/addprefix.js
@@ -8,10 +8,7 @@ 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";
/*
@@ -24,5 +21,3 @@ exports.addprefix = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/addsuffix.js b/core/modules/filters/addsuffix.js
index fb80c2573..27ca659e9 100644
--- a/core/modules/filters/addsuffix.js
+++ b/core/modules/filters/addsuffix.js
@@ -8,10 +8,7 @@ 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";
/*
@@ -24,5 +21,3 @@ exports.addsuffix = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/after.js b/core/modules/filters/after.js
index 6e5f3c77c..9840a73fa 100644
--- a/core/modules/filters/after.js
+++ b/core/modules/filters/after.js
@@ -6,10 +6,7 @@ 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";
/*
@@ -27,5 +24,3 @@ exports.after = function(source,operator,options) {
return [results[index + 1]];
}
};
-
-})();
diff --git a/core/modules/filters/all.js b/core/modules/filters/all.js
index 853fe0a7f..790afeca5 100644
--- a/core/modules/filters/all.js
+++ b/core/modules/filters/all.js
@@ -8,10 +8,7 @@ Filter operator for selecting tiddlers
[all[shadows+tiddlers]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var allFilterOperators;
@@ -28,12 +25,8 @@ function getAllFilterOperators() {
Export our filter function
*/
exports.all = function(source,operator,options) {
- // Get our suboperators
- var allFilterOperators = getAllFilterOperators();
- // Cycle through the suboperators accumulating their results
- var results = new $tw.utils.LinkedList(),
- subops = operator.operand.split("+");
// Check for common optimisations
+ var subops = operator.operand.split("+");
if(subops.length === 1 && subops[0] === "") {
return source;
} else if(subops.length === 1 && subops[0] === "tiddlers") {
@@ -46,13 +39,15 @@ exports.all = function(source,operator,options) {
return options.wiki.eachShadowPlusTiddlers;
}
// Do it the hard way
+ // Get our suboperators
+ var allFilterOperators = getAllFilterOperators();
+ // Cycle through the suboperators accumulating their results
+ var results = new $tw.utils.LinkedList();
for(var t=0; t<subops.length; t++) {
var subop = allFilterOperators[subops[t]];
if(subop) {
results.pushTop(subop(source,operator.prefix,options));
}
}
- return results.toArray();
+ return results.makeTiddlerIterator(options.wiki);
};
-
-})();
diff --git a/core/modules/filters/all/current.js b/core/modules/filters/all/current.js
index 82ad8cca3..098fa85f0 100644
--- a/core/modules/filters/all/current.js
+++ b/core/modules/filters/all/current.js
@@ -6,10 +6,7 @@ module-type: allfilteroperator
Filter function for [all[current]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -23,5 +20,3 @@ exports.current = function(source,prefix,options) {
return [];
}
};
-
-})();
diff --git a/core/modules/filters/all/missing.js b/core/modules/filters/all/missing.js
index 4ba932089..c87e43c98 100644
--- a/core/modules/filters/all/missing.js
+++ b/core/modules/filters/all/missing.js
@@ -6,10 +6,7 @@ module-type: allfilteroperator
Filter function for [all[missing]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -18,5 +15,3 @@ Export our filter function
exports.missing = function(source,prefix,options) {
return options.wiki.getMissingTitles();
};
-
-})();
diff --git a/core/modules/filters/all/orphans.js b/core/modules/filters/all/orphans.js
index d5b4fc270..a2e29ba97 100644
--- a/core/modules/filters/all/orphans.js
+++ b/core/modules/filters/all/orphans.js
@@ -6,10 +6,7 @@ module-type: allfilteroperator
Filter function for [all[orphans]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -18,5 +15,3 @@ Export our filter function
exports.orphans = function(source,prefix,options) {
return options.wiki.getOrphanTitles();
};
-
-})();
diff --git a/core/modules/filters/all/shadows.js b/core/modules/filters/all/shadows.js
index 51654fee2..7946afa73 100644
--- a/core/modules/filters/all/shadows.js
+++ b/core/modules/filters/all/shadows.js
@@ -6,10 +6,7 @@ module-type: allfilteroperator
Filter function for [all[shadows]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -18,5 +15,3 @@ Export our filter function
exports.shadows = function(source,prefix,options) {
return options.wiki.allShadowTitles();
};
-
-})();
diff --git a/core/modules/filters/all/tags.js b/core/modules/filters/all/tags.js
index 2aaa9dec2..de243453f 100644
--- a/core/modules/filters/all/tags.js
+++ b/core/modules/filters/all/tags.js
@@ -6,10 +6,7 @@ module-type: allfilteroperator
Filter function for [all[tags]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -18,5 +15,3 @@ Export our filter function
exports.tags = function(source,prefix,options) {
return Object.keys(options.wiki.getTagMap());
};
-
-})();
diff --git a/core/modules/filters/all/tiddlers.js b/core/modules/filters/all/tiddlers.js
index 9a6e43875..4e480bf4d 100644
--- a/core/modules/filters/all/tiddlers.js
+++ b/core/modules/filters/all/tiddlers.js
@@ -6,10 +6,7 @@ module-type: allfilteroperator
Filter function for [all[tiddlers]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -18,5 +15,3 @@ Export our filter function
exports.tiddlers = function(source,prefix,options) {
return options.wiki.allTitles();
};
-
-})();
diff --git a/core/modules/filters/backlinks.js b/core/modules/filters/backlinks.js
index 2d9d65d84..f8bd4903a 100644
--- a/core/modules/filters/backlinks.js
+++ b/core/modules/filters/backlinks.js
@@ -6,21 +6,16 @@ module-type: filteroperator
Filter operator for returning all the backlinks from a tiddler
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
Export our filter function
*/
exports.backlinks = function(source,operator,options) {
- var results = [];
+ var results = new $tw.utils.LinkedList();
source(function(tiddler,title) {
- $tw.utils.pushTop(results,options.wiki.getTiddlerBacklinks(title));
+ results.pushTop(options.wiki.getTiddlerBacklinks(title));
});
- return results;
+ return results.makeTiddlerIterator(options.wiki);
};
-
-})();
diff --git a/core/modules/filters/backtranscludes.js b/core/modules/filters/backtranscludes.js
new file mode 100644
index 000000000..07ef9b254
--- /dev/null
+++ b/core/modules/filters/backtranscludes.js
@@ -0,0 +1,20 @@
+/*\
+title: $:/core/modules/filters/backtranscludes.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for returning all the backtranscludes from a tiddler
+
+\*/
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.backtranscludes = function(source,operator,options) {
+ var results = new $tw.utils.LinkedList();
+ source(function(tiddler,title) {
+ results.pushTop(options.wiki.getTiddlerBacktranscludes(title));
+ });
+ return results.makeTiddlerIterator(options.wiki);
+};
diff --git a/core/modules/filters/before.js b/core/modules/filters/before.js
index 292cc619d..1d3473b69 100644
--- a/core/modules/filters/before.js
+++ b/core/modules/filters/before.js
@@ -6,10 +6,7 @@ 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";
/*
@@ -27,5 +24,3 @@ exports.before = function(source,operator,options) {
return [results[index - 1]];
}
};
-
-})();
diff --git a/core/modules/filters/commands.js b/core/modules/filters/commands.js
index 5ab575a78..753c8b8db 100644
--- a/core/modules/filters/commands.js
+++ b/core/modules/filters/commands.js
@@ -6,10 +6,7 @@ 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";
/*
@@ -23,5 +20,3 @@ exports.commands = function(source,operator,options) {
results.sort();
return results;
};
-
-})();
diff --git a/core/modules/filters/compare.js b/core/modules/filters/compare.js
index fd509a28e..ac84f8da2 100644
--- a/core/modules/filters/compare.js
+++ b/core/modules/filters/compare.js
@@ -6,10 +6,7 @@ module-type: filteroperator
General purpose comparison operator
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.compare = function(source,operator,options) {
@@ -36,5 +33,3 @@ var modes = {
"lteq": function(value) {return value <= 0;},
"lt": function(value) {return value < 0;}
}
-
-})();
diff --git a/core/modules/filters/contains.js b/core/modules/filters/contains.js
index 964c6700f..910b43a4a 100644
--- a/core/modules/filters/contains.js
+++ b/core/modules/filters/contains.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for finding values in array fields
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -17,7 +14,7 @@ Export our filter function
*/
exports.contains = function(source,operator,options) {
var results = [],
- fieldname = (operator.suffix || "list").toLowerCase();
+ fieldname = operator.suffix || "list";
if(operator.prefix === "!") {
source(function(tiddler,title) {
if(tiddler) {
@@ -41,5 +38,3 @@ exports.contains = function(source,operator,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/count.js b/core/modules/filters/count.js
index 638b135df..3a7be70ad 100644
--- a/core/modules/filters/count.js
+++ b/core/modules/filters/count.js
@@ -6,10 +6,7 @@ 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";
/*
@@ -22,5 +19,3 @@ exports.count = function(source,operator,options) {
});
return [count + ""];
};
-
-})();
diff --git a/core/modules/filters/crypto.js b/core/modules/filters/crypto.js
new file mode 100644
index 000000000..8b05220b2
--- /dev/null
+++ b/core/modules/filters/crypto.js
@@ -0,0 +1,19 @@
+/*\
+title: $:/core/modules/filters/crypto.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operators for cryptography, using the Stanford JavaScript library
+
+\*/
+
+"use strict";
+
+exports.sha256 = function(source,operator,options) {
+ var results = [],
+ length = parseInt(operator.operand,10) || 20;
+ source(function(tiddler,title) {
+ results.push($tw.utils.sha256(title,{length: length}));
+ });
+ return results;
+};
diff --git a/core/modules/filters/days.js b/core/modules/filters/days.js
index 318d72567..663416d64 100644
--- a/core/modules/filters/days.js
+++ b/core/modules/filters/days.js
@@ -6,10 +6,7 @@ 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";
/*
@@ -46,5 +43,3 @@ exports.days = function(source,operator,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/deserialize.js b/core/modules/filters/deserialize.js
new file mode 100644
index 000000000..cebab43d3
--- /dev/null
+++ b/core/modules/filters/deserialize.js
@@ -0,0 +1,34 @@
+/*\
+title: $:/core/modules/filters/deserialize.js
+type: application/javascript
+module-type: filteroperator
+Filter operator for deserializing string data into JSON representing tiddlers
+\*/
+
+"use strict";
+
+exports["deserialize"] = function(source,operator,options) {
+ var results = [],
+ deserializer;
+ if(operator.operand) {
+ // Get the deserializer identified by the operand
+ deserializer = $tw.Wiki.tiddlerDeserializerModules[operator.operand];
+ if(deserializer) {
+ source(function(tiddler,title) {
+ var tiddlers;
+ try {
+ tiddlers = deserializer(title);
+ } catch(e) {
+ // Return an empty array if we could not extract any tiddlers
+ tiddlers = [];
+ }
+ results.push(JSON.stringify(tiddlers));
+ });
+ } else {
+ return [$tw.language.getString("Error/DeserializeOperator/UnknownDeserializer")];
+ }
+ } else {
+ return [$tw.language.getString("Error/DeserializeOperator/MissingOperand")];
+ }
+ return results;
+}
diff --git a/core/modules/filters/deserializers.js b/core/modules/filters/deserializers.js
new file mode 100644
index 000000000..7ab96fbae
--- /dev/null
+++ b/core/modules/filters/deserializers.js
@@ -0,0 +1,22 @@
+/*\
+title: $:/core/modules/filters/deserializers.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for returning the names of the deserializers in this wiki
+
+\*/
+
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.deserializers = function(source,operator,options) {
+ var results = [];
+ $tw.utils.each($tw.Wiki.tiddlerDeserializerModules,function(deserializer,type) {
+ results.push(type);
+ });
+ results.sort();
+ return results;
+};
diff --git a/core/modules/filters/duplicateslugs.js b/core/modules/filters/duplicateslugs.js
index dbd2f23e7..30b6da0a7 100644
--- a/core/modules/filters/duplicateslugs.js
+++ b/core/modules/filters/duplicateslugs.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter function for [duplicateslugs[]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -32,5 +29,3 @@ exports.duplicateslugs = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/each.js b/core/modules/filters/each.js
index 5c2c29077..0a389b5c3 100644
--- a/core/modules/filters/each.js
+++ b/core/modules/filters/each.js
@@ -7,10 +7,7 @@ Filter operator that selects one tiddler for each unique value of the specified
With suffix "list", selects all tiddlers that are values in a specified list field.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -63,5 +60,3 @@ exports.each = function(source,operator,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/eachday.js b/core/modules/filters/eachday.js
index 6fdccf879..86f343e25 100644
--- a/core/modules/filters/eachday.js
+++ b/core/modules/filters/eachday.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator that selects one tiddler for each unique day covered by the specified date field
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -35,5 +32,3 @@ exports.eachday = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/editiondescription.js b/core/modules/filters/editiondescription.js
index ee3acd898..ce526a9a9 100644
--- a/core/modules/filters/editiondescription.js
+++ b/core/modules/filters/editiondescription.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for returning the descriptions of the specified edition names
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -22,12 +19,10 @@ exports.editiondescription = function(source,operator,options) {
if(editionInfo) {
source(function(tiddler,title) {
if($tw.utils.hop(editionInfo,title)) {
- results.push(editionInfo[title].description || "");
+ results.push(editionInfo[title].description || "");
}
});
}
}
return results;
};
-
-})();
diff --git a/core/modules/filters/editions.js b/core/modules/filters/editions.js
index 05ae57c31..919dacfe9 100644
--- a/core/modules/filters/editions.js
+++ b/core/modules/filters/editions.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for returning the names of the available editions in this wiki
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -28,5 +25,3 @@ exports.editions = function(source,operator,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/else.js b/core/modules/filters/else.js
index c3829371e..cffcf33ef 100644
--- a/core/modules/filters/else.js
+++ b/core/modules/filters/else.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for replacing an empty input list with a constant, passing a non-empty input list straight through
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -26,5 +23,3 @@ exports.else = function(source,operator,options) {
return results;
}
};
-
-})();
diff --git a/core/modules/filters/encodings.js b/core/modules/filters/encodings.js
index 557599c1a..ecb0d7289 100644
--- a/core/modules/filters/encodings.js
+++ b/core/modules/filters/encodings.js
@@ -6,25 +6,37 @@ module-type: filteroperator
Filter operator for applying decodeURIComponent() to each item.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
Export our filter functions
*/
+exports.decodebase64 = function(source,operator,options) {
+ var results = [];
+ var binary = operator.suffixes && operator.suffixes[0].indexOf("binary") !== -1;
+ var urlsafe = operator.suffixes && operator.suffixes[0].indexOf("urlsafe") !== -1;
+ source(function(tiddler,title) {
+ results.push($tw.utils.base64Decode(title,binary,urlsafe));
+ });
+ return results;
+};
+
+exports.encodebase64 = function(source,operator,options) {
+ var results = [];
+ var binary = operator.suffixes && operator.suffixes[0].indexOf("binary") !== -1;
+ var urlsafe = operator.suffixes && operator.suffixes[0].indexOf("urlsafe") !== -1;
+ source(function(tiddler,title) {
+ results.push($tw.utils.base64Encode(title,binary,urlsafe));
+ });
+ return results;
+};
+
exports.decodeuricomponent = function(source,operator,options) {
var results = [];
source(function(tiddler,title) {
- var value = title;
- try {
- value = decodeURIComponent(title);
- } catch(e) {
- }
- results.push(value);
+ results.push($tw.utils.decodeURIComponentSafe(title));
});
return results;
};
@@ -32,7 +44,7 @@ exports.decodeuricomponent = function(source,operator,options) {
exports.encodeuricomponent = function(source,operator,options) {
var results = [];
source(function(tiddler,title) {
- results.push(encodeURIComponent(title));
+ results.push($tw.utils.encodeURIComponentExtended(title));
});
return results;
};
@@ -40,12 +52,7 @@ exports.encodeuricomponent = function(source,operator,options) {
exports.decodeuri = function(source,operator,options) {
var results = [];
source(function(tiddler,title) {
- var value = title;
- try {
- value = decodeURI(title);
- } catch(e) {
- }
- results.push(value);
+ results.push($tw.utils.decodeURISafe(title));
});
return results;
};
@@ -102,9 +109,7 @@ exports.escapecss = function(source,operator,options) {
var results = [];
source(function(tiddler,title) {
// escape any character with a special meaning in CSS using CSS.escape()
- results.push(CSS.escape(title));
+ results.push($tw.utils.escapeCSS(title));
});
return results;
};
-
-})();
diff --git a/core/modules/filters/enlist.js b/core/modules/filters/enlist.js
index 0baaa9366..69aa9e9e0 100644
--- a/core/modules/filters/enlist.js
+++ b/core/modules/filters/enlist.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator returning its operand parsed as a list
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -38,5 +35,3 @@ exports.enlist = function(source,operator,options) {
return list;
}
};
-
-})();
diff --git a/core/modules/filters/field.js b/core/modules/filters/field.js
index fc8223555..8dd608d45 100644
--- a/core/modules/filters/field.js
+++ b/core/modules/filters/field.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for comparing fields for equality
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -17,7 +14,7 @@ Export our filter function
*/
exports.field = function(source,operator,options) {
var results = [],indexedResults,
- fieldname = (operator.suffix || operator.operator || "title").toLowerCase();
+ fieldname = operator.suffix || operator.operator || "title";
if(operator.prefix === "!") {
if(operator.regexp) {
source(function(tiddler,title) {
@@ -71,5 +68,3 @@ exports.field = function(source,operator,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/fields.js b/core/modules/filters/fields.js
index 671a1e200..e569f0e5e 100644
--- a/core/modules/filters/fields.js
+++ b/core/modules/filters/fields.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for returning the names of the fields on the selected tiddlers
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -20,7 +17,7 @@ exports.fields = function(source,operator,options) {
fieldName,
suffixes = (operator.suffixes || [])[0] || [],
operand = $tw.utils.parseStringArray(operator.operand);
-
+
source(function(tiddler,title) {
if(tiddler) {
if(suffixes.indexOf("include") !== -1) {
@@ -41,5 +38,3 @@ exports.fields = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/filter.js b/core/modules/filters/filter.js
index 2e549672b..466d43f8b 100644
--- a/core/modules/filters/filter.js
+++ b/core/modules/filters/filter.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator returning those input titles that pass a subfilter
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -20,12 +17,13 @@ exports.filter = function(source,operator,options) {
results = [],
target = operator.prefix !== "!";
source(function(tiddler,title) {
- var list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]));
+ var list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),options.widget.makeFakeWidgetWithVariables({
+ "currentTiddler": "" + title,
+ "..currentTiddler": options.widget.getVariable("currentTiddler","")
+ }));
if((list.length > 0) === target) {
results.push(title);
}
});
return results;
};
-
-})();
diff --git a/core/modules/filters/format.js b/core/modules/filters/format.js
index 2fc786d88..944007797 100644
--- a/core/modules/filters/format.js
+++ b/core/modules/filters/format.js
@@ -4,10 +4,7 @@ type: application/javascript
module-type: filteroperator
Filter operator for formatting strings
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var formatFilterOperators;
@@ -42,5 +39,3 @@ exports.format = function(source,operator,options) {
return results;
}
};
-
-})();
\ No newline at end of file
diff --git a/core/modules/filters/format/date.js b/core/modules/filters/format/date.js
index 1b29c5bfb..c74df3444 100644
--- a/core/modules/filters/format/date.js
+++ b/core/modules/filters/format/date.js
@@ -3,24 +3,19 @@ title: $:/core/modules/filters/format/date.js
type: application/javascript
module-type: formatfilteroperator
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
Export our filter function
*/
exports.date = function(source,operand,options) {
- var results = [];
+ var results = [];
source(function(tiddler,title) {
var value = $tw.utils.parseDate(title);
if(value && $tw.utils.isDate(value) && value.toString() !== "Invalid Date") {
results.push($tw.utils.formatDateString(value,operand || "YYYY MM DD 0hh:0mm"));
}
- });
+ });
return results;
};
-
-})();
\ No newline at end of file
diff --git a/core/modules/filters/format/json.js b/core/modules/filters/format/json.js
new file mode 100644
index 000000000..5db3658e7
--- /dev/null
+++ b/core/modules/filters/format/json.js
@@ -0,0 +1,30 @@
+/*\
+title: $:/core/modules/filters/format/json.js
+type: application/javascript
+module-type: formatfilteroperator
+\*/
+
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.json = function(source,operand,options) {
+ var results = [],
+ spaces = null;
+ if(operand) {
+ spaces = /^\d+$/.test(operand) ? parseInt(operand,10) : operand;
+ }
+ source(function(tiddler,title) {
+ var data = $tw.utils.parseJSONSafe(title);
+ try {
+ data = JSON.parse(title);
+ } catch(e) {
+ data = undefined;
+ }
+ if(data !== undefined) {
+ results.push(JSON.stringify(data,null,spaces));
+ }
+ });
+ return results;
+};
diff --git a/core/modules/filters/format/relativedate.js b/core/modules/filters/format/relativedate.js
index 262aeaaf2..ab9c02d72 100644
--- a/core/modules/filters/format/relativedate.js
+++ b/core/modules/filters/format/relativedate.js
@@ -3,24 +3,19 @@ title: $:/core/modules/filters/format/relativedate.js
type: application/javascript
module-type: formatfilteroperator
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
Export our filter function
*/
exports.relativedate = function(source,operand,options) {
- var results = [];
+ var results = [];
source(function(tiddler,title) {
var value = $tw.utils.parseDate(title);
if(value && $tw.utils.isDate(value) && value.toString() !== "Invalid Date") {
results.push($tw.utils.getRelativeDate((new Date()) - (new Date(value))).description);
}
- });
+ });
return results;
};
-
-})();
\ No newline at end of file
diff --git a/core/modules/filters/format/timestamp.js b/core/modules/filters/format/timestamp.js
new file mode 100644
index 000000000..9be351c33
--- /dev/null
+++ b/core/modules/filters/format/timestamp.js
@@ -0,0 +1,21 @@
+/*\
+title: $:/core/modules/filters/format/timestamp.js
+type: application/javascript
+module-type: formatfilteroperator
+\*/
+
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.timestamp = function(source,operand,options) {
+ var results = [];
+ source(function(tiddler,title) {
+ if (title.match(/^-?\d+$/)) {
+ var value = new Date(Number(title));
+ results.push($tw.utils.formatDateString(value,operand || "[UTC]YYYY0MM0DD0hh0mm0ss0XXX"));
+ }
+ });
+ return results;
+};
diff --git a/core/modules/filters/format/titlelist.js b/core/modules/filters/format/titlelist.js
new file mode 100644
index 000000000..9e9c827ef
--- /dev/null
+++ b/core/modules/filters/format/titlelist.js
@@ -0,0 +1,20 @@
+/*\
+title: $:/core/modules/filters/format/titlelist.js
+type: application/javascript
+module-type: formatfilteroperator
+\*/
+
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.titlelist = function(source,operand,options) {
+ var results = [];
+ source(function(tiddler,title) {
+ if(title && title.length) {
+ results.push($tw.utils.stringifyList([title]));
+ }
+ });
+ return results;
+};
diff --git a/core/modules/filters/function.js b/core/modules/filters/function.js
new file mode 100644
index 000000000..b6f2fa636
--- /dev/null
+++ b/core/modules/filters/function.js
@@ -0,0 +1,36 @@
+/*\
+title: $:/core/modules/filters/function.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator returning those input titles that are returned from a function
+
+\*/
+
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.function = function(source,operator,options) {
+ var functionName = operator.operands[0],
+ params = [],
+ results;
+ $tw.utils.each(operator.operands.slice(1),function(param) {
+ params.push({value: param});
+ });
+ // console.log(`Calling ${functionName} with params ${JSON.stringify(params)}`);
+ var variableInfo = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(functionName,{params: params, source: source});
+ if(variableInfo && variableInfo.srcVariable && variableInfo.srcVariable.isFunctionDefinition) {
+ results = variableInfo.resultList ? variableInfo.resultList : [variableInfo.text];
+ }
+ // Return the input list if the function wasn't found
+ if(!results) {
+ results = [];
+ source(function(tiddler,title) {
+ results.push(title);
+ });
+ }
+ // console.log(`function ${functionName} with params ${JSON.stringify(params)} results: ${JSON.stringify(results)}`);
+ return results;
+};
diff --git a/core/modules/filters/get.js b/core/modules/filters/get.js
index feae6684e..8c078ec85 100644
--- a/core/modules/filters/get.js
+++ b/core/modules/filters/get.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for replacing tiddler titles by the value of the field specified in the operand.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -27,5 +24,3 @@ exports.get = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/getindex.js b/core/modules/filters/getindex.js
index b604d4ec8..ce34b3356 100644
--- a/core/modules/filters/getindex.js
+++ b/core/modules/filters/getindex.js
@@ -6,10 +6,7 @@ module-type: filteroperator
returns the value at a given index of datatiddlers
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -28,5 +25,3 @@ exports.getindex = function(source,operator,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/getvariable.js b/core/modules/filters/getvariable.js
index 43451abed..eab697194 100644
--- a/core/modules/filters/getvariable.js
+++ b/core/modules/filters/getvariable.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for replacing input values by the value of the variable with the same name, or blank if the variable is missing
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -22,5 +19,3 @@ exports.getvariable = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/has.js b/core/modules/filters/has.js
index bdc267c70..ceb117f9c 100644
--- a/core/modules/filters/has.js
+++ b/core/modules/filters/has.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for checking if a tiddler has the specified field or index
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -61,10 +58,8 @@ exports.has = function(source,operator,options) {
if(tiddler && $tw.utils.hop(tiddler.fields,operator.operand) && (tiddler.fields[operator.operand].length !== 0)) {
results.push(title);
}
- });
+ });
}
}
return results;
};
-
-})();
diff --git a/core/modules/filters/haschanged.js b/core/modules/filters/haschanged.js
index 4c63b7758..43d660cb9 100644
--- a/core/modules/filters/haschanged.js
+++ b/core/modules/filters/haschanged.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator returns tiddlers from the list that have a non-zero changecount.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -32,5 +29,3 @@ exports.haschanged = function(source,operator,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/indexes.js b/core/modules/filters/indexes.js
index 3bbb22659..1de730217 100644
--- a/core/modules/filters/indexes.js
+++ b/core/modules/filters/indexes.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for returning the indexes of a data tiddler
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -26,5 +23,3 @@ exports.indexes = function(source,operator,options) {
results.sort();
return results;
};
-
-})();
diff --git a/core/modules/filters/insertafter.js b/core/modules/filters/insertafter.js
new file mode 100644
index 000000000..a8f1edf12
--- /dev/null
+++ b/core/modules/filters/insertafter.js
@@ -0,0 +1,41 @@
+/*\
+title: $:/core/modules/filters/insertafter.js
+type: application/javascript
+module-type: filteroperator
+
+Insert an item after another item in a list
+
+\*/
+
+"use strict";
+
+/*
+Order a list
+*/
+exports.insertafter = function(source,operator,options) {
+ var results = [];
+ source(function(tiddler,title) {
+ results.push(title);
+ });
+ var target = operator.operands[1] || (options.widget && options.widget.getVariable(operator.suffix || "currentTiddler"));
+ if(target !== operator.operand) {
+ // Remove the entry from the list if it is present
+ var pos = results.indexOf(operator.operand);
+ if(pos !== -1) {
+ results.splice(pos,1);
+ }
+ // Insert the entry after the target marker
+ pos = results.indexOf(target);
+ if(pos !== -1) {
+ results.splice(pos+1,0,operator.operand);
+ } else {
+ var suffix = operator.operands.length > 1 ? operator.suffix : "";
+ if(suffix === "start") {
+ results.splice(0,0,operator.operand);
+ } else {
+ results.push(operator.operand);
+ }
+ }
+ }
+ return results;
+};
diff --git a/core/modules/filters/insertbefore.js b/core/modules/filters/insertbefore.js
index 6fa9728f9..33e41887f 100644
--- a/core/modules/filters/insertbefore.js
+++ b/core/modules/filters/insertbefore.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Insert an item before another item in a list
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -20,7 +17,7 @@ exports.insertbefore = function(source,operator,options) {
source(function(tiddler,title) {
results.push(title);
});
- var target = options.widget && options.widget.getVariable(operator.suffix || "currentTiddler");
+ var target = operator.operands[1] || (options.widget && options.widget.getVariable(operator.suffix || "currentTiddler"));
if(target !== operator.operand) {
// Remove the entry from the list if it is present
var pos = results.indexOf(operator.operand);
@@ -32,10 +29,13 @@ exports.insertbefore = function(source,operator,options) {
if(pos !== -1) {
results.splice(pos,0,operator.operand);
} else {
- results.push(operator.operand);
+ var suffix = operator.operands.length > 1 ? operator.suffix : "";
+ if(suffix == "start") {
+ results.splice(0,0,operator.operand);
+ } else {
+ results.push(operator.operand);
+ }
}
}
return results;
};
-
-})();
diff --git a/core/modules/filters/is.js b/core/modules/filters/is.js
index b75943786..87861a6e9 100644
--- a/core/modules/filters/is.js
+++ b/core/modules/filters/is.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for checking tiddler properties
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var isFilterOperators;
@@ -44,5 +41,3 @@ exports.is = function(source,operator,options) {
return results;
}
};
-
-})();
\ No newline at end of file
diff --git a/core/modules/filters/is/binary.js b/core/modules/filters/is/binary.js
index 01b9aabd3..7fb02772e 100644
--- a/core/modules/filters/is/binary.js
+++ b/core/modules/filters/is/binary.js
@@ -6,10 +6,7 @@ module-type: isfilteroperator
Filter function for [is[binary]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -32,5 +29,3 @@ exports.binary = function(source,prefix,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/is/blank.js b/core/modules/filters/is/blank.js
index 8f500da45..274d3eba1 100644
--- a/core/modules/filters/is/blank.js
+++ b/core/modules/filters/is/blank.js
@@ -6,10 +6,7 @@ module-type: isfilteroperator
Filter function for [is[blank]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -32,5 +29,3 @@ exports.blank = function(source,prefix,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/is/current.js b/core/modules/filters/is/current.js
index b5b88f616..1853c5e28 100644
--- a/core/modules/filters/is/current.js
+++ b/core/modules/filters/is/current.js
@@ -6,10 +6,7 @@ module-type: isfilteroperator
Filter function for [is[current]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -33,5 +30,3 @@ exports.current = function(source,prefix,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/is/draft.js b/core/modules/filters/is/draft.js
index 3dd183a46..caba7849f 100644
--- a/core/modules/filters/is/draft.js
+++ b/core/modules/filters/is/draft.js
@@ -6,10 +6,7 @@ module-type: isfilteroperator
Filter function for [is[draft]] analagous to [has[draft.of]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -19,18 +16,16 @@ exports.draft = function(source,prefix,options) {
var results = [];
if(prefix === "!") {
source(function(tiddler,title) {
- if(!tiddler || !$tw.utils.hop(tiddler.fields,"draft.of")) {
+ if(!tiddler || !tiddler.isDraft()) {
results.push(title);
}
});
} else {
source(function(tiddler,title) {
- if(tiddler && $tw.utils.hop(tiddler.fields,"draft.of") && (tiddler.fields["draft.of"].length !== 0)) {
+ if(tiddler && tiddler.isDraft()) {
results.push(title);
}
- });
+ });
}
return results;
};
-
-})();
diff --git a/core/modules/filters/is/image.js b/core/modules/filters/is/image.js
index 3527540d3..be276c834 100644
--- a/core/modules/filters/is/image.js
+++ b/core/modules/filters/is/image.js
@@ -6,10 +6,7 @@ module-type: isfilteroperator
Filter function for [is[image]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -32,5 +29,3 @@ exports.image = function(source,prefix,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/is/missing.js b/core/modules/filters/is/missing.js
index 8ebf90d41..7720ac472 100644
--- a/core/modules/filters/is/missing.js
+++ b/core/modules/filters/is/missing.js
@@ -6,10 +6,7 @@ module-type: isfilteroperator
Filter function for [is[missing]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -32,5 +29,3 @@ exports.missing = function(source,prefix,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/is/orphan.js b/core/modules/filters/is/orphan.js
index 94d09ad61..8827da4c9 100644
--- a/core/modules/filters/is/orphan.js
+++ b/core/modules/filters/is/orphan.js
@@ -6,10 +6,7 @@ module-type: isfilteroperator
Filter function for [is[orphan]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -33,5 +30,3 @@ exports.orphan = function(source,prefix,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/is/shadow.js b/core/modules/filters/is/shadow.js
index cfb6b926c..4f1335c69 100644
--- a/core/modules/filters/is/shadow.js
+++ b/core/modules/filters/is/shadow.js
@@ -6,10 +6,7 @@ module-type: isfilteroperator
Filter function for [is[shadow]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -32,5 +29,3 @@ exports.shadow = function(source,prefix,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/is/system.js b/core/modules/filters/is/system.js
index 84d0656fd..b27feb392 100644
--- a/core/modules/filters/is/system.js
+++ b/core/modules/filters/is/system.js
@@ -6,10 +6,7 @@ module-type: isfilteroperator
Filter function for [is[system]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -32,5 +29,3 @@ exports.system = function(source,prefix,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/is/tag.js b/core/modules/filters/is/tag.js
index d614029c4..69d1713be 100644
--- a/core/modules/filters/is/tag.js
+++ b/core/modules/filters/is/tag.js
@@ -6,10 +6,7 @@ module-type: isfilteroperator
Filter function for [is[tag]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -33,5 +30,3 @@ exports.tag = function(source,prefix,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/is/tiddler.js b/core/modules/filters/is/tiddler.js
index d97cd7892..24ca5cee2 100644
--- a/core/modules/filters/is/tiddler.js
+++ b/core/modules/filters/is/tiddler.js
@@ -6,10 +6,7 @@ module-type: isfilteroperator
Filter function for [is[tiddler]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -32,5 +29,3 @@ exports.tiddler = function(source,prefix,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/is/variable.js b/core/modules/filters/is/variable.js
index 1f2e5d1b3..624a179d7 100644
--- a/core/modules/filters/is/variable.js
+++ b/core/modules/filters/is/variable.js
@@ -6,10 +6,7 @@ module-type: isfilteroperator
Filter function for [is[variable]]
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -19,18 +16,16 @@ exports.variable = function(source,prefix,options) {
var results = [];
if(prefix === "!") {
source(function(tiddler,title) {
- if(!(title in options.widget.variables)) {
+ if(options.widget.getVariable(title) === undefined) {
results.push(title);
}
});
} else {
source(function(tiddler,title) {
- if(title in options.widget.variables) {
+ if(options.widget.getVariable(title) !== undefined) {
results.push(title);
}
});
}
return results;
};
-
-})();
diff --git a/core/modules/filters/json-ops.js b/core/modules/filters/json-ops.js
new file mode 100644
index 000000000..8f16ad417
--- /dev/null
+++ b/core/modules/filters/json-ops.js
@@ -0,0 +1,278 @@
+/*\
+title: $:/core/modules/filters/json-ops.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operators for JSON operations
+
+\*/
+
+"use strict";
+
+exports["jsonget"] = function(source,operator,options) {
+ var results = [];
+ source(function(tiddler,title) {
+ var data = $tw.utils.parseJSONSafe(title,title);
+ if(data) {
+ var items = getDataItemValueAsStrings(data,operator.operands);
+ if(items !== undefined) {
+ results.push.apply(results,items);
+ }
+ }
+ });
+ return results;
+};
+
+exports["jsonextract"] = function(source,operator,options) {
+ var results = [];
+ source(function(tiddler,title) {
+ var data = $tw.utils.parseJSONSafe(title,title);
+ if(data) {
+ var item = getDataItem(data,operator.operands);
+ if(item !== undefined) {
+ results.push(JSON.stringify(item));
+ }
+ }
+ });
+ return results;
+};
+
+exports["jsonindexes"] = function(source,operator,options) {
+ var results = [];
+ source(function(tiddler,title) {
+ var data = $tw.utils.parseJSONSafe(title,title);
+ if(data) {
+ var items = getDataItemKeysAsStrings(data,operator.operands);
+ if(items !== undefined) {
+ results.push.apply(results,items);
+ }
+ }
+ });
+ return results;
+};
+
+exports["jsontype"] = function(source,operator,options) {
+ var results = [];
+ source(function(tiddler,title) {
+ var data = $tw.utils.parseJSONSafe(title,title);
+ if(data) {
+ var item = getDataItemType(data,operator.operands);
+ if(item !== undefined) {
+ results.push(item);
+ }
+ }
+ });
+ return results;
+};
+
+exports["jsonset"] = function(source,operator,options) {
+ var suffixes = operator.suffixes || [],
+ type = suffixes[0] && suffixes[0][0],
+ indexes = operator.operands.slice(0,-1),
+ value = operator.operands[operator.operands.length - 1],
+ results = [];
+ if(operator.operands.length === 1 && operator.operands[0] === "") {
+ value = undefined; // Prevents the value from being assigned
+ }
+ switch(type) {
+ case "string":
+ // Use value unchanged
+ break;
+ case "boolean":
+ value = (value === "true" ? true : (value === "false" ? false : undefined));
+ break;
+ case "number":
+ value = $tw.utils.parseNumber(value);
+ break;
+ case "array":
+ indexes = operator.operands;
+ value = [];
+ break;
+ case "object":
+ indexes = operator.operands;
+ value = {};
+ break;
+ case "null":
+ indexes = operator.operands;
+ value = null;
+ break;
+ case "json":
+ value = $tw.utils.parseJSONSafe(value,function() {return undefined;});
+ break;
+ default:
+ // Use value unchanged
+ break;
+ }
+ source(function(tiddler,title) {
+ var data = $tw.utils.parseJSONSafe(title,title);
+ if(data) {
+ data = setDataItem(data,indexes,value);
+ results.push(JSON.stringify(data));
+ }
+ });
+ return results;
+};
+
+/*
+Given a JSON data structure and an array of index strings, return an array of the string representation of the values at the end of the index chain, or "undefined" if any of the index strings are invalid
+*/
+function getDataItemValueAsStrings(data,indexes) {
+ // Get the item
+ var item = getDataItem(data,indexes);
+ // Return the item as a string list
+ return convertDataItemValueToStrings(item);
+}
+
+/*
+Given a JSON data structure and an array of index strings, return an array of the string representation of the keys of the item at the end of the index chain, or "undefined" if any of the index strings are invalid
+*/
+function getDataItemKeysAsStrings(data,indexes) {
+ // Get the item
+ var item = getDataItem(data,indexes);
+ // Return the item keys as a string
+ return convertDataItemKeysToStrings(item);
+}
+
+/*
+Return an array of the string representation of the values of a data item, or "undefined" if the item is undefined
+*/
+function convertDataItemValueToStrings(item) {
+ // Return the item as a string
+ if(item === undefined) {
+ return undefined;
+ } else if(item === null) {
+ return ["null"]
+ } else if(typeof item === "object") {
+ var results = [],i,t;
+ if($tw.utils.isArray(item)) {
+ // Return all the items in arrays recursively
+ for(i=0; i<item.length; i++) {
+ t = convertDataItemValueToStrings(item[i])
+ if(t !== undefined) {
+ results.push.apply(results,t);
+ }
+ }
+ } else {
+ // Return all the values in objects recursively
+ $tw.utils.each(Object.keys(item).sort(),function(key) {
+ t = convertDataItemValueToStrings(item[key]);
+ if(t !== undefined) {
+ results.push.apply(results,t);
+ }
+ });
+ }
+ return results;
+ }
+ return [item.toString()];
+}
+
+/*
+Return an array of the string representation of the keys of a data item, or "undefined" if the item is undefined
+*/
+function convertDataItemKeysToStrings(item) {
+ // Return the item as a string
+ if(item === undefined) {
+ return item;
+ } else if(typeof item === "object") {
+ if(item === null) {
+ return [];
+ }
+ var results = [];
+ if($tw.utils.isArray(item)) {
+ for(var i=0; i<item.length; i++) {
+ results.push(i.toString());
+ }
+ return results;
+ } else {
+ $tw.utils.each(Object.keys(item).sort(),function(key) {
+ results.push(key);
+ });
+ return results;
+ }
+ }
+ return [];
+}
+
+function getDataItemType(data,indexes) {
+ // Get the item
+ var item = getDataItem(data,indexes);
+ // Return the item type
+ if(item === undefined) {
+ return item;
+ } else if(item === null) {
+ return "null";
+ } else if($tw.utils.isArray(item)) {
+ return "array";
+ } else if(typeof item === "object") {
+ return "object";
+ } else {
+ return typeof item;
+ }
+}
+
+function getItemAtIndex(item,index) {
+ if($tw.utils.hop(item,index)) {
+ return item[index];
+ } else if($tw.utils.isArray(item)) {
+ index = $tw.utils.parseInt(index);
+ if(index < 0) { index = index + item.length };
+ return item[index]; // Will be undefined if index was out-of-bounds
+ } else {
+ return undefined;
+ }
+}
+
+/*
+Given a JSON data structure and an array of index strings, return the value at the end of the index chain, or "undefined" if any of the index strings are invalid
+*/
+function getDataItem(data,indexes) {
+ if(indexes.length === 0 || (indexes.length === 1 && indexes[0] === "")) {
+ return data;
+ }
+ // Get the item
+ var item = data;
+ for(var i=0; i<indexes.length; i++) {
+ if(item !== undefined) {
+ if(item !== null && ["number","string","boolean"].indexOf(typeof item) === -1) {
+ item = getItemAtIndex(item,indexes[i]);
+ } else {
+ item = undefined;
+ }
+ }
+ }
+ return item;
+}
+
+/*
+Given a JSON data structure, an array of index strings and a value, return the data structure with the value added at the end of the index chain. If any of the index strings are invalid then the JSON data structure is returned unmodified. If the root item is targetted then a different data object will be returned
+*/
+function setDataItem(data,indexes,value) {
+ // Ignore attempts to assign undefined
+ if(value === undefined) {
+ return data;
+ }
+ // Check for the root item
+ if(indexes.length === 0 || (indexes.length === 1 && indexes[0] === "")) {
+ return value;
+ }
+ // Traverse the JSON data structure using the index chain
+ var current = data;
+ for(var i = 0; i < indexes.length - 1; i++) {
+ current = getItemAtIndex(current,indexes[i]);
+ if(current === undefined) {
+ // Return the original JSON data structure if any of the index strings are invalid
+ return data;
+ }
+ }
+ // Add the value to the end of the index chain
+ var lastIndex = indexes[indexes.length - 1];
+ if($tw.utils.isArray(current)) {
+ lastIndex = $tw.utils.parseInt(lastIndex);
+ if(lastIndex < 0) { lastIndex = lastIndex + current.length };
+ }
+ // Only set indexes on objects and arrays
+ if(typeof current === "object") {
+ current[lastIndex] = value;
+ }
+ return data;
+}
diff --git a/core/modules/filters/limit.js b/core/modules/filters/limit.js
index c878c1ac7..9b440155e 100644
--- a/core/modules/filters/limit.js
+++ b/core/modules/filters/limit.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for chopping the results to a specified maximum number of entries
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -30,5 +27,3 @@ exports.limit = function(source,operator,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/links.js b/core/modules/filters/links.js
index e1a859bc1..0b56a8871 100644
--- a/core/modules/filters/links.js
+++ b/core/modules/filters/links.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for returning all the links from a tiddler
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -20,7 +17,5 @@ exports.links = function(source,operator,options) {
source(function(tiddler,title) {
results.pushTop(options.wiki.getTiddlerLinks(title));
});
- return results.toArray();
+ return results.makeTiddlerIterator(options.wiki);
};
-
-})();
diff --git a/core/modules/filters/list.js b/core/modules/filters/list.js
index 1b23b9382..2a5e7b8bb 100644
--- a/core/modules/filters/list.js
+++ b/core/modules/filters/list.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator returning the tiddlers whose title is listed in the operand tiddler
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -31,5 +28,3 @@ exports.list = function(source,operator,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/listed.js b/core/modules/filters/listed.js
index 8cb1c2f68..610305245 100644
--- a/core/modules/filters/listed.js
+++ b/core/modules/filters/listed.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator returning all tiddlers that have the selected tiddlers in a list
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -23,5 +20,3 @@ exports.listed = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/listops.js b/core/modules/filters/listops.js
index 0c30c22e7..ccd81b9fe 100644
--- a/core/modules/filters/listops.js
+++ b/core/modules/filters/listops.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operators for manipulating the current selection list
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -58,6 +55,7 @@ Last entry/entries in list
exports.last = function(source,operator,options) {
var count = $tw.utils.getInt(operator.operand,1),
results = [];
+ if(count === 0) return results;
source(function(tiddler,title) {
results.push(title);
});
@@ -87,7 +85,8 @@ exports.butlast = function(source,operator,options) {
source(function(tiddler,title) {
results.push(title);
});
- return results.slice(0,-count);
+ var index = count === 0 ? results.length : -count;
+ return results.slice(0,index);
};
exports.bl = exports.butlast;
@@ -103,4 +102,14 @@ exports.nth = function(source,operator,options) {
return results.slice(count - 1,count);
};
-})();
+/*
+The zero based nth member of the list
+*/
+exports.zth = function(source,operator,options) {
+ var count = $tw.utils.getInt(operator.operand,0),
+ results = [];
+ source(function(tiddler,title) {
+ results.push(title);
+ });
+ return results.slice(count,count + 1);
+};
diff --git a/core/modules/filters/lookup.js b/core/modules/filters/lookup.js
index 2174e8c47..f500b87dd 100644
--- a/core/modules/filters/lookup.js
+++ b/core/modules/filters/lookup.js
@@ -5,26 +5,44 @@ module-type: filteroperator
Filter operator that looks up values via a title prefix
-[lookup:<field>[<prefix>]]
+[lookup:<defaultvalue>:<field OR index>[<prefix>],[<field-name OR index-name>]]
-Prepends the prefix to the selected items and returns the specified field value
+Prepends the prefix to the selected items and returns the specified
+field or index value. If the 2nd suffix does not exist, it defaults to field.
+If the second operand is missing it defaults to "text" for fields, and "0" for indexes
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
Export our filter function
*/
exports.lookup = function(source,operator,options) {
- var results = [];
- source(function(tiddler,title) {
- results.push(options.wiki.getTiddlerText(operator.operand + title) || operator.suffix || '');
- });
+ var results = [],
+ suffixes = operator.suffixes || [],
+ defaultSuffix = suffixes[0] ? (suffixes[0][0] || "") : "",
+ indexSuffix = (suffixes[1] && suffixes[1][0] === "index") ? true : false,
+ target;
+ if(operator.operands.length == 2) {
+ target = operator.operands[1]
+ } else {
+ target = indexSuffix ? "0": "text";
+ }
+ if(indexSuffix) {
+ source(function(tiddler,title) {
+ var data = options.wiki.extractTiddlerDataItem(operator.operands[0]+title,target,defaultSuffix);
+ results.push(data);
+ });
+ } else {
+ source(function(tiddler,title) {
+ var value = defaultSuffix;
+ var targetTiddler = options.wiki.getTiddler(operator.operands[0]+title);
+ if(targetTiddler && targetTiddler.getFieldString(target)) {
+ value = targetTiddler.getFieldString(target);
+ }
+ results.push(value);
+ });
+ }
return results;
};
-
-})();
diff --git a/core/modules/filters/match.js b/core/modules/filters/match.js
index 34caf487e..ce0b2b9d4 100644
--- a/core/modules/filters/match.js
+++ b/core/modules/filters/match.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for checking if a title matches a string
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -49,5 +46,3 @@ exports.match = function(source,operator,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/math.js b/core/modules/filters/math.js
index f52a8c678..bdf2117eb 100644
--- a/core/modules/filters/math.js
+++ b/core/modules/filters/math.js
@@ -13,10 +13,7 @@ Note that strings are converted to numbers automatically. Trailing non-digits ar
* "12kk" converts to 12
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.negate = makeNumericBinaryOperator(
@@ -125,6 +122,83 @@ exports.minall = makeNumericReducingOperator(
Infinity // Initial value
);
+exports.median = makeNumericArrayOperator(
+ function(values) {
+ var len = values.length, median;
+ values.sort(function(a,b) {return a-b});
+ if(len % 2) {
+ // Odd, return the middle number
+ median = values[(len - 1) / 2];
+ } else {
+ // Even, return average of two middle numbers
+ median = (values[len / 2 - 1] + values[len / 2]) / 2;
+ }
+ return [median];
+ }
+);
+
+exports.average = makeNumericReducingOperator(
+ function(accumulator,value) {return accumulator + value},
+ 0, // Initial value
+ function(finalValue,numberOfValues) {
+ return finalValue/numberOfValues;
+ }
+);
+
+exports.variance = makeNumericReducingOperator(
+ function(accumulator,value) {return accumulator + value},
+ 0,
+ function(finalValue,numberOfValues,originalValues) {
+ return getVarianceFromArray(originalValues,finalValue/numberOfValues);
+ }
+);
+
+exports["standard-deviation"] = makeNumericReducingOperator(
+ function(accumulator,value) {return accumulator + value},
+ 0,
+ function(finalValue,numberOfValues,originalValues) {
+ var variance = getVarianceFromArray(originalValues,finalValue/numberOfValues);
+ return Math.sqrt(variance);
+ }
+);
+
+//trigonometry
+exports.cos = makeNumericBinaryOperator(
+ function(a) {return Math.cos(a)}
+);
+
+exports.sin = makeNumericBinaryOperator(
+ function(a) {return Math.sin(a)}
+);
+
+exports.tan = makeNumericBinaryOperator(
+ function(a) {return Math.tan(a)}
+);
+
+exports.acos = makeNumericBinaryOperator(
+ function(a) {return Math.acos(a)}
+);
+
+exports.asin = makeNumericBinaryOperator(
+ function(a) {return Math.asin(a)}
+);
+
+exports.atan = makeNumericBinaryOperator(
+ function(a) {return Math.atan(a)}
+);
+
+exports.atan2 = makeNumericBinaryOperator(
+ function(a,b) {return Math.atan2(a,b)}
+);
+
+//Calculate the variance of a population of numbers in an array given its mean
+function getVarianceFromArray(values,mean) {
+ var deviationTotal = values.reduce(function(accumulator,value) {
+ return accumulator + Math.pow(value - mean, 2);
+ },0);
+ return deviationTotal/values.length;
+};
+
function makeNumericBinaryOperator(fnCalc) {
return function(source,operator,options) {
var result = [],
@@ -134,19 +208,39 @@ function makeNumericBinaryOperator(fnCalc) {
});
return result;
};
-}
+};
-function makeNumericReducingOperator(fnCalc,initialValue) {
+function makeNumericReducingOperator(fnCalc,initialValue,fnFinal) {
initialValue = initialValue || 0;
return function(source,operator,options) {
var result = [];
source(function(tiddler,title) {
- result.push(title);
+ result.push($tw.utils.parseNumber(title));
});
- return [$tw.utils.stringifyNumber(result.reduce(function(accumulator,currentValue) {
- return fnCalc(accumulator,$tw.utils.parseNumber(currentValue));
- },initialValue))];
+ // We return an empty array if there are no input titles
+ if(result.length === 0) {
+ return [];
+ }
+ var value = result.reduce(function(accumulator,currentValue) {
+ return fnCalc(accumulator,currentValue);
+ },initialValue);
+ if(fnFinal) {
+ value = fnFinal(value,result.length,result);
+ }
+ return [$tw.utils.stringifyNumber(value)];
};
-}
+};
-})();
+function makeNumericArrayOperator(fnCalc) {
+ return function(source,operator,options) {
+ var results = [];
+ source(function(tiddler,title) {
+ results.push($tw.utils.parseNumber(title));
+ });
+ results = fnCalc(results);
+ $tw.utils.each(results,function(value,index) {
+ results[index] = $tw.utils.stringifyNumber(value);
+ });
+ return results;
+ };
+};
diff --git a/core/modules/filters/minlength.js b/core/modules/filters/minlength.js
index d4e679bef..4428049f8 100644
--- a/core/modules/filters/minlength.js
+++ b/core/modules/filters/minlength.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for filtering out titles that don't meet the minimum length in the operand
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -25,5 +22,3 @@ exports.minlength = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/moduleproperty.js b/core/modules/filters/moduleproperty.js
new file mode 100644
index 000000000..67b994d52
--- /dev/null
+++ b/core/modules/filters/moduleproperty.js
@@ -0,0 +1,32 @@
+/*\
+title: $:/core/modules/filters/moduleproperty.js
+type: application/javascript
+module-type: filteroperator
+
+Filter [[module-name]moduleproperty[name]] retrieve a module property
+
+\*/
+
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.moduleproperty = function(source,operator,options) {
+ var results = [];
+ source(function(tiddler,title) {
+ try {
+ var value = require(title)[operator.operand || ""];
+ if(value !== undefined) {
+ if(typeof value !== "string") {
+ value = JSON.stringify(value);
+ }
+ results.push(value);
+ }
+ } catch(e) {
+ // Do nothing. It probably wasn't a module.
+ }
+ });
+ results.sort();
+ return results;
+};
diff --git a/core/modules/filters/modules.js b/core/modules/filters/modules.js
index 23ea44887..b09d8d825 100644
--- a/core/modules/filters/modules.js
+++ b/core/modules/filters/modules.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for returning the titles of the modules of a given type in this wiki
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -17,13 +14,23 @@ Export our filter function
*/
exports.modules = function(source,operator,options) {
var results = [];
- source(function(tiddler,title) {
- $tw.utils.each($tw.modules.types[title],function(moduleInfo,moduleName) {
- results.push(moduleName);
+ if(operator.operands.length >= 2) {
+ // Return the modules that have the module property specified in the first operand with the value in the second operand
+ source(function(tiddler,title) {
+ $tw.utils.each($tw.modules.types[title],function(moduleInfo,moduleName) {
+ if(require(moduleName)[operator.operands[0]] === operator.operands[1]) {
+ results.push(moduleName);
+ }
+ });
});
- });
+ } else {
+ // Return all the module names without filtering
+ source(function(tiddler,title) {
+ $tw.utils.each($tw.modules.types[title],function(moduleInfo,moduleName) {
+ results.push(moduleName);
+ });
+ });
+ }
results.sort();
return results;
};
-
-})();
diff --git a/core/modules/filters/moduletypes.js b/core/modules/filters/moduletypes.js
index 67321caea..752c383ac 100644
--- a/core/modules/filters/moduletypes.js
+++ b/core/modules/filters/moduletypes.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for returning the names of the module types in this wiki
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -23,5 +20,3 @@ exports.moduletypes = function(source,operator,options) {
results.sort();
return results;
};
-
-})();
diff --git a/core/modules/filters/next.js b/core/modules/filters/next.js
index c12295bf5..01c7e1f90 100644
--- a/core/modules/filters/next.js
+++ b/core/modules/filters/next.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator returning the tiddler whose title occurs next in the list supplied in the operand tiddler
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -28,5 +25,3 @@ exports.next = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/plugintiddlers.js b/core/modules/filters/plugintiddlers.js
index 489ec52e5..c56f88a91 100644
--- a/core/modules/filters/plugintiddlers.js
+++ b/core/modules/filters/plugintiddlers.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for returning the titles of the shadow tiddlers within a plugin
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -28,5 +25,3 @@ exports.plugintiddlers = function(source,operator,options) {
results.sort();
return results;
};
-
-})();
diff --git a/core/modules/filters/prefix.js b/core/modules/filters/prefix.js
index 49bb8110f..9b53cd78e 100644
--- a/core/modules/filters/prefix.js
+++ b/core/modules/filters/prefix.js
@@ -6,31 +6,44 @@ module-type: filteroperator
Filter operator for checking if a title starts with a prefix
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
Export our filter function
*/
exports.prefix = function(source,operator,options) {
- var results = [];
- if(operator.prefix === "!") {
- source(function(tiddler,title) {
- if(title.substr(0,operator.operand.length) !== operator.operand) {
- results.push(title);
- }
- });
+ var results = [],
+ suffixes = (operator.suffixes || [])[0] || [];
+ if(suffixes.indexOf("caseinsensitive") !== -1) {
+ var operand = operator.operand.toLowerCase();
+ if(operator.prefix === "!") {
+ source(function(tiddler,title) {
+ if(title.toLowerCase().substr(0,operand.length) !== operand) {
+ results.push(title);
+ }
+ });
+ } else {
+ source(function(tiddler,title) {
+ if(title.toLowerCase().substr(0,operand.length) === operand) {
+ results.push(title);
+ }
+ });
+ }
} else {
- source(function(tiddler,title) {
- if(title.substr(0,operator.operand.length) === operator.operand) {
- results.push(title);
- }
- });
+ if(operator.prefix === "!") {
+ source(function(tiddler,title) {
+ if(title.substr(0,operator.operand.length) !== operator.operand) {
+ results.push(title);
+ }
+ });
+ } else {
+ source(function(tiddler,title) {
+ if(title.substr(0,operator.operand.length) === operator.operand) {
+ results.push(title);
+ }
+ });
+ }
}
return results;
};
-
-})();
diff --git a/core/modules/filters/previous.js b/core/modules/filters/previous.js
index ed975458c..2d76aa59f 100644
--- a/core/modules/filters/previous.js
+++ b/core/modules/filters/previous.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator returning the tiddler whose title occurs immediately prior in the list supplied in the operand tiddler
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -28,5 +25,3 @@ exports.previous = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/range.js b/core/modules/filters/range.js
index f46d10699..7932e8548 100644
--- a/core/modules/filters/range.js
+++ b/core/modules/filters/range.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for generating a numeric range.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -17,9 +14,13 @@ Export our filter function
*/
exports.range = function(source,operator,options) {
var results = [];
- // Split the operand into numbers delimited by these symbols
- var parts = operator.operand.split(/[,:;]/g),
- beg, end, inc, i, fixed = 0;
+ // For backwards compatibility, if there is only one operand, try to split it using one of the delimiters
+ var parts = operator.operands || [];
+ if(parts.length === 1) {
+ parts = operator.operand.split(/[,:;]/g);
+ }
+ // Process the parts
+ var beg, end, inc, i, fixed = 0;
for (i=0; i<parts.length; i++) {
// Validate real number
if(!/^\s*[+-]?((\d+(\.\d*)?)|(\.\d+))\s*$/.test(parts[i])) {
@@ -95,5 +96,3 @@ exports.range = function(source,operator,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/reduce.js b/core/modules/filters/reduce.js
index 206936887..112a927bc 100644
--- a/core/modules/filters/reduce.js
+++ b/core/modules/filters/reduce.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator evaluates a subfilter for each item, making the running total available in the variable `accumulator`, and the current index available in the variable `index`
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -26,24 +23,14 @@ exports.reduce = function(source,operator,options) {
accumulator = operator.operands[1] || "";
for(var index=0; index<results.length; index++) {
var title = results[index],
- list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),{
- getVariable: function(name) {
- switch(name) {
- case "currentTiddler":
- return "" + title;
- case "accumulator":
- return "" + accumulator;
- case "index":
- return "" + index;
- case "revIndex":
- return "" + (results.length - 1 - index);
- case "length":
- return "" + results.length;
- default:
- return options.widget.getVariable(name);
- }
- }
- });
+ list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),options.widget.makeFakeWidgetWithVariables({
+ "currentTiddler": "" + title,
+ "..currentTiddler": options.widget.getVariable("currentTiddler"),
+ "accumulator": "" + accumulator,
+ "index": "" + index,
+ "revIndex": "" + (results.length - 1 - index),
+ "length": "" + results.length
+ }));
if(list.length > 0) {
accumulator = "" + list[0];
}
@@ -54,5 +41,3 @@ exports.reduce = function(source,operator,options) {
return [];
}
};
-
-})();
diff --git a/core/modules/filters/regexp.js b/core/modules/filters/regexp.js
index 4f8d9a8ee..b9d3e2377 100644
--- a/core/modules/filters/regexp.js
+++ b/core/modules/filters/regexp.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for regexp matching
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -17,7 +14,7 @@ Export our filter function
*/
exports.regexp = function(source,operator,options) {
var results = [],
- fieldname = (operator.suffix || "title").toLowerCase(),
+ fieldname = operator.suffix || "title",
regexpString, regexp, flags = "", match,
getFieldString = function(tiddler,title) {
if(tiddler) {
@@ -68,5 +65,3 @@ exports.regexp = function(source,operator,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/removeprefix.js b/core/modules/filters/removeprefix.js
index 3e93dcd00..5e9e4919e 100644
--- a/core/modules/filters/removeprefix.js
+++ b/core/modules/filters/removeprefix.js
@@ -6,23 +6,28 @@ module-type: filteroperator
Filter operator for removing a prefix from each title in the list. Titles that do not start with the prefix are removed.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
Export our filter function
*/
exports.removeprefix = function(source,operator,options) {
- var results = [];
- source(function(tiddler,title) {
- if(title.substr(0,operator.operand.length) === operator.operand) {
- results.push(title.substr(operator.operand.length));
- }
- });
+ var results = [],
+ suffixes = (operator.suffixes || [])[0] || [];
+ if(suffixes.indexOf("caseinsensitive") !== -1) {
+ var operand = operator.operand.toLowerCase();
+ source(function(tiddler,title) {
+ if(title.toLowerCase().substr(0,operand.length) === operand) {
+ results.push(title.substr(operand.length));
+ }
+ });
+ } else {
+ source(function(tiddler,title) {
+ if(title.substr(0,operator.operand.length) === operator.operand) {
+ results.push(title.substr(operator.operand.length));
+ }
+ });
+ }
return results;
};
-
-})();
diff --git a/core/modules/filters/removesuffix.js b/core/modules/filters/removesuffix.js
index 3d305aabf..98f4f9ba5 100644
--- a/core/modules/filters/removesuffix.js
+++ b/core/modules/filters/removesuffix.js
@@ -6,23 +6,32 @@ module-type: filteroperator
Filter operator for removing a suffix from each title in the list. Titles that do not end with the suffix are removed.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
Export our filter function
*/
exports.removesuffix = function(source,operator,options) {
- var results = [];
- source(function(tiddler,title) {
- if(title && title.substr(-operator.operand.length) === operator.operand) {
- results.push(title.substr(0,title.length - operator.operand.length));
- }
- });
+ var results = [],
+ suffixes = (operator.suffixes || [])[0] || [];
+ if (!operator.operand) {
+ source(function(tiddler,title) {
+ results.push(title);
+ });
+ } else if(suffixes.indexOf("caseinsensitive") !== -1) {
+ var operand = operator.operand.toLowerCase();
+ source(function(tiddler,title) {
+ if(title && title.toLowerCase().substr(-operand.length) === operand) {
+ results.push(title.substr(0,title.length - operand.length));
+ }
+ });
+ } else {
+ source(function(tiddler,title) {
+ if(title && title.substr(-operator.operand.length) === operator.operand) {
+ results.push(title.substr(0,title.length - operator.operand.length));
+ }
+ });
+ }
return results;
};
-
-})();
diff --git a/core/modules/filters/sameday.js b/core/modules/filters/sameday.js
index 5dfc35128..91e3e55e3 100644
--- a/core/modules/filters/sameday.js
+++ b/core/modules/filters/sameday.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator that selects tiddlers with a modified date field on the same day as the provided value.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -29,5 +26,3 @@ exports.sameday = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/search.js b/core/modules/filters/search.js
index adcb076a0..532cdc839 100644
--- a/core/modules/filters/search.js
+++ b/core/modules/filters/search.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for searching for the text in the operand tiddler
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -40,6 +37,7 @@ exports.search = function(source,operator,options) {
invert: invert,
field: fields,
excludeField: excludeFields,
+ some: hasFlag("some"),
caseSensitive: hasFlag("casesensitive"),
literal: hasFlag("literal"),
whitespace: hasFlag("whitespace"),
@@ -54,5 +52,3 @@ exports.search = function(source,operator,options) {
});
}
};
-
-})();
diff --git a/core/modules/filters/shadowsource.js b/core/modules/filters/shadowsource.js
index f16e2bcc7..279759991 100644
--- a/core/modules/filters/shadowsource.js
+++ b/core/modules/filters/shadowsource.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for returning the source plugins for shadow tiddlers
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -26,5 +23,3 @@ exports.shadowsource = function(source,operator,options) {
results.sort();
return results;
};
-
-})();
diff --git a/core/modules/filters/slugify.js b/core/modules/filters/slugify.js
index afc12423e..694426d2a 100644
--- a/core/modules/filters/slugify.js
+++ b/core/modules/filters/slugify.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for slugifying a tiddler title
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.slugify = function(source,operator,options) {
@@ -19,5 +16,3 @@ exports.slugify = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/sort.js b/core/modules/filters/sort.js
index 176cd4740..cdfe79728 100644
--- a/core/modules/filters/sort.js
+++ b/core/modules/filters/sort.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for sorting
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -52,5 +49,3 @@ var prepare_results = function (source) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/sortsub.js b/core/modules/filters/sortsub.js
index f556bfafc..291829992 100644
--- a/core/modules/filters/sortsub.js
+++ b/core/modules/filters/sortsub.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for sorting by a subfilter
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -25,15 +22,10 @@ exports.sortsub = function(source,operator,options) {
inputTitles.push(title);
var r = filterFn.call(options.wiki,function(iterator) {
iterator(options.wiki.getTiddler(title),title);
- },{
- getVariable: function(name) {
- if(name === "currentTiddler") {
- return title;
- } else {
- return options.widget.getVariable(name);
- }
- }
- });
+ },options.widget.makeFakeWidgetWithVariables({
+ "currentTiddler": "" + title,
+ "..currentTiddler": options.widget.getVariable("currentTiddler")
+ }));
sortKeys.push(r[0] || "");
});
// Rather than sorting the titles array, we'll sort the indexes so that we can consult both arrays
@@ -53,5 +45,3 @@ exports.sortsub = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/splitbefore.js b/core/modules/filters/splitbefore.js
index 071cead3e..c38b5480d 100644
--- a/core/modules/filters/splitbefore.js
+++ b/core/modules/filters/splitbefore.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator that splits each result on the first occurance of the specified separator and returns the unique values.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -27,5 +24,3 @@ exports.splitbefore = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/storyviews.js b/core/modules/filters/storyviews.js
index 41fffed92..df097582a 100644
--- a/core/modules/filters/storyviews.js
+++ b/core/modules/filters/storyviews.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for returning the names of the story views in this wiki
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -25,5 +22,3 @@ exports.storyviews = function(source,operator,options) {
results.sort();
return results;
};
-
-})();
diff --git a/core/modules/filters/strings.js b/core/modules/filters/strings.js
index 38e5be231..4183bac7f 100644
--- a/core/modules/filters/strings.js
+++ b/core/modules/filters/strings.js
@@ -8,10 +8,7 @@ Filter operators for strings. Unary/binary operators work on each item in turn,
Sum/product/maxall/minall operate on the entire list, returning a single item.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.length = makeStringBinaryOperator(
@@ -74,6 +71,113 @@ exports.join = makeStringReducingOperator(
},null
);
+var dmp = require("$:/core/modules/utils/diff-match-patch/diff_match_patch.js");
+
+exports.levenshtein = makeStringBinaryOperator(
+ function(a,b) {
+ var dmpObject = new dmp.diff_match_patch(),
+ diffs = dmpObject.diff_main(a,b);
+ return [dmpObject.diff_levenshtein(diffs) + ""];
+ }
+);
+
+// these two functions are adapted from https://github.com/google/diff-match-patch/wiki/Line-or-Word-Diffs
+function diffLineWordMode(text1,text2,mode) {
+ var dmpObject = new dmp.diff_match_patch();
+ var a = diffPartsToChars(text1,text2,mode);
+ var lineText1 = a.chars1;
+ var lineText2 = a.chars2;
+ var lineArray = a.lineArray;
+ var diffs = dmpObject.diff_main(lineText1,lineText2,false);
+ dmpObject.diff_charsToLines_(diffs,lineArray);
+ return diffs;
+}
+
+function diffPartsToChars(text1,text2,mode) {
+ var lineArray = [];
+ var lineHash = {};
+ lineArray[0] = '';
+
+ function diff_linesToPartsMunge_(text,mode) {
+ var chars = '';
+ var lineStart = 0;
+ var lineEnd = -1;
+ var lineArrayLength = lineArray.length,
+ regexpResult;
+ var searchRegexp = /\W+/g;
+ while(lineEnd < text.length - 1) {
+ if(mode === "words") {
+ regexpResult = searchRegexp.exec(text);
+ lineEnd = searchRegexp.lastIndex;
+ if(regexpResult === null) {
+ lineEnd = text.length;
+ }
+ lineEnd = --lineEnd;
+ } else {
+ lineEnd = text.indexOf('\n', lineStart);
+ if(lineEnd == -1) {
+ lineEnd = text.length - 1;
+ }
+ }
+ var line = text.substring(lineStart, lineEnd + 1);
+
+ if(lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : (lineHash[line] !== undefined)) {
+ chars += String.fromCharCode(lineHash[line]);
+ } else {
+ if(lineArrayLength == maxLines) {
+ line = text.substring(lineStart);
+ lineEnd = text.length;
+ }
+ chars += String.fromCharCode(lineArrayLength);
+ lineHash[line] = lineArrayLength;
+ lineArray[lineArrayLength++] = line;
+ }
+ lineStart = lineEnd + 1;
+ }
+ return chars;
+ }
+ var maxLines = 40000;
+ var chars1 = diff_linesToPartsMunge_(text1,mode);
+ maxLines = 65535;
+ var chars2 = diff_linesToPartsMunge_(text2,mode);
+ return {chars1: chars1, chars2: chars2, lineArray: lineArray};
+};
+
+exports.makepatches = function(source,operator,options) {
+ var dmpObject = new dmp.diff_match_patch(),
+ suffix = operator.suffix || "",
+ result = [];
+
+ source(function(tiddler,title) {
+ var diffs, patches;
+ if(suffix === "lines" || suffix === "words") {
+ diffs = diffLineWordMode(title,operator.operand,suffix);
+ patches = dmpObject.patch_make(title,diffs);
+ } else {
+ patches = dmpObject.patch_make(title,operator.operand);
+ }
+ Array.prototype.push.apply(result,[dmpObject.patch_toText(patches)]);
+ });
+
+ return result;
+};
+
+exports.applypatches = makeStringBinaryOperator(
+ function(a,b) {
+ var dmpObject = new dmp.diff_match_patch(),
+ patches;
+ try {
+ patches = dmpObject.patch_fromText(b);
+ } catch(e) {
+ }
+ if(patches) {
+ return [dmpObject.patch_apply(patches,a)[0]];
+ } else {
+ return [a];
+ }
+ }
+);
+
function makeStringBinaryOperator(fnCalc) {
return function(source,operator,options) {
var result = [];
@@ -105,13 +209,16 @@ exports.splitregexp = function(source,operator,options) {
flags = (suffix.indexOf("m") !== -1 ? "m" : "") + (suffix.indexOf("i") !== -1 ? "i" : ""),
regExp;
try {
- regExp = new RegExp(operator.operand || "",flags);
+ regExp = new RegExp(operator.operand || "",flags);
} catch(ex) {
return ["RegExp error: " + ex];
}
source(function(tiddler,title) {
- Array.prototype.push.apply(result,title.split(regExp));
- });
+ var parts = title.split(regExp).map(function(part){
+ return part || ""; // make sure it's a string
+ });
+ Array.prototype.push.apply(result,parts);
+ });
return result;
};
@@ -119,23 +226,25 @@ exports["search-replace"] = function(source,operator,options) {
var results = [],
suffixes = operator.suffixes || [],
flagSuffix = (suffixes[0] ? (suffixes[0][0] || "") : ""),
- flags = (flagSuffix.indexOf("g") !== -1 ? "g" : "") + (flagSuffix.indexOf("i") !== -1 ? "i" : ""),
+ flags = (flagSuffix.indexOf("g") !== -1 ? "g" : "") + (flagSuffix.indexOf("i") !== -1 ? "i" : "") + (flagSuffix.indexOf("m") !== -1 ? "m" : ""),
isRegExp = (suffixes[1] && suffixes[1][0] === "regexp") ? true : false,
- searchTerm,
+ //Escape regexp characters if the operand is not a regular expression
+ searchTerm = isRegExp ? operator.operand : $tw.utils.escapeRegExp(operator.operand),
+ //Escape $ character in replacement string if not in regular expression mode
+ replacement = isRegExp ? operator.operands[1] : (operator.operands[1]||"").replace(/\$/g,"$$$$"),
regExp;
-
+ try {
+ regExp = new RegExp(searchTerm,flags);
+ } catch(ex) {
+ return ["RegExp error: " + ex];
+ }
+
source(function(tiddler,title) {
if(title && (operator.operands.length > 1)) {
- //Escape regexp characters if the operand is not a regular expression
- searchTerm = isRegExp ? operator.operand : $tw.utils.escapeRegExp(operator.operand);
- try {
- regExp = new RegExp(searchTerm,flags);
- } catch(ex) {
- return ["RegExp error: " + ex];
- }
results.push(
- title.replace(regExp,operator.operands[1])
+ title.replace(regExp,replacement)
);
+ regExp.lastIndex = 0;
} else {
results.push(title);
}
@@ -155,8 +264,8 @@ exports.pad = function(source,operator,options) {
} else {
var padString = "",
padStringLength = targetLength - title.length;
- while (padStringLength > padString.length) {
- padString += fill;
+ while(padStringLength > padString.length) {
+ padString += fill;
}
//make sure we do not exceed the specified length
padString = padString.slice(0,padStringLength);
@@ -172,4 +281,12 @@ exports.pad = function(source,operator,options) {
return results;
}
-})();
+exports.charcode = function(source,operator,options) {
+ var chars = [];
+ $tw.utils.each(operator.operands,function(operand) {
+ if(operand !== "") {
+ chars.push(String.fromCharCode($tw.utils.parseInt(operand)));
+ }
+ });
+ return [chars.join("")];
+};
diff --git a/core/modules/filters/subfilter.js b/core/modules/filters/subfilter.js
index 79ae82777..5e35f7cd1 100644
--- a/core/modules/filters/subfilter.js
+++ b/core/modules/filters/subfilter.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator returning its operand evaluated as a filter
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -29,5 +26,3 @@ exports.subfilter = function(source,operator,options) {
return list;
}
};
-
-})();
diff --git a/core/modules/filters/substitute.js b/core/modules/filters/substitute.js
new file mode 100644
index 000000000..925e59286
--- /dev/null
+++ b/core/modules/filters/substitute.js
@@ -0,0 +1,31 @@
+/*\
+title: $:/core/modules/filters/substitute.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for substituting variables and embedded filter expressions with their corresponding values
+
+\*/
+
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.substitute = function(source,operator,options) {
+ var results = [],
+ operands = [];
+ $tw.utils.each(operator.operands,function(operand,index){
+ operands.push({
+ name: (index + 1).toString(),
+ value: operand
+ });
+ });
+ source(function(tiddler,title) {
+ if(title) {
+ results.push(options.wiki.getSubstitutedText(title,options.widget,{substitutions:operands}));
+ }
+ });
+ return results;
+};
+
diff --git a/core/modules/filters/subtiddlerfields.js b/core/modules/filters/subtiddlerfields.js
index 681dd243d..d16150706 100644
--- a/core/modules/filters/subtiddlerfields.js
+++ b/core/modules/filters/subtiddlerfields.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for returning the names of the fields on the selected subtiddlers of the plugin named in the operand
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -27,5 +24,3 @@ exports.subtiddlerfields = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/suffix.js b/core/modules/filters/suffix.js
index a93733cc8..e31d40568 100644
--- a/core/modules/filters/suffix.js
+++ b/core/modules/filters/suffix.js
@@ -6,31 +6,48 @@ module-type: filteroperator
Filter operator for checking if a title ends with a suffix
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
Export our filter function
*/
exports.suffix = function(source,operator,options) {
- var results = [];
- if(operator.prefix === "!") {
+ var results = [],
+ suffixes = (operator.suffixes || [])[0] || [];
+ if (!operator.operand) {
source(function(tiddler,title) {
- if(title.substr(-operator.operand.length) !== operator.operand) {
- results.push(title);
- }
+ results.push(title);
});
+ } else if(suffixes.indexOf("caseinsensitive") !== -1) {
+ var operand = operator.operand.toLowerCase();
+ if(operator.prefix === "!") {
+ source(function(tiddler,title) {
+ if(title.toLowerCase().substr(-operand.length) !== operand) {
+ results.push(title);
+ }
+ });
+ } else {
+ source(function(tiddler,title) {
+ if(title.toLowerCase().substr(-operand.length) === operand) {
+ results.push(title);
+ }
+ });
+ }
} else {
- source(function(tiddler,title) {
- if(title.substr(-operator.operand.length) === operator.operand) {
- results.push(title);
- }
- });
+ if(operator.prefix === "!") {
+ source(function(tiddler,title) {
+ if(title.substr(-operator.operand.length) !== operator.operand) {
+ results.push(title);
+ }
+ });
+ } else {
+ source(function(tiddler,title) {
+ if(title.substr(-operator.operand.length) === operator.operand) {
+ results.push(title);
+ }
+ });
+ }
}
return results;
};
-
-})();
diff --git a/core/modules/filters/tag.js b/core/modules/filters/tag.js
index e7ddbb361..fdb67af79 100644
--- a/core/modules/filters/tag.js
+++ b/core/modules/filters/tag.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for checking for the presence of a tag
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -50,9 +47,7 @@ exports.tag = function(source,operator,options) {
});
results = options.wiki.sortByList(results,operator.operand);
}
- }
+ }
}
return results;
};
-
-})();
diff --git a/core/modules/filters/tagging.js b/core/modules/filters/tagging.js
index a7fea68ec..0efff01ef 100644
--- a/core/modules/filters/tagging.js
+++ b/core/modules/filters/tagging.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator returning all tiddlers that are tagged with the selected tiddlers
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -22,5 +19,3 @@ exports.tagging = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/tags.js b/core/modules/filters/tags.js
index 4a73fd83f..c4ce719c8 100644
--- a/core/modules/filters/tags.js
+++ b/core/modules/filters/tags.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator returning all the tags of the selected tiddlers
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -27,5 +24,3 @@ exports.tags = function(source,operator,options) {
});
return Object.keys(tags);
};
-
-})();
diff --git a/core/modules/filters/then.js b/core/modules/filters/then.js
index 994775c08..5d9c75a08 100644
--- a/core/modules/filters/then.js
+++ b/core/modules/filters/then.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for replacing any titles with a constant
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -22,5 +19,3 @@ exports.then = function(source,operator,options) {
});
return results;
};
-
-})();
diff --git a/core/modules/filters/title.js b/core/modules/filters/title.js
index 88ac6f132..a1dff909b 100644
--- a/core/modules/filters/title.js
+++ b/core/modules/filters/title.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for comparing title fields for equality
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -28,5 +25,3 @@ exports.title = function(source,operator,options) {
}
return results;
};
-
-})();
diff --git a/core/modules/filters/transcludes.js b/core/modules/filters/transcludes.js
new file mode 100644
index 000000000..5032e4255
--- /dev/null
+++ b/core/modules/filters/transcludes.js
@@ -0,0 +1,20 @@
+/*\
+title: $:/core/modules/filters/transcludes.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for returning all the transcludes from a tiddler
+
+\*/
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.transcludes = function(source,operator,options) {
+ var results = new $tw.utils.LinkedList();
+ source(function(tiddler,title) {
+ results.pushTop(options.wiki.getTiddlerTranscludes(title));
+ });
+ return results.makeTiddlerIterator(options.wiki);
+};
diff --git a/core/modules/filters/unknown.js b/core/modules/filters/unknown.js
new file mode 100644
index 000000000..8fe2a6889
--- /dev/null
+++ b/core/modules/filters/unknown.js
@@ -0,0 +1,44 @@
+/*\
+title: $:/core/modules/filters/unknown.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for handling unknown filter operators.
+
+Not intended to be used directly by end users, hence the square brackets around the name.
+
+\*/
+
+"use strict";
+
+var fieldFilterOperatorFn = require("$:/core/modules/filters/field.js").field;
+
+/*
+Export our filter function
+*/
+exports["[unknown]"] = function(source,operator,options) {
+ // Check for a user defined filter operator
+ if(operator.operator.indexOf(".") !== -1) {
+ var params = [];
+ $tw.utils.each(operator.operands,function(param) {
+ params.push({value: param});
+ });
+ var variableInfo = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(operator.operator,{params: params, source: source});
+ if(variableInfo && variableInfo.srcVariable) {
+ var list = variableInfo.resultList ? variableInfo.resultList : [variableInfo.text];
+ if(operator.prefix === "!") {
+ var results = [];
+ source(function(tiddler,title) {
+ if(list.indexOf(title) === -1) {
+ results.push(title);
+ }
+ });
+ return results;
+ } else {
+ return list;
+ }
+ }
+ }
+ // Otherwise, use the "field" operator
+ return fieldFilterOperatorFn(source,operator,options);
+};
diff --git a/core/modules/filters/untagged.js b/core/modules/filters/untagged.js
index 5a08b4edc..22f3f6d0c 100644
--- a/core/modules/filters/untagged.js
+++ b/core/modules/filters/untagged.js
@@ -6,31 +6,19 @@ module-type: filteroperator
Filter operator returning all the selected tiddlers that are untagged
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
Export our filter function
*/
exports.untagged = function(source,operator,options) {
- var results = [];
- if(operator.prefix === "!") {
- source(function(tiddler,title) {
- if(tiddler && $tw.utils.isArray(tiddler.fields.tags) && tiddler.fields.tags.length > 0) {
- $tw.utils.pushTop(results,title);
- }
- });
- } else {
- source(function(tiddler,title) {
- if(!tiddler || !tiddler.hasField("tags") || ($tw.utils.isArray(tiddler.fields.tags) && tiddler.fields.tags.length === 0)) {
- $tw.utils.pushTop(results,title);
- }
- });
- }
+ var results = [],
+ expected = (operator.prefix === "!");
+ source(function(tiddler,title) {
+ if(((tiddler && $tw.utils.isArray(tiddler.fields.tags) && tiddler.fields.tags.length > 0) === expected) || (!tiddler && !expected)) {
+ results.push(title);
+ }
+ });
return results;
};
-
-})();
diff --git a/core/modules/filters/variables.js b/core/modules/filters/variables.js
index fda40a404..f35885cb0 100644
--- a/core/modules/filters/variables.js
+++ b/core/modules/filters/variables.js
@@ -6,21 +6,22 @@ module-type: filteroperator
Filter operator for returning the names of the active variables
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
Export our filter function
*/
exports.variables = function(source,operator,options) {
- var names = [];
- for(var variable in options.widget.variables) {
- names.push(variable);
+ var names = [],
+ widget = options.widget;
+ while(widget && !widget.hasOwnProperty("variables")) {
+ widget = widget.parentWidget;
+ }
+ if(widget && widget.variables) {
+ for(var variable in widget.variables) {
+ names.push(variable);
+ }
}
return names.sort();
};
-
-})();
diff --git a/core/modules/filters/wikiparserrules.js b/core/modules/filters/wikiparserrules.js
index 213298515..5bdbcdfdf 100644
--- a/core/modules/filters/wikiparserrules.js
+++ b/core/modules/filters/wikiparserrules.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Filter operator for returning the names of the wiki parser rules in this wiki
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -27,5 +24,3 @@ exports.wikiparserrules = function(source,operator,options) {
results.sort();
return results;
};
-
-})();
diff --git a/core/modules/filters/x-listops.js b/core/modules/filters/x-listops.js
index cb8c031a2..2f305d0ca 100644
--- a/core/modules/filters/x-listops.js
+++ b/core/modules/filters/x-listops.js
@@ -6,10 +6,7 @@ module-type: filteroperator
Extended filter operators to manipulate the current list.
\*/
-(function () {
- /*jslint node: true, browser: true */
- /*global $tw: false */
"use strict";
/*
@@ -193,7 +190,7 @@ Extended filter operators to manipulate the current list.
step = stepSize || 1,
i = 0,
opLength = operands.length,
- nextOperandIndex;
+ nextOperandIndex;
for(i; i < opLength; i++) {
resultsIndex = results.indexOf(operands[i]);
if(resultsIndex !== -1) {
@@ -202,7 +199,7 @@ Extended filter operators to manipulate the current list.
}
if(resultsIndex !== -1) {
i = i + step;
- nextOperandIndex = (i < opLength ? i : i - opLength);
+ nextOperandIndex = (i < opLength ? i : i % opLength);
if(operands.length > 1) {
results.splice(resultsIndex,1,operands[nextOperandIndex]);
} else {
@@ -211,12 +208,12 @@ Extended filter operators to manipulate the current list.
} else {
results.push(operands[0]);
}
- return results;
+ return results;
}
/*
Toggles an item in the current list.
- */
+ */
exports.toggle = function(source,operator) {
return cycleValueInArray(prepare_results(source),operator.operands);
}
@@ -228,8 +225,6 @@ Extended filter operators to manipulate the current list.
if(step < 0) {
operands.reverse();
step = Math.abs(step);
- }
+ }
return cycleValueInArray(results,operands,step);
}
-
-})();
diff --git a/core/modules/indexers/back-indexer.js b/core/modules/indexers/back-indexer.js
new file mode 100644
index 000000000..77b51b819
--- /dev/null
+++ b/core/modules/indexers/back-indexer.js
@@ -0,0 +1,122 @@
+/*\
+title: $:/core/modules/indexers/back-indexer.js
+type: application/javascript
+module-type: indexer
+
+By parsing the tiddler text, indexes the tiddlers' back links, back transclusions, block level back links.
+
+\*/
+function BackIndexer(wiki) {
+ this.wiki = wiki;
+}
+
+BackIndexer.prototype.init = function() {
+ this.subIndexers = {
+ link: new BackSubIndexer(this,"extractLinks"),
+ transclude: new BackSubIndexer(this,"extractTranscludes"),
+ };
+};
+
+BackIndexer.prototype.rebuild = function() {
+ $tw.utils.each(this.subIndexers,function(subIndexer) {
+ subIndexer.rebuild();
+ });
+};
+
+BackIndexer.prototype.update = function(updateDescriptor) {
+ $tw.utils.each(this.subIndexers,function(subIndexer) {
+ subIndexer.update(updateDescriptor);
+ });
+};
+function BackSubIndexer(indexer,extractor) {
+ this.wiki = indexer.wiki;
+ this.indexer = indexer;
+ this.extractor = extractor;
+ /**
+ * {
+ * [target title, e.g. tiddler title being linked to]:
+ * {
+ * [source title, e.g. tiddler title that has link syntax in its text]: true
+ * }
+ * }
+ */
+ this.index = null;
+}
+
+BackSubIndexer.prototype.init = function() {
+ // lazy init until first lookup
+ this.index = null;
+}
+
+BackSubIndexer.prototype._init = function() {
+ this.index = Object.create(null);
+ var self = this;
+ this.wiki.forEachTiddler(function(sourceTitle,tiddler) {
+ var newTargets = self._getTarget(tiddler);
+ $tw.utils.each(newTargets, function(target) {
+ if(!self.index[target]) {
+ self.index[target] = Object.create(null);
+ }
+ self.index[target][sourceTitle] = true;
+ });
+ });
+}
+
+BackSubIndexer.prototype.rebuild = function() {
+ this.index = null;
+}
+
+/*
+* Get things that is being referenced in the text, e.g. tiddler names in the link syntax.
+*/
+BackSubIndexer.prototype._getTarget = function(tiddler) {
+ if(this.wiki.isBinaryTiddler(tiddler.fields.text)) {
+ return [];
+ }
+ var parser = this.wiki.parseText(tiddler.fields.type, tiddler.fields.text, {});
+ if(parser) {
+ return this.wiki[this.extractor](parser.tree, tiddler.fields.title);
+ }
+ return [];
+}
+
+BackSubIndexer.prototype.update = function(updateDescriptor) {
+ // lazy init/update until first lookup
+ if(!this.index) {
+ return;
+ }
+ var newTargets = [],
+ oldTargets = [],
+ self = this;
+ if(updateDescriptor.old.exists) {
+ oldTargets = this._getTarget(updateDescriptor.old.tiddler);
+ }
+ if(updateDescriptor.new.exists) {
+ newTargets = this._getTarget(updateDescriptor.new.tiddler);
+ }
+
+ $tw.utils.each(oldTargets,function(target) {
+ if(self.index[target]) {
+ delete self.index[target][updateDescriptor.old.tiddler.fields.title];
+ }
+ });
+ $tw.utils.each(newTargets,function(target) {
+ if(!self.index[target]) {
+ self.index[target] = Object.create(null);
+ }
+ self.index[target][updateDescriptor.new.tiddler.fields.title] = true;
+ });
+}
+
+BackSubIndexer.prototype.lookup = function(title) {
+ if(!this.index) {
+ this._init();
+ }
+ if(this.index[title]) {
+ return Object.keys(this.index[title]);
+ } else {
+ return [];
+ }
+}
+
+exports.BackIndexer = BackIndexer;
diff --git a/core/modules/indexers/backlinks-index.js b/core/modules/indexers/backlinks-index.js
deleted file mode 100644
index 5902e2829..000000000
--- a/core/modules/indexers/backlinks-index.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*\
-title: $:/core/modules/indexers/backlinks-indexer.js
-type: application/javascript
-module-type: indexer
-
-Indexes the tiddlers' backlinks
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global modules: false */
-"use strict";
-
-
-function BacklinksIndexer(wiki) {
- this.wiki = wiki;
-}
-
-BacklinksIndexer.prototype.init = function() {
- this.index = null;
-}
-
-BacklinksIndexer.prototype.rebuild = function() {
- this.index = null;
-}
-
-BacklinksIndexer.prototype._getLinks = function(tiddler) {
- var parser = this.wiki.parseText(tiddler.fields.type, tiddler.fields.text, {});
- if(parser) {
- return this.wiki.extractLinks(parser.tree);
- }
- return [];
-}
-
-BacklinksIndexer.prototype.update = function(updateDescriptor) {
- if(!this.index) {
- return;
- }
- var newLinks = [],
- oldLinks = [],
- self = this;
- if(updateDescriptor.old.exists) {
- oldLinks = this._getLinks(updateDescriptor.old.tiddler);
- }
- if(updateDescriptor.new.exists) {
- newLinks = this._getLinks(updateDescriptor.new.tiddler);
- }
-
- $tw.utils.each(oldLinks,function(link) {
- if(self.index[link]) {
- delete self.index[link][updateDescriptor.old.tiddler.fields.title];
- }
- });
- $tw.utils.each(newLinks,function(link) {
- if(!self.index[link]) {
- self.index[link] = Object.create(null);
- }
- self.index[link][updateDescriptor.new.tiddler.fields.title] = true;
- });
-}
-
-BacklinksIndexer.prototype.lookup = function(title) {
- if(!this.index) {
- this.index = Object.create(null);
- var self = this;
- this.wiki.forEachTiddler(function(title,tiddler) {
- var links = self._getLinks(tiddler);
- $tw.utils.each(links, function(link) {
- if(!self.index[link]) {
- self.index[link] = Object.create(null);
- }
- self.index[link][title] = true;
- });
- });
- }
- if(this.index[title]) {
- return Object.keys(this.index[title]);
- } else {
- return [];
- }
-}
-
-exports.BacklinksIndexer = BacklinksIndexer;
-
-})();
diff --git a/core/modules/indexers/field-indexer.js b/core/modules/indexers/field-indexer.js
index 0f070e5e5..47e89de34 100644
--- a/core/modules/indexers/field-indexer.js
+++ b/core/modules/indexers/field-indexer.js
@@ -6,10 +6,7 @@ module-type: indexer
Indexes the tiddlers with each field value
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global modules: false */
"use strict";
var DEFAULT_MAXIMUM_INDEXED_VALUE_LENGTH = 128;
@@ -32,18 +29,18 @@ FieldIndexer.prototype.setMaxIndexedValueLength = function(length) {
FieldIndexer.prototype.addIndexMethods = function() {
var self = this;
+ // get all tiddlers, including those overwrite shadow tiddlers
this.wiki.each.byField = function(name,value) {
- var titles = self.wiki.allTitles(),
- lookup = self.lookup(name,value);
+ var lookup = self.lookup(name,value);
return lookup && lookup.filter(function(title) {
- return titles.indexOf(title) !== -1;
+ return self.wiki.tiddlerExists(title)
});
};
+ // get shadow tiddlers, including shadow tiddlers that is overwritten
this.wiki.eachShadow.byField = function(name,value) {
- var titles = self.wiki.allShadowTitles(),
- lookup = self.lookup(name,value);
+ var lookup = self.lookup(name,value);
return lookup && lookup.filter(function(title) {
- return titles.indexOf(title) !== -1;
+ return self.wiki.isShadowTiddler(title)
});
};
this.wiki.eachTiddlerPlusShadows.byField = function(name,value) {
@@ -121,7 +118,7 @@ FieldIndexer.prototype.update = function(updateDescriptor) {
indexEntry[value].push(updateDescriptor["new"].tiddler.fields.title);
}
}
- });
+ });
}
};
@@ -139,5 +136,3 @@ FieldIndexer.prototype.lookup = function(name,value) {
};
exports.FieldIndexer = FieldIndexer;
-
-})();
diff --git a/core/modules/indexers/tag-indexer.js b/core/modules/indexers/tag-indexer.js
index c7d297fc9..7844173c6 100644
--- a/core/modules/indexers/tag-indexer.js
+++ b/core/modules/indexers/tag-indexer.js
@@ -6,10 +6,7 @@ module-type: indexer
Indexes the tiddlers with each tag
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global modules: false */
"use strict";
function TagIndexer(wiki) {
@@ -65,7 +62,7 @@ TagSubIndexer.prototype.rebuild = function() {
} else {
self.index[tag].titles.push(title);
}
- });
+ });
});
};
@@ -83,7 +80,7 @@ TagSubIndexer.prototype.lookup = function(tag) {
if(!indexRecord.isSorted) {
if(this.indexer.wiki.sortByList) {
indexRecord.titles = this.indexer.wiki.sortByList(indexRecord.titles,tag);
- }
+ }
indexRecord.isSorted = true;
}
return indexRecord.titles;
@@ -94,5 +91,3 @@ TagSubIndexer.prototype.lookup = function(tag) {
exports.TagIndexer = TagIndexer;
-
-})();
diff --git a/core/modules/info/dimensions.js b/core/modules/info/dimensions.js
new file mode 100644
index 000000000..48458dd0f
--- /dev/null
+++ b/core/modules/info/dimensions.js
@@ -0,0 +1,86 @@
+/*\
+title: $:/core/modules/info/windowdimensions.js
+type: application/javascript
+module-type: info
+\*/
+
+exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
+ if(!$tw.browser) {
+ return [];
+ }
+
+ class WindowDimensionsTracker {
+ constructor(updateCallback) {
+ this.updateCallback = updateCallback;
+ this.resizeHandlers = new Map();
+ this.dimensionsInfo = [
+ ["outer/width", win => win.outerWidth],
+ ["outer/height", win => win.outerHeight],
+ ["inner/width", win => win.innerWidth],
+ ["inner/height", win => win.innerHeight],
+ ["client/width", win => win.document.documentElement.clientWidth],
+ ["client/height", win => win.document.documentElement.clientHeight]
+ ];
+ }
+
+ buildTiddlers(win,windowId) {
+ const prefix = `$:/info/browser/window/${windowId}/`;
+ return this.dimensionsInfo.map(([suffix, getter]) => ({
+ title: prefix + suffix,
+ text: String(getter(win))
+ }));
+ }
+
+ clearTiddlers(windowId) {
+ const prefix = `$:/info/browser/window/${windowId}/`,
+ deletions = this.dimensionsInfo.map(([suffix]) => prefix + suffix);
+ this.updateCallback([], deletions);
+ }
+
+ getUpdateHandler(win,windowId) {
+ let scheduled = false;
+ return () => {
+ if(!scheduled) {
+ scheduled = true;
+ requestAnimationFrame(() => {
+ this.updateCallback(this.buildTiddlers(win,windowId), []);
+ scheduled = false;
+ });
+ }
+ };
+ }
+
+ trackWindow(win,windowId) {
+ const handler = this.getUpdateHandler(win, windowId);
+ handler(); // initial update
+ win.addEventListener("resize",handler,{passive:true});
+ this.resizeHandlers.set(windowId,{win, handler});
+ }
+
+ untrackWindow(windowId) {
+ const entry = this.resizeHandlers.get(windowId);
+ if(entry) {
+ entry.win.removeEventListener("resize", entry.handler);
+ this.resizeHandlers.delete(windowId);
+ }
+ this.clearTiddlers(windowId);
+ }
+ }
+
+ const tracker = new WindowDimensionsTracker(updateInfoTiddlersCallback);
+
+ // Track main window
+ tracker.trackWindow(window,"system/main");
+
+ // Hook into event bus for user windows
+ if($tw.eventBus) {
+ $tw.eventBus.on("window:opened", ({window: win, windowID}) => {
+ tracker.trackWindow(win, "user/" + windowID);
+ });
+ $tw.eventBus.on("window:closed", ({windowID}) => {
+ tracker.untrackWindow("user/" + windowID);
+ });
+ }
+
+ return [];
+};
diff --git a/core/modules/info/platform.js b/core/modules/info/platform.js
index b9c140956..9775b2d6b 100644
--- a/core/modules/info/platform.js
+++ b/core/modules/info/platform.js
@@ -6,10 +6,7 @@ module-type: info
Initialise basic platform $:/info/ tiddlers
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
@@ -22,7 +19,7 @@ exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
if($tw.browser) {
// Document location
var setLocationProperty = function(name,value) {
- infoTiddlerFields.push({title: "$:/info/url/" + name, text: value});
+ infoTiddlerFields.push({title: "$:/info/url/" + name, text: value});
},
location = document.location;
setLocationProperty("full", (location.toString()).split("#")[0]);
@@ -48,5 +45,3 @@ exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
}
return infoTiddlerFields;
};
-
-})();
diff --git a/core/modules/keyboard.js b/core/modules/keyboard.js
index fa883f3dd..8adab9e81 100644
--- a/core/modules/keyboard.js
+++ b/core/modules/keyboard.js
@@ -6,10 +6,7 @@ module-type: global
Keyboard handling utilities
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var namedKeys = {
@@ -141,6 +138,7 @@ function KeyboardManager(options) {
this.shortcutKeysList = [], // Stores the shortcut-key descriptors
this.shortcutActionList = [], // Stores the corresponding action strings
this.shortcutParsedList = []; // Stores the parsed key descriptors
+ this.shortcutPriorityList = []; // Stores the parsed shortcut priority
this.lookupNames = ["shortcuts"];
this.lookupNames.push($tw.platform.isMac ? "shortcuts-mac" : "shortcuts-not-mac")
this.lookupNames.push($tw.platform.isWindows ? "shortcuts-windows" : "shortcuts-not-windows");
@@ -179,7 +177,7 @@ Key descriptors have the following format:
ctrl+enter
ctrl+shift+alt+A
*/
-KeyboardManager.prototype.parseKeyDescriptor = function(keyDescriptor) {
+KeyboardManager.prototype.parseKeyDescriptor = function(keyDescriptor,options) {
var components = keyDescriptor.split(/\+|\-/),
info = {
keyCode: 0,
@@ -206,6 +204,9 @@ KeyboardManager.prototype.parseKeyDescriptor = function(keyDescriptor) {
info.keyCode = this.namedKeys[s];
}
}
+ if(options.keyDescriptor) {
+ info.keyDescriptor = options.keyDescriptor;
+ }
if(info.keyCode) {
return info;
} else {
@@ -237,6 +238,7 @@ KeyboardManager.prototype.parseKeyDescriptors = function(keyDescriptors,options)
lookupName = function(configName) {
var keyDescriptors = wiki.getTiddlerText("$:/config/" + configName + "/" + name);
if(keyDescriptors) {
+ options.keyDescriptor = keyDescriptor;
result.push.apply(result,self.parseKeyDescriptors(keyDescriptors,options));
}
};
@@ -245,7 +247,7 @@ KeyboardManager.prototype.parseKeyDescriptors = function(keyDescriptors,options)
});
}
} else {
- result.push(self.parseKeyDescriptor(keyDescriptor));
+ result.push(self.parseKeyDescriptor(keyDescriptor,options));
}
});
return result;
@@ -276,16 +278,20 @@ KeyboardManager.prototype.checkKeyDescriptor = function(event,keyInfo) {
};
KeyboardManager.prototype.checkKeyDescriptors = function(event,keyInfoArray) {
+ return (this.getMatchingKeyDescriptor(event,keyInfoArray) !== null);
+};
+
+KeyboardManager.prototype.getMatchingKeyDescriptor = function(event,keyInfoArray) {
for(var t=0; t<keyInfoArray.length; t++) {
if(this.checkKeyDescriptor(event,keyInfoArray[t])) {
- return true;
+ return keyInfoArray[t];
}
}
- return false;
+ return null;
};
KeyboardManager.prototype.getEventModifierKeyDescriptor = function(event) {
- return event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey ? "ctrl" :
+ return event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey ? "ctrl" :
event.shiftKey && !event.ctrlKey && !event.altKey && !event.metaKey ? "shift" :
event.ctrlKey && event.shiftKey && !event.altKey && !event.metaKey ? "ctrl-shift" :
event.altKey && !event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt" :
@@ -295,7 +301,7 @@ KeyboardManager.prototype.getEventModifierKeyDescriptor = function(event) {
event.metaKey && !event.ctrlKey && !event.shiftKey && !event.altKey ? "meta" :
event.metaKey && event.ctrlKey && !event.shiftKey && !event.altKey ? "meta-ctrl" :
event.metaKey && event.ctrlKey && event.shiftKey && !event.altKey ? "meta-ctrl-shift" :
- event.metaKey && event.ctrlKey & event.shiftKey && event.altKey ? "meta-ctrl-alt-shift" : "normal";
+ event.metaKey && event.ctrlKey && event.shiftKey && event.altKey ? "meta-ctrl-alt-shift" : "normal";
};
KeyboardManager.prototype.getShortcutTiddlerList = function() {
@@ -310,12 +316,23 @@ KeyboardManager.prototype.updateShortcutLists = function(tiddlerList) {
this.shortcutKeysList[i] = tiddlerFields.key !== undefined ? tiddlerFields.key : undefined;
this.shortcutActionList[i] = tiddlerFields.text;
this.shortcutParsedList[i] = this.shortcutKeysList[i] !== undefined ? this.parseKeyDescriptors(this.shortcutKeysList[i]) : undefined;
+ this.shortcutPriorityList[i] = tiddlerFields.priority === "yes" ? true : false;
}
};
-KeyboardManager.prototype.handleKeydownEvent = function(event) {
+/*
+event: the keyboard event object
+options:
+ onlyPriority: true if only priority global shortcuts should be invoked
+*/
+KeyboardManager.prototype.handleKeydownEvent = function(event, options) {
+ options = options || {};
var key, action;
for(var i=0; i<this.shortcutTiddlers.length; i++) {
+ if(options.onlyPriority && this.shortcutPriorityList[i] !== true) {
+ continue;
+ }
+
if(this.shortcutParsedList[i] !== undefined && this.checkKeyDescriptors(event,this.shortcutParsedList[i])) {
key = this.shortcutParsedList[i];
action = this.shortcutActionList[i];
@@ -324,7 +341,7 @@ KeyboardManager.prototype.handleKeydownEvent = function(event) {
if(key !== undefined) {
event.preventDefault();
event.stopPropagation();
- $tw.rootWidget.invokeActionString(action,$tw.rootWidget);
+ $tw.rootWidget.invokeActionString(action,$tw.rootWidget,event);
return true;
}
return false;
@@ -363,5 +380,3 @@ KeyboardManager.prototype.handleShortcutChanges = function(changedTiddlers) {
};
exports.KeyboardManager = KeyboardManager;
-
-})();
diff --git a/core/modules/language.js b/core/modules/language.js
index 5e44d6696..b0409ee4d 100644
--- a/core/modules/language.js
+++ b/core/modules/language.js
@@ -6,10 +6,7 @@ module-type: global
The $tw.Language() manages translateable strings
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -41,5 +38,3 @@ Language.prototype.getRawString = function(title) {
};
exports.Language = Language;
-
-})();
diff --git a/core/modules/macros/changecount.js b/core/modules/macros/changecount.js
index 2d0f62e5a..871ce630d 100644
--- a/core/modules/macros/changecount.js
+++ b/core/modules/macros/changecount.js
@@ -6,10 +6,7 @@ module-type: macro
Macro to return the changecount for the current tiddler
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -26,5 +23,3 @@ Run the macro
exports.run = function() {
return this.wiki.getChangeCount(this.getVariable("currentTiddler")) + "";
};
-
-})();
diff --git a/core/modules/macros/contrastcolour.js b/core/modules/macros/contrastcolour.js
index eab6f0108..8134bdeff 100644
--- a/core/modules/macros/contrastcolour.js
+++ b/core/modules/macros/contrastcolour.js
@@ -6,10 +6,7 @@ module-type: macro
Macro to choose which of two colours has the highest contrast with a base colour
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -51,5 +48,3 @@ exports.run = function(target,fallbackTarget,colourA,colourB) {
brightnessB = rgbColourB[0] * 0.299 + rgbColourB[1] * 0.587 + rgbColourB[2] * 0.114;
return Math.abs(brightnessTarget - brightnessA) > Math.abs(brightnessTarget - brightnessB) ? colourA : colourB;
};
-
-})();
diff --git a/core/modules/macros/csvtiddlers.js b/core/modules/macros/csvtiddlers.js
index 7b34ce04d..e5d2f9137 100644
--- a/core/modules/macros/csvtiddlers.js
+++ b/core/modules/macros/csvtiddlers.js
@@ -6,10 +6,7 @@ module-type: macro
Macro to output tiddlers matching a filter to CSV
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -35,9 +32,11 @@ exports.run = function(filter,format) {
// Collect all the fields
for(t=0;t<tiddlers.length; t++) {
tiddler = this.wiki.getTiddler(tiddlers[t]);
- for(f in tiddler.fields) {
- if(fields.indexOf(f) === -1) {
- fields.push(f);
+ if(tiddler) {
+ for(f in tiddler.fields) {
+ if(fields.indexOf(f) === -1) {
+ fields.push(f);
+ }
}
}
}
@@ -60,8 +59,10 @@ exports.run = function(filter,format) {
for(var t=0;t<tiddlers.length; t++) {
row = [];
tiddler = this.wiki.getTiddler(tiddlers[t]);
- for(f=0; f<fields.length; f++) {
- row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
+ if(tiddler) {
+ for(f=0; f<fields.length; f++) {
+ row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
+ }
}
output.push(row.join(","));
}
@@ -71,5 +72,3 @@ exports.run = function(filter,format) {
function quoteAndEscape(value) {
return "\"" + value.replace(/"/mg,"\"\"") + "\"";
}
-
-})();
diff --git a/core/modules/macros/displayshortcuts.js b/core/modules/macros/displayshortcuts.js
index b18297238..10f6c7221 100644
--- a/core/modules/macros/displayshortcuts.js
+++ b/core/modules/macros/displayshortcuts.js
@@ -6,10 +6,7 @@ module-type: macro
Macro to display a list of keyboard shortcuts in human readable form. Notably, it resolves named shortcuts like `((bold))` to the underlying keystrokes.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -41,5 +38,3 @@ exports.run = function(shortcuts,prefix,separator,suffix) {
return "";
}
};
-
-})();
diff --git a/core/modules/macros/jsontiddler.js b/core/modules/macros/jsontiddler.js
index 509fd5559..ff5ae3c9b 100644
--- a/core/modules/macros/jsontiddler.js
+++ b/core/modules/macros/jsontiddler.js
@@ -6,10 +6,7 @@ module-type: macro
Macro to output a single tiddler to JSON
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -37,4 +34,3 @@ exports.run = function(title) {
return JSON.stringify(fields,null,$tw.config.preferences.jsonSpaces);
};
-})();
diff --git a/core/modules/macros/jsontiddlers.js b/core/modules/macros/jsontiddlers.js
index eeaf70d3a..25e08f6b9 100644
--- a/core/modules/macros/jsontiddlers.js
+++ b/core/modules/macros/jsontiddlers.js
@@ -6,10 +6,7 @@ module-type: macro
Macro to output tiddlers matching a filter to JSON
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -29,5 +26,3 @@ Run the macro
exports.run = function(filter,spaces) {
return this.wiki.getTiddlersAsJson(filter,$tw.utils.parseInt(spaces));
};
-
-})();
diff --git a/core/modules/macros/makedatauri.js b/core/modules/macros/makedatauri.js
index 0ff862df1..db67495e5 100644
--- a/core/modules/macros/makedatauri.js
+++ b/core/modules/macros/makedatauri.js
@@ -8,10 +8,7 @@ Macro to convert a string of text to a data URI
<<makedatauri text:"Text to be converted" type:"text/vnd.tiddlywiki">>
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -32,5 +29,3 @@ Run the macro
exports.run = function(text,type,_canonical_uri) {
return $tw.utils.makeDataUri(text,type,_canonical_uri);
};
-
-})();
diff --git a/core/modules/macros/now.js b/core/modules/macros/now.js
index d0a15dce2..86513f1b9 100644
--- a/core/modules/macros/now.js
+++ b/core/modules/macros/now.js
@@ -6,10 +6,7 @@ module-type: macro
Macro to return a formatted version of the current time
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -28,5 +25,3 @@ Run the macro
exports.run = function(format) {
return $tw.utils.formatDateString(new Date(),format || "0hh:0mm, DDth MMM YYYY");
};
-
-})();
diff --git a/core/modules/macros/qualify.js b/core/modules/macros/qualify.js
index de9dc6c8e..ff6716dd4 100644
--- a/core/modules/macros/qualify.js
+++ b/core/modules/macros/qualify.js
@@ -6,10 +6,7 @@ module-type: macro
Macro to qualify a state tiddler title according
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -28,5 +25,3 @@ Run the macro
exports.run = function(title) {
return title + "-" + this.getStateQualifier();
};
-
-})();
diff --git a/core/modules/macros/resolvepath.js b/core/modules/macros/resolvepath.js
index d84d87563..68c2e4d04 100644
--- a/core/modules/macros/resolvepath.js
+++ b/core/modules/macros/resolvepath.js
@@ -6,10 +6,7 @@ module-type: macro
Resolves a relative path for an absolute rootpath.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "resolvepath";
@@ -25,5 +22,3 @@ Run the macro
exports.run = function(source, root) {
return $tw.utils.resolvePath(source, root);
};
-
-})();
diff --git a/core/modules/macros/uniquetitle.js b/core/modules/macros/uniquetitle.js
deleted file mode 100644
index 8531d1ce7..000000000
--- a/core/modules/macros/uniquetitle.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*\
-title: $:/core/modules/macros/unusedtitle.js
-type: application/javascript
-module-type: macro
-Macro to return a new title that is unused in the wiki. It can be given a name as a base.
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Information about this macro
-*/
-
-exports.name = "unusedtitle";
-
-exports.params = [
- {name: "baseName"},
- {name: "options"}
-];
-
-/*
-Run the macro
-*/
-exports.run = function(baseName, options) {
- if(!baseName) {
- baseName = $tw.language.getString("DefaultNewTiddlerTitle");
- }
- return this.wiki.generateNewTitle(baseName, options);
-};
-
-})();
diff --git a/core/modules/macros/unusedtitle.js b/core/modules/macros/unusedtitle.js
new file mode 100644
index 000000000..056c713df
--- /dev/null
+++ b/core/modules/macros/unusedtitle.js
@@ -0,0 +1,32 @@
+/*\
+title: $:/core/modules/macros/unusedtitle.js
+type: application/javascript
+module-type: macro
+
+Macro to return a new title that is unused in the wiki. It can be given a name as a base.
+\*/
+
+"use strict";
+
+exports.name = "unusedtitle";
+
+exports.params = [
+ {name: "baseName"},
+ {name: "separator"},
+ {name: "template"},
+ {name: "startCount"}
+];
+
+/*
+Run the macro
+*/
+exports.run = function(baseName,separator,template,startCount) {
+ separator = separator || " ";
+ startCount = startCount || 0;
+ if(!baseName) {
+ baseName = $tw.language.getString("DefaultNewTiddlerTitle");
+ }
+ // $tw.wiki.generateNewTitle = function(baseTitle,options)
+ // options.prefix must be a string!
+ return this.wiki.generateNewTitle(baseName, {"prefix": separator, "template": template, "startCount": startCount}).trim();
+};
diff --git a/core/modules/macros/version.js b/core/modules/macros/version.js
index b0dd0b0d5..0a5315b81 100644
--- a/core/modules/macros/version.js
+++ b/core/modules/macros/version.js
@@ -6,10 +6,7 @@ module-type: macro
Macro to return the TiddlyWiki core version number
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -26,5 +23,3 @@ Run the macro
exports.run = function() {
return $tw.version;
};
-
-})();
diff --git a/core/modules/parsers/audioparser.js b/core/modules/parsers/audioparser.js
index 95380bf80..757703da4 100644
--- a/core/modules/parsers/audioparser.js
+++ b/core/modules/parsers/audioparser.js
@@ -6,7 +6,6 @@ module-type: parser
The audio parser parses an audio tiddler into an embeddable HTML element
\*/
-(function(){
/*jslint node: true, browser: true */
/*global $tw: false */
@@ -15,25 +14,34 @@ The audio parser parses an audio tiddler into an embeddable HTML element
var AudioParser = function(type,text,options) {
var element = {
type: "element",
- tag: "audio",
+ tag: "$audio", // Using $audio to enable widget interception
attributes: {
controls: {type: "string", value: "controls"},
style: {type: "string", value: "width: 100%; object-fit: contain"}
}
- },
- src;
+ };
+
+ // Pass through source information
if(options._canonical_uri) {
element.attributes.src = {type: "string", value: options._canonical_uri};
+ element.attributes.type = {type: "string", value: type};
} else if(text) {
element.attributes.src = {type: "string", value: "data:" + type + ";base64," + text};
+ element.attributes.type = {type: "string", value: type};
}
+
+ // Pass through tiddler title if available
+ if(options.title) {
+ element.attributes.tiddler = {type: "string", value: options.title};
+ }
+
this.tree = [element];
+ this.source = text;
+ this.type = type;
};
exports["audio/ogg"] = AudioParser;
exports["audio/mpeg"] = AudioParser;
exports["audio/mp3"] = AudioParser;
exports["audio/mp4"] = AudioParser;
-
-})();
-
+
\ No newline at end of file
diff --git a/core/modules/parsers/binaryparser.js b/core/modules/parsers/binaryparser.js
index fb3d38678..947d9befa 100644
--- a/core/modules/parsers/binaryparser.js
+++ b/core/modules/parsers/binaryparser.js
@@ -6,10 +6,7 @@ module-type: parser
The binary parser parses a binary tiddler into a warning message and download link
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var BINARY_WARNING_MESSAGE = "$:/core/ui/BinaryWarning";
@@ -23,7 +20,7 @@ var BinaryParser = function(type,text,options) {
children: [{
type: "transclude",
attributes: {
- tiddler: {type: "string", value: BINARY_WARNING_MESSAGE}
+ "$tiddler": {type: "string", value: BINARY_WARNING_MESSAGE}
}
}]
};
@@ -38,7 +35,7 @@ var BinaryParser = function(type,text,options) {
children: [{
type: "transclude",
attributes: {
- tiddler: {type: "string", value: EXPORT_BUTTON_IMAGE}
+ "$tiddler": {type: "string", value: EXPORT_BUTTON_IMAGE}
}
}]
};
@@ -64,9 +61,8 @@ var BinaryParser = function(type,text,options) {
children: [warn, link]
}
this.tree = [element];
+ this.source = text;
+ this.type = type;
};
exports["application/octet-stream"] = BinaryParser;
-
-})();
-
diff --git a/core/modules/parsers/csvparser.js b/core/modules/parsers/csvparser.js
index 0e6c9f7bc..2d32b3a06 100644
--- a/core/modules/parsers/csvparser.js
+++ b/core/modules/parsers/csvparser.js
@@ -6,13 +6,15 @@ module-type: parser
The CSV text parser processes CSV files into a table wrapped in a scrollable widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var CsvParser = function(type,text,options) {
+ // Special handler for tab-delimited files
+ if (type === 'text/tab-delimited-values' && !options.separator) {
+ options.separator = "\t";
+ }
+
// Table framework
this.tree = [{
"type": "scrollable", "children": [{
@@ -24,30 +26,32 @@ var CsvParser = function(type,text,options) {
}]
}];
// Split the text into lines
- var lines = text.split(/\r?\n/mg),
+ var lines = $tw.utils.parseCsvString(text, options),
tag = "th";
+ var maxColumns = 0;
+ $tw.utils.each(lines, function(columns) {
+ maxColumns = Math.max(columns.length, maxColumns);
+ });
+
for(var line=0; line<lines.length; line++) {
- var lineText = lines[line];
- if(lineText) {
- var row = {
- "type": "element", "tag": "tr", "children": []
- };
- var columns = lineText.split(",");
- for(var column=0; column<columns.length; column++) {
- row.children.push({
- "type": "element", "tag": tag, "children": [{
- "type": "text",
- "text": columns[column]
- }]
- });
- }
- tag = "td";
- this.tree[0].children[0].children[0].children.push(row);
+ var columns = lines[line];
+ var row = {
+ "type": "element", "tag": "tr", "children": []
+ };
+ for(var column=0; column<maxColumns; column++) {
+ row.children.push({
+ "type": "element", "tag": tag, "children": [{
+ "type": "text",
+ "text": columns[column] || ''
+ }]
+ });
}
+ tag = "td";
+ this.tree[0].children[0].children[0].children.push(row);
}
+ this.source = text;
+ this.type = type;
};
exports["text/csv"] = CsvParser;
-
-})();
-
+exports["text/tab-delimited-values"] = CsvParser;
diff --git a/core/modules/parsers/htmlparser.js b/core/modules/parsers/htmlparser.js
index 39b0c21df..fee869868 100644
--- a/core/modules/parsers/htmlparser.js
+++ b/core/modules/parsers/htmlparser.js
@@ -6,10 +6,7 @@ module-type: parser
The HTML parser displays text as raw HTML
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var HtmlParser = function(type,text,options) {
@@ -23,13 +20,14 @@ var HtmlParser = function(type,text,options) {
type: "element",
tag: "iframe",
attributes: {
- src: {type: "string", value: src},
- sandbox: {type: "string", value: ""}
+ src: {type: "string", value: src}
}
}];
+ if($tw.wiki.getTiddlerText("$:/config/HtmlParser/DisableSandbox","no") !== "yes") {
+ this.tree[0].attributes.sandbox = {type: "string", value: $tw.wiki.getTiddlerText("$:/config/HtmlParser/SandboxTokens","")};
+ }
+ this.source = text;
+ this.type = type;
};
exports["text/html"] = HtmlParser;
-
-})();
-
diff --git a/core/modules/parsers/imageparser.js b/core/modules/parsers/imageparser.js
index e3b8fb60a..c7201445f 100644
--- a/core/modules/parsers/imageparser.js
+++ b/core/modules/parsers/imageparser.js
@@ -6,10 +6,7 @@ module-type: parser
The image parser parses an image into an embeddable HTML element
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var ImageParser = function(type,text,options) {
@@ -28,6 +25,8 @@ var ImageParser = function(type,text,options) {
}
}
this.tree = [element];
+ this.source = text;
+ this.type = type;
};
exports["image/svg+xml"] = ImageParser;
@@ -38,8 +37,6 @@ exports["image/gif"] = ImageParser;
exports["image/webp"] = ImageParser;
exports["image/heic"] = ImageParser;
exports["image/heif"] = ImageParser;
+exports["image/avif"] = ImageParser;
exports["image/x-icon"] = ImageParser;
exports["image/vnd.microsoft.icon"] = ImageParser;
-
-})();
-
diff --git a/core/modules/parsers/parseutils.js b/core/modules/parsers/parseutils.js
index 8d83efd1b..05a85e1ec 100644
--- a/core/modules/parsers/parseutils.js
+++ b/core/modules/parsers/parseutils.js
@@ -22,10 +22,7 @@ Most functions have the following pattern:
The exception is `skipWhiteSpace`, which just returns the position after the whitespace.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -85,6 +82,7 @@ exports.parseTokenString = function(source,pos,token) {
/*
Look for a token matching a regex. Returns null if not found, otherwise returns {type: "regexp", match:, start:, end:,}
+Use the "Y" (sticky) flag to avoid searching the entire rest of the string
*/
exports.parseTokenRegExp = function(source,pos,reToken) {
var node = {
@@ -114,7 +112,7 @@ exports.parseStringLiteral = function(source,pos) {
var match = reString.exec(source);
if(match && match.index === pos) {
node.value = match[1] !== undefined ? match[1] :(
- match[2] !== undefined ? match[2] : match[3]
+ match[2] !== undefined ? match[2] : match[3]
);
node.end = pos + match[0].length;
return node;
@@ -123,6 +121,49 @@ exports.parseStringLiteral = function(source,pos) {
}
};
+/*
+Returns an array of {name:} with an optional "default" property. Options include:
+requireParenthesis: require the parameter definition to be wrapped in parenthesis
+*/
+exports.parseParameterDefinition = function(paramString,options) {
+ options = options || {};
+ if(options.requireParenthesis) {
+ var parenMatch = /^\s*\((.*)\)\s*$/g.exec(paramString);
+ if(!parenMatch) {
+ return [];
+ }
+ paramString = parenMatch[1];
+ }
+ var params = [],
+ reParam = /\s*([^:),\s]+)(?:\s*:\s*(?:"""([\s\S]*?)"""|"([^"]*)"|'([^']*)'|([^,"'\s]+)))?/mg,
+ paramMatch = reParam.exec(paramString);
+ while(paramMatch) {
+ // Save the parameter details
+ var paramInfo = {name: paramMatch[1]},
+ defaultValue = paramMatch[2] || paramMatch[3] || paramMatch[4] || paramMatch[5];
+ if(defaultValue !== undefined) {
+ paramInfo["default"] = defaultValue;
+ }
+ params.push(paramInfo);
+ // Look for the next parameter
+ paramMatch = reParam.exec(paramString);
+ }
+ return params;
+};
+
+exports.parseMacroParameters = function(node,source,pos) {
+ // Process parameters
+ var parameter = $tw.utils.parseMacroParameter(source,pos);
+ while(parameter) {
+ node.params.push(parameter);
+ pos = parameter.end;
+ // Get the next parameter
+ parameter = $tw.utils.parseMacroParameter(source,pos);
+ }
+ node.end = pos;
+ return node;
+}
+
/*
Look for a macro invocation parameter. Returns null if not found, or {type: "macro-parameter", name:, value:, start:, end:}
*/
@@ -132,7 +173,7 @@ exports.parseMacroParameter = function(source,pos) {
start: pos
};
// Define our regexp
- var reMacroParameter = /(?:([A-Za-z0-9\-_]+)\s*:)?(?:\s*(?:"""([\s\S]*?)"""|"([^"]*)"|'([^']*)'|\[\[([^\]]*)\]\]|((?:(?:>(?!>))|[^\s>"'])+)))/g;
+ const reMacroParameter = /(?:([A-Za-z0-9\-_]+)\s*:)?(?:\s*(?:"""([\s\S]*?)"""|"([^"]*)"|'([^']*)'|\[\[([^\]]*)\]\]|((?:(?:>(?!>))|[^\s>"'])+)))/y;
// Skip whitespace
pos = $tw.utils.skipWhiteSpace(source,pos);
// Look for the parameter
@@ -162,7 +203,36 @@ exports.parseMacroParameter = function(source,pos) {
};
/*
-Look for a macro invocation. Returns null if not found, or {type: "macrocall", name:, parameters:, start:, end:}
+Look for a macro invocation. Returns null if not found, or {type: "transclude", attributes:, start:, end:}
+*/
+exports.parseMacroInvocationAsTransclusion = function(source,pos) {
+ var node = $tw.utils.parseMacroInvocation(source,pos);
+ if(node) {
+ var positionalName = 0,
+ transclusion = {
+ type: "transclude",
+ start: node.start,
+ end: node.end
+ };
+ $tw.utils.addAttributeToParseTreeNode(transclusion,"$variable",node.name);
+ $tw.utils.each(node.params,function(param) {
+ var name = param.name;
+ if(name) {
+ if(name.charAt(0) === "$") {
+ name = "$" + name;
+ }
+ $tw.utils.addAttributeToParseTreeNode(transclusion,{name: name,type: "string", value: param.value, start: param.start, end: param.end});
+ } else {
+ $tw.utils.addAttributeToParseTreeNode(transclusion,{name: (positionalName++) + "",type: "string", value: param.value, start: param.start, end: param.end});
+ }
+ });
+ return transclusion;
+ }
+ return node;
+};
+
+/*
+Look for a macro invocation. Returns null if not found, or {type: "macrocall", name:, params:, start:, end:}
*/
exports.parseMacroInvocation = function(source,pos) {
var node = {
@@ -171,7 +241,7 @@ exports.parseMacroInvocation = function(source,pos) {
params: []
};
// Define our regexps
- var reMacroName = /([^\s>"'=]+)/g;
+ const reMacroName = /([^\s>"'=]+)/y;
// Skip whitespace
pos = $tw.utils.skipWhiteSpace(source,pos);
// Look for a double less than sign
@@ -187,14 +257,8 @@ exports.parseMacroInvocation = function(source,pos) {
}
node.name = name.match[1];
pos = name.end;
- // Process parameters
- var parameter = $tw.utils.parseMacroParameter(source,pos);
- while(parameter) {
- node.params.push(parameter);
- pos = parameter.end;
- // Get the next parameter
- parameter = $tw.utils.parseMacroParameter(source,pos);
- }
+ node = $tw.utils.parseMacroParameters(node,source,pos);
+ pos = node.end;
// Skip whitespace
pos = $tw.utils.skipWhiteSpace(source,pos);
// Look for a double greater than sign
@@ -208,18 +272,42 @@ exports.parseMacroInvocation = function(source,pos) {
return node;
};
+exports.parseFilterVariable = function(source) {
+ var node = {
+ name: "",
+ params: [],
+ },
+ pos = 0,
+ reName = /([^\s"']+)/y;
+ // If there is no whitespace or it is an empty string then there are no macro parameters
+ if(/^\S*$/.test(source)) {
+ node.name = source;
+ return node;
+ }
+ // Get the variable name
+ var nameMatch = $tw.utils.parseTokenRegExp(source,pos,reName);
+ if(nameMatch) {
+ node.name = nameMatch.match[1];
+ pos = nameMatch.end;
+ node = $tw.utils.parseMacroParameters(node,source,pos);
+ delete node.end;
+ }
+ return node;
+};
+
/*
-Look for an HTML attribute definition. Returns null if not found, otherwise returns {type: "attribute", name:, valueType: "string|indirect|macro", value:, start:, end:,}
+Look for an HTML attribute definition. Returns null if not found, otherwise returns {type: "attribute", name:, type: "filtered|string|indirect|macro", value|filter|textReference:, start:, end:,}
*/
exports.parseAttribute = function(source,pos) {
var node = {
start: pos
};
// Define our regexps
- var reAttributeName = /([^\/\s>"'=]+)/g,
- reUnquotedAttribute = /([^\/\s<>"'=]+)/g,
- reFilteredValue = /\{\{\{(.+?)\}\}\}/g,
- reIndirectValue = /\{\{([^\}]+)\}\}/g;
+ const reAttributeName = /([^\/\s>"'`=]+)/y,
+ reUnquotedAttribute = /([^\/\s<>"'`=]+)/y,
+ reFilteredValue = /\{\{\{([\S\s]+?)\}\}\}/y,
+ reIndirectValue = /\{\{([^\}]+)\}\}/y,
+ reSubstitutedValue = /(?:```([\s\S]*?)```|`([^`]|[\S\s]*?)`)/y;
// Skip whitespace
pos = $tw.utils.skipWhiteSpace(source,pos);
// Get the attribute name
@@ -272,8 +360,15 @@ exports.parseAttribute = function(source,pos) {
node.type = "macro";
node.value = macroInvocation;
} else {
- node.type = "string";
- node.value = "true";
+ var substitutedValue = $tw.utils.parseTokenRegExp(source,pos,reSubstitutedValue);
+ if(substitutedValue) {
+ pos = substitutedValue.end;
+ node.type = "substituted";
+ node.rawValue = substitutedValue.match[1] || substitutedValue.match[2];
+ } else {
+ node.type = "string";
+ node.value = "true";
+ }
}
}
}
@@ -287,5 +382,3 @@ exports.parseAttribute = function(source,pos) {
node.end = pos;
return node;
};
-
-})();
diff --git a/core/modules/parsers/pdfparser.js b/core/modules/parsers/pdfparser.js
index 95d74ef4b..0551e93fa 100644
--- a/core/modules/parsers/pdfparser.js
+++ b/core/modules/parsers/pdfparser.js
@@ -6,16 +6,13 @@ module-type: parser
The PDF parser embeds a PDF viewer
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var ImageParser = function(type,text,options) {
var element = {
type: "element",
- tag: "embed",
+ tag: "iframe",
attributes: {}
},
src;
@@ -25,9 +22,8 @@ var ImageParser = function(type,text,options) {
element.attributes.src = {type: "string", value: "data:application/pdf;base64," + text};
}
this.tree = [element];
+ this.source = text;
+ this.type = type;
};
exports["application/pdf"] = ImageParser;
-
-})();
-
diff --git a/core/modules/parsers/textparser.js b/core/modules/parsers/textparser.js
index 4f55f6f0c..ca97404ac 100644
--- a/core/modules/parsers/textparser.js
+++ b/core/modules/parsers/textparser.js
@@ -6,20 +6,21 @@ module-type: parser
The plain text parser processes blocks of source text into a degenerate parse tree consisting of a single text node
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var TextParser = function(type,text,options) {
this.tree = [{
- type: "codeblock",
+ type: "genesis",
attributes: {
- code: {type: "string", value: text},
- language: {type: "string", value: type}
+ $type: {name: "$type", type: "string", value: "$codeblock"},
+ code: {name: "code", type: "string", value: text},
+ language: {name: "language", type: "string", value: type},
+ $remappable: {name: "$remappable", type:"string", value: "no"}
}
}];
+ this.source = text;
+ this.type = type;
};
exports["text/plain"] = TextParser;
@@ -28,6 +29,3 @@ exports["application/javascript"] = TextParser;
exports["application/json"] = TextParser;
exports["text/css"] = TextParser;
exports["application/x-tiddler-dictionary"] = TextParser;
-
-})();
-
diff --git a/core/modules/parsers/videoparser.js b/core/modules/parsers/videoparser.js
index f1c281c7c..e4406e56a 100644
--- a/core/modules/parsers/videoparser.js
+++ b/core/modules/parsers/videoparser.js
@@ -6,10 +6,7 @@ module-type: parser
The video parser parses a video tiddler into an embeddable HTML element
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var VideoParser = function(type,text,options) {
@@ -28,11 +25,11 @@ var VideoParser = function(type,text,options) {
element.attributes.src = {type: "string", value: "data:" + type + ";base64," + text};
}
this.tree = [element];
+ this.source = text;
+ this.type = type;
};
exports["video/ogg"] = VideoParser;
exports["video/webm"] = VideoParser;
exports["video/mp4"] = VideoParser;
exports["video/quicktime"] = VideoParser;
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/codeblock.js b/core/modules/parsers/wikiparser/rules/codeblock.js
index 262038f87..bdecd65be 100644
--- a/core/modules/parsers/wikiparser/rules/codeblock.js
+++ b/core/modules/parsers/wikiparser/rules/codeblock.js
@@ -12,10 +12,7 @@ Wiki text rule for code blocks. For example:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "codeblock";
@@ -29,13 +26,16 @@ exports.init = function(parser) {
exports.parse = function() {
var reEnd = /(\r?\n```$)/mg;
+ var languageStart = this.parser.pos + 3,
+ languageEnd = languageStart + this.match[1].length;
// Move past the match
this.parser.pos = this.matchRegExp.lastIndex;
// Look for the end of the block
reEnd.lastIndex = this.parser.pos;
var match = reEnd.exec(this.parser.source),
- text;
+ text,
+ codeStart = this.parser.pos;
// Process the block
if(match) {
text = this.parser.source.substring(this.parser.pos,match.index);
@@ -48,10 +48,8 @@ exports.parse = function() {
return [{
type: "codeblock",
attributes: {
- code: {type: "string", value: text},
- language: {type: "string", value: this.match[1]}
+ code: {type: "string", value: text, start: codeStart, end: this.parser.pos},
+ language: {type: "string", value: this.match[1], start: languageStart, end: languageEnd}
}
}];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/codeinline.js b/core/modules/parsers/wikiparser/rules/codeinline.js
index ee9149833..5606ba478 100644
--- a/core/modules/parsers/wikiparser/rules/codeinline.js
+++ b/core/modules/parsers/wikiparser/rules/codeinline.js
@@ -11,10 +11,7 @@ Wiki text inline rule for code runs. For example:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "codeinline";
@@ -33,7 +30,8 @@ exports.parse = function() {
// Look for the end marker
reEnd.lastIndex = this.parser.pos;
var match = reEnd.exec(this.parser.source),
- text;
+ text,
+ start = this.parser.pos;
// Process the text
if(match) {
text = this.parser.source.substring(this.parser.pos,match.index);
@@ -47,9 +45,9 @@ exports.parse = function() {
tag: "code",
children: [{
type: "text",
- text: text
+ text: text,
+ start: start,
+ end: this.parser.pos
}]
}];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/commentblock.js b/core/modules/parsers/wikiparser/rules/commentblock.js
index b7651c272..96d3deb3d 100644
--- a/core/modules/parsers/wikiparser/rules/commentblock.js
+++ b/core/modules/parsers/wikiparser/rules/commentblock.js
@@ -7,19 +7,22 @@ Wiki text block rule for HTML comments. For example:
```
<!-- This is a comment -->
+\define macroX()
+<!-- This is a comment -->
+xxxx
+\end
+<!-- This is a comment -->
+
```
Note that the syntax for comments is simplified to an opening "<!--" sequence and a closing "-->" sequence -- HTML itself implements a more complex format (see http://ostermiller.org/findhtmlcomment.html)
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "commentblock";
-exports.types = {block: true};
+exports.types = {block:true, pragma:true};
exports.init = function(parser) {
this.parser = parser;
@@ -46,5 +49,3 @@ exports.parse = function() {
// Don't return any elements
return [];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/commentinline.js b/core/modules/parsers/wikiparser/rules/commentinline.js
index 671bd79d6..e826b95e6 100644
--- a/core/modules/parsers/wikiparser/rules/commentinline.js
+++ b/core/modules/parsers/wikiparser/rules/commentinline.js
@@ -12,10 +12,7 @@ Wiki text inline rule for HTML comments. For example:
Note that the syntax for comments is simplified to an opening "<!--" sequence and a closing "-->" sequence -- HTML itself implements a more complex format (see http://ostermiller.org/findhtmlcomment.html)
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "commentinline";
@@ -46,5 +43,3 @@ exports.parse = function() {
// Don't return any elements
return [];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/conditional.js b/core/modules/parsers/wikiparser/rules/conditional.js
new file mode 100644
index 000000000..3995b90dc
--- /dev/null
+++ b/core/modules/parsers/wikiparser/rules/conditional.js
@@ -0,0 +1,114 @@
+/*\
+title: $:/core/modules/parsers/wikiparser/rules/conditional.js
+type: application/javascript
+module-type: wikirule
+
+Conditional shortcut syntax
+
+```
+This is a <%if [{something}] %>Elephant<%elseif [{else}] %>Pelican<%else%>Crocodile<%endif%>
+```
+
+\*/
+"use strict";
+
+exports.name = "conditional";
+exports.types = {inline: true, block: true};
+
+exports.init = function(parser) {
+ this.parser = parser;
+ // Regexp to match
+ this.matchRegExp = /\<\%\s*if\s+/mg;
+ this.terminateIfRegExp = /\%\>/mg;
+};
+
+exports.findNextMatch = function(startPos) {
+ // Look for the next <%if shortcut
+ this.matchRegExp.lastIndex = startPos;
+ this.match = this.matchRegExp.exec(this.parser.source);
+ // If not found then return no match
+ if(!this.match) {
+ return undefined;
+ }
+ // Check for the next %>
+ this.terminateIfRegExp.lastIndex = this.match.index;
+ this.terminateIfMatch = this.terminateIfRegExp.exec(this.parser.source);
+ // If not found then return no match
+ if(!this.terminateIfMatch) {
+ return undefined;
+ }
+ // Return the position at which the construction was found
+ return this.match.index;
+};
+
+/*
+Parse the most recent match
+*/
+exports.parse = function() {
+ // Get the filter condition
+ var filterCondition = this.parser.source.substring(this.match.index + this.match[0].length,this.terminateIfMatch.index);
+ // Advance the parser position to past the %>
+ this.parser.pos = this.terminateIfMatch.index + this.terminateIfMatch[0].length;
+ // Parse the if clause
+ return this.parseIfClause(filterCondition);
+};
+
+exports.parseIfClause = function(filterCondition) {
+ // Create the list widget
+ var listWidget = {
+ type: "list",
+ tag: "$list",
+ isBlock: this.is.block,
+ children: [
+ {
+ type: "list-template",
+ tag: "$list-template"
+ },
+ {
+ type: "list-empty",
+ tag: "$list-empty"
+ }
+ ]
+ };
+ $tw.utils.addAttributeToParseTreeNode(listWidget,"filter",filterCondition);
+ $tw.utils.addAttributeToParseTreeNode(listWidget,"variable","condition");
+ $tw.utils.addAttributeToParseTreeNode(listWidget,"limit","1");
+ // Check for an immediately following double linebreak
+ var hasLineBreak = !!$tw.utils.parseTokenRegExp(this.parser.source,this.parser.pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/g);
+ // Parse the body looking for else or endif
+ var reEndString = "\\<\\%\\s*(endif)\\s*\\%\\>|\\<\\%\\s*(else)\\s*\\%\\>|\\<\\%\\s*(elseif)\\s+([\\s\\S]+?)\\%\\>",
+ ex;
+ if(hasLineBreak) {
+ ex = this.parser.parseBlocksTerminatedExtended(reEndString);
+ } else {
+ var reEnd = new RegExp(reEndString,"mg");
+ ex = this.parser.parseInlineRunTerminatedExtended(reEnd,{eatTerminator: true});
+ }
+ // Put the body into the list template
+ listWidget.children[0].children = ex.tree;
+ // Check for an else or elseif
+ if(ex.match) {
+ if(ex.match[1] === "endif") {
+ // Nothing to do if we just found an endif
+ } else if(ex.match[2] === "else") {
+ // Check for an immediately following double linebreak
+ hasLineBreak = !!$tw.utils.parseTokenRegExp(this.parser.source,this.parser.pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/g);
+ // If we found an else then we need to parse the body looking for the endif
+ var reEndString = "\\<\\%\\s*(endif)\\s*\\%\\>",
+ ex;
+ if(hasLineBreak) {
+ ex = this.parser.parseBlocksTerminatedExtended(reEndString);
+ } else {
+ var reEnd = new RegExp(reEndString,"mg");
+ ex = this.parser.parseInlineRunTerminatedExtended(reEnd,{eatTerminator: true});
+ }
+ // Put the parsed content inside the list empty template
+ listWidget.children[1].children = ex.tree;
+ } else if(ex.match[3] === "elseif") {
+ // Parse the elseif clause by reusing this parser, passing the new filter condition
+ listWidget.children[1].children = this.parseIfClause(ex.match[4]);
+ }
+ }
+ // Return the parse tree node
+ return [listWidget];
+};
diff --git a/core/modules/parsers/wikiparser/rules/dash.js b/core/modules/parsers/wikiparser/rules/dash.js
index 45481bf07..02d82baec 100644
--- a/core/modules/parsers/wikiparser/rules/dash.js
+++ b/core/modules/parsers/wikiparser/rules/dash.js
@@ -12,10 +12,7 @@ This is an em-dash: ---
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "dash";
@@ -36,5 +33,3 @@ exports.parse = function() {
entity: dash
}];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/emphasis/bold.js b/core/modules/parsers/wikiparser/rules/emphasis/bold.js
index 3799feeb5..70f741759 100644
--- a/core/modules/parsers/wikiparser/rules/emphasis/bold.js
+++ b/core/modules/parsers/wikiparser/rules/emphasis/bold.js
@@ -17,10 +17,7 @@ This wikiparser can be modified using the rules eg:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "bold";
@@ -46,5 +43,3 @@ exports.parse = function() {
children: tree
}];
};
-
-})();
\ No newline at end of file
diff --git a/core/modules/parsers/wikiparser/rules/emphasis/italic.js b/core/modules/parsers/wikiparser/rules/emphasis/italic.js
index 3e0744c4d..995e58123 100644
--- a/core/modules/parsers/wikiparser/rules/emphasis/italic.js
+++ b/core/modules/parsers/wikiparser/rules/emphasis/italic.js
@@ -17,10 +17,7 @@ This wikiparser can be modified using the rules eg:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "italic";
@@ -46,5 +43,3 @@ exports.parse = function() {
children: tree
}];
};
-
-})();
\ No newline at end of file
diff --git a/core/modules/parsers/wikiparser/rules/emphasis/strikethrough.js b/core/modules/parsers/wikiparser/rules/emphasis/strikethrough.js
index 0fb34fc52..3c05bbe2c 100644
--- a/core/modules/parsers/wikiparser/rules/emphasis/strikethrough.js
+++ b/core/modules/parsers/wikiparser/rules/emphasis/strikethrough.js
@@ -17,10 +17,7 @@ This wikiparser can be modified using the rules eg:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "strikethrough";
@@ -42,9 +39,7 @@ exports.parse = function() {
// Return the classed span
return [{
type: "element",
- tag: "strike",
+ tag: "s",
children: tree
}];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/emphasis/subscript.js b/core/modules/parsers/wikiparser/rules/emphasis/subscript.js
index 12be0fbbc..104ed0294 100644
--- a/core/modules/parsers/wikiparser/rules/emphasis/subscript.js
+++ b/core/modules/parsers/wikiparser/rules/emphasis/subscript.js
@@ -17,10 +17,7 @@ This wikiparser can be modified using the rules eg:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "subscript";
@@ -46,5 +43,3 @@ exports.parse = function() {
children: tree
}];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/emphasis/superscript.js b/core/modules/parsers/wikiparser/rules/emphasis/superscript.js
index 5a5330d8c..be7157255 100644
--- a/core/modules/parsers/wikiparser/rules/emphasis/superscript.js
+++ b/core/modules/parsers/wikiparser/rules/emphasis/superscript.js
@@ -17,10 +17,7 @@ This wikiparser can be modified using the rules eg:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "superscript";
@@ -46,5 +43,3 @@ exports.parse = function() {
children: tree
}];
};
-
-})();
\ No newline at end of file
diff --git a/core/modules/parsers/wikiparser/rules/emphasis/underscore.js b/core/modules/parsers/wikiparser/rules/emphasis/underscore.js
index d36bd242d..2c2bf71c3 100644
--- a/core/modules/parsers/wikiparser/rules/emphasis/underscore.js
+++ b/core/modules/parsers/wikiparser/rules/emphasis/underscore.js
@@ -17,10 +17,7 @@ This wikiparser can be modified using the rules eg:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "underscore";
@@ -46,5 +43,3 @@ exports.parse = function() {
children: tree
}];
};
-
-})();
\ No newline at end of file
diff --git a/core/modules/parsers/wikiparser/rules/entity.js b/core/modules/parsers/wikiparser/rules/entity.js
index dc3917daf..df2068b78 100644
--- a/core/modules/parsers/wikiparser/rules/entity.js
+++ b/core/modules/parsers/wikiparser/rules/entity.js
@@ -10,10 +10,7 @@ Wiki text inline rule for HTML entities. For example:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "entity";
@@ -36,5 +33,3 @@ exports.parse = function() {
// Return the entity
return [{type: "entity", entity: this.match[0]}];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/extlink.js b/core/modules/parsers/wikiparser/rules/extlink.js
index e06f88d8d..2678e3873 100644
--- a/core/modules/parsers/wikiparser/rules/extlink.js
+++ b/core/modules/parsers/wikiparser/rules/extlink.js
@@ -14,10 +14,7 @@ A suppressed external link: ~http://www.tiddlyspace.com/
External links can be suppressed by preceding them with `~`.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "extlink";
@@ -31,6 +28,7 @@ exports.init = function(parser) {
exports.parse = function() {
// Move past the match
+ var start = this.parser.pos;
this.parser.pos = this.matchRegExp.lastIndex;
// Create the link unless it is suppressed
if(this.match[0].substr(0,1) === "~") {
@@ -46,10 +44,8 @@ exports.parse = function() {
rel: {type: "string", value: "noopener noreferrer"}
},
children: [{
- type: "text", text: this.match[0]
+ type: "text", text: this.match[0], start: start, end: this.parser.pos
}]
}];
}
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/filteredtranscludeblock.js b/core/modules/parsers/wikiparser/rules/filteredtranscludeblock.js
index 7ab4801bf..2fd96183e 100644
--- a/core/modules/parsers/wikiparser/rules/filteredtranscludeblock.js
+++ b/core/modules/parsers/wikiparser/rules/filteredtranscludeblock.js
@@ -14,10 +14,7 @@ Wiki text rule for block-level filtered transclusion. For example:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "filteredtranscludeblock";
@@ -31,6 +28,16 @@ exports.init = function(parser) {
exports.parse = function() {
// Move past the match
+ var filterStart = this.parser.pos + 3;
+ var filterEnd = filterStart + this.match[1].length;
+ var toolTipStart = filterEnd + 1;
+ var toolTipEnd = toolTipStart + (this.match[2] ? this.match[2].length : 0);
+ var templateStart = toolTipEnd + 2;
+ var templateEnd = templateStart + (this.match[3] ? this.match[3].length : 0);
+ var styleStart = templateEnd + 2;
+ var styleEnd = styleStart + (this.match[4] ? this.match[4].length : 0);
+ var classesStart = styleEnd + 1;
+ var classesEnd = classesStart + (this.match[5] ? this.match[5].length : 0);
this.parser.pos = this.matchRegExp.lastIndex;
// Get the match details
var filter = this.match[1],
@@ -42,23 +49,21 @@ exports.parse = function() {
var node = {
type: "list",
attributes: {
- filter: {type: "string", value: filter}
+ filter: {type: "string", value: filter, start: filterStart, end: filterEnd},
},
isBlock: true
};
if(tooltip) {
- node.attributes.tooltip = {type: "string", value: tooltip};
+ node.attributes.tooltip = {type: "string", value: tooltip, start: toolTipStart, end: toolTipEnd};
}
if(template) {
- node.attributes.template = {type: "string", value: template};
+ node.attributes.template = {type: "string", value: template, start: templateStart, end: templateEnd};
}
if(style) {
- node.attributes.style = {type: "string", value: style};
+ node.attributes.style = {type: "string", value: style, start: styleStart, end: styleEnd};
}
if(classes) {
- node.attributes.itemClass = {type: "string", value: classes.split(".").join(" ")};
+ node.attributes.itemClass = {type: "string", value: classes.split(".").join(" "), start: classesStart, end: classesEnd};
}
return [node];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/filteredtranscludeinline.js b/core/modules/parsers/wikiparser/rules/filteredtranscludeinline.js
index 029fd6802..ee82ff517 100644
--- a/core/modules/parsers/wikiparser/rules/filteredtranscludeinline.js
+++ b/core/modules/parsers/wikiparser/rules/filteredtranscludeinline.js
@@ -14,10 +14,7 @@ Wiki text rule for inline filtered transclusion. For example:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "filteredtranscludeinline";
@@ -30,6 +27,16 @@ exports.init = function(parser) {
};
exports.parse = function() {
+ var filterStart = this.parser.pos + 3;
+ var filterEnd = filterStart + this.match[1].length;
+ var toolTipStart = filterEnd + 1;
+ var toolTipEnd = toolTipStart + (this.match[2] ? this.match[2].length : 0);
+ var templateStart = toolTipEnd + 2;
+ var templateEnd = templateStart + (this.match[3] ? this.match[3].length : 0);
+ var styleStart = templateEnd + 2;
+ var styleEnd = styleStart + (this.match[4] ? this.match[4].length : 0);
+ var classesStart = styleEnd + 1;
+ var classesEnd = classesStart + (this.match[5] ? this.match[5].length : 0);
// Move past the match
this.parser.pos = this.matchRegExp.lastIndex;
// Get the match details
@@ -42,22 +49,20 @@ exports.parse = function() {
var node = {
type: "list",
attributes: {
- filter: {type: "string", value: filter}
+ filter: {type: "string", value: filter, start: filterStart, end: filterEnd},
}
};
if(tooltip) {
- node.attributes.tooltip = {type: "string", value: tooltip};
+ node.attributes.tooltip = {type: "string", value: tooltip, start: toolTipStart, end: toolTipEnd};
}
if(template) {
- node.attributes.template = {type: "string", value: template};
+ node.attributes.template = {type: "string", value: template, start: templateStart, end: templateEnd};
}
if(style) {
- node.attributes.style = {type: "string", value: style};
+ node.attributes.style = {type: "string", value: style, start: styleStart, end: styleEnd};
}
if(classes) {
- node.attributes.itemClass = {type: "string", value: classes.split(".").join(" ")};
+ node.attributes.itemClass = {type: "string", value: classes.split(".").join(" "), start: classesStart, end: classesEnd};
}
return [node];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/fnprocdef.js b/core/modules/parsers/wikiparser/rules/fnprocdef.js
new file mode 100644
index 000000000..63ae8130f
--- /dev/null
+++ b/core/modules/parsers/wikiparser/rules/fnprocdef.js
@@ -0,0 +1,91 @@
+/*\
+title: $:/core/modules/parsers/wikiparser/rules/fnprocdef.js
+type: application/javascript
+module-type: wikirule
+
+Wiki pragma rule for function, procedure and widget definitions
+
+```
+\function name(param:defaultvalue,param2:defaultvalue)
+definition text
+\end
+
+\procedure name(param:defaultvalue,param2:defaultvalue)
+definition text
+\end
+
+\widget $mywidget(param:defaultvalue,param2:defaultvalue)
+definition text
+\end
+```
+
+\*/
+
+"use strict";
+
+exports.name = "fnprocdef";
+exports.types = {pragma: true};
+
+/*
+Instantiate parse rule
+*/
+exports.init = function(parser) {
+ this.parser = parser;
+ // Regexp to match
+ this.matchRegExp = /\\(function|procedure|widget)\s+([^(\s]+)\((\s*([^)]*))?\)(\s*\r?\n)?/mg;
+};
+
+/*
+Parse the most recent match
+*/
+exports.parse = function() {
+ // Move past the macro name and parameters
+ this.parser.pos = this.matchRegExp.lastIndex;
+ // Parse the parameters
+ var params = [];
+ if(this.match[3]) {
+ params = $tw.utils.parseParameterDefinition(this.match[4]);
+ }
+ // Is the remainder of the line blank after the parameter close paren?
+ var reEnd;
+ if(this.match[5]) {
+ // If so, it is a multiline definition and the end of the body is marked with \end
+ reEnd = new RegExp("((:?^|\\r?\\n)[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[2]) + ")?\\s*?(?:$|\\r?\\n))","mg");
+ } else {
+ // Otherwise, the end of the definition is marked by the end of the line
+ reEnd = /($|\r?\n)/mg;
+ // Move past any whitespace
+ this.parser.pos = $tw.utils.skipWhiteSpace(this.parser.source,this.parser.pos);
+ }
+ // Find the end of the definition
+ reEnd.lastIndex = this.parser.pos;
+ var text,
+ endMatch = reEnd.exec(this.parser.source);
+ if(endMatch) {
+ text = this.parser.source.substring(this.parser.pos,endMatch.index);
+ this.parser.pos = endMatch.index + endMatch[0].length;
+ } else {
+ // We didn't find the end of the definition, so we'll make it blank
+ text = "";
+ }
+ // Save the macro definition
+ var parseTreeNodes = [{
+ type: "set",
+ attributes: {},
+ children: [],
+ params: params
+ }];
+ $tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"name",this.match[2]);
+ $tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"value",text);
+ if(this.match[1] === "function") {
+ parseTreeNodes[0].isFunctionDefinition = true;
+ } else if(this.match[1] === "procedure") {
+ parseTreeNodes[0].isProcedureDefinition = true;
+ } else if(this.match[1] === "widget") {
+ parseTreeNodes[0].isWidgetDefinition = true;
+ }
+ if(this.parser.configTrimWhiteSpace) {
+ parseTreeNodes[0].configTrimWhiteSpace = true;
+ }
+ return parseTreeNodes;
+};
diff --git a/core/modules/parsers/wikiparser/rules/hardlinebreaks.js b/core/modules/parsers/wikiparser/rules/hardlinebreaks.js
index c278686b4..da28f7808 100644
--- a/core/modules/parsers/wikiparser/rules/hardlinebreaks.js
+++ b/core/modules/parsers/wikiparser/rules/hardlinebreaks.js
@@ -17,10 +17,7 @@ Not
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "hardlinebreaks";
@@ -45,15 +42,14 @@ exports.parse = function() {
reEnd.lastIndex = this.parser.pos;
match = reEnd.exec(this.parser.source);
if(match) {
+ var start = this.parser.pos;
this.parser.pos = reEnd.lastIndex;
// Add a line break if the terminator was a line break
if(match[2]) {
- tree.push({type: "element", tag: "br"});
+ tree.push({type: "element", tag: "br", start: start, end: this.parser.pos});
}
}
} while(match && !match[1]);
// Return the nodes
return tree;
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/heading.js b/core/modules/parsers/wikiparser/rules/heading.js
index de4e45c27..af2a6ad12 100644
--- a/core/modules/parsers/wikiparser/rules/heading.js
+++ b/core/modules/parsers/wikiparser/rules/heading.js
@@ -6,10 +6,7 @@ module-type: wikirule
Wiki text block rule for headings
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "heading";
@@ -30,17 +27,18 @@ exports.parse = function() {
// Move past the !s
this.parser.pos = this.matchRegExp.lastIndex;
// Parse any classes, whitespace and then the heading itself
+ var classStart = this.parser.pos;
var classes = this.parser.parseClasses();
+ var classEnd = this.parser.pos;
this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
var tree = this.parser.parseInlineRun(/(\r?\n)/mg);
// Return the heading
return [{
type: "element",
- tag: "h" + headingLevel,
+ tag: "h" + headingLevel,
attributes: {
- "class": {type: "string", value: classes.join(" ")}
+ "class": {type: "string", value: classes.join(" "), start: classStart, end: classEnd}
},
children: tree
}];
};
-})();
diff --git a/core/modules/parsers/wikiparser/rules/horizrule.js b/core/modules/parsers/wikiparser/rules/horizrule.js
index bacad06ed..2294add6b 100644
--- a/core/modules/parsers/wikiparser/rules/horizrule.js
+++ b/core/modules/parsers/wikiparser/rules/horizrule.js
@@ -10,10 +10,7 @@ Wiki text block rule for rules. For example:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "horizrule";
@@ -30,5 +27,3 @@ exports.parse = function() {
this.parser.pos = this.matchRegExp.lastIndex;
return [{type: "element", tag: "hr"}];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/html.js b/core/modules/parsers/wikiparser/rules/html.js
index b9e6bdc69..47c375b5e 100644
--- a/core/modules/parsers/wikiparser/rules/html.js
+++ b/core/modules/parsers/wikiparser/rules/html.js
@@ -17,10 +17,7 @@ This is a widget invocation
}}}
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "html";
@@ -44,11 +41,15 @@ Parse the most recent match
exports.parse = function() {
// Retrieve the most recent match so that recursive calls don't overwrite it
var tag = this.nextTag;
+ if (!tag.isSelfClosing) {
+ tag.openTagStart = tag.start;
+ tag.openTagEnd = tag.end;
+ }
this.nextTag = null;
// Advance the parser position to past the tag
this.parser.pos = tag.end;
// Check for an immediately following double linebreak
- var hasLineBreak = !tag.isSelfClosing && !!$tw.utils.parseTokenRegExp(this.parser.source,this.parser.pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/g);
+ var hasLineBreak = !tag.isSelfClosing && !!$tw.utils.parseTokenRegExp(this.parser.source,this.parser.pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/y);
// Set whether we're in block mode
tag.isBlock = this.is.block || hasLineBreak;
// Parse the body if we need to
@@ -60,13 +61,34 @@ exports.parse = function() {
var reEnd = new RegExp("(" + reEndString + ")","mg");
tag.children = this.parser.parseInlineRun(reEnd,{eatTerminator: true});
}
+ tag.end = this.parser.pos;
+ tag.closeTagEnd = tag.end;
+ if (tag.closeTagEnd === tag.openTagEnd || this.parser.source[tag.closeTagEnd - 1] !== '>') {
+ tag.closeTagStart = tag.end;
+ } else {
+ tag.closeTagStart = tag.closeTagEnd - 2;
+ var closeTagMinPos = tag.children.length > 0 ? tag.children[tag.children.length-1].end : tag.openTagEnd;
+ if (!Number.isSafeInteger(closeTagMinPos)) closeTagMinPos = tag.openTagEnd;
+ while (tag.closeTagStart >= closeTagMinPos) {
+ var char = this.parser.source[tag.closeTagStart];
+ if (char === '>') {
+ tag.closeTagStart = -1;
+ break;
+ }
+ if (char === '<') break;
+ tag.closeTagStart -= 1;
+ }
+ if (tag.closeTagStart < closeTagMinPos) {
+ tag.closeTagStart = tag.end;
+ }
+ }
}
// Return the tag
return [tag];
};
/*
-Look for an HTML tag. Returns null if not found, otherwise returns {type: "element", name:, attributes: [], isSelfClosing:, start:, end:,}
+Look for an HTML tag. Returns null if not found, otherwise returns {type: "element", name:, attributes: {}, orderedAttributes: [], isSelfClosing:, start:, end:,}
*/
exports.parseTag = function(source,pos,options) {
options = options || {};
@@ -74,10 +96,11 @@ exports.parseTag = function(source,pos,options) {
node = {
type: "element",
start: pos,
- attributes: {}
+ attributes: {},
+ orderedAttributes: []
};
// Define our regexps
- var reTagName = /([a-zA-Z0-9\-\$]+)/g;
+ const reTagName = /([a-zA-Z0-9\-\$\.]+)/y;
// Skip whitespace
pos = $tw.utils.skipWhiteSpace(source,pos);
// Look for a less than sign
@@ -92,9 +115,6 @@ exports.parseTag = function(source,pos,options) {
return null;
}
node.tag = token.match[1];
- if(node.tag.slice(1).indexOf("$") !== -1) {
- return null;
- }
if(node.tag.charAt(0) === "$") {
node.type = node.tag.substr(1);
}
@@ -106,6 +126,7 @@ exports.parseTag = function(source,pos,options) {
// Process attributes
var attribute = $tw.utils.parseAttribute(source,pos);
while(attribute) {
+ node.orderedAttributes.push(attribute);
node.attributes[attribute.name] = attribute;
pos = attribute.end;
// Get the next attribute
@@ -127,7 +148,7 @@ exports.parseTag = function(source,pos,options) {
pos = token.end;
// Check for a required line break
if(options.requireLineBreak) {
- token = $tw.utils.parseTokenRegExp(source,pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/g);
+ token = $tw.utils.parseTokenRegExp(source,pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/y);
if(!token) {
return null;
}
@@ -139,7 +160,7 @@ exports.parseTag = function(source,pos,options) {
exports.findNextTag = function(source,pos,options) {
// A regexp for finding candidate HTML tags
- var reLookahead = /<([a-zA-Z\-\$]+)/g;
+ var reLookahead = /<([a-zA-Z\-\$\.]+)/g;
// Find the next candidate
reLookahead.lastIndex = pos;
var match = reLookahead.exec(source);
@@ -170,5 +191,3 @@ exports.isLegalTag = function(tag) {
return true;
}
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/image.js b/core/modules/parsers/wikiparser/rules/image.js
index 6b379d9c5..9ae093380 100644
--- a/core/modules/parsers/wikiparser/rules/image.js
+++ b/core/modules/parsers/wikiparser/rules/image.js
@@ -17,10 +17,7 @@ Wiki text inline rule for embedding images. For example:
Generates the `<$image>` widget.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "image";
@@ -116,18 +113,16 @@ exports.parseImage = function(source,pos) {
// Skip whitespace
pos = $tw.utils.skipWhiteSpace(source,pos);
// Get the source up to the terminating `]]`
- token = $tw.utils.parseTokenRegExp(source,pos,/(?:([^|\]]*?)\|)?([^\]]+?)\]\]/g);
+ token = $tw.utils.parseTokenRegExp(source,pos,/(?:([^|\]]*?)\|)?([^\]]+?)\]\]/y);
if(!token) {
return null;
}
pos = token.end;
if(token.match[1]) {
- node.attributes.tooltip = {type: "string", value: token.match[1].trim()};
+ node.attributes.tooltip = {type: "string", value: token.match[1].trim(),start: token.start,end:token.start + token.match[1].length - 1};
}
- node.attributes.source = {type: "string", value: (token.match[2] || "").trim()};
+ node.attributes.source = {type: "string", value: (token.match[2] || "").trim(), start: token.start + (token.match[1] ? token.match[1].length : 0), end: token.end - 2};
// Update the end position
node.end = pos;
return node;
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/import.js b/core/modules/parsers/wikiparser/rules/import.js
index bce5e1ef3..52332f0e3 100644
--- a/core/modules/parsers/wikiparser/rules/import.js
+++ b/core/modules/parsers/wikiparser/rules/import.js
@@ -10,10 +10,7 @@ Wiki pragma rule for importing variable definitions
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "import";
@@ -25,7 +22,7 @@ Instantiate parse rule
exports.init = function(parser) {
this.parser = parser;
// Regexp to match
- this.matchRegExp = /^\\import[^\S\n]/mg;
+ this.matchRegExp = /\\import[^\S\n]/mg;
};
/*
@@ -36,18 +33,17 @@ exports.parse = function() {
// Move past the pragma invocation
this.parser.pos = this.matchRegExp.lastIndex;
// Parse the filter terminated by a line break
- var reMatch = /(.*)(\r?\n)|$/mg;
+ var reMatch = /(.*)(?:$|\r?\n)/mg;
reMatch.lastIndex = this.parser.pos;
+ var filterStart = this.parser.source;
var match = reMatch.exec(this.parser.source);
this.parser.pos = reMatch.lastIndex;
// Parse tree nodes to return
return [{
type: "importvariables",
attributes: {
- filter: {type: "string", value: match[1]}
+ filter: {type: "string", value: match[1], start: filterStart, end: this.parser.pos}
},
children: []
}];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/list.js b/core/modules/parsers/wikiparser/rules/list.js
index 17eab6dad..98cc5540f 100644
--- a/core/modules/parsers/wikiparser/rules/list.js
+++ b/core/modules/parsers/wikiparser/rules/list.js
@@ -40,10 +40,7 @@ A CSS class can be applied to a list item as follows:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "list";
@@ -74,6 +71,7 @@ exports.parse = function() {
// Match the list marker
var reMatch = /([\*#;:>]+)/mg;
reMatch.lastIndex = this.parser.pos;
+ var start = this.parser.pos;
var match = reMatch.exec(this.parser.source);
if(!match || match.index !== this.parser.pos) {
break;
@@ -94,9 +92,21 @@ exports.parse = function() {
}
// Construct the list element or reuse the previous one at this level
if(listStack.length <= t) {
- var listElement = {type: "element", tag: listInfo.listTag, children: [
- {type: "element", tag: listInfo.itemTag, children: []}
- ]};
+ var listElement = {
+ type: "element",
+ tag: listInfo.listTag,
+ children: [
+ {
+ type: "element",
+ tag: listInfo.itemTag,
+ children: [],
+ start: start,
+ end: this.parser.pos,
+ }
+ ],
+ start: start,
+ end: this.parser.pos,
+ };
// Link this list element into the last child item of the parent list item
if(t) {
var prevListItem = listStack[t-1].children[listStack[t-1].children.length-1];
@@ -105,21 +115,33 @@ exports.parse = function() {
// Save this element in the stack
listStack[t] = listElement;
} else if(t === (match[0].length - 1)) {
- listStack[t].children.push({type: "element", tag: listInfo.itemTag, children: []});
+ listStack[t].children.push({
+ type: "element",
+ tag: listInfo.itemTag,
+ children: [],
+ start: start,
+ end: this.parser.pos,
+ });
}
}
if(listStack.length > match[0].length) {
listStack.splice(match[0].length,listStack.length - match[0].length);
}
// Process the body of the list item into the last list item
+ var classStart = this.parser.pos;
var lastListChildren = listStack[listStack.length-1].children,
lastListItem = lastListChildren[lastListChildren.length-1],
classes = this.parser.parseClasses();
+ var classEnd = this.parser.pos;
this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
var tree = this.parser.parseInlineRun(/(\r?\n)/mg);
lastListItem.children.push.apply(lastListItem.children,tree);
+ lastListItem.end = this.parser.pos;
+ listStack[listStack.length-1].end = this.parser.pos;
if(classes.length > 0) {
$tw.utils.addClassToParseTreeNode(lastListItem,classes.join(" "));
+ lastListItem.attributes.class.start = classStart;
+ lastListItem.attributes.class.end = classEnd;
}
// Consume any whitespace following the list item
this.parser.skipWhitespace();
@@ -127,5 +149,3 @@ exports.parse = function() {
// Return the root element of the list
return [listStack[0]];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/macrocallblock.js b/core/modules/parsers/wikiparser/rules/macrocallblock.js
index 6f50fdbb0..3793d563d 100644
--- a/core/modules/parsers/wikiparser/rules/macrocallblock.js
+++ b/core/modules/parsers/wikiparser/rules/macrocallblock.js
@@ -10,10 +10,7 @@ Wiki rule for block macro calls
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "macrocallblock";
@@ -27,7 +24,7 @@ exports.findNextMatch = function(startPos) {
var nextStart = startPos;
// Try parsing at all possible macrocall openers until we match
while((nextStart = this.parser.source.indexOf("<<",nextStart)) >= 0) {
- var nextCall = $tw.utils.parseMacroInvocation(this.parser.source,nextStart);
+ var nextCall = $tw.utils.parseMacroInvocationAsTransclusion(this.parser.source,nextStart);
if(nextCall) {
var c = this.parser.source.charAt(nextCall.end);
// Ensure EOL after parsed macro
@@ -52,5 +49,3 @@ exports.parse = function() {
this.parser.pos = call.end;
return [call];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/macrocallinline.js b/core/modules/parsers/wikiparser/rules/macrocallinline.js
index 165a70dce..bd6e777bb 100644
--- a/core/modules/parsers/wikiparser/rules/macrocallinline.js
+++ b/core/modules/parsers/wikiparser/rules/macrocallinline.js
@@ -10,10 +10,7 @@ Wiki rule for macro calls
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "macrocallinline";
@@ -27,7 +24,7 @@ exports.findNextMatch = function(startPos) {
var nextStart = startPos;
// Try parsing at all possible macrocall openers until we match
while((nextStart = this.parser.source.indexOf("<<",nextStart)) >= 0) {
- this.nextCall = $tw.utils.parseMacroInvocation(this.parser.source,nextStart);
+ this.nextCall = $tw.utils.parseMacroInvocationAsTransclusion(this.parser.source,nextStart);
if(this.nextCall) {
return nextStart;
}
@@ -45,5 +42,3 @@ exports.parse = function() {
this.parser.pos = call.end;
return [call];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/macrodef.js b/core/modules/parsers/wikiparser/rules/macrodef.js
index cc76ca7ec..24f0e1212 100644
--- a/core/modules/parsers/wikiparser/rules/macrodef.js
+++ b/core/modules/parsers/wikiparser/rules/macrodef.js
@@ -12,10 +12,7 @@ definition text, including $param$ markers
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "macrodef";
@@ -27,7 +24,7 @@ Instantiate parse rule
exports.init = function(parser) {
this.parser = parser;
// Regexp to match
- this.matchRegExp = /^\\define\s+([^(\s]+)\(\s*([^)]*)\)(\s*\r?\n)?/mg;
+ this.matchRegExp = /\\define\s+([^(\s]+)\(\s*([^)]*)\)(\s*\r?\n)?/mg;
};
/*
@@ -54,11 +51,11 @@ exports.parse = function() {
paramMatch = reParam.exec(paramString);
}
}
- // Is this a multiline definition?
+ // Is the remainder of the \define line blank after the parameter close paren?
var reEnd;
if(this.match[3]) {
- // If so, the end of the body is marked with \end
- reEnd = /(\r?\n\\end[^\S\n\r]*(?:$|\r?\n))/mg;
+ // If so, it is a multiline definition and the end of the body is marked with \end
+ reEnd = new RegExp("((?:^|\\r?\\n)[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?\\s*?(?:$|\\r?\\n))","mg");
} else {
// Otherwise, the end of the definition is marked by the end of the line
reEnd = /($|\r?\n)/mg;
@@ -77,16 +74,14 @@ exports.parse = function() {
text = "";
}
// Save the macro definition
- return [{
+ var parseTreeNodes = [{
type: "set",
- attributes: {
- name: {type: "string", value: this.match[1]},
- value: {type: "string", value: text}
- },
+ attributes: {},
children: [],
params: params,
isMacroDefinition: true
}];
+ $tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"name",this.match[1]);
+ $tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"value",text);
+ return parseTreeNodes;
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/parameters.js b/core/modules/parsers/wikiparser/rules/parameters.js
new file mode 100644
index 000000000..ccd50319c
--- /dev/null
+++ b/core/modules/parsers/wikiparser/rules/parameters.js
@@ -0,0 +1,55 @@
+/*\
+title: $:/core/modules/parsers/wikiparser/rules/parameters.js
+type: application/javascript
+module-type: wikirule
+
+Wiki pragma rule for parameter definitions
+
+```
+\parameters(param:defaultvalue,param2:defaultvalue)
+definition text
+```
+
+\*/
+
+"use strict";
+
+exports.name = "parameters";
+exports.types = {pragma: true};
+
+/*
+Instantiate parse rule
+*/
+exports.init = function(parser) {
+ this.parser = parser;
+ // Regexp to match
+ this.matchRegExp = /\\parameters\s*\(([^)]*)\)(\s*\r?\n)?/mg;
+};
+
+/*
+Parse the most recent match
+*/
+exports.parse = function() {
+ // Move past the macro name and parameters
+ this.parser.pos = this.matchRegExp.lastIndex;
+ // Parse the parameters
+ var params = $tw.utils.parseParameterDefinition(this.match[1]);
+ var attributes = Object.create(null),
+ orderedAttributes = [];
+ $tw.utils.each(params,function(param) {
+ var name = param.name;
+ // Parameter names starting with dollar must be escaped to double dollars for the parameters widget
+ if(name.charAt(0) === "$") {
+ name = "$" + name;
+ }
+ var attribute = {name: name, type: "string", value: param["default"] || ""};
+ attributes[name] = attribute;
+ orderedAttributes.push(attribute);
+ });
+ // Save the macro definition
+ return [{
+ type: "parameters",
+ attributes: attributes,
+ orderedAttributes: orderedAttributes
+ }];
+};
diff --git a/core/modules/parsers/wikiparser/rules/parsermode.js b/core/modules/parsers/wikiparser/rules/parsermode.js
new file mode 100644
index 000000000..868db3e15
--- /dev/null
+++ b/core/modules/parsers/wikiparser/rules/parsermode.js
@@ -0,0 +1,63 @@
+/*\
+title: $:/core/modules/parsers/wikiparser/rules/parsermode.js
+type: application/javascript
+module-type: wikirule
+
+Wiki pragma rule for parser mode specifications
+
+```
+\parsermode block
+\parsermode inline
+```
+
+\*/
+
+"use strict";
+
+exports.name = "parsermode";
+exports.types = {pragma: true};
+
+/*
+Instantiate parse rule
+*/
+exports.init = function(parser) {
+ this.parser = parser;
+ // Regexp to match
+ this.matchRegExp = /\\parsermode[^\S\n]/mg;
+};
+
+/*
+Parse the most recent match
+*/
+exports.parse = function() {
+ // Move past the pragma invocation
+ this.parser.pos = this.matchRegExp.lastIndex;
+ // Parse whitespace delimited tokens terminated by a line break
+ var reMatch = /[^\S\n]*(\S+)|(\r?\n)/mg,
+ parserMode = undefined;
+ reMatch.lastIndex = this.parser.pos;
+ var match = reMatch.exec(this.parser.source);
+ while(match && match.index === this.parser.pos) {
+ this.parser.pos = reMatch.lastIndex;
+ // Exit if we've got the line break
+ if(match[2]) {
+ break;
+ }
+ // Process the token
+ if(match[1]) {
+ parserMode = match[1];
+ }
+ // Match the next token
+ match = reMatch.exec(this.parser.source);
+ }
+ // Process the tokens
+ if(parserMode !== undefined) {
+ if(parserMode === "block") {
+ this.parser.parseAsInline = false;
+ } else if(parserMode === "inline") {
+ this.parser.parseAsInline = true;
+ }
+ }
+ // No parse tree nodes to return
+ return [];
+};
diff --git a/core/modules/parsers/wikiparser/rules/prettyextlink.js b/core/modules/parsers/wikiparser/rules/prettyextlink.js
index 4c497c257..2c575c227 100644
--- a/core/modules/parsers/wikiparser/rules/prettyextlink.js
+++ b/core/modules/parsers/wikiparser/rules/prettyextlink.js
@@ -11,10 +11,7 @@ Wiki text inline rule for external links. For example:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "prettyextlink";
@@ -96,20 +93,23 @@ exports.parseLink = function(source,pos) {
splitPos = null;
}
// Pull out the tooltip and URL
- var tooltip, URL;
+ var tooltip, URL, urlStart;
+ textNode.start = pos;
if(splitPos) {
+ urlStart = splitPos + 1;
URL = source.substring(splitPos + 1,closePos).trim();
textNode.text = source.substring(pos,splitPos).trim();
+ textNode.end = splitPos;
} else {
+ urlStart = pos;
URL = source.substring(pos,closePos).trim();
textNode.text = URL;
+ textNode.end = closePos;
}
- node.attributes.href = {type: "string", value: URL};
+ node.attributes.href = {type: "string", value: URL, start: urlStart, end: closePos};
node.attributes.target = {type: "string", value: "_blank"};
node.attributes.rel = {type: "string", value: "noopener noreferrer"};
// Update the end position
node.end = closePos + 2;
return node;
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/prettylink.js b/core/modules/parsers/wikiparser/rules/prettylink.js
index 56a2850a3..91579256d 100644
--- a/core/modules/parsers/wikiparser/rules/prettylink.js
+++ b/core/modules/parsers/wikiparser/rules/prettylink.js
@@ -12,10 +12,7 @@ Wiki text inline rule for pretty links. For example:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "prettylink";
@@ -29,35 +26,40 @@ exports.init = function(parser) {
exports.parse = function() {
// Move past the match
+ var start = this.parser.pos + 2;
this.parser.pos = this.matchRegExp.lastIndex;
// Process the link
var text = this.match[1],
- link = this.match[2] || text;
+ link = this.match[2] || text,
+ textEndPos = this.parser.source.indexOf("|", start);
+ if (textEndPos < 0 || textEndPos > this.matchRegExp.lastIndex) {
+ textEndPos = this.matchRegExp.lastIndex - 2;
+ }
+ var linkStart = this.match[2] ? (start + this.match[1].length + 1) : start;
+ var linkEnd = linkStart + link.length;
if($tw.utils.isLinkExternal(link)) {
return [{
type: "element",
tag: "a",
attributes: {
- href: {type: "string", value: link},
+ href: {type: "string", value: link, start: linkStart, end: linkEnd},
"class": {type: "string", value: "tc-tiddlylink-external"},
target: {type: "string", value: "_blank"},
rel: {type: "string", value: "noopener noreferrer"}
},
children: [{
- type: "text", text: text
+ type: "text", text: text, start: start, end: textEndPos
}]
}];
} else {
return [{
type: "link",
attributes: {
- to: {type: "string", value: link}
+ to: {type: "string", value: link, start: linkStart, end: linkEnd}
},
children: [{
- type: "text", text: text
+ type: "text", text: text, start: start, end: textEndPos
}]
}];
}
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/quoteblock.js b/core/modules/parsers/wikiparser/rules/quoteblock.js
index 71b689680..be8746de4 100644
--- a/core/modules/parsers/wikiparser/rules/quoteblock.js
+++ b/core/modules/parsers/wikiparser/rules/quoteblock.js
@@ -3,36 +3,10 @@ title: $:/core/modules/parsers/wikiparser/rules/quoteblock.js
type: application/javascript
module-type: wikirule
-Wiki text rule for quote blocks. For example:
-
-```
- <<<.optionalClass(es) optional cited from
- a quote
- <<<
-
- <<<.optionalClass(es)
- a quote
- <<< optional cited from
-```
-
-Quotes can be quoted by putting more <s
-
-```
- <<<
- Quote Level 1
-
- <<<<
- QuoteLevel 2
- <<<<
-
- <<<
-```
+Wiki text rule for quote blocks.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "quoteblock";
@@ -47,33 +21,42 @@ exports.init = function(parser) {
exports.parse = function() {
var classes = ["tc-quote"];
// Get all the details of the match
- var reEndString = "^" + this.match[1] + "(?!<)";
+ var reEndString = "^\\s*" + this.match[1] + "(?!<)";
// Move past the <s
this.parser.pos = this.matchRegExp.lastIndex;
-
// Parse any classes, whitespace and then the optional cite itself
+ var classStart = this.parser.pos;
classes.push.apply(classes, this.parser.parseClasses());
+ var classEnd = this.parser.pos;
this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
+ var citeStart = this.parser.pos;
var cite = this.parser.parseInlineRun(/(\r?\n)/mg);
+ var citeEnd = this.parser.pos;
// before handling the cite, parse the body of the quote
- var tree= this.parser.parseBlocks(reEndString);
+ var tree = this.parser.parseBlocks(reEndString);
// If we got a cite, put it before the text
if(cite.length > 0) {
tree.unshift({
type: "element",
tag: "cite",
- children: cite
+ children: cite,
+ start: citeStart,
+ end: citeEnd
});
}
// Parse any optional cite
this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
+ citeStart = this.parser.pos;
cite = this.parser.parseInlineRun(/(\r?\n)/mg);
+ citeEnd = this.parser.pos;
// If we got a cite, push it
if(cite.length > 0) {
tree.push({
type: "element",
tag: "cite",
- children: cite
+ children: cite,
+ start: citeStart,
+ end: citeEnd
});
}
// Return the blockquote element
@@ -81,10 +64,8 @@ exports.parse = function() {
type: "element",
tag: "blockquote",
attributes: {
- class: { type: "string", value: classes.join(" ") },
+ class: { type: "string", value: classes.join(" "), start: classStart, end: classEnd },
},
children: tree
}];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/rules.js b/core/modules/parsers/wikiparser/rules/rules.js
index cfc03330b..7b3749308 100644
--- a/core/modules/parsers/wikiparser/rules/rules.js
+++ b/core/modules/parsers/wikiparser/rules/rules.js
@@ -11,10 +11,7 @@ Wiki pragma rule for rules specifications
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "rules";
@@ -26,7 +23,7 @@ Instantiate parse rule
exports.init = function(parser) {
this.parser = parser;
// Regexp to match
- this.matchRegExp = /^\\rules[^\S\n]/mg;
+ this.matchRegExp = /\\rules[^\S\n]/mg;
};
/*
@@ -60,5 +57,3 @@ exports.parse = function() {
// No parse tree nodes to return
return [];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/styleblock.js b/core/modules/parsers/wikiparser/rules/styleblock.js
index 3fcad5bb4..2abf2fc9e 100644
--- a/core/modules/parsers/wikiparser/rules/styleblock.js
+++ b/core/modules/parsers/wikiparser/rules/styleblock.js
@@ -26,10 +26,7 @@ This is a paragraph
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "styleblock";
@@ -69,5 +66,3 @@ exports.parse = function() {
}
return tree;
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/styleinline.js b/core/modules/parsers/wikiparser/rules/styleinline.js
index cd42d8f00..3aea0d266 100644
--- a/core/modules/parsers/wikiparser/rules/styleinline.js
+++ b/core/modules/parsers/wikiparser/rules/styleinline.js
@@ -13,10 +13,7 @@ Wiki text inline rule for assigning styles and classes to inline runs. For examp
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "styleinline";
@@ -41,9 +38,6 @@ exports.parse = function() {
var node = {
type: "element",
tag: "span",
- attributes: {
- "class": {type: "string", value: "tc-inline-style"}
- },
children: tree
};
if(classString) {
@@ -52,7 +46,8 @@ exports.parse = function() {
if(stylesString) {
$tw.utils.addAttributeToParseTreeNode(node,"style",stylesString);
}
+ if(!classString && !stylesString) {
+ $tw.utils.addClassToParseTreeNode(node,"tc-inline-style");
+ }
return [node];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/syslink.js b/core/modules/parsers/wikiparser/rules/syslink.js
index 6eb2cdcd4..a57850265 100644
--- a/core/modules/parsers/wikiparser/rules/syslink.js
+++ b/core/modules/parsers/wikiparser/rules/syslink.js
@@ -6,10 +6,7 @@ module-type: wikirule
Wiki text inline rule for system tiddler links.
Can be suppressed preceding them with `~`.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "syslink";
@@ -29,10 +26,11 @@ exports.init = function(parser) {
exports.parse = function() {
var match = this.match[0];
// Move past the match
+ var start = this.parser.pos;
this.parser.pos = this.matchRegExp.lastIndex;
// Create the link unless it is suppressed
if(match.substr(0,1) === "~") {
- return [{type: "text", text: match.substr(1)}];
+ return [{type: "text", text: match.substr(1), start: start+1, end: this.parser.pos}];
} else {
return [{
type: "link",
@@ -41,10 +39,10 @@ exports.parse = function() {
},
children: [{
type: "text",
- text: match
+ text: match,
+ start: start,
+ end: this.parser.pos
}]
}];
}
};
-
-})();
\ No newline at end of file
diff --git a/core/modules/parsers/wikiparser/rules/table.js b/core/modules/parsers/wikiparser/rules/table.js
index fb72f6890..67def255f 100644
--- a/core/modules/parsers/wikiparser/rules/table.js
+++ b/core/modules/parsers/wikiparser/rules/table.js
@@ -6,10 +6,7 @@ module-type: wikirule
Wiki text block rule for tables.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "table";
@@ -93,11 +90,12 @@ var processRow = function(prevColumns) {
}
// Check whether this is a heading cell
var cell;
+ var start = this.parser.pos;
if(chr === "!") {
this.parser.pos++;
- cell = {type: "element", tag: "th", children: []};
+ cell = {type: "element", tag: "th", start: start, children: []};
} else {
- cell = {type: "element", tag: "td", children: []};
+ cell = {type: "element", tag: "td", start: start, children: []};
}
tree.push(cell);
// Record information about this cell
@@ -121,6 +119,7 @@ var processRow = function(prevColumns) {
}
// Move back to the closing `|`
this.parser.pos--;
+ cell.end = this.parser.pos;
}
col++;
cellRegExp.lastIndex = this.parser.pos;
@@ -150,7 +149,7 @@ exports.parse = function() {
} else {
// Otherwise, create a new row if this one is of a different type
if(rowType !== currRowType) {
- rowContainer = {type: "element", tag: rowContainerTypes[rowType], children: []};
+ rowContainer = {type: "element", tag: rowContainerTypes[rowType], children: [], start: this.parser.pos, end: this.parser.pos};
table.children.push(rowContainer);
currRowType = rowType;
}
@@ -161,7 +160,7 @@ exports.parse = function() {
// Move the caption to the first row if it isn't already
if(table.children.length !== 1) {
table.children.pop(); // Take rowContainer out of the children array
- table.children.splice(0,0,rowContainer); // Insert it at the bottom
+ table.children.splice(0,0,rowContainer); // Insert it at the bottom
}
// Set the alignment - TODO: figure out why TW did this
// rowContainer.attributes.align = rowCount === 0 ? "top" : "bottom";
@@ -169,19 +168,19 @@ exports.parse = function() {
rowContainer.children = this.parser.parseInlineRun(rowTermRegExp,{eatTerminator: true});
} else {
// Create the row
- var theRow = {type: "element", tag: "tr", children: []};
+ var theRow = {type: "element", tag: "tr", children: [], start: rowMatch.index};
$tw.utils.addClassToParseTreeNode(theRow,rowCount%2 ? "oddRow" : "evenRow");
rowContainer.children.push(theRow);
// Process the row
theRow.children = processRow.call(this,prevColumns);
this.parser.pos = rowMatch.index + rowMatch[0].length;
+ theRow.end = this.parser.pos;
// Increment the row count
rowCount++;
}
+ rowContainer.end = this.parser.pos;
}
rowMatch = rowRegExp.exec(this.parser.source);
}
return [table];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/transcludeblock.js b/core/modules/parsers/wikiparser/rules/transcludeblock.js
index 56a4f63b8..5c5367cb4 100644
--- a/core/modules/parsers/wikiparser/rules/transcludeblock.js
+++ b/core/modules/parsers/wikiparser/rules/transcludeblock.js
@@ -11,10 +11,7 @@ Wiki text rule for block-level transclusion. For example:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "transcludeblock";
@@ -23,7 +20,28 @@ exports.types = {block: true};
exports.init = function(parser) {
this.parser = parser;
// Regexp to match
- this.matchRegExp = /\{\{([^\{\}\|]*)(?:\|\|([^\|\{\}]+))?\}\}(?:\r?\n|$)/mg;
+ this.matchRegExp = /\{\{([^\{\}\|]*)(?:\|\|([^\|\{\}]+))?(?:\|([^\{\}]+))?\}\}(?:\r?\n|$)/mg;
+};
+
+/*
+Reject the match if we don't have a template or text reference
+*/
+exports.findNextMatch = function(startPos) {
+ this.matchRegExp.lastIndex = startPos;
+ this.match = this.matchRegExp.exec(this.parser.source);
+ if(this.match) {
+ var template = $tw.utils.trim(this.match[2]),
+ textRef = $tw.utils.trim(this.match[1]);
+ // Bail if we don't have a template or text reference
+ if(!template && !textRef) {
+ return undefined;
+ } else {
+ return this.match.index;
+ }
+ } else {
+ return undefined;
+ }
+ return this.match ? this.match.index : undefined;
};
exports.parse = function() {
@@ -31,13 +49,22 @@ exports.parse = function() {
this.parser.pos = this.matchRegExp.lastIndex;
// Get the match details
var template = $tw.utils.trim(this.match[2]),
- textRef = $tw.utils.trim(this.match[1]);
+ textRef = $tw.utils.trim(this.match[1]),
+ params = this.match[3] ? this.match[3].split("|") : [];
// Prepare the transclude widget
var transcludeNode = {
type: "transclude",
attributes: {},
isBlock: true
};
+ $tw.utils.each(params,function(paramValue,index) {
+ var name = "" + index;
+ transcludeNode.attributes[name] = {
+ name: name,
+ type: "string",
+ value: paramValue
+ }
+ });
// Prepare the tiddler widget
var tr, targetTitle, targetField, targetIndex, tiddlerNode;
if(textRef) {
@@ -48,14 +75,14 @@ exports.parse = function() {
tiddlerNode = {
type: "tiddler",
attributes: {
- tiddler: {type: "string", value: targetTitle}
+ tiddler: {name: "tiddler", type: "string", value: targetTitle}
},
isBlock: true,
children: [transcludeNode]
};
}
if(template) {
- transcludeNode.attributes.tiddler = {type: "string", value: template};
+ transcludeNode.attributes["$tiddler"] = {name: "$tiddler", type: "string", value: template};
if(textRef) {
return [tiddlerNode];
} else {
@@ -63,12 +90,12 @@ exports.parse = function() {
}
} else {
if(textRef) {
- transcludeNode.attributes.tiddler = {type: "string", value: targetTitle};
+ transcludeNode.attributes["$tiddler"] = {name: "$tiddler", type: "string", value: targetTitle};
if(targetField) {
- transcludeNode.attributes.field = {type: "string", value: targetField};
+ transcludeNode.attributes["$field"] = {name: "$field", type: "string", value: targetField};
}
if(targetIndex) {
- transcludeNode.attributes.index = {type: "string", value: targetIndex};
+ transcludeNode.attributes["$index"] = {name: "$index", type: "string", value: targetIndex};
}
return [tiddlerNode];
} else {
@@ -76,5 +103,3 @@ exports.parse = function() {
}
}
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/transcludeinline.js b/core/modules/parsers/wikiparser/rules/transcludeinline.js
index dbf39bfb6..57def3e33 100644
--- a/core/modules/parsers/wikiparser/rules/transcludeinline.js
+++ b/core/modules/parsers/wikiparser/rules/transcludeinline.js
@@ -11,10 +11,7 @@ Wiki text rule for inline-level transclusion. For example:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "transcludeinline";
@@ -23,7 +20,28 @@ exports.types = {inline: true};
exports.init = function(parser) {
this.parser = parser;
// Regexp to match
- this.matchRegExp = /\{\{([^\{\}\|]*)(?:\|\|([^\|\{\}]+))?\}\}/mg;
+ this.matchRegExp = /\{\{([^\{\}\|]*)(?:\|\|([^\|\{\}]+))?(?:\|([^\{\}]+))?\}\}/mg;
+};
+
+/*
+Reject the match if we don't have a template or text reference
+*/
+exports.findNextMatch = function(startPos) {
+ this.matchRegExp.lastIndex = startPos;
+ this.match = this.matchRegExp.exec(this.parser.source);
+ if(this.match) {
+ var template = $tw.utils.trim(this.match[2]),
+ textRef = $tw.utils.trim(this.match[1]);
+ // Bail if we don't have a template or text reference
+ if(!template && !textRef) {
+ return undefined;
+ } else {
+ return this.match.index;
+ }
+ } else {
+ return undefined;
+ }
+ return this.match ? this.match.index : undefined;
};
exports.parse = function() {
@@ -31,12 +49,21 @@ exports.parse = function() {
this.parser.pos = this.matchRegExp.lastIndex;
// Get the match details
var template = $tw.utils.trim(this.match[2]),
- textRef = $tw.utils.trim(this.match[1]);
+ textRef = $tw.utils.trim(this.match[1]),
+ params = this.match[3] ? this.match[3].split("|") : [];
// Prepare the transclude widget
var transcludeNode = {
type: "transclude",
attributes: {}
};
+ $tw.utils.each(params,function(paramValue,index) {
+ var name = "" + index;
+ transcludeNode.attributes[name] = {
+ name: name,
+ type: "string",
+ value: paramValue
+ }
+ });
// Prepare the tiddler widget
var tr, targetTitle, targetField, targetIndex, tiddlerNode;
if(textRef) {
@@ -47,13 +74,13 @@ exports.parse = function() {
tiddlerNode = {
type: "tiddler",
attributes: {
- tiddler: {type: "string", value: targetTitle}
+ tiddler: {name: "tiddler", type: "string", value: targetTitle}
},
children: [transcludeNode]
};
}
if(template) {
- transcludeNode.attributes.tiddler = {type: "string", value: template};
+ transcludeNode.attributes["$tiddler"] = {name: "$tiddler", type: "string", value: template};
if(textRef) {
return [tiddlerNode];
} else {
@@ -61,12 +88,12 @@ exports.parse = function() {
}
} else {
if(textRef) {
- transcludeNode.attributes.tiddler = {type: "string", value: targetTitle};
+ transcludeNode.attributes["$tiddler"] = {name: "$tiddler", type: "string", value: targetTitle};
if(targetField) {
- transcludeNode.attributes.field = {type: "string", value: targetField};
+ transcludeNode.attributes["$field"] = {name: "$field", type: "string", value: targetField};
}
if(targetIndex) {
- transcludeNode.attributes.index = {type: "string", value: targetIndex};
+ transcludeNode.attributes["$index"] = {name: "$index", type: "string", value: targetIndex};
}
return [tiddlerNode];
} else {
@@ -74,5 +101,3 @@ exports.parse = function() {
}
}
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/typedblock.js b/core/modules/parsers/wikiparser/rules/typedblock.js
index 4195e57e5..03fdc8e10 100644
--- a/core/modules/parsers/wikiparser/rules/typedblock.js
+++ b/core/modules/parsers/wikiparser/rules/typedblock.js
@@ -22,10 +22,7 @@ $$$
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var widget = require("$:/core/modules/widgets/widget.js");
@@ -46,6 +43,7 @@ exports.parse = function() {
renderType = this.match[2];
// Move past the match
this.parser.pos = this.matchRegExp.lastIndex;
+ var start = this.parser.pos;
// Look for the end of the block
reEnd.lastIndex = this.parser.pos;
var match = reEnd.exec(this.parser.source),
@@ -74,10 +72,10 @@ exports.parse = function() {
tag: "pre",
children: [{
type: "text",
- text: text
+ text: text,
+ start: start,
+ end: this.parser.pos
}]
}];
}
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/whitespace.js b/core/modules/parsers/wikiparser/rules/whitespace.js
index e3b0c8e3f..3be34ee88 100644
--- a/core/modules/parsers/wikiparser/rules/whitespace.js
+++ b/core/modules/parsers/wikiparser/rules/whitespace.js
@@ -11,10 +11,7 @@ Wiki pragma rule for whitespace specifications
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "whitespace";
@@ -26,7 +23,7 @@ Instantiate parse rule
exports.init = function(parser) {
this.parser = parser;
// Regexp to match
- this.matchRegExp = /^\\whitespace[^\S\n]/mg;
+ this.matchRegExp = /\\whitespace[^\S\n]/mg;
};
/*
@@ -68,5 +65,3 @@ exports.parse = function() {
// No parse tree nodes to return
return [];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/wikilink.js b/core/modules/parsers/wikiparser/rules/wikilink.js
index fadc4587e..d706de8a9 100644
--- a/core/modules/parsers/wikiparser/rules/wikilink.js
+++ b/core/modules/parsers/wikiparser/rules/wikilink.js
@@ -14,10 +14,7 @@ AnotherLink
Precede a camel case word with `~` to prevent it from being recognised as a link.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.name = "wikilink";
@@ -36,6 +33,7 @@ exports.parse = function() {
// Get the details of the match
var linkText = this.match[0];
// Move past the macro call
+ var start = this.parser.pos;
this.parser.pos = this.matchRegExp.lastIndex;
// If the link starts with the unwikilink character then just output it as plain text
if(linkText.substr(0,1) === $tw.config.textPrimitives.unWikiLink) {
@@ -57,9 +55,9 @@ exports.parse = function() {
},
children: [{
type: "text",
- text: linkText
+ text: linkText,
+ start: start,
+ end: this.parser.pos
}]
}];
};
-
-})();
diff --git a/core/modules/parsers/wikiparser/rules/wikilinkprefix.js b/core/modules/parsers/wikiparser/rules/wikilinkprefix.js
new file mode 100644
index 000000000..c1c5db1f6
--- /dev/null
+++ b/core/modules/parsers/wikiparser/rules/wikilinkprefix.js
@@ -0,0 +1,35 @@
+/*\
+title: $:/core/modules/parsers/wikiparser/rules/wikilinkprefix.js
+type: application/javascript
+module-type: wikirule
+
+Wiki text inline rule for suppressed wiki links. For example:
+
+```
+~SuppressedLink
+```
+
+\*/
+
+"use strict";
+
+exports.name = "wikilinkprefix";
+exports.types = {inline: true};
+
+exports.init = function(parser) {
+ this.parser = parser;
+ // Regexp to match
+ this.matchRegExp = new RegExp($tw.config.textPrimitives.unWikiLink + $tw.config.textPrimitives.wikiLink,"mg");
+};
+
+/*
+Parse the most recent match
+*/
+exports.parse = function() {
+ // Get the details of the match
+ var linkText = this.match[0];
+ // Move past the wikilink
+ this.parser.pos = this.matchRegExp.lastIndex;
+ // Return the link without unwikilink character as plain text
+ return [{type: "text", text: linkText.substr(1)}];
+};
diff --git a/core/modules/parsers/wikiparser/wikiparser.js b/core/modules/parsers/wikiparser/wikiparser.js
index e6f860a91..3d1379fd4 100644
--- a/core/modules/parsers/wikiparser/wikiparser.js
+++ b/core/modules/parsers/wikiparser/wikiparser.js
@@ -19,10 +19,7 @@ Attributes are stored as hashmaps of the following objects:
{type: "macro", macro: <TBD>} - indirect through a macro invocation
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -32,6 +29,7 @@ options: see below:
parseAsInline: true to parse text as inline instead of block
wiki: reference to wiki to use
_canonical_uri: optional URI of content if text is missing or empty
+ configTrimWhiteSpace: true to trim whitespace
*/
var WikiParser = function(type,text,options) {
this.wiki = options.wiki;
@@ -46,7 +44,9 @@ var WikiParser = function(type,text,options) {
this.source = text || "";
this.sourceLength = this.source.length;
// Flag for ignoring whitespace
- this.configTrimWhiteSpace = false;
+ this.configTrimWhiteSpace = options.configTrimWhiteSpace !== undefined ? options.configTrimWhiteSpace : false;
+ // Parser mode
+ this.parseAsInline = options.parseAsInline;
// Set current parse position
this.pos = 0;
// Start with empty output
@@ -83,11 +83,16 @@ var WikiParser = function(type,text,options) {
// Parse any pragmas
var topBranch = this.parsePragmas();
// Parse the text into inline runs or blocks
- if(options.parseAsInline) {
+ if(this.parseAsInline) {
topBranch.push.apply(topBranch,this.parseInlineRun());
} else {
topBranch.push.apply(topBranch,this.parseBlocks());
}
+ // Build rules' name map
+ this.usingRuleMap = {};
+ $tw.utils.each(this.pragmaRules, function (ruleInfo) { self.usingRuleMap[ruleInfo.rule.name] = Object.getPrototypeOf(ruleInfo.rule); });
+ $tw.utils.each(this.blockRules, function (ruleInfo) { self.usingRuleMap[ruleInfo.rule.name] = Object.getPrototypeOf(ruleInfo.rule); });
+ $tw.utils.each(this.inlineRules, function (ruleInfo) { self.usingRuleMap[ruleInfo.rule.name] = Object.getPrototypeOf(ruleInfo.rule); });
// Return the parse tree
};
@@ -116,7 +121,7 @@ WikiParser.prototype.loadRemoteTiddler = function(url) {
*/
WikiParser.prototype.setupRules = function(proto,configPrefix) {
var self = this;
- if(!$tw.safemode) {
+ if(!$tw.safeMode) {
$tw.utils.each(proto,function(object,name) {
if(self.wiki.getTiddlerText(configPrefix + name,"enable") !== "enable") {
delete proto[name];
@@ -191,6 +196,7 @@ Parse any pragmas at the beginning of a block of parse text
WikiParser.prototype.parsePragmas = function() {
var currentTreeBranch = this.tree;
while(true) {
+ var savedPos = this.pos;
// Skip whitespace
this.skipWhitespace();
// Check for the end of the text
@@ -201,16 +207,24 @@ WikiParser.prototype.parsePragmas = function() {
var nextMatch = this.findNextMatch(this.pragmaRules,this.pos);
// If not, just exit
if(!nextMatch || nextMatch.matchIndex !== this.pos) {
+ this.pos = savedPos;
break;
}
// Process the pragma rule
+ var start = this.pos;
var subTree = nextMatch.rule.parse();
if(subTree.length > 0) {
+ // Set the start and end positions of the pragma rule if
+ if (subTree[0].start === undefined) subTree[0].start = start;
+ if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
+ $tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
// Quick hack; we only cope with a single parse tree node being returned, which is true at the moment
currentTreeBranch.push.apply(currentTreeBranch,subTree);
subTree[0].children = [];
currentTreeBranch = subTree[0].children;
}
+ // Skip whitespace after the pragma
+ this.skipWhitespace();
}
return currentTreeBranch;
};
@@ -220,7 +234,7 @@ Parse a block from the current position
terminatorRegExpString: optional regular expression string that identifies the end of plain paragraphs. Must not include capturing parenthesis
*/
WikiParser.prototype.parseBlock = function(terminatorRegExpString) {
- var terminatorRegExp = terminatorRegExpString ? new RegExp("(" + terminatorRegExpString + "|\\r?\\n\\r?\\n)","mg") : /(\r?\n\r?\n)/mg;
+ var terminatorRegExp = terminatorRegExpString ? new RegExp(terminatorRegExpString + "|\\r?\\n\\r?\\n","mg") : /(\r?\n\r?\n)/mg;
this.skipWhitespace();
if(this.pos >= this.sourceLength) {
return [];
@@ -228,10 +242,21 @@ WikiParser.prototype.parseBlock = function(terminatorRegExpString) {
// Look for a block rule that applies at the current position
var nextMatch = this.findNextMatch(this.blockRules,this.pos);
if(nextMatch && nextMatch.matchIndex === this.pos) {
- return nextMatch.rule.parse();
+ var start = this.pos;
+ var subTree = nextMatch.rule.parse();
+ // Set the start and end positions of the first and last blocks if they're not already set
+ if (subTree.length > 0) {
+ if (subTree[0].start === undefined) subTree[0].start = start;
+ if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
+ }
+ $tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
+ return subTree;
}
// Treat it as a paragraph if we didn't find a block rule
- return [{type: "element", tag: "p", children: this.parseInlineRun(terminatorRegExp)}];
+ var start = this.pos;
+ var children = this.parseInlineRun(terminatorRegExp);
+ var end = this.pos;
+ return [{type: "element", tag: "p", children: children, start: start, end: end }];
};
/*
@@ -258,11 +283,21 @@ WikiParser.prototype.parseBlocksUnterminated = function() {
};
/*
-Parse blocks of text until a terminating regexp is encountered
+Parse blocks of text until a terminating regexp is encountered. Wrapper for parseBlocksTerminatedExtended that just returns the parse tree
*/
WikiParser.prototype.parseBlocksTerminated = function(terminatorRegExpString) {
- var terminatorRegExp = new RegExp("(" + terminatorRegExpString + ")","mg"),
- tree = [];
+ var ex = this.parseBlocksTerminatedExtended(terminatorRegExpString);
+ return ex.tree;
+};
+
+/*
+Parse blocks of text until a terminating regexp is encountered
+*/
+WikiParser.prototype.parseBlocksTerminatedExtended = function(terminatorRegExpString) {
+ var terminatorRegExp = new RegExp(terminatorRegExpString,"mg"),
+ result = {
+ tree: []
+ };
// Skip any whitespace
this.skipWhitespace();
// Check if we've got the end marker
@@ -271,7 +306,7 @@ WikiParser.prototype.parseBlocksTerminated = function(terminatorRegExpString) {
// Parse the text into blocks
while(this.pos < this.sourceLength && !(match && match.index === this.pos)) {
var blocks = this.parseBlock(terminatorRegExpString);
- tree.push.apply(tree,blocks);
+ result.tree.push.apply(result.tree,blocks);
// Skip any whitespace
this.skipWhitespace();
// Check if we've got the end marker
@@ -280,8 +315,9 @@ WikiParser.prototype.parseBlocksTerminated = function(terminatorRegExpString) {
}
if(match && match.index === this.pos) {
this.pos = match.index + match[0].length;
+ result.match = match;
}
- return tree;
+ return result;
};
/*
@@ -307,23 +343,37 @@ WikiParser.prototype.parseInlineRunUnterminated = function(options) {
while(this.pos < this.sourceLength && nextMatch) {
// Process the text preceding the run rule
if(nextMatch.matchIndex > this.pos) {
- this.pushTextWidget(tree,this.source.substring(this.pos,nextMatch.matchIndex));
+ this.pushTextWidget(tree,this.source.substring(this.pos,nextMatch.matchIndex),this.pos,nextMatch.matchIndex);
this.pos = nextMatch.matchIndex;
}
// Process the run rule
- tree.push.apply(tree,nextMatch.rule.parse());
+ var start = this.pos;
+ var subTree = nextMatch.rule.parse();
+ // Set the start and end positions of the first and last child if they're not already set
+ if (subTree.length > 0) {
+ // Set the start and end positions of the first and last child if they're not already set
+ if (subTree[0].start === undefined) subTree[0].start = start;
+ if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
+ }
+ $tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
+ tree.push.apply(tree,subTree);
// Look for the next run rule
nextMatch = this.findNextMatch(this.inlineRules,this.pos);
}
// Process the remaining text
if(this.pos < this.sourceLength) {
- this.pushTextWidget(tree,this.source.substr(this.pos));
+ this.pushTextWidget(tree,this.source.substr(this.pos),this.pos,this.sourceLength);
}
this.pos = this.sourceLength;
return tree;
};
WikiParser.prototype.parseInlineRunTerminated = function(terminatorRegExp,options) {
+ var ex = this.parseInlineRunTerminatedExtended(terminatorRegExp,options);
+ return ex.tree;
+};
+
+WikiParser.prototype.parseInlineRunTerminatedExtended = function(terminatorRegExp,options) {
options = options || {};
var tree = [];
// Find the next occurrence of the terminator
@@ -337,24 +387,35 @@ WikiParser.prototype.parseInlineRunTerminated = function(terminatorRegExp,option
if(terminatorMatch) {
if(!inlineRuleMatch || inlineRuleMatch.matchIndex >= terminatorMatch.index) {
if(terminatorMatch.index > this.pos) {
- this.pushTextWidget(tree,this.source.substring(this.pos,terminatorMatch.index));
+ this.pushTextWidget(tree,this.source.substring(this.pos,terminatorMatch.index),this.pos,terminatorMatch.index);
}
this.pos = terminatorMatch.index;
if(options.eatTerminator) {
this.pos += terminatorMatch[0].length;
}
- return tree;
+ return {
+ match: terminatorMatch,
+ tree: tree
+ };
}
}
// Process any inline rule, along with the text preceding it
if(inlineRuleMatch) {
// Preceding text
if(inlineRuleMatch.matchIndex > this.pos) {
- this.pushTextWidget(tree,this.source.substring(this.pos,inlineRuleMatch.matchIndex));
+ this.pushTextWidget(tree,this.source.substring(this.pos,inlineRuleMatch.matchIndex),this.pos,inlineRuleMatch.matchIndex);
this.pos = inlineRuleMatch.matchIndex;
}
// Process the inline rule
- tree.push.apply(tree,inlineRuleMatch.rule.parse());
+ var start = this.pos;
+ var subTree = inlineRuleMatch.rule.parse();
+ // Set the start and end positions of the first and last child if they're not already set
+ if (subTree.length > 0) {
+ if (subTree[0].start === undefined) subTree[0].start = start;
+ if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
+ }
+ $tw.utils.each(subTree, function (node) { node.rule = inlineRuleMatch.rule.name; });
+ tree.push.apply(tree,subTree);
// Look for the next inline rule
inlineRuleMatch = this.findNextMatch(this.inlineRules,this.pos);
// Look for the next terminator match
@@ -364,21 +425,23 @@ WikiParser.prototype.parseInlineRunTerminated = function(terminatorRegExp,option
}
// Process the remaining text
if(this.pos < this.sourceLength) {
- this.pushTextWidget(tree,this.source.substr(this.pos));
+ this.pushTextWidget(tree,this.source.substr(this.pos),this.pos,this.sourceLength);
}
this.pos = this.sourceLength;
- return tree;
+ return {
+ tree: tree
+ };
};
/*
Push a text widget onto an array, respecting the configTrimWhiteSpace setting
*/
-WikiParser.prototype.pushTextWidget = function(array,text) {
+WikiParser.prototype.pushTextWidget = function(array,text,start,end) {
if(this.configTrimWhiteSpace) {
text = $tw.utils.trim(text);
}
if(text) {
- array.push({type: "text", text: text});
+ array.push({type: "text", text: text, start: start, end: end});
}
};
@@ -429,6 +492,3 @@ WikiParser.prototype.amendRules = function(type,names) {
};
exports["text/vnd.tiddlywiki"] = WikiParser;
-
-})();
-
diff --git a/core/modules/parsers/wikiparser/wikirulebase.js b/core/modules/parsers/wikiparser/wikirulebase.js
index 8aa960ef7..a9d6c748f 100644
--- a/core/modules/parsers/wikiparser/wikirulebase.js
+++ b/core/modules/parsers/wikiparser/wikirulebase.js
@@ -6,10 +6,7 @@ module-type: global
Base class for wiki parser rules
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -35,5 +32,3 @@ WikiRuleBase.prototype.findNextMatch = function(startPos) {
};
exports.WikiRuleBase = WikiRuleBase;
-
-})();
diff --git a/core/modules/pluginswitcher.js b/core/modules/pluginswitcher.js
index 395dc8b20..d89d261d7 100644
--- a/core/modules/pluginswitcher.js
+++ b/core/modules/pluginswitcher.js
@@ -6,10 +6,7 @@ module-type: global
Manages switching plugins for themes and languages.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -52,7 +49,7 @@ PluginSwitcher.prototype.switchPlugins = function() {
var tiddler = self.wiki.getTiddler(title);
if(tiddler && tiddler.isPlugin() && plugins.indexOf(title) === -1) {
plugins.push(title);
- var pluginInfo = JSON.parse(self.wiki.getTiddlerText(title)),
+ var pluginInfo = $tw.utils.parseJSONSafe(self.wiki.getTiddlerText(title)),
dependents = $tw.utils.parseStringArray(tiddler.fields.dependents || "");
$tw.utils.each(dependents,function(title) {
accumulatePlugin(title);
@@ -75,5 +72,3 @@ PluginSwitcher.prototype.switchPlugins = function() {
};
exports.PluginSwitcher = PluginSwitcher;
-
-})();
diff --git a/core/modules/saver-handler.js b/core/modules/saver-handler.js
index e2ac21361..7f4e834a0 100644
--- a/core/modules/saver-handler.js
+++ b/core/modules/saver-handler.js
@@ -6,10 +6,7 @@ module-type: global
The saver handler tracks changes to the store and handles saving the entire wiki via saver modules.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -46,8 +43,10 @@ function SaverHandler(options) {
// Filter the changes so that we only count changes to tiddlers that we care about
var filteredChanges = self.filterFn.call(self.wiki,function(iterator) {
$tw.utils.each(changes,function(change,title) {
- var tiddler = self.wiki.getTiddler(title);
- iterator(tiddler,title);
+ if(change.normal) {
+ var tiddler = self.wiki.getTiddler(title);
+ iterator(tiddler,title);
+ }
});
});
// Adjust the number of changes
@@ -95,6 +94,7 @@ function SaverHandler(options) {
if($tw.browser) {
$tw.rootWidget.addEventListener("tm-save-wiki",function(event) {
self.saveWiki({
+ wiki: event.widget.wiki,
template: event.param,
downloadType: "text/plain",
variables: event.paramObject
@@ -102,6 +102,7 @@ function SaverHandler(options) {
});
$tw.rootWidget.addEventListener("tm-download-file",function(event) {
self.saveWiki({
+ wiki: event.widget.wiki,
method: "download",
template: event.param,
downloadType: "text/plain",
@@ -147,19 +148,22 @@ Save the wiki contents. Options are:
method: "save", "autosave" or "download"
template: the tiddler containing the template to save
downloadType: the content type for the saved file
+ wiki: optional wiki, overriding the default wiki specified in the constructor
*/
SaverHandler.prototype.saveWiki = function(options) {
options = options || {};
var self = this,
+ wiki = options.wiki || this.wiki,
method = options.method || "save";
// Ignore autosave if disabled
- if(method === "autosave" && ($tw.config.disableAutoSave || this.wiki.getTiddlerText(this.titleAutoSave,"yes") !== "yes")) {
+ if(method === "autosave" && ($tw.config.disableAutoSave || wiki.getTiddlerText(this.titleAutoSave,"yes") !== "yes")) {
return false;
}
var variables = options.variables || {},
- template = options.template || "$:/core/save/all",
+ template = (options.template ||
+ wiki.getTiddlerText("$:/config/SaveWikiButton/Template","$:/core/save/all")).trim(),
downloadType = options.downloadType || "text/plain",
- text = this.wiki.renderTiddler(downloadType,template,options),
+ text = wiki.renderTiddler(downloadType,template,options),
callback = function(err) {
if(err) {
alert($tw.language.getString("Error/WhileSaving") + ":\n\n" + err);
@@ -178,7 +182,7 @@ SaverHandler.prototype.saveWiki = function(options) {
// Call the highest priority saver that supports this method
for(var t=this.savers.length-1; t>=0; t--) {
var saver = this.savers[t];
- if(saver.info.capabilities.indexOf(method) !== -1 && saver.save(text,method,callback,{variables: {filename: variables.filename}})) {
+ if(saver.info.capabilities.indexOf(method) !== -1 && saver.save(text,method,callback,{variables: {filename: variables.filename, type: variables.type}})) {
this.logger.log("Saving wiki with method",method,"through saver",saver.info.name);
return true;
}
@@ -207,5 +211,3 @@ SaverHandler.prototype.updateDirtyStatus = function() {
};
exports.SaverHandler = SaverHandler;
-
-})();
diff --git a/core/modules/savers/andtidwiki.js b/core/modules/savers/andtidwiki.js
index df2b0ceaa..5ce4dbe0e 100644
--- a/core/modules/savers/andtidwiki.js
+++ b/core/modules/savers/andtidwiki.js
@@ -6,10 +6,8 @@ module-type: saver
Handles saving changes via the AndTidWiki Android app
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false, netscape: false, Components: false */
+
"use strict";
var AndTidWiki = function(wiki) {
@@ -42,7 +40,7 @@ AndTidWiki.prototype.save = function(text,method,callback,options) {
window.twi.saveWiki(text);
} else {
// Get the pathname of this document
- var pathname = decodeURIComponent(document.location.toString().split("#")[0]);
+ var pathname = $tw.utils.decodeURIComponentSafe(document.location.toString().split("#")[0]);
// Strip the file://
if(pathname.indexOf("file://") === 0) {
pathname = pathname.substr(7);
@@ -86,5 +84,3 @@ Create an instance of this saver
exports.create = function(wiki) {
return new AndTidWiki(wiki);
};
-
-})();
diff --git a/core/modules/savers/beaker.js b/core/modules/savers/beaker.js
deleted file mode 100644
index dc24ef67f..000000000
--- a/core/modules/savers/beaker.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/*\
-title: $:/core/modules/savers/beaker.js
-type: application/javascript
-module-type: saver
-
-Saves files using the Beaker browser's (https://beakerbrowser.com) Dat protocol (https://datproject.org/)
-Compatible with beaker >= V0.7.2
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Set up the saver
-*/
-var BeakerSaver = function(wiki) {
- this.wiki = wiki;
-};
-
-BeakerSaver.prototype.save = function(text,method,callback) {
- var dat = new DatArchive("" + window.location),
- pathname = ("" + window.location.pathname).split("#")[0];
- dat.stat(pathname).then(function(value) {
- if(value.isDirectory()) {
- pathname = pathname + "/index.html";
- }
- dat.writeFile(pathname,text,"utf8").then(function(value) {
- callback(null);
- },function(reason) {
- callback("Beaker Saver Write Error: " + reason);
- });
- },function(reason) {
- callback("Beaker Saver Stat Error: " + reason);
- });
- return true;
-};
-
-/*
-Information about this saver
-*/
-BeakerSaver.prototype.info = {
- name: "beaker",
- priority: 3000,
- capabilities: ["save", "autosave"]
-};
-
-/*
-Static method that returns true if this saver is capable of working
-*/
-exports.canSave = function(wiki) {
- return !!window.DatArchive && location.protocol==="dat:";
-};
-
-/*
-Create an instance of this saver
-*/
-exports.create = function(wiki) {
- return new BeakerSaver(wiki);
-};
-
-})();
diff --git a/core/modules/savers/custom.js b/core/modules/savers/custom.js
index 836691204..dc5f91703 100644
--- a/core/modules/savers/custom.js
+++ b/core/modules/savers/custom.js
@@ -9,10 +9,7 @@ on the parent window (of an iframe). If present, the saver must define
and the saver may define
priority: number
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var findSaver = function(window) {
@@ -57,4 +54,3 @@ Create an instance of this saver
exports.create = function(wiki) {
return new CustomSaver(wiki);
};
-})();
diff --git a/core/modules/savers/download.js b/core/modules/savers/download.js
index 3f5740dcd..156dea144 100644
--- a/core/modules/savers/download.js
+++ b/core/modules/savers/download.js
@@ -6,10 +6,7 @@ module-type: saver
Handles saving changes via HTML5's download APIs
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -22,23 +19,29 @@ DownloadSaver.prototype.save = function(text,method,callback,options) {
options = options || {};
// Get the current filename
var filename = options.variables.filename;
+ var type = options.variables.type;
if(!filename) {
var p = document.location.pathname.lastIndexOf("/");
if(p !== -1) {
// We decode the pathname because document.location is URL encoded by the browser
- filename = decodeURIComponent(document.location.pathname.substr(p+1));
+ filename = $tw.utils.decodeURIComponentSafe(document.location.pathname.substr(p+1));
}
}
if(!filename) {
filename = "tiddlywiki.html";
}
+ if(!type) {
+ type = "text/html";
+ }
// Set up the link
var link = document.createElement("a");
- if(Blob !== undefined) {
- var blob = new Blob([text], {type: "text/html"});
+ // We prefer Blobs if they're available, unless we're dealing with a tiddler type declaring itself full of base64 encoded content.
+ // Then we use data urls, because browsers will know to decode the stream and download the actual binary file as intended.
+ if(Blob !== undefined && !type.includes(";base64")) {
+ var blob = new Blob([text], {type: type});
link.setAttribute("href", URL.createObjectURL(blob));
} else {
- link.setAttribute("href","data:text/html," + encodeURIComponent(text));
+ link.setAttribute("href","data:" + type + "," + encodeURIComponent(text));
}
link.setAttribute("download",filename);
document.body.appendChild(link);
@@ -80,5 +83,3 @@ Create an instance of this saver
exports.create = function(wiki) {
return new DownloadSaver(wiki);
};
-
-})();
diff --git a/core/modules/savers/fsosaver.js b/core/modules/savers/fsosaver.js
index 37224e42a..85b56e956 100644
--- a/core/modules/savers/fsosaver.js
+++ b/core/modules/savers/fsosaver.js
@@ -9,10 +9,7 @@ Note: Since TiddlyWiki's markup contains the MOTW, the FileSystemObject normally
However, if the wiki is loaded as an .HTA file (Windows HTML Applications) then the FSO can be used.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -70,5 +67,3 @@ Create an instance of this saver
exports.create = function(wiki) {
return new FSOSaver(wiki);
};
-
-})();
diff --git a/core/modules/savers/gitea.js b/core/modules/savers/gitea.js
index 2c0242566..ef23214c1 100644
--- a/core/modules/savers/gitea.js
+++ b/core/modules/savers/gitea.js
@@ -6,10 +6,7 @@ module-type: saver
Saves wiki by pushing a commit to the gitea
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -61,7 +58,7 @@ GiteaSaver.prototype.save = function(text,method,callback) {
}
var use_put = true;
if(xhr.status !== 404) {
- getResponseData = JSON.parse(getResponseDataJson);
+ getResponseData = $tw.utils.parseJSONSafe(getResponseDataJson);
$tw.utils.each(getResponseData,function(details) {
if(details.name === filename) {
sha = details.sha;
@@ -72,7 +69,7 @@ GiteaSaver.prototype.save = function(text,method,callback) {
}
}
var data = {
- message: $tw.language.getRawString("ControlPanel/Saving/GitService/CommitMessage"),
+ message: $tw.language.getString("ControlPanel/Saving/GitService/CommitMessage"),
content: $tw.utils.base64Encode(text),
sha: sha
};
@@ -104,7 +101,7 @@ GiteaSaver.prototype.upload = function(uri,method,headers,data,callback) {
if(err) {
return callback(err);
}
- var putResponseData = JSON.parse(putResponseDataJson);
+ var putResponseData = $tw.utils.parseJSONSafe(putResponseDataJson);
callback(null);
}
});
@@ -132,5 +129,3 @@ Create an instance of this saver
exports.create = function(wiki) {
return new GiteaSaver(wiki);
};
-
-})();
diff --git a/core/modules/savers/github.js b/core/modules/savers/github.js
index 2276a2346..f0dca48fc 100644
--- a/core/modules/savers/github.js
+++ b/core/modules/savers/github.js
@@ -6,10 +6,7 @@ module-type: saver
Saves wiki by pushing a commit to the GitHub v3 REST API
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -31,7 +28,7 @@ GitHubSaver.prototype.save = function(text,method,callback) {
headers = {
"Accept": "application/vnd.github.v3+json",
"Content-Type": "application/json;charset=UTF-8",
- "Authorization": "Basic " + window.btoa(username + ":" + password),
+ "Authorization": "Basic " + $tw.utils.base64Encode(username + ":" + password),
"If-None-Match": ""
};
// Bail if we don't have everything we need
@@ -61,7 +58,7 @@ GitHubSaver.prototype.save = function(text,method,callback) {
return callback(err);
}
if(xhr.status !== 404) {
- getResponseData = JSON.parse(getResponseDataJson);
+ getResponseData = $tw.utils.parseJSONSafe(getResponseDataJson);
$tw.utils.each(getResponseData,function(details) {
if(details.name === filename) {
sha = details.sha;
@@ -69,7 +66,7 @@ GitHubSaver.prototype.save = function(text,method,callback) {
});
}
var data = {
- message: $tw.language.getRawString("ControlPanel/Saving/GitService/CommitMessage"),
+ message: $tw.language.getString("ControlPanel/Saving/GitService/CommitMessage"),
content: $tw.utils.base64Encode(text),
branch: branch,
sha: sha
@@ -84,7 +81,7 @@ GitHubSaver.prototype.save = function(text,method,callback) {
if(err) {
return callback(err);
}
- var putResponseData = JSON.parse(putResponseDataJson);
+ var putResponseData = $tw.utils.parseJSONSafe(putResponseDataJson);
callback(null);
}
});
@@ -115,5 +112,3 @@ Create an instance of this saver
exports.create = function(wiki) {
return new GitHubSaver(wiki);
};
-
-})();
diff --git a/core/modules/savers/gitlab.js b/core/modules/savers/gitlab.js
index 7796ed743..43305b578 100644
--- a/core/modules/savers/gitlab.js
+++ b/core/modules/savers/gitlab.js
@@ -6,10 +6,7 @@ module-type: saver
Saves wiki by pushing a commit to the GitLab REST API
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: true */
"use strict";
/*
@@ -58,7 +55,7 @@ GitLabSaver.prototype.save = function(text,method,callback) {
}
var requestType = "POST";
if(xhr.status !== 404) {
- getResponseData = JSON.parse(getResponseDataJson);
+ getResponseData = $tw.utils.parseJSONSafe(getResponseDataJson);
$tw.utils.each(getResponseData,function(details) {
if(details.name === filename) {
requestType = "PUT";
@@ -67,7 +64,7 @@ GitLabSaver.prototype.save = function(text,method,callback) {
});
}
var data = {
- commit_message: $tw.language.getRawString("ControlPanel/Saving/GitService/CommitMessage"),
+ commit_message: $tw.language.getString("ControlPanel/Saving/GitService/CommitMessage"),
content: text,
branch: branch,
sha: sha
@@ -82,7 +79,7 @@ GitLabSaver.prototype.save = function(text,method,callback) {
if(err) {
return callback(err);
}
- var putResponseData = JSON.parse(putResponseDataJson);
+ var putResponseData = $tw.utils.parseJSONSafe(putResponseDataJson);
callback(null);
}
});
@@ -113,5 +110,3 @@ Create an instance of this saver
exports.create = function(wiki) {
return new GitLabSaver(wiki);
};
-
-})();
diff --git a/core/modules/savers/hyperdrive.js b/core/modules/savers/hyperdrive.js
deleted file mode 100644
index 232392672..000000000
--- a/core/modules/savers/hyperdrive.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/*\
-title: $:/core/modules/savers/hyperdrive.js
-type: application/javascript
-module-type: saver
-
-Saves files using the Hyperdrive Protocol (https://hypercore-protocol.org/#hyperdrive) Beaker browser beta-1.0 and later (https://beakerbrowser.com)
-Compatible with beaker >= V1.0.0
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Set up the saver
-*/
-var HyperdriveSaver = function(wiki) {
- this.wiki = wiki;
-};
-
-HyperdriveSaver.prototype.save = function(text,method,callback) {
- var dat = beaker.hyperdrive.drive("" + window.location),
- pathname = ("" + window.location.pathname).split("#")[0];
- dat.stat(pathname).then(function(value) {
- if(value.isDirectory()) {
- pathname = pathname + "/index.html";
- }
- dat.writeFile(pathname,text,"utf8").then(function(value) {
- callback(null);
- },function(reason) {
- callback("Hyperdrive Saver Write Error: " + reason);
- });
- },function(reason) {
- callback("Hyperdrive Saver Stat Error: " + reason);
- });
- return true;
-};
-
-/*
-Information about this saver
-*/
-HyperdriveSaver.prototype.info = {
- name: "beaker-1.x",
- priority: 3000,
- capabilities: ["save", "autosave"]
-};
-
-/*
-Static method that returns true if this saver is capable of working
-*/
-exports.canSave = function(wiki) {
- return !!window.beaker && !!beaker.hyperdrive && location.protocol==="hyper:";
-};
-
-/*
-Create an instance of this saver
-*/
-exports.create = function(wiki) {
- return new HyperdriveSaver(wiki);
-};
-
-})();
diff --git a/core/modules/savers/manualdownload.js b/core/modules/savers/manualdownload.js
index af9bcd743..bb3c3c142 100644
--- a/core/modules/savers/manualdownload.js
+++ b/core/modules/savers/manualdownload.js
@@ -6,10 +6,7 @@ module-type: saver
Handles saving changes via HTML5's download APIs
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Title of the tiddler containing the download message
@@ -52,5 +49,3 @@ Create an instance of this saver
exports.create = function(wiki) {
return new ManualDownloadSaver(wiki);
};
-
-})();
diff --git a/core/modules/savers/msdownload.js b/core/modules/savers/msdownload.js
index 6cb55c334..233fd3571 100644
--- a/core/modules/savers/msdownload.js
+++ b/core/modules/savers/msdownload.js
@@ -6,10 +6,7 @@ module-type: saver
Handles saving changes via window.navigator.msSaveBlob()
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -55,5 +52,3 @@ Create an instance of this saver
exports.create = function(wiki) {
return new MsDownloadSaver(wiki);
};
-
-})();
diff --git a/core/modules/savers/put.js b/core/modules/savers/put.js
index 771f21c0e..b77cfdfc8 100644
--- a/core/modules/savers/put.js
+++ b/core/modules/savers/put.js
@@ -9,10 +9,7 @@ Works with any server which accepts a PUT request
to the current URL, such as a WebDAV server.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -20,7 +17,7 @@ Retrieve ETag if available
*/
var retrieveETag = function(self) {
var headers = {
- Accept: "*/*;charset=UTF-8"
+ Accept: "*/*"
};
$tw.utils.httpRequest({
url: self.uri(),
@@ -48,14 +45,14 @@ var PutSaver = function(wiki) {
var self = this;
var uri = this.uri();
// Async server probe. Until probe finishes, save will fail fast
- // See also https://github.com/Jermolene/TiddlyWiki5/issues/2276
+ // See also https://github.com/TiddlyWiki/TiddlyWiki5/issues/2276
$tw.utils.httpRequest({
url: uri,
type: "OPTIONS",
callback: function(err,data,xhr) {
// Check DAV header http://www.webdav.org/specs/rfc2518.html#rfc.section.9.1
if(!err) {
- self.serverAcceptsPuts = xhr.status === 200 && !!xhr.getResponseHeader("dav");
+ self.serverAcceptsPuts = xhr.status >= 200 && xhr.status < 300 && !!xhr.getResponseHeader("dav");
}
}
});
@@ -80,6 +77,7 @@ PutSaver.prototype.save = function(text,method,callback) {
if(this.etag) {
headers["If-Match"] = this.etag;
}
+ $tw.notifier.display("$:/language/Notifications/Save/Starting");
$tw.utils.httpRequest({
url: this.uri(),
type: "PUT",
@@ -87,14 +85,20 @@ PutSaver.prototype.save = function(text,method,callback) {
data: text,
callback: function(err,data,xhr) {
if(err) {
- // response is textual: "XMLHttpRequest error code: 412"
- var status = Number(err.substring(err.indexOf(':') + 2, err.length))
- if(status === 412) { // edit conflict
- var message = $tw.language.getString("Error/EditConflict");
- callback(message);
- } else {
- callback(err); // fail
+ var status = xhr.status,
+ errorMsg = err;
+ if(status === 412) { // file changed on server
+ errorMsg = $tw.language.getString("Error/PutEditConflict");
+ } else if(status === 401) { // authentication required
+ errorMsg = $tw.language.getString("Error/PutUnauthorized");
+ } else if(status === 403) { // permission denied
+ errorMsg = $tw.language.getString("Error/PutForbidden");
}
+ if (xhr.responseText) {
+ // treat any server response like a plain text error explanation
+ errorMsg = errorMsg + "\n\n" + xhr.responseText;
+ }
+ callback(errorMsg); // fail
} else {
self.etag = xhr.getResponseHeader("ETag");
if(self.etag == null) {
@@ -129,5 +133,3 @@ Create an instance of this saver
exports.create = function(wiki) {
return new PutSaver(wiki);
};
-
-})();
diff --git a/core/modules/savers/tiddlyfox.js b/core/modules/savers/tiddlyfox.js
index 3abe31afe..2356e287e 100644
--- a/core/modules/savers/tiddlyfox.js
+++ b/core/modules/savers/tiddlyfox.js
@@ -6,10 +6,7 @@ module-type: saver
Handles saving changes via the TiddlyFox file extension
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false, netscape: false, Components: false */
"use strict";
var TiddlyFoxSaver = function(wiki) {
@@ -43,7 +40,7 @@ TiddlyFoxSaver.prototype.save = function(text,method,callback) {
}
// Create the message element and put it in the message box
var message = document.createElement("div");
- message.setAttribute("data-tiddlyfox-path",decodeURIComponent(pathname));
+ message.setAttribute("data-tiddlyfox-path",$tw.utils.decodeURIComponentSafe(pathname));
message.setAttribute("data-tiddlyfox-content",text);
messageBox.appendChild(message);
// Add an event handler for when the file has been saved
@@ -82,5 +79,3 @@ Create an instance of this saver
exports.create = function(wiki) {
return new TiddlyFoxSaver(wiki);
};
-
-})();
diff --git a/core/modules/savers/tiddlyie.js b/core/modules/savers/tiddlyie.js
index d6d49db45..3b380592d 100644
--- a/core/modules/savers/tiddlyie.js
+++ b/core/modules/savers/tiddlyie.js
@@ -6,10 +6,7 @@ module-type: saver
Handles saving changes via Internet Explorer BHO extenion (TiddlyIE)
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -67,5 +64,3 @@ Create an instance of this saver
exports.create = function(wiki) {
return new TiddlyIESaver(wiki);
};
-
-})();
diff --git a/core/modules/savers/twedit.js b/core/modules/savers/twedit.js
index 6907a542c..8aae0c54e 100644
--- a/core/modules/savers/twedit.js
+++ b/core/modules/savers/twedit.js
@@ -6,10 +6,7 @@ module-type: saver
Handles saving changes via the TWEdit iOS app
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false, netscape: false, Components: false */
"use strict";
var TWEditSaver = function(wiki) {
@@ -21,7 +18,7 @@ TWEditSaver.prototype.save = function(text,method,callback) {
return false;
}
// Get the pathname of this document
- var pathname = decodeURIComponent(document.location.pathname);
+ var pathname = $tw.utils.decodeURIComponentSafe(document.location.pathname);
// Strip any query or location part
var p = pathname.indexOf("?");
if(p !== -1) {
@@ -87,5 +84,3 @@ exports.create = function(wiki) {
if($tw.browser) {
window.version = {title: "TiddlyWiki"};
}
-
-})();
diff --git a/core/modules/savers/upload.js b/core/modules/savers/upload.js
index a7264338d..35e05286e 100644
--- a/core/modules/savers/upload.js
+++ b/core/modules/savers/upload.js
@@ -8,10 +8,7 @@ Handles saving changes via upload to a server.
Designed to be compatible with BidiX's UploadPlugin at http://tiddlywiki.bidix.info/#UploadPlugin
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -47,10 +44,10 @@ UploadSaver.prototype.save = function(text,method,callback) {
}
// Construct the url if not provided
if(!url) {
- url = "http://" + username + ".tiddlyspot.com/store.cgi";
+ url = "http://" + username + ".tiddlyhost.com/";
}
// Assemble the header
- var boundary = "---------------------------" + "AaB03x";
+ var boundary = "---------------------------" + "AaB03x";
var uploadFormName = "UploadPlugin";
var head = [];
head.push("--" + boundary + "\r\nContent-disposition: form-data; name=\"UploadPlugin\"\r\n");
@@ -64,6 +61,7 @@ UploadSaver.prototype.save = function(text,method,callback) {
var tail = "\r\n--" + boundary + "--\r\n",
data = head.join("\r\n") + text + tail;
// Do the HTTP post
+ $tw.notifier.display("$:/language/Notifications/Save/Starting");
var http = new XMLHttpRequest();
http.open("POST",url,true,username,password);
http.setRequestHeader("Content-Type","multipart/form-data; charset=UTF-8; boundary=" + boundary);
@@ -81,7 +79,6 @@ UploadSaver.prototype.save = function(text,method,callback) {
} catch(ex) {
return callback($tw.language.getString("Error/Caption") + ":" + ex);
}
- $tw.notifier.display("$:/language/Notifications/Save/Starting");
return true;
};
@@ -107,5 +104,3 @@ Create an instance of this saver
exports.create = function(wiki) {
return new UploadSaver(wiki);
};
-
-})();
diff --git a/core/modules/server/routes/delete-tiddler.js b/core/modules/server/routes/delete-tiddler.js
deleted file mode 100644
index d04020c75..000000000
--- a/core/modules/server/routes/delete-tiddler.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*\
-title: $:/core/modules/server/routes/delete-tiddler.js
-type: application/javascript
-module-type: route
-
-DELETE /recipes/default/tiddlers/:title
-
-\*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-exports.method = "DELETE";
-
-exports.path = /^\/bags\/default\/tiddlers\/(.+)$/;
-
-exports.handler = function(request,response,state) {
- var title = decodeURIComponent(state.params[0]);
- state.wiki.deleteTiddler(title);
- response.writeHead(204, "OK", {
- "Content-Type": "text/plain"
- });
- response.end();
-};
-
-}());
diff --git a/core/modules/server/routes/get-favicon.js b/core/modules/server/routes/get-favicon.js
deleted file mode 100644
index 79dd1a6be..000000000
--- a/core/modules/server/routes/get-favicon.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*\
-title: $:/core/modules/server/routes/get-favicon.js
-type: application/javascript
-module-type: route
-
-GET /favicon.ico
-
-\*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-exports.method = "GET";
-
-exports.path = /^\/favicon.ico$/;
-
-exports.handler = function(request,response,state) {
- response.writeHead(200, {"Content-Type": "image/x-icon"});
- var buffer = state.wiki.getTiddlerText("$:/favicon.ico","");
- response.end(buffer,"base64");
-};
-
-}());
diff --git a/core/modules/server/routes/get-file.js b/core/modules/server/routes/get-file.js
deleted file mode 100644
index ac4b01d7e..000000000
--- a/core/modules/server/routes/get-file.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*\
-title: $:/core/modules/server/routes/get-file.js
-type: application/javascript
-module-type: route
-
-GET /files/:filepath
-
-\*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-exports.method = "GET";
-
-exports.path = /^\/files\/(.+)$/;
-
-exports.handler = function(request,response,state) {
- var path = require("path"),
- fs = require("fs"),
- util = require("util"),
- suppliedFilename = decodeURIComponent(state.params[0]),
- filename = path.resolve(state.boot.wikiPath,"files",suppliedFilename),
- extension = path.extname(filename);
- fs.readFile(filename,function(err,content) {
- var status,content,type = "text/plain";
- if(err) {
- console.log("Error accessing file " + filename + ": " + err.toString());
- status = 404;
- content = "File '" + suppliedFilename + "' not found";
- } else {
- status = 200;
- content = content;
- type = ($tw.config.fileExtensionInfo[extension] ? $tw.config.fileExtensionInfo[extension].type : "application/octet-stream");
- }
- response.writeHead(status,{
- "Content-Type": type
- });
- response.end(content);
- });
-};
-
-}());
diff --git a/core/modules/server/routes/get-index.js b/core/modules/server/routes/get-index.js
deleted file mode 100644
index c90341925..000000000
--- a/core/modules/server/routes/get-index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*\
-title: $:/core/modules/server/routes/get-index.js
-type: application/javascript
-module-type: route
-
-GET /
-
-\*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-var zlib = require("zlib");
-
-exports.method = "GET";
-
-exports.path = /^\/$/;
-
-exports.handler = function(request,response,state) {
- var acceptEncoding = request.headers["accept-encoding"];
- if(!acceptEncoding) {
- acceptEncoding = "";
- }
- var text = state.wiki.renderTiddler(state.server.get("root-render-type"),state.server.get("root-tiddler")),
- responseHeaders = {
- "Content-Type": state.server.get("root-serve-type")
- };
- /*
- If the gzip=yes flag for `listen` is set, check if the user agent permits
- compression. If so, compress our response. Note that we use the synchronous
- functions from zlib to stay in the imperative style. The current `Server`
- doesn't depend on this, and we may just as well use the async versions.
- */
- if(state.server.enableGzip) {
- if (/\bdeflate\b/.test(acceptEncoding)) {
- responseHeaders["Content-Encoding"] = "deflate";
- text = zlib.deflateSync(text);
- } else if (/\bgzip\b/.test(acceptEncoding)) {
- responseHeaders["Content-Encoding"] = "gzip";
- text = zlib.gzipSync(text);
- }
- }
- response.writeHead(200,responseHeaders);
- response.end(text);
-};
-
-}());
diff --git a/core/modules/server/routes/get-status.js b/core/modules/server/routes/get-status.js
deleted file mode 100644
index c570c090b..000000000
--- a/core/modules/server/routes/get-status.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*\
-title: $:/core/modules/server/routes/get-status.js
-type: application/javascript
-module-type: route
-
-GET /status
-
-\*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-exports.method = "GET";
-
-exports.path = /^\/status$/;
-
-exports.handler = function(request,response,state) {
- response.writeHead(200, {"Content-Type": "application/json"});
- var text = JSON.stringify({
- username: state.authenticatedUsername || state.server.get("anon-username") || "",
- anonymous: !state.authenticatedUsername,
- read_only: !state.server.isAuthorized("writers",state.authenticatedUsername),
- sse_enabled: state.server.get("sse-enabled") === "yes",
- space: {
- recipe: "default"
- },
- tiddlywiki_version: $tw.version
- });
- response.end(text,"utf8");
-};
-
-}());
diff --git a/core/modules/server/routes/put-tiddler.js b/core/modules/server/routes/put-tiddler.js
deleted file mode 100644
index f6e49e5b2..000000000
--- a/core/modules/server/routes/put-tiddler.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*\
-title: $:/core/modules/server/routes/put-tiddler.js
-type: application/javascript
-module-type: route
-
-PUT /recipes/default/tiddlers/:title
-
-\*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-exports.method = "PUT";
-
-exports.path = /^\/recipes\/default\/tiddlers\/(.+)$/;
-
-exports.handler = function(request,response,state) {
- var title = decodeURIComponent(state.params[0]),
- fields = JSON.parse(state.data);
- // Pull up any subfields in the `fields` object
- if(fields.fields) {
- $tw.utils.each(fields.fields,function(field,name) {
- fields[name] = field;
- });
- delete fields.fields;
- }
- // Remove any revision field
- if(fields.revision) {
- delete fields.revision;
- }
- state.wiki.addTiddler(new $tw.Tiddler(state.wiki.getCreationFields(),fields,{title: title},state.wiki.getModificationFields()));
- var changeCount = state.wiki.getChangeCount(title).toString();
- response.writeHead(204, "OK",{
- Etag: "\"default/" + encodeURIComponent(title) + "/" + changeCount + ":\"",
- "Content-Type": "text/plain"
- });
- response.end();
-};
-
-}());
diff --git a/core/modules/server/server-sent-events.js b/core/modules/server/server-sent-events.js
deleted file mode 100644
index 377d64c7f..000000000
--- a/core/modules/server/server-sent-events.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/*\
-title: $:/core/modules/server/server-sent-events.js
-type: application/javascript
-module-type: library
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-parameters:
- prefix - usually the plugin path, such as `plugins/tiddlywiki/tiddlyweb`. The
- route will match `/events/${prefix}` exactly.
-
- handler - a function that will be called each time a request comes in with the
- request and state from the route and an emit function to call.
-*/
-
-var ServerSentEvents = function ServerSentEvents(prefix, handler) {
- this.handler = handler;
- this.prefix = prefix;
-};
-
-ServerSentEvents.prototype.getExports = function() {
- return {
- bodyFormat: "stream",
- method: "GET",
- path: new RegExp("^/events/" + this.prefix + "$"),
- handler: this.handleEventRequest.bind(this)
- };
-};
-
-ServerSentEvents.prototype.handleEventRequest = function(request,response,state) {
- if(ServerSentEvents.prototype.isEventStreamRequest(request)) {
- response.writeHead(200, {
- "Content-Type": "text/event-stream",
- "Cache-Control": "no-cache",
- "Connection": "keep-alive"
- });
- this.handler(request,state,this.emit.bind(this,response),this.end.bind(this,response));
- } else {
- response.writeHead(406,"Not Acceptable",{});
- response.end();
- }
-};
-
-ServerSentEvents.prototype.isEventStreamRequest = function(request) {
- return request.headers.accept &&
- request.headers.accept.match(/^text\/event-stream/);
-};
-
-ServerSentEvents.prototype.emit = function(response,event,data) {
- if(typeof event !== "string" || event.indexOf("\n") !== -1) {
- throw new Error("Type must be a single-line string");
- }
- if(typeof data !== "string" || data.indexOf("\n") !== -1) {
- throw new Error("Data must be a single-line string");
- }
- response.write("event: " + event + "\ndata: " + data + "\n\n", "utf8");
-};
-
-ServerSentEvents.prototype.end = function(response) {
- response.end();
-};
-
-exports.ServerSentEvents = ServerSentEvents;
-
-})();
diff --git a/core/modules/server/server.js b/core/modules/server/server.js
deleted file mode 100644
index 6e37e603a..000000000
--- a/core/modules/server/server.js
+++ /dev/null
@@ -1,276 +0,0 @@
-/*\
-title: $:/core/modules/server/server.js
-type: application/javascript
-module-type: library
-
-Serve tiddlers over http
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-if($tw.node) {
- var util = require("util"),
- fs = require("fs"),
- url = require("url"),
- path = require("path"),
- querystring = require("querystring");
-}
-
-/*
-A simple HTTP server with regexp-based routes
-options: variables - optional hashmap of variables to set (a misnomer - they are really constant parameters)
- routes - optional array of routes to use
- wiki - reference to wiki object
-*/
-function Server(options) {
- var self = this;
- this.routes = options.routes || [];
- this.authenticators = options.authenticators || [];
- this.wiki = options.wiki;
- this.boot = options.boot || $tw.boot;
- this.servername = $tw.utils.transliterateToSafeASCII(this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
- // Initialise the variables
- this.variables = $tw.utils.extend({},this.defaultVariables);
- if(options.variables) {
- for(var variable in options.variables) {
- if(options.variables[variable]) {
- this.variables[variable] = options.variables[variable];
- }
- }
- }
- $tw.utils.extend({},this.defaultVariables,options.variables);
- // Initialise CSRF
- this.csrfDisable = this.get("csrf-disable") === "yes";
- // Initialize Gzip compression
- this.enableGzip = this.get("gzip") === "yes";
- // Initialise authorization
- var authorizedUserName = (this.get("username") && this.get("password")) ? this.get("username") : "(anon)";
- this.authorizationPrincipals = {
- readers: (this.get("readers") || authorizedUserName).split(",").map($tw.utils.trim),
- writers: (this.get("writers") || authorizedUserName).split(",").map($tw.utils.trim)
- }
- // Load and initialise authenticators
- $tw.modules.forEachModuleOfType("authenticator", function(title,authenticatorDefinition) {
- // console.log("Loading server route " + title);
- self.addAuthenticator(authenticatorDefinition.AuthenticatorClass);
- });
- // Load route handlers
- $tw.modules.forEachModuleOfType("route", function(title,routeDefinition) {
- // console.log("Loading server route " + title);
- self.addRoute(routeDefinition);
- });
- // Initialise the http vs https
- this.listenOptions = null;
- this.protocol = "http";
- var tlsKeyFilepath = this.get("tls-key"),
- tlsCertFilepath = this.get("tls-cert");
- if(tlsCertFilepath && tlsKeyFilepath) {
- this.listenOptions = {
- key: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsKeyFilepath),"utf8"),
- cert: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsCertFilepath),"utf8")
- };
- this.protocol = "https";
- }
- this.transport = require(this.protocol);
-}
-
-Server.prototype.defaultVariables = {
- port: "8080",
- host: "127.0.0.1",
- "root-tiddler": "$:/core/save/all",
- "root-render-type": "text/plain",
- "root-serve-type": "text/html",
- "tiddler-render-type": "text/html",
- "tiddler-render-template": "$:/core/templates/server/static.tiddler.html",
- "system-tiddler-render-type": "text/plain",
- "system-tiddler-render-template": "$:/core/templates/wikified-tiddler",
- "debug-level": "none",
- "gzip": "no"
-};
-
-Server.prototype.get = function(name) {
- return this.variables[name];
-};
-
-Server.prototype.addRoute = function(route) {
- this.routes.push(route);
-};
-
-Server.prototype.addAuthenticator = function(AuthenticatorClass) {
- // Instantiate and initialise the authenticator
- var authenticator = new AuthenticatorClass(this),
- result = authenticator.init();
- if(typeof result === "string") {
- $tw.utils.error("Error: " + result);
- } else if(result) {
- // Only use the authenticator if it initialised successfully
- this.authenticators.push(authenticator);
- }
-};
-
-Server.prototype.findMatchingRoute = function(request,state) {
- for(var t=0; t<this.routes.length; t++) {
- var potentialRoute = this.routes[t],
- pathRegExp = potentialRoute.path,
- pathname = state.urlInfo.pathname,
- match;
- if(state.pathPrefix) {
- if(pathname.substr(0,state.pathPrefix.length) === state.pathPrefix) {
- pathname = pathname.substr(state.pathPrefix.length) || "/";
- match = potentialRoute.path.exec(pathname);
- } else {
- match = false;
- }
- } else {
- match = potentialRoute.path.exec(pathname);
- }
- if(match && request.method === potentialRoute.method) {
- state.params = [];
- for(var p=1; p<match.length; p++) {
- state.params.push(match[p]);
- }
- return potentialRoute;
- }
- }
- return null;
-};
-
-Server.prototype.methodMappings = {
- "GET": "readers",
- "OPTIONS": "readers",
- "HEAD": "readers",
- "PUT": "writers",
- "POST": "writers",
- "DELETE": "writers"
-};
-
-/*
-Check whether a given user is authorized for the specified authorizationType ("readers" or "writers"). Pass null or undefined as the username to check for anonymous access
-*/
-Server.prototype.isAuthorized = function(authorizationType,username) {
- var principals = this.authorizationPrincipals[authorizationType] || [];
- return principals.indexOf("(anon)") !== -1 || (username && (principals.indexOf("(authenticated)") !== -1 || principals.indexOf(username) !== -1));
-}
-
-Server.prototype.requestHandler = function(request,response,options) {
- options = options || {};
- // Compose the state object
- var self = this;
- var state = {};
- state.wiki = options.wiki || self.wiki;
- state.boot = options.boot || self.boot;
- state.server = self;
- state.urlInfo = url.parse(request.url);
- state.queryParameters = querystring.parse(state.urlInfo.query);
- state.pathPrefix = options.pathPrefix || this.get("path-prefix") || "";
- // Get the principals authorized to access this resource
- var authorizationType = this.methodMappings[request.method] || "readers";
- // Check for the CSRF header if this is a write
- if(!this.csrfDisable && authorizationType === "writers" && request.headers["x-requested-with"] !== "TiddlyWiki") {
- response.writeHead(403,"'X-Requested-With' header required to login to '" + this.servername + "'");
- response.end();
- return;
- }
- // Check whether anonymous access is granted
- state.allowAnon = this.isAuthorized(authorizationType,null);
- // Authenticate with the first active authenticator
- if(this.authenticators.length > 0) {
- if(!this.authenticators[0].authenticateRequest(request,response,state)) {
- // Bail if we failed (the authenticator will have sent the response)
- return;
- }
- }
- // Authorize with the authenticated username
- if(!this.isAuthorized(authorizationType,state.authenticatedUsername)) {
- response.writeHead(401,"'" + state.authenticatedUsername + "' is not authorized to access '" + this.servername + "'");
- response.end();
- return;
- }
- // Find the route that matches this path
- var route = self.findMatchingRoute(request,state);
- // Optionally output debug info
- if(self.get("debug-level") !== "none") {
- console.log("Request path:",JSON.stringify(state.urlInfo));
- console.log("Request headers:",JSON.stringify(request.headers));
- console.log("authenticatedUsername:",state.authenticatedUsername);
- }
- // Return a 404 if we didn't find a route
- if(!route) {
- response.writeHead(404);
- response.end();
- return;
- }
- // Receive the request body if necessary and hand off to the route handler
- if(route.bodyFormat === "stream" || request.method === "GET" || request.method === "HEAD") {
- // Let the route handle the request stream itself
- route.handler(request,response,state);
- } else if(route.bodyFormat === "string" || !route.bodyFormat) {
- // Set the encoding for the incoming request
- request.setEncoding("utf8");
- var data = "";
- request.on("data",function(chunk) {
- data += chunk.toString();
- });
- request.on("end",function() {
- state.data = data;
- route.handler(request,response,state);
- });
- } else if(route.bodyFormat === "buffer") {
- var data = [];
- request.on("data",function(chunk) {
- data.push(chunk);
- });
- request.on("end",function() {
- state.data = Buffer.concat(data);
- route.handler(request,response,state);
- })
- } else {
- response.writeHead(400,"Invalid bodyFormat " + route.bodyFormat + " in route " + route.method + " " + route.path.source);
- response.end();
- }
-};
-
-/*
-Listen for requests
-port: optional port number (falls back to value of "port" variable)
-host: optional host address (falls back to value of "host" variable)
-prefix: optional prefix (falls back to value of "path-prefix" variable)
-*/
-Server.prototype.listen = function(port,host,prefix) {
- var self = this;
- // Handle defaults for port and host
- port = port || this.get("port");
- host = host || this.get("host");
- prefix = prefix || this.get("path-prefix") || "";
- // Check for the port being a string and look it up as an environment variable
- if(parseInt(port,10).toString() !== port) {
- port = process.env[port] || 8080;
- }
- // Warn if required plugins are missing
- if(!this.wiki.getTiddler("$:/plugins/tiddlywiki/tiddlyweb") || !this.wiki.getTiddler("$:/plugins/tiddlywiki/filesystem")) {
- $tw.utils.warning("Warning: Plugins required for client-server operation (\"tiddlywiki/filesystem\" and \"tiddlywiki/tiddlyweb\") are missing from tiddlywiki.info file");
- }
- // Create the server
- var server;
- if(this.listenOptions) {
- server = this.transport.createServer(this.listenOptions,this.requestHandler.bind(this));
- } else {
- server = this.transport.createServer(this.requestHandler.bind(this));
- }
- // Display the port number after we've started listening (the port number might have been specified as zero, in which case we will get an assigned port)
- server.on("listening",function() {
- var address = server.address();
- $tw.utils.log("Serving on " + self.protocol + "://" + address.address + ":" + address.port + prefix,"brown/orange");
- $tw.utils.log("(press ctrl-C to exit)","red");
- });
- // Listen
- return server.listen(port,host);
-};
-
-exports.Server = Server;
-
-})();
diff --git a/core/modules/startup/browser-messaging.js b/core/modules/startup/browser-messaging.js
index bee6d4988..27ddb19d5 100644
--- a/core/modules/startup/browser-messaging.js
+++ b/core/modules/startup/browser-messaging.js
@@ -6,10 +6,7 @@ module-type: startup
Browser message handling
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Export name and synchronous status
@@ -62,12 +59,14 @@ function loadIFrame(url,callback) {
Unload library iframe for given url
*/
function unloadIFrame(url){
- $tw.utils.each(document.getElementsByTagName('iframe'), function(iframe) {
+ var iframes = document.getElementsByTagName('iframe');
+ for(var t=iframes.length-1; t--; t>=0) {
+ var iframe = iframes[t];
if(iframe.getAttribute("library") === "true" &&
iframe.getAttribute("src") === url) {
iframe.parentNode.removeChild(iframe);
}
- });
+ }
}
function saveIFrameInfoTiddler(iframeInfo) {
@@ -152,7 +151,7 @@ exports.startup = function() {
if(event.data.status.charAt(0) === "2") {
if(event.data.cookies) {
if(event.data.cookies.type === "save-info") {
- var tiddlers = JSON.parse(event.data.body);
+ var tiddlers = $tw.utils.parseJSONSafe(event.data.body);
$tw.utils.each(tiddlers,function(tiddler) {
$tw.wiki.addTiddler(new $tw.Tiddler($tw.wiki.getCreationFields(),tiddler,{
title: event.data.cookies.infoTitlePrefix + event.data.cookies.url + "/" + tiddler.title,
@@ -170,7 +169,7 @@ exports.startup = function() {
},$tw.wiki.getModificationFields()));
});
} else if(event.data.cookies.type === "save-tiddler") {
- var tiddler = JSON.parse(event.data.body);
+ var tiddler = $tw.utils.parseJSONSafe(event.data.body);
$tw.wiki.addTiddler(new $tw.Tiddler(tiddler));
}
}
@@ -179,5 +178,3 @@ exports.startup = function() {
}
},false);
};
-
-})();
diff --git a/core/modules/startup/commands.js b/core/modules/startup/commands.js
deleted file mode 100644
index bd8b4afb3..000000000
--- a/core/modules/startup/commands.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/*\
-title: $:/core/modules/startup/commands.js
-type: application/javascript
-module-type: startup
-
-Command processing
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-// Export name and synchronous status
-exports.name = "commands";
-exports.platforms = ["node"];
-exports.after = ["story"];
-exports.synchronous = false;
-
-exports.startup = function(callback) {
- // On the server, start a commander with the command line arguments
- var commander = new $tw.Commander(
- $tw.boot.argv,
- function(err) {
- if(err) {
- return $tw.utils.error("Error: " + err);
- }
- callback();
- },
- $tw.wiki,
- {output: process.stdout, error: process.stderr}
- );
- commander.execute();
-};
-
-})();
diff --git a/core/modules/startup/css-escape-polyfill.js b/core/modules/startup/css-escape-polyfill.js
deleted file mode 100644
index 288a7336b..000000000
--- a/core/modules/startup/css-escape-polyfill.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/*\
-title: $:/core/modules/startup/CSSescape.js
-type: application/javascript
-module-type: startup
-
-Polyfill for CSS.escape()
-
-\*/
-(function(root,factory){
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-// Export name and synchronous status
-exports.name = "css-escape";
-exports.platforms = ["browser"];
-exports.after = ["startup"];
-exports.synchronous = true;
-
-/*! https://mths.be/cssescape v1.5.1 by @mathias | MIT license */
-// https://github.com/umdjs/umd/blob/master/returnExports.js
-exports.startup = factory(root);
-}(typeof global != 'undefined' ? global : this, function(root) {
-
- if (root.CSS && root.CSS.escape) {
- return;
- }
-
- // https://drafts.csswg.org/cssom/#serialize-an-identifier
- var cssEscape = function(value) {
- if (arguments.length == 0) {
- throw new TypeError('`CSS.escape` requires an argument.');
- }
- var string = String(value);
- var length = string.length;
- var index = -1;
- var codeUnit;
- var result = '';
- var firstCodeUnit = string.charCodeAt(0);
- while (++index < length) {
- codeUnit = string.charCodeAt(index);
- // Note: there’s no need to special-case astral symbols, surrogate
- // pairs, or lone surrogates.
-
- // If the character is NULL (U+0000), then the REPLACEMENT CHARACTER
- // (U+FFFD).
- if (codeUnit == 0x0000) {
- result += '\uFFFD';
- continue;
- }
-
- if (
- // If the character is in the range [\1-\1F] (U+0001 to U+001F) or is
- // U+007F, […]
- (codeUnit >= 0x0001 && codeUnit <= 0x001F) || codeUnit == 0x007F ||
- // If the character is the first character and is in the range [0-9]
- // (U+0030 to U+0039), […]
- (index == 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
- // If the character is the second character and is in the range [0-9]
- // (U+0030 to U+0039) and the first character is a `-` (U+002D), […]
- (
- index == 1 &&
- codeUnit >= 0x0030 && codeUnit <= 0x0039 &&
- firstCodeUnit == 0x002D
- )
- ) {
- // https://drafts.csswg.org/cssom/#escape-a-character-as-code-point
- result += '\\' + codeUnit.toString(16) + ' ';
- continue;
- }
-
- if (
- // If the character is the first character and is a `-` (U+002D), and
- // there is no second character, […]
- index == 0 &&
- length == 1 &&
- codeUnit == 0x002D
- ) {
- result += '\\' + string.charAt(index);
- continue;
- }
-
- // If the character is not handled by one of the above rules and is
- // greater than or equal to U+0080, is `-` (U+002D) or `_` (U+005F), or
- // is in one of the ranges [0-9] (U+0030 to U+0039), [A-Z] (U+0041 to
- // U+005A), or [a-z] (U+0061 to U+007A), […]
- if (
- codeUnit >= 0x0080 ||
- codeUnit == 0x002D ||
- codeUnit == 0x005F ||
- codeUnit >= 0x0030 && codeUnit <= 0x0039 ||
- codeUnit >= 0x0041 && codeUnit <= 0x005A ||
- codeUnit >= 0x0061 && codeUnit <= 0x007A
- ) {
- // the character itself
- result += string.charAt(index);
- continue;
- }
-
- // Otherwise, the escaped character.
- // https://drafts.csswg.org/cssom/#escape-a-character
- result += '\\' + string.charAt(index);
-
- }
- return result;
- };
-
- if (!root.CSS) {
- root.CSS = {};
- }
-
- root.CSS.escape = cssEscape;
-
-}));
diff --git a/core/modules/startup/eventbus.js b/core/modules/startup/eventbus.js
new file mode 100644
index 000000000..0ad69fb27
--- /dev/null
+++ b/core/modules/startup/eventbus.js
@@ -0,0 +1,46 @@
+/*\
+title: $:/core/modules/startup/eventbus.js
+type: application/javascript
+module-type: startup
+
+Event bus for cross module communication
+\*/
+
+exports.name = "eventbus";
+exports.platforms = ["browser"];
+exports.before = ["windows"];
+exports.synchronous = true;
+
+$tw.eventBus = {
+ listenersMap: new Map(),
+
+ on(event,handler) {
+ if(!this.listenersMap.has(event)) {
+ this.listenersMap.set(event,new Set());
+ }
+ const listeners = this.listenersMap.get(event);
+ listeners.add(handler);
+ },
+
+ off(event,handler) {
+ const listeners = this.listenersMap.get(event);
+ if(listeners) {
+ listeners.delete(handler);
+ }
+ },
+
+ once(event,handler) {
+ const wrapper = (...args) => {
+ handler(...args);
+ this.off(event, wrapper);
+ };
+ this.on(event, wrapper);
+ },
+
+ emit(event,data) {
+ const listeners = this.listenersMap.get(event);
+ if(listeners) {
+ listeners.forEach(fn => fn(data));
+ }
+ }
+};
diff --git a/core/modules/startup/favicon.js b/core/modules/startup/favicon.js
index 38ea4ddd5..895b46f6c 100644
--- a/core/modules/startup/favicon.js
+++ b/core/modules/startup/favicon.js
@@ -6,10 +6,7 @@ module-type: startup
Favicon handling
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Export name and synchronous status
@@ -17,7 +14,7 @@ exports.name = "favicon";
exports.platforms = ["browser"];
exports.after = ["startup"];
exports.synchronous = true;
-
+
// Favicon tiddler
var FAVICON_TITLE = "$:/favicon.ico";
@@ -41,5 +38,3 @@ exports.startup = function() {
}
});
};
-
-})();
diff --git a/core/modules/startup/info.js b/core/modules/startup/info.js
index ed2305930..dc65557c7 100644
--- a/core/modules/startup/info.js
+++ b/core/modules/startup/info.js
@@ -6,10 +6,7 @@ module-type: startup
Initialise $:/info tiddlers via $:/temp/info-plugin pseudo-plugin
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Export name and synchronous status
@@ -22,11 +19,17 @@ var TITLE_INFO_PLUGIN = "$:/temp/info-plugin";
exports.startup = function() {
// Function to bake the info plugin with new tiddlers
- var updateInfoPlugin = function(tiddlerFieldsArray) {
+ // additions: array of tiddler field objects
+ // removals: array of titles to remove
+ var updateInfoPlugin = function(additions = [], removals = []) {
// Get the existing tiddlers
var json = $tw.wiki.getTiddlerData(TITLE_INFO_PLUGIN,{tiddlers: {}});
- // Add the new ones
- $tw.utils.each(tiddlerFieldsArray,function(fields) {
+ $tw.utils.each(removals,function(title) {
+ if(json.tiddlers[title]) {
+ delete json.tiddlers[title];
+ }
+ });
+ $tw.utils.each(additions,function(fields) {
if(fields && fields.title) {
json.tiddlers[fields.title] = fields;
}
@@ -50,9 +53,7 @@ exports.startup = function() {
}
});
updateInfoPlugin(tiddlerFieldsArray);
- var changes = $tw.wiki.readPluginInfo([TITLE_INFO_PLUGIN]);
+ $tw.wiki.readPluginInfo([TITLE_INFO_PLUGIN]);
$tw.wiki.registerPluginTiddlers("info",[TITLE_INFO_PLUGIN]);
$tw.wiki.unpackPluginTiddlers();
};
-
-})();
diff --git a/core/modules/startup/load-modules.js b/core/modules/startup/load-modules.js
index 1dc71f7ac..c94335fb7 100644
--- a/core/modules/startup/load-modules.js
+++ b/core/modules/startup/load-modules.js
@@ -6,10 +6,7 @@ module-type: startup
Load core modules
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Export name and synchronous status
@@ -34,7 +31,7 @@ exports.startup = function() {
$tw.modules.applyMethods("tiddlerdeserializer",$tw.Wiki.tiddlerDeserializerModules);
$tw.macros = $tw.modules.getModulesByTypeAsHashmap("macro");
$tw.wiki.initParsers();
- $tw.Commander.initCommands();
+ if($tw.node) {
+ $tw.Commander.initCommands();
+ }
};
-
-})();
diff --git a/core/modules/startup/password.js b/core/modules/startup/password.js
index 5e8bd5352..5ea36ee19 100644
--- a/core/modules/startup/password.js
+++ b/core/modules/startup/password.js
@@ -6,10 +6,7 @@ module-type: startup
Password handling
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Export name and synchronous status
@@ -49,5 +46,3 @@ exports.startup = function() {
}
});
};
-
-})();
diff --git a/core/modules/startup/plugins.js b/core/modules/startup/plugins.js
index cad61b104..3ceda8669 100644
--- a/core/modules/startup/plugins.js
+++ b/core/modules/startup/plugins.js
@@ -6,15 +6,13 @@ module-type: startup
Startup logic concerned with managing plugins
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Export name and synchronous status
exports.name = "plugins";
exports.after = ["load-modules"];
+exports.before = ["startup"];
exports.synchronous = true;
var TITLE_REQUIRE_RELOAD_DUE_TO_PLUGIN_CHANGE = "$:/status/RequireReloadDueToPluginChange";
@@ -60,7 +58,7 @@ exports.startup = function() {
// Collect the shadow tiddlers of any modified plugins
$tw.utils.each(changes.modifiedPlugins,function(pluginTitle) {
var pluginInfo = $tw.wiki.getPluginInfo(pluginTitle);
- if(pluginInfo) {
+ if(pluginInfo && pluginInfo.tiddlers) {
$tw.utils.each(Object.keys(pluginInfo.tiddlers),function(title) {
changedShadowTiddlers[title] = false;
});
@@ -74,11 +72,10 @@ exports.startup = function() {
$tw.wiki.unpackPluginTiddlers();
// Queue change events for the changed shadow tiddlers
$tw.utils.each(Object.keys(changedShadowTiddlers),function(title) {
- $tw.wiki.enqueueTiddlerEvent(title,changedShadowTiddlers[title]);
+ $tw.wiki.enqueueTiddlerEvent(title,changedShadowTiddlers[title], true);
});
}
}
});
};
-})();
diff --git a/core/modules/startup/render.js b/core/modules/startup/render.js
index 49c9c33aa..43ef48207 100644
--- a/core/modules/startup/render.js
+++ b/core/modules/startup/render.js
@@ -6,10 +6,7 @@ module-type: startup
Title, stylesheet and page rendering
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Export name and synchronous status
@@ -29,7 +26,11 @@ var THROTTLE_REFRESH_TIMEOUT = 400;
exports.startup = function() {
// Set up the title
- $tw.titleWidgetNode = $tw.wiki.makeTranscludeWidget(PAGE_TITLE_TITLE,{document: $tw.fakeDocument, parseAsInline: true});
+ $tw.titleWidgetNode = $tw.wiki.makeTranscludeWidget(PAGE_TITLE_TITLE, {
+ document: $tw.fakeDocument,
+ parseAsInline: true,
+ importPageMacros: true,
+ });
$tw.titleContainer = $tw.fakeDocument.createElement("div");
$tw.titleWidgetNode.render($tw.titleContainer,null);
var publishTitle = function() {
@@ -47,12 +48,17 @@ exports.startup = function() {
$tw.styleWidgetNode = $tw.wiki.makeTranscludeWidget(PAGE_STYLESHEET_TITLE,{document: $tw.fakeDocument});
$tw.styleContainer = $tw.fakeDocument.createElement("style");
$tw.styleWidgetNode.render($tw.styleContainer,null);
+ $tw.styleWidgetNode.assignedStyles = $tw.styleContainer.textContent;
$tw.styleElement = document.createElement("style");
- $tw.styleElement.innerHTML = $tw.styleContainer.textContent;
+ $tw.styleElement.innerHTML = $tw.styleWidgetNode.assignedStyles;
document.head.insertBefore($tw.styleElement,document.head.firstChild);
$tw.wiki.addEventListener("change",$tw.perf.report("styleRefresh",function(changes) {
if($tw.styleWidgetNode.refresh(changes,$tw.styleContainer,null)) {
- $tw.styleElement.innerHTML = $tw.styleContainer.textContent;
+ var newStyles = $tw.styleContainer.textContent;
+ if(newStyles !== $tw.styleWidgetNode.assignedStyles) {
+ $tw.styleWidgetNode.assignedStyles = newStyles;
+ $tw.styleElement.innerHTML = $tw.styleWidgetNode.assignedStyles;
+ }
}
}));
// Display the $:/core/ui/PageTemplate tiddler to kick off the display
@@ -81,13 +87,15 @@ exports.startup = function() {
deferredChanges = Object.create(null);
$tw.hooks.invokeHook("th-page-refreshed");
}
+ var throttledRefresh = $tw.perf.report("throttledRefresh",refresh);
+
// Add the change event handler
$tw.wiki.addEventListener("change",$tw.perf.report("mainRefresh",function(changes) {
// Check if only tiddlers that are throttled have changed
var onlyThrottledTiddlersHaveChanged = true;
for(var title in changes) {
var tiddler = $tw.wiki.getTiddler(title);
- if(!tiddler || !(tiddler.hasField("draft.of") || tiddler.hasField("throttle.refresh"))) {
+ if(!$tw.wiki.isVolatileTiddler(title) && (!tiddler || !(tiddler.hasField("draft.of") || tiddler.hasField("throttle.refresh")))) {
onlyThrottledTiddlersHaveChanged = false;
}
}
@@ -101,7 +109,7 @@ exports.startup = function() {
if(isNaN(timeout)) {
timeout = THROTTLE_REFRESH_TIMEOUT;
}
- timerId = setTimeout(refresh,timeout);
+ timerId = setTimeout(throttledRefresh,timeout);
$tw.utils.extend(deferredChanges,changes);
} else {
$tw.utils.extend(deferredChanges,changes);
@@ -114,5 +122,3 @@ exports.startup = function() {
// Run any post-render startup actions
$tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/PostRender");
};
-
-})();
diff --git a/core/modules/startup/rootwidget.js b/core/modules/startup/rootwidget.js
index 353c25958..30a6c960c 100644
--- a/core/modules/startup/rootwidget.js
+++ b/core/modules/startup/rootwidget.js
@@ -6,10 +6,7 @@ module-type: startup
Setup the root widget and the core root widget handlers
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Export name and synchronous status
@@ -20,6 +17,46 @@ exports.before = ["story"];
exports.synchronous = true;
exports.startup = function() {
+ // Install the HTTP client event handler
+ $tw.httpClient = new $tw.utils.HttpClient();
+ var getPropertiesWithPrefix = function(properties,prefix) {
+ var result = Object.create(null);
+ $tw.utils.each(properties,function(value,name) {
+ if(name.indexOf(prefix) === 0) {
+ result[name.substring(prefix.length)] = properties[name];
+ }
+ });
+ return result;
+ };
+ $tw.rootWidget.addEventListener("tm-http-request",function(event) {
+ var params = event.paramObject || {};
+ $tw.httpClient.initiateHttpRequest({
+ wiki: event.widget.wiki,
+ url: params.url,
+ method: params.method,
+ body: params.body,
+ binary: params.binary,
+ useDefaultHeaders: params.useDefaultHeaders,
+ oncompletion: params.oncompletion,
+ onprogress: params.onprogress,
+ bindStatus: params["bind-status"],
+ bindProgress: params["bind-progress"],
+ variables: getPropertiesWithPrefix(params,"var-"),
+ headers: getPropertiesWithPrefix(params,"header-"),
+ passwordHeaders: getPropertiesWithPrefix(params,"password-header-"),
+ queryStrings: getPropertiesWithPrefix(params,"query-"),
+ passwordQueryStrings: getPropertiesWithPrefix(params,"password-query-"),
+ basicAuthUsername: params["basic-auth-username"],
+ basicAuthUsernameFromStore: params["basic-auth-username-from-store"],
+ basicAuthPassword: params["basic-auth-password"],
+ basicAuthPasswordFromStore: params["basic-auth-password-from-store"],
+ bearerAuthToken: params["bearer-auth-token"],
+ bearerAuthTokenFromStore: params["bearer-auth-token-from-store"]
+ });
+ });
+ $tw.rootWidget.addEventListener("tm-http-cancel-all-requests",function(event) {
+ $tw.httpClient.cancelAllHttpRequests();
+ });
// Install the modal message mechanism
$tw.modal = new $tw.utils.Modal($tw.wiki);
$tw.rootWidget.addEventListener("tm-modal",function(event) {
@@ -27,7 +64,7 @@ exports.startup = function() {
});
$tw.rootWidget.addEventListener("tm-show-switcher",function(event) {
$tw.modal.display("$:/core/ui/SwitcherModal",{variables: event.paramObject, event: event});
- });
+ });
// Install the notification mechanism
$tw.notifier = new $tw.utils.Notifier($tw.wiki);
$tw.rootWidget.addEventListener("tm-notify",function(event) {
@@ -35,21 +72,35 @@ exports.startup = function() {
});
// Install the copy-to-clipboard mechanism
$tw.rootWidget.addEventListener("tm-copy-to-clipboard",function(event) {
- $tw.utils.copyToClipboard(event.param);
+ $tw.utils.copyToClipboard(event.param,{
+ successNotification: event.paramObject && event.paramObject.successNotification,
+ failureNotification: event.paramObject && event.paramObject.failureNotification
+ });
});
// Install the tm-focus-selector message
$tw.rootWidget.addEventListener("tm-focus-selector",function(event) {
var selector = event.param || "",
- element;
- try {
- element = document.querySelector(selector);
- } catch(e) {
- console.log("Error in selector: ",selector)
- }
+ element,
+ baseElement = event.event && event.event.target ? event.event.target.ownerDocument : document;
+ element = $tw.utils.querySelectorSafe(selector,baseElement);
if(element && element.focus) {
element.focus(event.paramObject);
}
});
+ // Install the tm-rename-tiddler and tm-relink-tiddler messages
+ var makeRenameHandler = function(method) {
+ return function(event) {
+ var options = {},
+ paramObject = event.paramObject || {},
+ from = paramObject.from || event.tiddlerTitle,
+ to = paramObject.to;
+ options.dontRenameInTags = (paramObject.renameInTags === "false" || paramObject.renameInTags === "no") ? true : false;
+ options.dontRenameInLists = (paramObject.renameInLists === "false" || paramObject.renameInLists === "no") ? true : false;
+ $tw.wiki[method](from,to,options);
+ };
+ };
+ $tw.rootWidget.addEventListener("tm-rename-tiddler",makeRenameHandler("renameTiddler"));
+ $tw.rootWidget.addEventListener("tm-relink-tiddler",makeRenameHandler("relinkTiddler"));
// Install the scroller
$tw.pageScroller = new $tw.utils.PageScroller();
$tw.rootWidget.addEventListener("tm-scroll",function(event) {
@@ -68,17 +119,8 @@ exports.startup = function() {
fullScreenDocument[fullscreen._exitFullscreen]();
} else {
fullScreenDocument.documentElement[fullscreen._requestFullscreen](Element.ALLOW_KEYBOARD_INPUT);
- }
+ }
}
});
}
- // If we're being viewed on a data: URI then give instructions for how to save
- if(document.location.protocol === "data:") {
- $tw.rootWidget.dispatchEvent({
- type: "tm-modal",
- param: "$:/language/Modals/SaveInstructions"
- });
- }
};
-
-})();
diff --git a/core/modules/startup/startup.js b/core/modules/startup/startup.js
index f681b71d1..6f78c71b5 100755
--- a/core/modules/startup/startup.js
+++ b/core/modules/startup/startup.js
@@ -6,10 +6,7 @@ module-type: startup
Miscellaneous startup logic for both the client and server.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Export name and synchronous status
@@ -27,6 +24,11 @@ exports.startup = function() {
if($tw.browser) {
$tw.browser.isIE = (/msie|trident/i.test(navigator.userAgent));
$tw.browser.isFirefox = !!document.mozFullScreenEnabled;
+ // 2023-07-21 Edge returns UA below. So we use "isChromeLike"
+ //'mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/114.0.0.0 safari/537.36 edg/114.0.1823.82'
+ $tw.browser.isChromeLike = navigator.userAgent.toLowerCase().indexOf("chrome") > -1;
+ $tw.browser.hasTouch = !!window.matchMedia && window.matchMedia("(pointer: coarse)").matches;
+ $tw.browser.isMobileChrome = $tw.browser.isChromeLike && $tw.browser.hasTouch;
}
// Platform detection
$tw.platform = {};
@@ -62,14 +64,6 @@ exports.startup = function() {
wiki: $tw.wiki,
document: $tw.browser ? document : $tw.fakeDocument
});
- // Execute any startup actions
- $tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction");
- if($tw.browser) {
- $tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Browser");
- }
- if($tw.node) {
- $tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Node");
- }
// Kick off the language manager and switcher
$tw.language = new $tw.Language();
$tw.languageSwitcher = new $tw.PluginSwitcher({
@@ -83,8 +77,10 @@ exports.startup = function() {
if($tw.browser) {
var pluginTiddler = $tw.wiki.getTiddler(plugins[0]);
if(pluginTiddler) {
+ document.documentElement.setAttribute("lang",pluginTiddler.getFieldString("name"));
document.documentElement.setAttribute("dir",pluginTiddler.getFieldString("text-direction") || "auto");
} else {
+ document.documentElement.setAttribute("lang","en-GB");
document.documentElement.removeAttribute("dir");
}
}
@@ -110,6 +106,14 @@ exports.startup = function() {
handlerMethod: "handleKeydownEvent"
}]);
}
+ // Execute any startup actions
+ $tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction");
+ if($tw.browser) {
+ $tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Browser");
+ }
+ if($tw.node) {
+ $tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Node");
+ }
// Clear outstanding tiddler store change events to avoid an unnecessary refresh cycle at startup
$tw.wiki.clearTiddlerEventQueue();
// Find a working syncadaptor
@@ -121,7 +125,11 @@ exports.startup = function() {
});
// Set up the syncer object if we've got a syncadaptor
if($tw.syncadaptor) {
- $tw.syncer = new $tw.Syncer({wiki: $tw.wiki, syncadaptor: $tw.syncadaptor});
+ $tw.syncer = new $tw.Syncer({
+ wiki: $tw.wiki,
+ syncadaptor: $tw.syncadaptor,
+ logging: $tw.wiki.getTiddlerText('$:/config/SyncLogging', "yes") === "yes"
+ });
}
// Setup the saver handler
$tw.saverHandler = new $tw.SaverHandler({
@@ -137,5 +145,3 @@ exports.startup = function() {
$tw.anim = new $tw.utils.Animator();
}
};
-
-})();
diff --git a/core/modules/startup/story.js b/core/modules/startup/story.js
index 0ca975ce3..a0c878024 100644
--- a/core/modules/startup/story.js
+++ b/core/modules/startup/story.js
@@ -6,10 +6,7 @@ module-type: startup
Load core modules
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Export name and synchronous status
@@ -54,7 +51,9 @@ exports.startup = function() {
var hash = $tw.utils.getLocationHash();
if(hash !== $tw.locationHash) {
$tw.locationHash = hash;
- openStartupTiddlers({defaultToCurrentStory: true});
+ if(hash !== "#") {
+ openStartupTiddlers({defaultToCurrentStory: true});
+ }
}
},false);
// Listen for the tm-browser-refresh message
@@ -91,7 +90,9 @@ exports.startup = function() {
updateAddressBar: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_UPDATE_ADDRESS_BAR,"yes").trim() === "yes" ? "permalink" : "none",
updateHistory: $tw.wiki.getTiddlerText(CONFIG_UPDATE_HISTORY,"no").trim(),
targetTiddler: event.param || event.tiddlerTitle,
- copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permalink" : "none"
+ copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permalink" : "none",
+ successNotification: event.paramObject && event.paramObject.successNotification,
+ failureNotification: event.paramObject && event.paramObject.failureNotification
});
});
// Listen for the tm-permaview message
@@ -100,8 +101,10 @@ exports.startup = function() {
updateAddressBar: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_UPDATE_ADDRESS_BAR,"yes").trim() === "yes" ? "permaview" : "none",
updateHistory: $tw.wiki.getTiddlerText(CONFIG_UPDATE_HISTORY,"no").trim(),
targetTiddler: event.param || event.tiddlerTitle,
- copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permaview" : "none"
- });
+ copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permaview" : "none",
+ successNotification: event.paramObject && event.paramObject.successNotification,
+ failureNotification: event.paramObject && event.paramObject.failureNotification
+ });
});
}
};
@@ -120,10 +123,10 @@ function openStartupTiddlers(options) {
var hash = $tw.locationHash.substr(1),
split = hash.indexOf(":");
if(split === -1) {
- target = decodeURIComponent(hash.trim());
+ target = $tw.utils.decodeURIComponentSafe(hash.trim());
} else {
- target = decodeURIComponent(hash.substr(0,split).trim());
- storyFilter = decodeURIComponent(hash.substr(split + 1).trim());
+ target = $tw.utils.decodeURIComponentSafe(hash.substr(0,split).trim());
+ storyFilter = $tw.utils.decodeURIComponentSafe(hash.substr(split + 1).trim());
}
}
// If the story wasn't specified use the current tiddlers or a blank story
@@ -165,7 +168,7 @@ function openStartupTiddlers(options) {
story.addToHistory(target);
} else if(storyList.length > 0) {
story.addToHistory(storyList[0]);
- }
+ }
}
}
@@ -175,6 +178,8 @@ options.updateAddressBar: "permalink", "permaview" or "no" (defaults to "permavi
options.updateHistory: "yes" or "no" (defaults to "no")
options.copyToClipboard: "permalink", "permaview" or "no" (defaults to "no")
options.targetTiddler: optional title of target tiddler for permalink
+options.successNotification: optional title of tiddler to use as the notification in case of success
+options.failureNotification: optional title of tiddler to use as the notification in case of failure
*/
function updateLocationHash(options) {
// Get the story and the history stack
@@ -203,14 +208,18 @@ function updateLocationHash(options) {
break;
}
// Copy URL to the clipboard
+ var url = "";
switch(options.copyToClipboard) {
case "permalink":
- $tw.utils.copyToClipboard($tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler));
+ url = $tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler);
break;
case "permaview":
- $tw.utils.copyToClipboard($tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler) + ":" + encodeURIComponent($tw.utils.stringifyList(storyList)));
+ url = $tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler) + ":" + encodeURIComponent($tw.utils.stringifyList(storyList));
break;
}
+ if(url) {
+ $tw.utils.copyToClipboard(url,{successNotification: options.successNotification, failureNotification: options.failureNotification});
+ }
// Only change the location hash if we must, thus avoiding unnecessary onhashchange events
if($tw.utils.getLocationHash() !== $tw.locationHash) {
if(options.updateHistory === "yes") {
@@ -222,5 +231,3 @@ function updateLocationHash(options) {
}
}
}
-
-})();
diff --git a/core/modules/startup/windows.js b/core/modules/startup/windows.js
index 75786d026..39a2f59d6 100644
--- a/core/modules/startup/windows.js
+++ b/core/modules/startup/windows.js
@@ -6,10 +6,7 @@ module-type: startup
Setup root widget handlers for the messages concerned with opening external browser windows
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Export name and synchronous status
@@ -20,6 +17,8 @@ exports.synchronous = true;
// Global to keep track of open windows (hashmap by title)
$tw.windows = {};
+// Default template to use for new windows
+var DEFAULT_WINDOW_TEMPLATE = "$:/core/templates/single.tiddler.window";
exports.startup = function() {
// Handle open window message
@@ -29,33 +28,39 @@ exports.startup = function() {
title = event.param || event.tiddlerTitle,
paramObject = event.paramObject || {},
windowTitle = paramObject.windowTitle || title,
- template = paramObject.template || "$:/core/templates/single.tiddler.window",
+ windowID = paramObject.windowID || title,
+ template = paramObject.template || DEFAULT_WINDOW_TEMPLATE,
width = paramObject.width || "700",
height = paramObject.height || "600",
- variables = $tw.utils.extend({},paramObject,{currentTiddler: title});
+ top = paramObject.top,
+ left = paramObject.left,
+ variables = $tw.utils.extend({},paramObject,{currentTiddler: title, "tv-window-id": windowID});
// Open the window
var srcWindow,
- srcDocument;
+ srcDocument;
// In case that popup blockers deny opening a new window
try {
- srcWindow = window.open("","external-" + title,"scrollbars,width=" + width + ",height=" + height),
+ srcWindow = window.open("","external-" + windowID,"scrollbars,width=" + width + ",height=" + height + (top ? ",top=" + top : "" ) + (left ? ",left=" + left : "" )),
srcDocument = srcWindow.document;
}
catch(e) {
return;
}
- $tw.windows[title] = srcWindow;
+ $tw.windows[windowID] = srcWindow;
// Check for reopening the same window
if(srcWindow.haveInitialisedWindow) {
+ srcWindow.focus();
return;
}
// Initialise the document
- srcDocument.write("<html><head></head><body class='tc-body tc-single-tiddler-window'></body></html>");
+ srcDocument.write("<!DOCTYPE html><head></head><body class='tc-body tc-single-tiddler-window'></body></html>");
srcDocument.close();
srcDocument.title = windowTitle;
+ $tw.eventBus.emit("window:opened",{windowID, window: srcWindow});
srcWindow.addEventListener("beforeunload",function(event) {
- delete $tw.windows[title];
+ delete $tw.windows[windowID];
$tw.wiki.removeEventListener("change",refreshHandler);
+ $tw.eventBus.emit("window:closed",{windowID});
},false);
// Set up the styles
var styleWidgetNode = $tw.wiki.makeTranscludeWidget("$:/core/ui/PageStylesheet",{
@@ -88,13 +93,19 @@ exports.startup = function() {
srcWindow.document.documentElement.addEventListener("click",$tw.popup,true);
srcWindow.haveInitialisedWindow = true;
});
- // Close open windows when unloading main window
- $tw.addUnloadTask(function() {
+ $tw.rootWidget.addEventListener("tm-close-window",function(event) {
+ var windowID = event.param,
+ win = $tw.windows[windowID];
+ if(win) {
+ win.close();
+ }
+ });
+ var closeAllWindows = function() {
$tw.utils.each($tw.windows,function(win) {
win.close();
});
- });
-
+ }
+ $tw.rootWidget.addEventListener("tm-close-all-windows",closeAllWindows);
+ // Close open windows when unloading main window
+ $tw.addUnloadTask(closeAllWindows);
};
-
-})();
diff --git a/core/modules/story.js b/core/modules/story.js
index 16ff5a74a..4e624bb26 100644
--- a/core/modules/story.js
+++ b/core/modules/story.js
@@ -6,10 +6,7 @@ module-type: global
Lightweight object for managing interactions with the story and history lists.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -133,6 +130,3 @@ Story.prototype.storyNewTiddler = function(targetTitle) {
};
exports.Story = Story;
-
-
-})();
diff --git a/core/modules/storyviews/classic.js b/core/modules/storyviews/classic.js
index e5f726f5f..341c51221 100644
--- a/core/modules/storyviews/classic.js
+++ b/core/modules/storyviews/classic.js
@@ -6,10 +6,7 @@ module-type: storyview
Views the story as a linear sequence
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var easing = "cubic-bezier(0.645, 0.045, 0.355, 1)"; // From http://easings.net/#easeInOutCubic
@@ -27,15 +24,11 @@ ClassicStoryView.prototype.navigateTo = function(historyInfo) {
var listItemWidget = this.listWidget.children[listElementIndex],
targetElement = listItemWidget.findFirstDomNode();
// Abandon if the list entry isn't a DOM element (it might be a text node)
- if(!(targetElement instanceof Element)) {
+ if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
return;
}
- if(duration) {
- // Scroll the node into view
- this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement});
- } else {
- targetElement.scrollIntoView();
- }
+ // Scroll the node into view
+ this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement});
};
ClassicStoryView.prototype.insert = function(widget) {
@@ -43,7 +36,7 @@ ClassicStoryView.prototype.insert = function(widget) {
if(duration) {
var targetElement = widget.findFirstDomNode();
// Abandon if the list entry isn't a DOM element (it might be a text node)
- if(!(targetElement instanceof Element)) {
+ if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
return;
}
// Get the current height of the tiddler
@@ -54,16 +47,16 @@ ClassicStoryView.prototype.insert = function(widget) {
// Reset the margin once the transition is over
setTimeout(function() {
$tw.utils.setStyle(targetElement,[
- {transition: "none"},
{marginBottom: ""}
]);
+ $tw.utils.removeStyle(targetElement, "transition");
},duration);
// Set up the initial position of the element
$tw.utils.setStyle(targetElement,[
- {transition: "none"},
{marginBottom: (-currHeight) + "px"},
{opacity: "0.0"}
]);
+ $tw.utils.removeStyle(targetElement, "transition");
$tw.utils.forceLayout(targetElement);
// Transition to the final position
$tw.utils.setStyle(targetElement,[
@@ -71,7 +64,7 @@ ClassicStoryView.prototype.insert = function(widget) {
"margin-bottom " + duration + "ms " + easing},
{marginBottom: currMarginBottom + "px"},
{opacity: "1.0"}
- ]);
+ ]);
}
};
@@ -82,8 +75,12 @@ ClassicStoryView.prototype.remove = function(widget) {
removeElement = function() {
widget.removeChildDomNodes();
};
+ // Blur the focus if it is within the descendents of the node we are removing
+ if($tw.utils.domContains(targetElement,targetElement.ownerDocument.activeElement)) {
+ targetElement.ownerDocument.activeElement.blur();
+ }
// Abandon if the list entry isn't a DOM element (it might be a text node)
- if(!(targetElement instanceof Element)) {
+ if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
removeElement();
return;
}
@@ -97,11 +94,9 @@ ClassicStoryView.prototype.remove = function(widget) {
setTimeout(removeElement,duration);
// Animate the closure
$tw.utils.setStyle(targetElement,[
- {transition: "none"},
- {transform: "translateX(0px)"},
{marginBottom: currMarginBottom + "px"},
- {opacity: "1.0"}
]);
+ $tw.utils.removeStyles(targetElement, ["transition", "transform", "opacity"]);
$tw.utils.forceLayout(targetElement);
$tw.utils.setStyle(targetElement,[
{transition: $tw.utils.roundTripPropertyName("transform") + " " + duration + "ms " + easing + ", " +
@@ -116,6 +111,4 @@ ClassicStoryView.prototype.remove = function(widget) {
}
};
-exports.classic = ClassicStoryView;
-
-})();
\ No newline at end of file
+exports.classic = ClassicStoryView;
\ No newline at end of file
diff --git a/core/modules/storyviews/pop.js b/core/modules/storyviews/pop.js
index d0592cf18..96bc6819e 100644
--- a/core/modules/storyviews/pop.js
+++ b/core/modules/storyviews/pop.js
@@ -6,10 +6,7 @@ module-type: storyview
Animates list insertions and removals
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var PopStoryView = function(listWidget) {
@@ -24,7 +21,7 @@ PopStoryView.prototype.navigateTo = function(historyInfo) {
var listItemWidget = this.listWidget.children[listElementIndex],
targetElement = listItemWidget.findFirstDomNode();
// Abandon if the list entry isn't a DOM element (it might be a text node)
- if(!(targetElement instanceof Element)) {
+ if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
return;
}
// Scroll the node into view
@@ -35,15 +32,12 @@ PopStoryView.prototype.insert = function(widget) {
var targetElement = widget.findFirstDomNode(),
duration = $tw.utils.getAnimationDuration();
// Abandon if the list entry isn't a DOM element (it might be a text node)
- if(!(targetElement instanceof Element)) {
+ if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
return;
}
// Reset once the transition is over
setTimeout(function() {
- $tw.utils.setStyle(targetElement,[
- {transition: "none"},
- {transform: "none"}
- ]);
+ $tw.utils.removeStyles(targetElement, ["transition", "transform"]);
$tw.utils.setStyle(widget.document.body,[
{"overflow-x": ""}
]);
@@ -54,10 +48,10 @@ PopStoryView.prototype.insert = function(widget) {
]);
// Set up the initial position of the element
$tw.utils.setStyle(targetElement,[
- {transition: "none"},
{transform: "scale(2)"},
{opacity: "0.0"}
]);
+ $tw.utils.removeStyle(targetElement, "transition");
$tw.utils.forceLayout(targetElement);
// Transition to the final position
$tw.utils.setStyle(targetElement,[
@@ -66,6 +60,9 @@ PopStoryView.prototype.insert = function(widget) {
{transform: "scale(1)"},
{opacity: "1.0"}
]);
+ setTimeout(function() {
+ $tw.utils.removeStyles(targetElement, ["transition", "transform", "opactity"]);
+ }, duration)
};
PopStoryView.prototype.remove = function(widget) {
@@ -77,18 +74,14 @@ PopStoryView.prototype.remove = function(widget) {
}
};
// Abandon if the list entry isn't a DOM element (it might be a text node)
- if(!(targetElement instanceof Element)) {
+ if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
removeElement();
return;
}
// Remove the element at the end of the transition
setTimeout(removeElement,duration);
// Animate the closure
- $tw.utils.setStyle(targetElement,[
- {transition: "none"},
- {transform: "scale(1)"},
- {opacity: "1.0"}
- ]);
+ $tw.utils.removeStyles(targetElement, ["transition", "transform", "opacity"]);
$tw.utils.forceLayout(targetElement);
$tw.utils.setStyle(targetElement,[
{transition: $tw.utils.roundTripPropertyName("transform") + " " + duration + "ms ease-in-out, " +
@@ -98,6 +91,4 @@ PopStoryView.prototype.remove = function(widget) {
]);
};
-exports.pop = PopStoryView;
-
-})();
+exports.pop = PopStoryView;
\ No newline at end of file
diff --git a/core/modules/storyviews/zoomin.js b/core/modules/storyviews/zoomin.js
index be65b8e3a..4ddba7174 100644
--- a/core/modules/storyviews/zoomin.js
+++ b/core/modules/storyviews/zoomin.js
@@ -6,10 +6,7 @@ module-type: storyview
Zooms between individual tiddlers
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var easing = "cubic-bezier(0.645, 0.045, 0.355, 1)"; // From http://easings.net/#easeInOutCubic
@@ -17,6 +14,10 @@ var easing = "cubic-bezier(0.645, 0.045, 0.355, 1)"; // From http://easings.net/
var ZoominListView = function(listWidget) {
var self = this;
this.listWidget = listWidget;
+ this.textNodeLogger = new $tw.utils.Logger("zoomin story river view", {
+ enable: true,
+ colour: 'red'
+ });
// Get the index of the tiddler that is at the top of the history
var history = this.listWidget.wiki.getTiddlerDataCached(this.listWidget.historyTitle,[]),
targetTiddler;
@@ -48,7 +49,10 @@ ZoominListView.prototype.navigateTo = function(historyInfo) {
var listItemWidget = this.listWidget.children[listElementIndex],
targetElement = listItemWidget.findFirstDomNode();
// Abandon if the list entry isn't a DOM element (it might be a text node)
- if(!(targetElement instanceof Element)) {
+ if(!targetElement) {
+ return;
+ } else if (targetElement.nodeType === Node.TEXT_NODE) {
+ this.logTextNodeRoot(targetElement);
return;
}
// Make the new tiddler be position absolute and visible so that we can measure it
@@ -92,6 +96,9 @@ ZoominListView.prototype.navigateTo = function(historyInfo) {
{transform: "translateX(0px) translateY(0px) scale(1)"},
{zIndex: "500"},
]);
+ setTimeout(function() {
+ $tw.utils.removeStyles(targetElement, ["transition", "opacity", "transform", "zIndex"]);
+ }, duration);
// Transform the previous tiddler out of the way and then hide it
if(prevCurrentTiddler && prevCurrentTiddler !== targetElement) {
scale = zoomBounds.width / sourceBounds.width;
@@ -122,7 +129,7 @@ function findTitleDomNode(widget,targetClass) {
targetClass = targetClass || "tc-title";
var domNode = widget.findFirstDomNode();
if(domNode && domNode.querySelector) {
- return domNode.querySelector("." + targetClass);
+ return $tw.utils.querySelectorSafe("." + targetClass,domNode);
}
return null;
}
@@ -130,7 +137,10 @@ function findTitleDomNode(widget,targetClass) {
ZoominListView.prototype.insert = function(widget) {
var targetElement = widget.findFirstDomNode();
// Abandon if the list entry isn't a DOM element (it might be a text node)
- if(!(targetElement instanceof Element)) {
+ if(!targetElement) {
+ return;
+ } else if (targetElement.nodeType === Node.TEXT_NODE) {
+ this.logTextNodeRoot(targetElement);
return;
}
// Make the newly inserted node position absolute and hidden
@@ -147,7 +157,7 @@ ZoominListView.prototype.remove = function(widget) {
widget.removeChildDomNodes();
};
// Abandon if the list entry isn't a DOM element (it might be a text node)
- if(!(targetElement instanceof Element)) {
+ if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
removeElement();
return;
}
@@ -173,16 +183,21 @@ ZoominListView.prototype.remove = function(widget) {
var toWidgetDomNode = toWidget && toWidget.findFirstDomNode();
// Set up the tiddler we're moving back in
if(toWidgetDomNode) {
- $tw.utils.addClass(toWidgetDomNode,"tc-storyview-zoomin-tiddler");
- $tw.utils.setStyle(toWidgetDomNode,[
- {display: "block"},
- {transformOrigin: "50% 50%"},
- {transform: "translateX(0px) translateY(0px) scale(10)"},
- {transition: $tw.utils.roundTripPropertyName("transform") + " " + duration + "ms " + easing + ", opacity " + duration + "ms " + easing},
- {opacity: "0"},
- {zIndex: "500"}
- ]);
- this.currentTiddlerDomNode = toWidgetDomNode;
+ if (toWidgetDomNode.nodeType === Node.TEXT_NODE) {
+ this.logTextNodeRoot(toWidgetDomNode);
+ toWidgetDomNode = null;
+ } else {
+ $tw.utils.addClass(toWidgetDomNode,"tc-storyview-zoomin-tiddler");
+ $tw.utils.setStyle(toWidgetDomNode,[
+ {display: "block"},
+ {transformOrigin: "50% 50%"},
+ {transform: "translateX(0px) translateY(0px) scale(10)"},
+ {transition: $tw.utils.roundTripPropertyName("transform") + " " + duration + "ms " + easing + ", opacity " + duration + "ms " + easing},
+ {opacity: "0"},
+ {zIndex: "500"}
+ ]);
+ this.currentTiddlerDomNode = toWidgetDomNode;
+ }
}
// Animate them both
// Force layout
@@ -195,6 +210,9 @@ ZoominListView.prototype.remove = function(widget) {
{opacity: "0"},
{zIndex: "0"}
]);
+ setTimeout(function() {
+ $tw.utils.removeStyles(toWidgetDomNode, ["transformOrigin", "transform", "transition", "opacity", "zIndex"]);
+ }, duration);
setTimeout(removeElement,duration);
// Now the tiddler we're going back to
if(toWidgetDomNode) {
@@ -206,6 +224,8 @@ ZoominListView.prototype.remove = function(widget) {
return true; // Indicate that we'll delete the DOM node
};
-exports.zoomin = ZoominListView;
+ZoominListView.prototype.logTextNodeRoot = function(node) {
+ this.textNodeLogger.log($tw.language.getString("Error/ZoominTextNode") + " " + node.textContent);
+};
-})();
+exports.zoomin = ZoominListView;
\ No newline at end of file
diff --git a/core/modules/syncer.js b/core/modules/syncer.js
index 23d21097f..f565d0b9f 100644
--- a/core/modules/syncer.js
+++ b/core/modules/syncer.js
@@ -6,10 +6,7 @@ module-type: global
The syncer tracks changes to the store and synchronises them to a remote data store represented as a "sync adaptor"
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -20,12 +17,11 @@ Syncer.prototype.titleIsAnonymous = "$:/status/IsAnonymous";
Syncer.prototype.titleIsReadOnly = "$:/status/IsReadOnly";
Syncer.prototype.titleUserName = "$:/status/UserName";
Syncer.prototype.titleSyncFilter = "$:/config/SyncFilter";
-Syncer.prototype.titleSyncDisablePolling = "$:/config/SyncDisablePolling";
Syncer.prototype.titleSyncPollingInterval = "$:/config/SyncPollingInterval";
Syncer.prototype.titleSyncDisableLazyLoading = "$:/config/SyncDisableLazyLoading";
Syncer.prototype.titleSavedNotification = "$:/language/Notifications/Save/Done";
Syncer.prototype.titleSyncThrottleInterval = "$:/config/SyncThrottleInterval";
-Syncer.prototype.taskTimerInterval = 1 * 1000; // Interval for sync timer
+Syncer.prototype.taskTimerInterval = 0.25 * 1000; // Interval for sync timer
Syncer.prototype.throttleInterval = 1 * 1000; // Defer saving tiddlers if they've changed in the last 1s...
Syncer.prototype.errorRetryInterval = 5 * 1000; // Interval to retry after an error
Syncer.prototype.fallbackInterval = 10 * 1000; // Unless the task is older than 10s
@@ -75,9 +71,11 @@ function Syncer(options) {
this.titlesHaveBeenLazyLoaded = {}; // Hashmap of titles of tiddlers that have already been lazily loaded from the server
// Timers
this.taskTimerId = null; // Timer for task dispatch
- this.pollTimerId = null; // Timer for polling server
// Number of outstanding requests
this.numTasksInProgress = 0;
+ // True when we want to force an immediate sync from the server
+ this.forceSyncFromServer = false;
+ this.timestampLastSyncFromServer = new Date();
// Listen out for changes to tiddlers
this.wiki.addEventListener("change",function(changes) {
// Filter the changes to just include ones that are being synced
@@ -90,7 +88,7 @@ function Syncer(options) {
if(filteredChanges.length > 0) {
self.processTaskQueue();
} else {
- // Look for deletions of tiddlers we're already syncing
+ // Look for deletions of tiddlers we're already syncing
var outstandingDeletion = false
$tw.utils.each(changes,function(change,title,object) {
if(change.deleted && $tw.utils.hop(self.tiddlerInfo,title)) {
@@ -122,7 +120,7 @@ function Syncer(options) {
self.login(username,password,function() {});
} else {
// No username and password, so we display a prompt
- self.handleLoginEvent();
+ self.handleLoginEvent();
}
});
$tw.rootWidget.addEventListener("tm-logout",function() {
@@ -139,7 +137,7 @@ function Syncer(options) {
if(!this.disableUI && this.wiki.getTiddlerText(this.titleSyncDisableLazyLoading) !== "yes") {
this.wiki.addEventListener("lazyLoad",function(title) {
self.handleLazyLoadEvent(title);
- });
+ });
}
// Get the login status
this.getStatus(function(err,isLoggedIn) {
@@ -174,8 +172,8 @@ Syncer.prototype.getTiddlerRevision = function(title) {
if(this.syncadaptor && this.syncadaptor.getTiddlerRevision) {
return this.syncadaptor.getTiddlerRevision(title);
} else {
- return this.wiki.getTiddler(title).fields.revision;
- }
+ return this.wiki.getTiddler(title).fields.revision;
+ }
};
/*
@@ -204,33 +202,37 @@ Syncer.prototype.readTiddlerInfo = function() {
Checks whether the wiki is dirty (ie the window shouldn't be closed)
*/
Syncer.prototype.isDirty = function() {
- this.logger.log("Checking dirty status");
- // Check tiddlers that are in the store and included in the filter function
- var titles = this.getSyncedTiddlers();
- for(var index=0; index<titles.length; index++) {
- var title = titles[index],
- tiddlerInfo = this.tiddlerInfo[title];
- if(this.wiki.tiddlerExists(title)) {
- if(tiddlerInfo) {
- // If the tiddler is known on the server and has been modified locally then it needs to be saved to the server
- if(this.wiki.getChangeCount(title) > tiddlerInfo.changeCount) {
+ var self = this;
+ function checkIsDirty() {
+ // Check tiddlers that are in the store and included in the filter function
+ var titles = self.getSyncedTiddlers();
+ for(var index=0; index<titles.length; index++) {
+ var title = titles[index],
+ tiddlerInfo = self.tiddlerInfo[title];
+ if(self.wiki.tiddlerExists(title)) {
+ if(tiddlerInfo) {
+ // If the tiddler is known on the server and has been modified locally then it needs to be saved to the server
+ if(self.wiki.getChangeCount(title) > tiddlerInfo.changeCount) {
+ return true;
+ }
+ } else {
+ // If the tiddler isn't known on the server then it needs to be saved to the server
return true;
}
- } else {
- // If the tiddler isn't known on the server then it needs to be saved to the server
+ }
+ }
+ // Check tiddlers that are known from the server but not currently in the store
+ titles = Object.keys(self.tiddlerInfo);
+ for(index=0; index<titles.length; index++) {
+ if(!self.wiki.tiddlerExists(titles[index])) {
+ // There must be a pending delete
return true;
}
}
+ return false;
}
- // Check tiddlers that are known from the server but not currently in the store
- titles = Object.keys(this.tiddlerInfo);
- for(index=0; index<titles.length; index++) {
- if(!this.wiki.tiddlerExists(titles[index])) {
- // There must be a pending delete
- return true;
- }
- }
- return false;
+ var dirtyStatus = checkIsDirty();
+ return dirtyStatus;
};
/*
@@ -268,9 +270,9 @@ Syncer.prototype.getStatus = function(callback) {
// Mark us as not logged in
this.wiki.addTiddler({title: this.titleIsLoggedIn,text: "no"});
// Get login status
- this.syncadaptor.getStatus(function(err,isLoggedIn,username,isReadOnly,isAnonymous,isPollingDisabled) {
+ this.syncadaptor.getStatus(function(err,isLoggedIn,username,isReadOnly,isAnonymous) {
if(err) {
- self.logger.alert(err);
+ self.displayError("Get Status Error",err);
} else {
// Set the various status tiddlers
self.wiki.addTiddler({title: self.titleIsReadOnly,text: isReadOnly ? "yes" : "no"});
@@ -279,9 +281,6 @@ Syncer.prototype.getStatus = function(callback) {
if(isLoggedIn) {
self.wiki.addTiddler({title: self.titleUserName,text: username || ""});
}
- if(isPollingDisabled) {
- self.wiki.addTiddler({title: self.titleSyncDisablePolling, text: "yes"});
- }
}
// Invoke the callback
if(callback) {
@@ -297,95 +296,16 @@ Syncer.prototype.getStatus = function(callback) {
Synchronise from the server by reading the skinny tiddler list and queuing up loads for any tiddlers that we don't already have up to date
*/
Syncer.prototype.syncFromServer = function() {
- var self = this,
- cancelNextSync = function() {
- if(self.pollTimerId) {
- clearTimeout(self.pollTimerId);
- self.pollTimerId = null;
- }
- },
- triggerNextSync = function() {
- if(pollingEnabled) {
- self.pollTimerId = setTimeout(function() {
- self.pollTimerId = null;
- self.syncFromServer.call(self);
- },self.pollTimerInterval);
- }
- },
- syncSystemFromServer = (self.wiki.getTiddlerText("$:/config/SyncSystemTiddlersFromServer") === "yes"),
- pollingEnabled = (self.wiki.getTiddlerText(self.titleSyncDisablePolling) !== "yes");
- if(this.syncadaptor && this.syncadaptor.getUpdatedTiddlers) {
- this.logger.log("Retrieving updated tiddler list");
- cancelNextSync();
- this.syncadaptor.getUpdatedTiddlers(self,function(err,updates) {
- triggerNextSync();
- if(err) {
- self.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
- return;
- }
- if(updates) {
- $tw.utils.each(updates.modifications,function(title) {
- self.titlesToBeLoaded[title] = true;
- });
- $tw.utils.each(updates.deletions,function(title) {
- if(syncSystemFromServer || !self.wiki.isSystemTiddler(title)) {
- delete self.tiddlerInfo[title];
- self.logger.log("Deleting tiddler missing from server:",title);
- self.wiki.deleteTiddler(title);
- }
- });
- if(updates.modifications.length > 0 || updates.deletions.length > 0) {
- self.processTaskQueue();
- }
- }
- });
- } else if(this.syncadaptor && this.syncadaptor.getSkinnyTiddlers) {
- this.logger.log("Retrieving skinny tiddler list");
- cancelNextSync();
- this.syncadaptor.getSkinnyTiddlers(function(err,tiddlers) {
- triggerNextSync();
- // Check for errors
- if(err) {
- self.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
- return;
- }
- // Keep track of which tiddlers we already know about have been reported this time
- var previousTitles = Object.keys(self.tiddlerInfo);
- // Process each incoming tiddler
- for(var t=0; t<tiddlers.length; t++) {
- // Get the incoming tiddler fields, and the existing tiddler
- var tiddlerFields = tiddlers[t],
- incomingRevision = tiddlerFields.revision + "",
- tiddler = self.wiki.tiddlerExists(tiddlerFields.title) && self.wiki.getTiddler(tiddlerFields.title),
- tiddlerInfo = self.tiddlerInfo[tiddlerFields.title],
- currRevision = tiddlerInfo ? tiddlerInfo.revision : null,
- indexInPreviousTitles = previousTitles.indexOf(tiddlerFields.title);
- if(indexInPreviousTitles !== -1) {
- previousTitles.splice(indexInPreviousTitles,1);
- }
- // Ignore the incoming tiddler if it's the same as the revision we've already got
- if(currRevision !== incomingRevision) {
- // Only load the skinny version if we don't already have a fat version of the tiddler
- if(!tiddler || tiddler.fields.text === undefined) {
- self.storeTiddler(tiddlerFields);
- }
- // Do a full load of this tiddler
- self.titlesToBeLoaded[tiddlerFields.title] = true;
- }
- }
- // Delete any tiddlers that were previously reported but missing this time
- $tw.utils.each(previousTitles,function(title) {
- if(syncSystemFromServer || !self.wiki.isSystemTiddler(title)) {
- delete self.tiddlerInfo[title];
- self.logger.log("Deleting tiddler missing from server:",title);
- self.wiki.deleteTiddler(title);
- }
- });
- self.processTaskQueue();
- });
+ if(this.canSyncFromServer()) {
+ this.forceSyncFromServer = true;
+ this.processTaskQueue();
}
};
+Syncer.prototype.canSyncFromServer = function() {
+ return !!this.syncadaptor.getUpdatedTiddlers || !!this.syncadaptor.getSkinnyTiddlers;
+}
+
/*
Force load a tiddler from the server
*/
@@ -409,6 +329,7 @@ Syncer.prototype.handleLazyLoadEvent = function(title) {
// Mark the tiddler as needing loading, and having already been lazily loaded
this.titlesToBeLoaded[title] = true;
this.titlesHaveBeenLazyLoaded[title] = true;
+ this.processTaskQueue();
}
}
};
@@ -479,7 +400,7 @@ Syncer.prototype.handleLogoutEvent = function() {
if(this.syncadaptor.logout) {
this.syncadaptor.logout(function(err) {
if(err) {
- self.logger.alert(err);
+ self.displayError("Logout Error",err);
} else {
self.getStatus();
}
@@ -524,31 +445,39 @@ Syncer.prototype.processTaskQueue = function() {
this.updateDirtyStatus();
// And trigger a timeout if there is a pending task
if(task === true) {
- this.triggerTimeout();
+ this.triggerTimeout(this.taskTimerInterval);
+ } else if(this.canSyncFromServer()) {
+ this.triggerTimeout(this.pollTimerInterval);
}
}
} else {
this.updateDirtyStatus();
+ this.triggerTimeout(this.taskTimerInterval);
}
};
Syncer.prototype.triggerTimeout = function(interval) {
var self = this;
- if(!this.taskTimerId) {
- this.taskTimerId = setTimeout(function() {
- self.taskTimerId = null;
- self.processTaskQueue.call(self);
- },interval || self.taskTimerInterval);
+ if(this.taskTimerId) {
+ clearTimeout(this.taskTimerId);
}
+ this.taskTimerId = setTimeout(function() {
+ self.taskTimerId = null;
+ self.processTaskQueue.call(self);
+ },interval || self.taskTimerInterval);
};
/*
-Choose the next sync task. We prioritise saves, then deletes, then loads from the server
+Choose the next sync task. We prioritise saves to the server, then getting updates from the server, then deletes to the server, then loads from the server
-Returns either a task object, null if there's no upcoming tasks, or the boolean true if there are pending tasks that aren't yet due
+Returns either:
+* a task object
+* the boolean true if there are pending sync tasks that aren't yet due
+* null if there's no pending sync tasks (just the next poll)
*/
Syncer.prototype.chooseNextTask = function() {
- var thresholdLastSaved = (new Date()) - this.throttleInterval,
+ var now = new Date(),
+ thresholdLastSaved = now - this.throttleInterval,
havePending = null;
// First we look for tiddlers that have been modified locally and need saving back to the server
var titles = this.getSyncedTiddlers();
@@ -569,7 +498,11 @@ Syncer.prototype.chooseNextTask = function() {
}
}
}
- // Second, we check tiddlers that are known from the server but not currently in the store, and so need deleting on the server
+ // Second we check for an outstanding sync from server
+ if(this.forceSyncFromServer || (this.timestampLastSyncFromServer && (now.valueOf() >= (this.timestampLastSyncFromServer.valueOf() + this.pollTimerInterval)))) {
+ return new SyncFromServerTask(this);
+ }
+ // Third, we check tiddlers that are known from the server but not currently in the store, and so need deleting on the server
titles = Object.keys(this.tiddlerInfo);
for(index=0; index<titles.length; index++) {
title = titles[index];
@@ -579,13 +512,13 @@ Syncer.prototype.chooseNextTask = function() {
return new DeleteTiddlerTask(this,title);
}
}
- // Check for tiddlers that need loading
+ // Finally, check for tiddlers that need loading
title = Object.keys(this.titlesToBeLoaded)[0];
if(title) {
delete this.titlesToBeLoaded[title];
return new LoadTiddlerTask(this,title);
}
- // No tasks are ready
+ // No tasks are ready now, but might be in the future
return havePending;
};
@@ -595,6 +528,10 @@ function SaveTiddlerTask(syncer,title) {
this.type = "save";
}
+SaveTiddlerTask.prototype.toString = function() {
+ return "SAVE " + this.title;
+}
+
SaveTiddlerTask.prototype.run = function(callback) {
var self = this,
changeCount = this.syncer.wiki.getChangeCount(this.title),
@@ -619,7 +556,6 @@ SaveTiddlerTask.prototype.run = function(callback) {
tiddlerInfo: self.syncer.tiddlerInfo[self.title]
});
} else {
- this.syncer.logger.log(" Not Dispatching 'save' task:",this.title,"tiddler does not exist");
$tw.utils.nextTick(callback(null));
}
};
@@ -630,6 +566,10 @@ function DeleteTiddlerTask(syncer,title) {
this.type = "delete";
}
+DeleteTiddlerTask.prototype.toString = function() {
+ return "DELETE " + this.title;
+}
+
DeleteTiddlerTask.prototype.run = function(callback) {
var self = this;
this.syncer.logger.log("Dispatching 'delete' task:",this.title);
@@ -653,6 +593,10 @@ function LoadTiddlerTask(syncer,title) {
this.type = "load";
}
+LoadTiddlerTask.prototype.toString = function() {
+ return "LOAD " + this.title;
+}
+
LoadTiddlerTask.prototype.run = function(callback) {
var self = this;
this.syncer.logger.log("Dispatching 'load' task:",this.title);
@@ -670,6 +614,89 @@ LoadTiddlerTask.prototype.run = function(callback) {
});
};
-exports.Syncer = Syncer;
+function SyncFromServerTask(syncer) {
+ this.syncer = syncer;
+ this.type = "syncfromserver";
+}
-})();
+SyncFromServerTask.prototype.toString = function() {
+ return "SYNCFROMSERVER";
+}
+
+SyncFromServerTask.prototype.run = function(callback) {
+ var self = this;
+ var syncSystemFromServer = (self.syncer.wiki.getTiddlerText("$:/config/SyncSystemTiddlersFromServer") === "yes" ? true : false);
+ var successCallback = function() {
+ self.syncer.forceSyncFromServer = false;
+ self.syncer.timestampLastSyncFromServer = new Date();
+ callback(null);
+ };
+ if(this.syncer.syncadaptor.getUpdatedTiddlers) {
+ this.syncer.syncadaptor.getUpdatedTiddlers(self.syncer,function(err,updates) {
+ if(err) {
+ self.syncer.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
+ return callback(err);
+ }
+ if(updates) {
+ $tw.utils.each(updates.modifications,function(title) {
+ self.syncer.titlesToBeLoaded[title] = true;
+ });
+ $tw.utils.each(updates.deletions,function(title) {
+ if(syncSystemFromServer || !self.syncer.wiki.isSystemTiddler(title)) {
+ delete self.syncer.tiddlerInfo[title];
+ self.syncer.logger.log("Deleting tiddler missing from server:",title);
+ self.syncer.wiki.deleteTiddler(title);
+ }
+ });
+ }
+ return successCallback();
+ });
+ } else if(this.syncer.syncadaptor.getSkinnyTiddlers) {
+ this.syncer.syncadaptor.getSkinnyTiddlers(function(err,tiddlers) {
+ // Check for errors
+ if(err) {
+ self.syncer.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
+ return callback(err);
+ }
+ // Keep track of which tiddlers we already know about have been reported this time
+ var previousTitles = Object.keys(self.syncer.tiddlerInfo);
+ // Process each incoming tiddler
+ for(var t=0; t<tiddlers.length; t++) {
+ // Get the incoming tiddler fields, and the existing tiddler
+ var tiddlerFields = tiddlers[t],
+ incomingRevision = tiddlerFields.revision + "",
+ tiddler = self.syncer.wiki.tiddlerExists(tiddlerFields.title) && self.syncer.wiki.getTiddler(tiddlerFields.title),
+ tiddlerInfo = self.syncer.tiddlerInfo[tiddlerFields.title],
+ currRevision = tiddlerInfo ? tiddlerInfo.revision : null,
+ indexInPreviousTitles = previousTitles.indexOf(tiddlerFields.title);
+ if(indexInPreviousTitles !== -1) {
+ previousTitles.splice(indexInPreviousTitles,1);
+ }
+ // Ignore the incoming tiddler if it's the same as the revision we've already got
+ if(currRevision !== incomingRevision) {
+ // Only load the skinny version if we don't already have a fat version of the tiddler
+ if(!tiddler || tiddler.fields.text === undefined) {
+ self.syncer.storeTiddler(tiddlerFields);
+ }
+ // Do a full load of this tiddler
+ self.syncer.titlesToBeLoaded[tiddlerFields.title] = true;
+ }
+ }
+ // Delete any tiddlers that were previously reported but missing this time
+ $tw.utils.each(previousTitles,function(title) {
+ if(syncSystemFromServer || !self.syncer.wiki.isSystemTiddler(title)) {
+ delete self.syncer.tiddlerInfo[title];
+ self.syncer.logger.log("Deleting tiddler missing from server:",title);
+ self.syncer.wiki.deleteTiddler(title);
+ }
+ });
+ self.syncer.forceSyncFromServer = false;
+ self.syncer.timestampLastSyncFromServer = new Date();
+ return successCallback();
+ });
+ } else {
+ return successCallback();
+ }
+};
+
+exports.Syncer = Syncer;
diff --git a/core/modules/tiddler.js b/core/modules/tiddler.js
index e58d4ddf9..d28f90945 100644
--- a/core/modules/tiddler.js
+++ b/core/modules/tiddler.js
@@ -6,10 +6,7 @@ module-type: tiddlermethod
Extension methods for the $tw.Tiddler object (constructor and methods required at boot time are in boot/boot.js)
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.hasTag = function(tag) {
@@ -24,13 +21,13 @@ exports.isDraft = function() {
return this.hasField("draft.of");
};
-exports.getFieldString = function(field) {
+exports.getFieldString = function(field,defaultValue) {
var value = this.fields[field];
// Check for a missing field
if(value === undefined || value === null) {
- return "";
+ return defaultValue || "";
}
- // Parse the field with the associated module (if any)
+ // Stringify the field with the associated tiddler field module (if any)
var fieldModule = $tw.Tiddler.fieldModules[field];
if(fieldModule && fieldModule.stringify) {
return fieldModule.stringify.call(this,value);
@@ -40,10 +37,10 @@ exports.getFieldString = function(field) {
};
/*
-Get the value of a field as a list
+Get the value of a field as an array / list
*/
exports.getFieldList = function(field) {
- var value = this.fields[field];
+ var value = this.getFieldString(field,null);
// Check for a missing field
if(value === undefined || value === null) {
return [];
@@ -99,5 +96,3 @@ exports.getFieldDay = function(field) {
this.cache.day[field] = day;
return day;
};
-
-})();
diff --git a/core/modules/upgraders/plugins.js b/core/modules/upgraders/plugins.js
index a7dd02982..8f35d5090 100644
--- a/core/modules/upgraders/plugins.js
+++ b/core/modules/upgraders/plugins.js
@@ -6,10 +6,7 @@ module-type: upgrader
Upgrader module that checks that plugins are newer than any already installed version
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var UPGRADE_LIBRARY_TITLE = "$:/UpgradeLibrary";
@@ -41,7 +38,7 @@ exports.upgrade = function(wiki,titles,tiddlers) {
// Check if we're dealing with a plugin
if(incomingTiddler && incomingTiddler["plugin-type"]) {
// Check whether the plugin contains JS modules
- var requiresReload = wiki.doesPluginInfoRequireReload(JSON.parse(incomingTiddler.text)) ? (wiki.getTiddlerText("$:/language/ControlPanel/Plugins/PluginWillRequireReload") + " ") : "";
+ var requiresReload = wiki.doesPluginInfoRequireReload($tw.utils.parseJSONSafe(incomingTiddler.text)) ? (wiki.getTiddlerText("$:/language/ControlPanel/Plugins/PluginWillRequireReload") + " ") : "";
messages[title] = requiresReload;
if(incomingTiddler.version) {
// Upgrade the incoming plugin if it is in the upgrade library
@@ -75,5 +72,3 @@ exports.upgrade = function(wiki,titles,tiddlers) {
});
return messages;
};
-
-})();
diff --git a/core/modules/upgraders/system.js b/core/modules/upgraders/system.js
index de7c48f52..ae3f76b3c 100644
--- a/core/modules/upgraders/system.js
+++ b/core/modules/upgraders/system.js
@@ -6,14 +6,11 @@ module-type: upgrader
Upgrader module that suppresses certain system tiddlers that shouldn't be imported
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
-var DONT_IMPORT_LIST = ["$:/StoryList","$:/HistoryList"],
- DONT_IMPORT_PREFIX_LIST = ["$:/temp/","$:/state/","$:/Import"],
+var DONT_IMPORT_LIST = ["$:/Import", "$:/build"],
+ UNSELECT_PREFIX_LIST = ["$:/temp/","$:/state/","$:/StoryList","$:/HistoryList"],
WARN_IMPORT_PREFIX_LIST = ["$:/core/modules/"];
exports.upgrade = function(wiki,titles,tiddlers) {
@@ -26,11 +23,10 @@ exports.upgrade = function(wiki,titles,tiddlers) {
tiddlers[title] = Object.create(null);
messages[title] = $tw.language.getString("Import/Upgrader/System/Suppressed");
} else {
- for(var t=0; t<DONT_IMPORT_PREFIX_LIST.length; t++) {
- var prefix = DONT_IMPORT_PREFIX_LIST[t];
+ for(var t=0; t<UNSELECT_PREFIX_LIST.length; t++) {
+ var prefix = UNSELECT_PREFIX_LIST[t];
if(title.substr(0,prefix.length) === prefix) {
- tiddlers[title] = Object.create(null);
- messages[title] = $tw.language.getString("Import/Upgrader/State/Suppressed");
+ messages[title] = $tw.language.getString("Import/Upgrader/Tiddler/Unselected");
}
}
for(var t=0; t<WARN_IMPORT_PREFIX_LIST.length; t++) {
@@ -48,5 +44,3 @@ exports.upgrade = function(wiki,titles,tiddlers) {
}
return messages;
};
-
-})();
diff --git a/core/modules/upgraders/themetweaks.js b/core/modules/upgraders/themetweaks.js
index e411b285a..616f9008d 100644
--- a/core/modules/upgraders/themetweaks.js
+++ b/core/modules/upgraders/themetweaks.js
@@ -15,10 +15,7 @@ Now, each tweak is stored in its own separate tiddler.
This upgrader copies any values from the old format to the new. The old data tiddlers are not deleted in case they have been used to store additional indexes.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var MAPPINGS = {
@@ -61,5 +58,3 @@ exports.upgrade = function(wiki,titles,tiddlers) {
});
return messages;
};
-
-})();
diff --git a/core/modules/utils/base64-utf8/base64-utf8.module.js b/core/modules/utils/base64-utf8/base64-utf8.module.js
deleted file mode 100644
index 8bd4e272d..000000000
--- a/core/modules/utils/base64-utf8/base64-utf8.module.js
+++ /dev/null
@@ -1,142 +0,0 @@
-// From https://gist.github.com/Nijikokun/5192472
-//
-// UTF8 Module
-//
-// Cleaner and modularized utf-8 encoding and decoding library for javascript.
-//
-// copyright: MIT
-// author: Nijiko Yonskai, @nijikokun, nijikokun@gmail.com
-(function (name, definition, context, dependencies) {
- if (typeof context['module'] !== 'undefined' && context['module']['exports']) { if (dependencies && context['require']) { for (var i = 0; i < dependencies.length; i++) context[dependencies[i]] = context['require'](dependencies[i]); } context['module']['exports'] = definition.apply(context); }
- else if (typeof context['define'] !== 'undefined' && context['define'] === 'function' && context['define']['amd']) { define(name, (dependencies || []), definition); }
- else { context[name] = definition.apply(context); }
-})('utf8', function () {
- return {
- encode: function (string) {
- if (typeof string !== 'string') return string;
- else string = string.replace(/\r\n/g, "\n");
- var output = "", i = 0, charCode;
-
- for (i; i < string.length; i++) {
- charCode = string.charCodeAt(i);
-
- if (charCode < 128) {
- output += String.fromCharCode(charCode);
- } else if ((charCode > 127) && (charCode < 2048)) {
- output += String.fromCharCode((charCode >> 6) | 192);
- output += String.fromCharCode((charCode & 63) | 128);
- } else if ((charCode > 55295) && (charCode < 57344) && string.length > i+1) {
- // Surrogate pair
- var hiSurrogate = charCode;
- var loSurrogate = string.charCodeAt(i+1);
- i++; // Skip the low surrogate on the next loop pass
- var codePoint = (((hiSurrogate - 55296) << 10) | (loSurrogate - 56320)) + 65536;
- output += String.fromCharCode((codePoint >> 18) | 240);
- output += String.fromCharCode(((codePoint >> 12) & 63) | 128);
- output += String.fromCharCode(((codePoint >> 6) & 63) | 128);
- output += String.fromCharCode((codePoint & 63) | 128);
- } else {
- // Not a surrogate pair, or a dangling surrogate without its partner that we'll just encode as-is
- output += String.fromCharCode((charCode >> 12) | 224);
- output += String.fromCharCode(((charCode >> 6) & 63) | 128);
- output += String.fromCharCode((charCode & 63) | 128);
- }
- }
-
- return output;
- },
-
- decode: function (string) {
- if (typeof string !== 'string') return string;
- var output = "", i = 0, charCode = 0;
-
- while (i < string.length) {
- charCode = string.charCodeAt(i);
-
- if (charCode < 128) {
- output += String.fromCharCode(charCode),
- i++;
- } else if ((charCode > 191) && (charCode < 224)) {
- output += String.fromCharCode(((charCode & 31) << 6) | (string.charCodeAt(i + 1) & 63));
- i += 2;
- } else if ((charCode > 223) && (charCode < 240)) {
- output += String.fromCharCode(((charCode & 15) << 12) | ((string.charCodeAt(i + 1) & 63) << 6) | (string.charCodeAt(i + 2) & 63));
- i += 3;
- } else {
- var codePoint = ((charCode & 7) << 18) | ((string.charCodeAt(i + 1) & 63) << 12) | ((string.charCodeAt(i + 2) & 63) << 6) | (string.charCodeAt(i + 3) & 63);
- // output += String.fromCodePoint(codePoint); // Can't do this because Internet Explorer doesn't have String.fromCodePoint
- output += String.fromCharCode(((codePoint - 65536) >> 10) + 55296) + String.fromCharCode(((codePoint - 65536) & 1023) + 56320); // So we do this instead
- i += 4;
- }
- }
-
- return output;
- }
- };
-}, this);
-
-// Base64 Module
-//
-// Cleaner, modularized and properly scoped base64 encoding and decoding module for strings.
-//
-// copyright: MIT
-// author: Nijiko Yonskai, @nijikokun, nijikokun@gmail.com
-(function (name, definition, context, dependencies) {
- if (typeof context['module'] !== 'undefined' && context['module']['exports']) { if (dependencies && context['require']) { for (var i = 0; i < dependencies.length; i++) context[dependencies[i]] = context['require'](dependencies[i]); } context['module']['exports'] = definition.apply(context); }
- else if (typeof context['define'] !== 'undefined' && context['define'] === 'function' && context['define']['amd']) { define(name, (dependencies || []), definition); }
- else { context[name] = definition.apply(context); }
-})('base64', function (utf8) {
- var $this = this;
- var $utf8 = utf8 || this.utf8;
- var map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-
- return {
- encode: function (input) {
- if (typeof $utf8 === 'undefined') throw { error: "MissingMethod", message: "UTF8 Module is missing." };
- if (typeof input !== 'string') return input;
- else input = $utf8.encode(input);
- var output = "", a, b, c, d, e, f, g, i = 0;
-
- while (i < input.length) {
- a = input.charCodeAt(i++);
- b = input.charCodeAt(i++);
- c = input.charCodeAt(i++);
- d = a >> 2;
- e = ((a & 3) << 4) | (b >> 4);
- f = ((b & 15) << 2) | (c >> 6);
- g = c & 63;
-
- if (isNaN(b)) f = g = 64;
- else if (isNaN(c)) g = 64;
-
- output += map.charAt(d) + map.charAt(e) + map.charAt(f) + map.charAt(g);
- }
-
- return output;
- },
-
- decode: function (input) {
- if (typeof $utf8 === 'undefined') throw { error: "MissingMethod", message: "UTF8 Module is missing." };
- if (typeof input !== 'string') return input;
- else input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
- var output = "", a, b, c, d, e, f, g, i = 0;
-
- while (i < input.length) {
- d = map.indexOf(input.charAt(i++));
- e = map.indexOf(input.charAt(i++));
- f = map.indexOf(input.charAt(i++));
- g = map.indexOf(input.charAt(i++));
-
- a = (d << 2) | (e >> 4);
- b = ((e & 15) << 4) | (f >> 2);
- c = ((f & 3) << 6) | g;
-
- output += String.fromCharCode(a);
- if (f != 64) output += String.fromCharCode(b);
- if (g != 64) output += String.fromCharCode(c);
- }
-
- return $utf8.decode(output);
- }
- }
-}, this, [ "utf8" ]);
\ No newline at end of file
diff --git a/core/modules/utils/base64-utf8/base64-utf8.module.min.js b/core/modules/utils/base64-utf8/base64-utf8.module.min.js
deleted file mode 100644
index f2f808004..000000000
--- a/core/modules/utils/base64-utf8/base64-utf8.module.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// From https://gist.github.com/Nijikokun/5192472
-//
-// UTF8 Module
-//
-// Cleaner and modularized utf-8 encoding and decoding library for javascript.
-//
-// copyright: MIT
-// author: Nijiko Yonskai, @nijikokun, nijikokun@gmail.com
-!function(r,e,o,t){void 0!==o.module&&o.module.exports?o.module.exports=e.apply(o):void 0!==o.define&&"function"===o.define&&o.define.amd?define("utf8",[],e):o.utf8=e.apply(o)}(0,function(){return{encode:function(r){if("string"!=typeof r)return r;r=r.replace(/\r\n/g,"\n");for(var e,o="",t=0;t<r.length;t++)if((e=r.charCodeAt(t))<128)o+=String.fromCharCode(e);else if(e>127&&e<2048)o+=String.fromCharCode(e>>6|192),o+=String.fromCharCode(63&e|128);else if(e>55295&&e<57344&&r.length>t+1){var i=e,n=r.charCodeAt(t+1);t++;var d=65536+(i-55296<<10|n-56320);o+=String.fromCharCode(d>>18|240),o+=String.fromCharCode(d>>12&63|128),o+=String.fromCharCode(d>>6&63|128),o+=String.fromCharCode(63&d|128)}else o+=String.fromCharCode(e>>12|224),o+=String.fromCharCode(e>>6&63|128),o+=String.fromCharCode(63&e|128);return o},decode:function(r){if("string"!=typeof r)return r;for(var e="",o=0,t=0;o<r.length;)if((t=r.charCodeAt(o))<128)e+=String.fromCharCode(t),o++;else if(t>191&&t<224)e+=String.fromCharCode((31&t)<<6|63&r.charCodeAt(o+1)),o+=2;else if(t>223&&t<240)e+=String.fromCharCode((15&t)<<12|(63&r.charCodeAt(o+1))<<6|63&r.charCodeAt(o+2)),o+=3;else{var i=(7&t)<<18|(63&r.charCodeAt(o+1))<<12|(63&r.charCodeAt(o+2))<<6|63&r.charCodeAt(o+3);e+=String.fromCharCode(55296+(i-65536>>10))+String.fromCharCode(56320+(i-65536&1023)),o+=4}return e}}},this),function(r,e,o,t){if(void 0!==o.module&&o.module.exports){if(t&&o.require)for(var i=0;i<t.length;i++)o[t[i]]=o.require(t[i]);o.module.exports=e.apply(o)}else void 0!==o.define&&"function"===o.define&&o.define.amd?define("base64",t||[],e):o.base64=e.apply(o)}(0,function(r){var e=r||this.utf8,o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";return{encode:function(r){if(void 0===e)throw{error:"MissingMethod",message:"UTF8 Module is missing."};if("string"!=typeof r)return r;r=e.encode(r);for(var t,i,n,d,f,a,h,C="",c=0;c<r.length;)d=(t=r.charCodeAt(c++))>>2,f=(3&t)<<4|(i=r.charCodeAt(c++))>>4,a=(15&i)<<2|(n=r.charCodeAt(c++))>>6,h=63&n,isNaN(i)?a=h=64:isNaN(n)&&(h=64),C+=o.charAt(d)+o.charAt(f)+o.charAt(a)+o.charAt(h);return C},decode:function(r){if(void 0===e)throw{error:"MissingMethod",message:"UTF8 Module is missing."};if("string"!=typeof r)return r;r=r.replace(/[^A-Za-z0-9\+\/\=]/g,"");for(var t,i,n,d,f,a,h="",C=0;C<r.length;)t=o.indexOf(r.charAt(C++))<<2|(d=o.indexOf(r.charAt(C++)))>>4,i=(15&d)<<4|(f=o.indexOf(r.charAt(C++)))>>2,n=(3&f)<<6|(a=o.indexOf(r.charAt(C++))),h+=String.fromCharCode(t),64!=f&&(h+=String.fromCharCode(i)),64!=a&&(h+=String.fromCharCode(n));return e.decode(h)}}},this,["utf8"]);
\ No newline at end of file
diff --git a/core/modules/utils/base64-utf8/tiddlywiki.files b/core/modules/utils/base64-utf8/tiddlywiki.files
deleted file mode 100644
index b12e7dfb9..000000000
--- a/core/modules/utils/base64-utf8/tiddlywiki.files
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "tiddlers": [
- {
- "file": "base64-utf8.module.min.js",
- "fields": {
- "type": "application/javascript",
- "title": "$:/core/modules/utils/base64-utf8/base64-utf8.module.js",
- "module-type": "library"
- },
- "prefix": "(function(){",
- "suffix": "}).call(exports);"
- }
- ]
-}
diff --git a/core/modules/utils/crypto.js b/core/modules/utils/crypto.js
index 252ac0ee8..dc239fbcc 100644
--- a/core/modules/utils/crypto.js
+++ b/core/modules/utils/crypto.js
@@ -6,10 +6,7 @@ module-type: utils
Utility functions related to crypto.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -21,7 +18,7 @@ exports.extractEncryptedStoreArea = function(text) {
if(encryptedStoreAreaStart !== -1) {
var encryptedStoreAreaEnd = text.indexOf("</pre>",encryptedStoreAreaStart);
if(encryptedStoreAreaEnd !== -1) {
- return $tw.utils.htmlDecode(text.substring(encryptedStoreAreaStart + encryptedStoreAreaStartMarker.length,encryptedStoreAreaEnd-1));
+ return $tw.utils.htmlDecode(text.substring(encryptedStoreAreaStart + encryptedStoreAreaStartMarker.length,encryptedStoreAreaEnd));
}
}
return null;
@@ -33,7 +30,7 @@ Attempt to extract the tiddlers from an encrypted store area using the current p
exports.decryptStoreArea = function(encryptedStoreArea,password) {
var decryptedText = $tw.crypto.decrypt(encryptedStoreArea,password);
if(decryptedText) {
- var json = JSON.parse(decryptedText),
+ var json = $tw.utils.parseJSONSafe(decryptedText),
tiddlers = [];
for(var title in json) {
if(title !== "$:/isEncrypted") {
@@ -90,5 +87,3 @@ exports.decryptStoreAreaInteractive = function(encryptedStoreArea,callback,optio
});
}
};
-
-})();
diff --git a/core/modules/utils/csv.js b/core/modules/utils/csv.js
index 37312d847..177f0c0ac 100644
--- a/core/modules/utils/csv.js
+++ b/core/modules/utils/csv.js
@@ -6,41 +6,114 @@ module-type: utils
A barebones CSV parser
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
+var QUOTE = '"';
+
+var getCellInfo = function(text, start, length, SEPARATOR) {
+ var isCellQuoted = text.charAt(start) === QUOTE;
+ var cellStart = isCellQuoted ? start + 1 : start;
+
+ if (text.charAt(i) === SEPARATOR) {
+ return [cellStart, cellStart, false];
+ }
+
+ for (var i = cellStart; i < length; i++) {
+ var cellCharacter = text.charAt(i);
+ var isEOL = cellCharacter === "\n" || cellCharacter === "\r";
+
+ if (isEOL && !isCellQuoted) {
+ return [cellStart, i, false];
+
+ } else if (cellCharacter === SEPARATOR && !isCellQuoted) {
+ return [cellStart, i, false];
+
+ } else if (cellCharacter === QUOTE && isCellQuoted) {
+ var nextCharacter = i + 1 < length ? text.charAt(i + 1) : '';
+ if (nextCharacter !== QUOTE) {
+ return [cellStart, i, true];
+ } else {
+ i++;
+ }
+ }
+ }
+
+ return [cellStart, i, isCellQuoted];
+}
+
+exports.parseCsvString = function(text, options) {
+ if (!text) {
+ return [];
+ }
+
+ options = options || {};
+ var SEPARATOR = options.separator || ",",
+ length = text.length,
+ rows = [],
+ nextRow = [];
+
+ for (var i = 0; i < length; i++) {
+ var cellInfo = getCellInfo(text, i, length, SEPARATOR);
+ var cellText = text.substring(cellInfo[0], cellInfo[1]);
+ if (cellInfo[2]) {
+ cellText = cellText.replace(/""/g, '"');
+ cellInfo[1]++;
+ }
+ nextRow.push(cellText);
+
+ i = cellInfo[1];
+
+ var character = text.charAt(i);
+ var nextCharacter = i + 1 < length ? text.charAt(i + 1) : '';
+
+ if (character === "\r" || character === "\n") {
+ // Edge case for empty rows
+ if (nextRow.length === 1 && nextRow[0] === '') {
+ nextRow.length = 0;
+ }
+ rows.push(nextRow);
+ nextRow = [];
+
+ if (character === "\r") {
+ var nextCharacter = i + 1 < length ? text.charAt(i + 1) : '';
+
+ if (nextCharacter === "\n") {
+ i++;
+ }
+ }
+ }
+ }
+
+ // Special case if last cell in last row is an empty cell
+ if (text.charAt(length - 1) === SEPARATOR) {
+ nextRow.push("");
+ }
+
+ rows.push(nextRow);
+
+ return rows;
+}
+
/*
Parse a CSV string with a header row and return an array of hashmaps.
*/
exports.parseCsvStringWithHeader = function(text,options) {
- options = options || {};
- var separator = options.separator || ",",
- rows = text.split(/\r?\n/mg).map(function(row) {
- return $tw.utils.trim(row);
- }).filter(function(row) {
- return row !== "";
- });
- if(rows.length < 1) {
- return "Missing header row";
- }
- var headings = rows[0].split(separator),
- results = [];
- for(var row=1; row<rows.length; row++) {
- var columns = rows[row].split(separator),
- columnResult = Object.create(null);
- if(columns.length !== headings.length) {
- return "Malformed CSV row '" + rows[row] + "'";
- }
- for(var column=0; column<columns.length; column++) {
- var columnName = headings[column];
- columnResult[columnName] = $tw.utils.trim(columns[column] || "");
- }
- results.push(columnResult);
- }
- return results;
-}
+ var csv = $tw.utils.parseCsvString(text, options);
+ var headers = csv[0];
+
+ csv = csv.slice(1);
+ for (var i = 0; i < csv.length; i++) {
+ var row = csv[i];
+ var rowObject = Object.create(null);
-})();
+ for(var columnIndex=0; columnIndex<headers.length; columnIndex++) {
+ var columnName = headers[columnIndex];
+ if (columnName) {
+ rowObject[columnName] = $tw.utils.trim(row[columnIndex] || "");
+ }
+ }
+ csv[i] = rowObject;
+ }
+ return csv;
+}
diff --git a/core/modules/utils/dom/animations/slide.js b/core/modules/utils/dom/animations/slide.js
index face94960..2057c4460 100644
--- a/core/modules/utils/dom/animations/slide.js
+++ b/core/modules/utils/dom/animations/slide.js
@@ -6,10 +6,7 @@ module-type: animation
A simple slide animation that varies the height of the element
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
function slideOpen(domNode,options) {
@@ -111,5 +108,3 @@ exports.slide = {
open: slideOpen,
close: slideClosed
};
-
-})();
diff --git a/core/modules/utils/dom/animator.js b/core/modules/utils/dom/animator.js
index f994d9b58..013900975 100644
--- a/core/modules/utils/dom/animator.js
+++ b/core/modules/utils/dom/animator.js
@@ -6,10 +6,7 @@ module-type: utils
Orchestrates animations and transitions
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
function Animator() {
@@ -39,5 +36,3 @@ Animator.prototype.perform = function(type,domNode,options) {
};
exports.Animator = Animator;
-
-})();
diff --git a/core/modules/utils/dom/browser.js b/core/modules/utils/dom/browser.js
index fcc292bed..11905a1fe 100644
--- a/core/modules/utils/dom/browser.js
+++ b/core/modules/utils/dom/browser.js
@@ -6,10 +6,7 @@ module-type: utils
Browser feature detection
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -27,6 +24,26 @@ exports.setStyle = function(element,styles) {
}
};
+/*
+Remove style properties of an element
+ element: dom node
+ styleProperties: ordered array of string property names
+*/
+exports.removeStyles = function(element, styleProperties) {
+ for (var i=0; i<styleProperties.length; i++) {
+ element.style.removeProperty($tw.utils.convertStyleNameToPropertyName(styleProperties[i]));
+ }
+}
+
+/*
+Remove single style property of an element
+ element: dom node
+ styleProperty: string property name
+*/
+exports.removeStyle = function(element, styleProperty) {
+ $tw.utils.removeStyles(element, [styleProperty])
+}
+
/*
Converts a standard CSS property name into the local browser-specific equivalent. For example:
"background-color" --> "backgroundColor"
@@ -160,5 +177,3 @@ exports.getFullScreenApis = function() {
return result;
}
};
-
-})();
diff --git a/core/modules/utils/dom/dom.js b/core/modules/utils/dom/dom.js
index df4c93b73..849c5a88b 100644
--- a/core/modules/utils/dom/dom.js
+++ b/core/modules/utils/dom/dom.js
@@ -6,12 +6,11 @@ module-type: utils
Various static DOM-related utility functions.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
+var Popup = require("$:/core/modules/utils/dom/popup.js");
+
/*
Determines whether element 'a' contains element 'b'
Code thanks to John Resig, http://ejohn.org/blog/comparing-document-position/
@@ -22,6 +21,28 @@ exports.domContains = function(a,b) {
!!(a.compareDocumentPosition(b) & 16);
};
+exports.domMatchesSelector = function(node,selector) {
+ return node.matches ? node.matches(selector) : node.msMatchesSelector(selector);
+};
+
+/*
+Select text in a an input or textarea (setSelectionRange crashes on certain input types)
+*/
+exports.setSelectionRangeSafe = function(node,start,end,direction) {
+ try {
+ node.setSelectionRange(start,end,direction);
+ } catch(e) {
+ node.select();
+ }
+};
+
+/*
+Select the text in an input or textarea by position
+*/
+exports.setSelectionByPosition = function(node,selectFromStart,selectFromEnd) {
+ $tw.utils.setSelectionRangeSafe(node,selectFromStart,node.value.length - selectFromEnd);
+};
+
exports.removeChildren = function(node) {
while(node.hasChildNodes()) {
node.removeChild(node.firstChild);
@@ -65,7 +86,7 @@ Get the first parent element that has scrollbars or use the body as fallback.
*/
exports.getScrollContainer = function(el) {
var doc = el.ownerDocument;
- while(el.parentNode) {
+ while(el.parentNode) {
el = el.parentNode;
if(el.scrollTop) {
return el;
@@ -204,7 +225,7 @@ exports.addEventListeners = function(domNode,events) {
if(eventInfo.handlerMethod) {
handler = function(event) {
eventInfo.handlerObject[eventInfo.handlerMethod].call(eventInfo.handlerObject,event);
- };
+ };
} else {
handler = eventInfo.handlerObject;
}
@@ -246,6 +267,7 @@ Copy plain text to the clipboard on browsers that support it
*/
exports.copyToClipboard = function(text,options) {
options = options || {};
+ text = text || "";
var textArea = document.createElement("textarea");
textArea.style.position = "fixed";
textArea.style.top = 0;
@@ -265,10 +287,12 @@ exports.copyToClipboard = function(text,options) {
var succeeded = false;
try {
succeeded = document.execCommand("copy");
- } catch (err) {
+ } catch(err) {
}
if(!options.doNotNotify) {
- $tw.notifier.display(succeeded ? "$:/language/Notifications/CopiedToClipboard/Succeeded" : "$:/language/Notifications/CopiedToClipboard/Failed");
+ var successNotification = options.successNotification || "$:/language/Notifications/CopiedToClipboard/Succeeded",
+ failureNotification = options.failureNotification || "$:/language/Notifications/CopiedToClipboard/Failed"
+ $tw.notifier.display(succeeded ? successNotification : failureNotification);
}
document.body.removeChild(textArea);
};
@@ -277,5 +301,87 @@ exports.getLocationPath = function() {
return window.location.toString().split("#")[0];
};
+/*
+Collect DOM variables
+*/
+exports.collectDOMVariables = function(selectedNode,domNode,event) {
+ var variables = {},
+ selectedNodeRect,
+ domNodeRect;
+ if(selectedNode) {
+ $tw.utils.each(selectedNode.attributes,function(attribute) {
+ variables["dom-" + attribute.name] = attribute.value.toString();
+ });
+
+ if("offsetLeft" in selectedNode) {
+ // Add variables with a (relative and absolute) popup coordinate string for the selected node
+ var nodeRect = {
+ left: selectedNode.offsetLeft,
+ top: selectedNode.offsetTop,
+ width: selectedNode.offsetWidth,
+ height: selectedNode.offsetHeight
+ };
+ variables["tv-popup-coords"] = Popup.buildCoordinates(Popup.coordinatePrefix.csOffsetParent,nodeRect);
-})();
+ var absRect = $tw.utils.extend({}, nodeRect);
+ for(var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) {
+ absRect.left += currentNode.offsetLeft;
+ absRect.top += currentNode.offsetTop;
+ }
+ variables["tv-popup-abs-coords"] = Popup.buildCoordinates(Popup.coordinatePrefix.csAbsolute,absRect);
+
+ // Add variables for offset of selected node
+ variables["tv-selectednode-posx"] = selectedNode.offsetLeft.toString();
+ variables["tv-selectednode-posy"] = selectedNode.offsetTop.toString();
+ variables["tv-selectednode-width"] = selectedNode.offsetWidth.toString();
+ variables["tv-selectednode-height"] = selectedNode.offsetHeight.toString();
+ }
+ }
+
+ if(domNode && ("offsetWidth" in domNode)) {
+ variables["tv-widgetnode-width"] = domNode.offsetWidth.toString();
+ variables["tv-widgetnode-height"] = domNode.offsetHeight.toString();
+ }
+
+ if(event && ("clientX" in event) && ("clientY" in event)) {
+ if(selectedNode) {
+ // Add variables for event X and Y position relative to selected node
+ selectedNodeRect = selectedNode.getBoundingClientRect();
+ variables["event-fromselected-posx"] = (event.clientX - selectedNodeRect.left).toString();
+ variables["event-fromselected-posy"] = (event.clientY - selectedNodeRect.top).toString();
+ }
+
+ if(domNode) {
+ // Add variables for event X and Y position relative to event catcher node
+ domNodeRect = domNode.getBoundingClientRect();
+ variables["event-fromcatcher-posx"] = (event.clientX - domNodeRect.left).toString();
+ variables["event-fromcatcher-posy"] = (event.clientY - domNodeRect.top).toString();
+ }
+
+ // Add variables for event X and Y position relative to the viewport
+ variables["event-fromviewport-posx"] = event.clientX.toString();
+ variables["event-fromviewport-posy"] = event.clientY.toString();
+ }
+ return variables;
+};
+
+/*
+Make sure the CSS selector is not invalid
+*/
+exports.querySelectorSafe = function(selector,baseElement) {
+ baseElement = baseElement || document;
+ try {
+ return baseElement.querySelector(selector);
+ } catch(e) {
+ console.log("Invalid selector: ",selector);
+ }
+};
+
+exports.querySelectorAllSafe = function(selector,baseElement) {
+ baseElement = baseElement || document;
+ try {
+ return baseElement.querySelectorAll(selector);
+ } catch(e) {
+ console.log("Invalid selector: ",selector);
+ }
+};
diff --git a/core/modules/utils/dom/dragndrop.js b/core/modules/utils/dom/dragndrop.js
index ba5d590c3..25a13537c 100644
--- a/core/modules/utils/dom/dragndrop.js
+++ b/core/modules/utils/dom/dragndrop.js
@@ -6,28 +6,26 @@ module-type: utils
Browser data transfer utilities, used with the clipboard and drag and drop
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
Options:
domNode: dom node to make draggable
-dragImageType: "pill" or "dom"
+selector: CSS selector to identify element within domNode to be used as drag handle (optional)
+dragImageType: "pill", "blank" or "dom" (the default)
dragTiddlerFn: optional function to retrieve the title of tiddler to drag
dragFilterFn: optional function to retreive the filter defining a list of tiddlers to drag
-widget: widget to use as the contect for the filter
+widget: widget to use as the context for the filter
*/
exports.makeDraggable = function(options) {
var dragImageType = options.dragImageType || "dom",
dragImage,
domNode = options.domNode;
// Make the dom node draggable (not necessary for anchor tags)
- if((domNode.tagName || "").toLowerCase() !== "a") {
- domNode.setAttribute("draggable","true");
+ if(!options.selector && ((domNode.tagName || "").toLowerCase() !== "a")) {
+ domNode.setAttribute("draggable","true");
}
// Add event handlers
$tw.utils.addEventListeners(domNode,[
@@ -39,20 +37,26 @@ exports.makeDraggable = function(options) {
var dragTiddler = options.dragTiddlerFn && options.dragTiddlerFn(),
dragFilter = options.dragFilterFn && options.dragFilterFn(),
titles = dragTiddler ? [dragTiddler] : [],
- startActions = options.startActions;
+ startActions = options.startActions,
+ variables,
+ domNodeRect;
if(dragFilter) {
titles.push.apply(titles,options.widget.wiki.filterTiddlers(dragFilter,options.widget));
}
var titleString = $tw.utils.stringifyList(titles);
// Check that we've something to drag
- if(titles.length > 0 && event.target === domNode) {
+ if(titles.length > 0 && (options.selector && $tw.utils.domMatchesSelector(event.target,options.selector) || event.target === domNode)) {
// Mark the drag in progress
$tw.dragInProgress = domNode;
// Set the dragging class on the element being dragged
- $tw.utils.addClass(event.target,"tc-dragging");
+ $tw.utils.addClass(domNode,"tc-dragging");
// Invoke drag-start actions if given
if(startActions !== undefined) {
- options.widget.invokeActionString(startActions,options.widget,event,{actionTiddler: titleString});
+ // Collect our variables
+ variables = $tw.utils.collectDOMVariables(domNode,null,event);
+ variables.modifier = $tw.keyboardManager.getEventModifierKeyDescriptor(event);
+ variables["actionTiddler"] = titleString;
+ options.widget.invokeActionString(startActions,options.widget,event,variables);
}
// Create the drag image elements
dragImage = options.widget.document.createElement("div");
@@ -73,6 +77,9 @@ exports.makeDraggable = function(options) {
if(dataTransfer.setDragImage) {
if(dragImageType === "pill") {
dataTransfer.setDragImage(dragImage.firstChild,-16,-16);
+ } else if(dragImageType === "blank") {
+ dragImage.removeChild(dragImage.firstChild);
+ dataTransfer.setDragImage(dragImage,0,0);
} else {
var r = domNode.getBoundingClientRect();
dataTransfer.setDragImage(domNode,event.clientX-r.left,event.clientY-r.top);
@@ -80,7 +87,7 @@ exports.makeDraggable = function(options) {
}
// Set up the data transfer
if(dataTransfer.clearData) {
- dataTransfer.clearData();
+ dataTransfer.clearData();
}
var jsonData = [];
if(titles.length > 1) {
@@ -97,19 +104,23 @@ exports.makeDraggable = function(options) {
dataTransfer.setData("text/plain",titleString);
dataTransfer.setData("text/x-moz-url","data:text/vnd.tiddler," + encodeURIComponent(jsonData));
}
- dataTransfer.setData("URL","data:text/vnd.tiddler," + encodeURIComponent(jsonData));
+ // If browser is Chrome-like and has a touch-input device do NOT .setData
+ if(!($tw.browser.isMobileChrome)) {
+ dataTransfer.setData("URL","data:text/vnd.tiddler," + encodeURIComponent(jsonData));
+ }
dataTransfer.setData("Text",titleString);
event.stopPropagation();
}
return false;
}},
{name: "dragend", handlerFunction: function(event) {
- if(event.target === domNode) {
+ if((options.selector && $tw.utils.domMatchesSelector(event.target,options.selector)) || event.target === domNode) {
// Collect the tiddlers being dragged
var dragTiddler = options.dragTiddlerFn && options.dragTiddlerFn(),
dragFilter = options.dragFilterFn && options.dragFilterFn(),
titles = dragTiddler ? [dragTiddler] : [],
- endActions = options.endActions;
+ endActions = options.endActions,
+ variables;
if(dragFilter) {
titles.push.apply(titles,options.widget.wiki.filterTiddlers(dragFilter,options.widget));
}
@@ -117,10 +128,13 @@ exports.makeDraggable = function(options) {
$tw.dragInProgress = null;
// Invoke drag-end actions if given
if(endActions !== undefined) {
- options.widget.invokeActionString(endActions,options.widget,event,{actionTiddler: titleString});
+ variables = $tw.utils.collectDOMVariables(domNode,null,event);
+ variables.modifier = $tw.keyboardManager.getEventModifierKeyDescriptor(event);
+ variables["actionTiddler"] = titleString;
+ options.widget.invokeActionString(endActions,options.widget,event,variables);
}
// Remove the dragging class on the element being dragged
- $tw.utils.removeClass(event.target,"tc-dragging");
+ $tw.utils.removeClass(domNode,"tc-dragging");
// Delete the drag image element
if(dragImage) {
dragImage.parentNode.removeChild(dragImage);
@@ -144,7 +158,7 @@ exports.importDataTransfer = function(dataTransfer,fallbackTitle,callback) {
if(!$tw.browser.isIE || importDataTypes[t].IECompatible) {
// Get the data
var dataType = importDataTypes[t];
- var data = dataTransfer.getData(dataType.type);
+ var data = dataTransfer.getData(dataType.type);
// Import the tiddlers in the data
if(data !== "" && data !== null) {
if($tw.log.IMPORT) {
@@ -158,13 +172,43 @@ exports.importDataTransfer = function(dataTransfer,fallbackTitle,callback) {
}
};
+exports.importPaste = function(item,fallbackTitle,callback) {
+ // Try each provided data type in turn
+ for(var t=0; t<importDataTypes.length; t++) {
+ if(item.type === importDataTypes[t].type) {
+ // Get the data
+ var dataType = importDataTypes[t];
+
+ item.getAsString(function(data){
+ if($tw.log.IMPORT) {
+ console.log("Importing data type '" + dataType.type + "', data: '" + data + "'")
+ }
+ var tiddlerFields = dataType.toTiddlerFieldsArray(data,fallbackTitle);
+ callback(tiddlerFields);
+ });
+ return;
+ }
+ }
+};
+
+exports.itemHasValidDataType = function(item) {
+ for(var t=0; t<importDataTypes.length; t++) {
+ if(!$tw.browser.isIE || importDataTypes[t].IECompatible) {
+ if(item.type === importDataTypes[t].type) {
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
var importDataTypes = [
{type: "text/vnd.tiddler", IECompatible: false, toTiddlerFieldsArray: function(data,fallbackTitle) {
return parseJSONTiddlers(data,fallbackTitle);
}},
{type: "URL", IECompatible: true, toTiddlerFieldsArray: function(data,fallbackTitle) {
// Check for tiddler data URI
- var match = decodeURIComponent(data).match(/^data\:text\/vnd\.tiddler,(.*)/i);
+ var match = $tw.utils.decodeURIComponentSafe(data).match(/^data\:text\/vnd\.tiddler,(.*)/i);
if(match) {
return parseJSONTiddlers(match[1],fallbackTitle);
} else {
@@ -173,7 +217,7 @@ var importDataTypes = [
}},
{type: "text/x-moz-url", IECompatible: false, toTiddlerFieldsArray: function(data,fallbackTitle) {
// Check for tiddler data URI
- var match = decodeURIComponent(data).match(/^data\:text\/vnd\.tiddler,(.*)/i);
+ var match = $tw.utils.decodeURIComponentSafe(data).match(/^data\:text\/vnd\.tiddler,(.*)/i);
if(match) {
return parseJSONTiddlers(match[1],fallbackTitle);
} else {
@@ -190,12 +234,18 @@ var importDataTypes = [
return [{title: fallbackTitle, text: data}];
}},
{type: "text/uri-list", IECompatible: false, toTiddlerFieldsArray: function(data,fallbackTitle) {
- return [{title: fallbackTitle, text: data}];
+ // Check for tiddler data URI
+ var match = $tw.utils.decodeURIComponentSafe(data).match(/^data\:text\/vnd\.tiddler,(.*)/i);
+ if(match) {
+ return parseJSONTiddlers(match[1],fallbackTitle);
+ } else {
+ return [{title: fallbackTitle, text: data}]; // As URL string
+ }
}}
];
function parseJSONTiddlers(json,fallbackTitle) {
- var data = JSON.parse(json);
+ var data = $tw.utils.parseJSONSafe(json);
if(!$tw.utils.isArray(data)) {
data = [data];
}
@@ -205,4 +255,20 @@ function parseJSONTiddlers(json,fallbackTitle) {
return data;
};
-})();
+function dragEventContainsType(event,targetType) {
+ if(event.dataTransfer.types) {
+ for(var i=0; i<event.dataTransfer.types.length; i++) {
+ if(event.dataTransfer.types[i] === targetType) {
+ return true;
+ break;
+ }
+ }
+ }
+ return false;
+};
+
+exports.dragEventContainsFiles = function(event) {
+ return (dragEventContainsType(event,"Files") && !dragEventContainsType(event,"text/plain"));
+};
+
+exports.dragEventContainsType = dragEventContainsType;
diff --git a/core/modules/utils/dom/http.js b/core/modules/utils/dom/http.js
index 952704138..75b82cd77 100644
--- a/core/modules/utils/dom/http.js
+++ b/core/modules/utils/dom/http.js
@@ -3,27 +3,249 @@ title: $:/core/modules/utils/dom/http.js
type: application/javascript
module-type: utils
-Browser HTTP support
+HTTP support
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
-A quick and dirty HTTP function; to be refactored later. Options are:
+Manage tm-http-request events. Options include:
+wiki: Reference to the wiki to be used for state tiddler tracking
+stateTrackerTitle: Title of tiddler to be used for state tiddler tracking
+*/
+function HttpClient(options) {
+ options = options || {};
+ this.nextId = 1;
+ this.wiki = options.wiki || $tw.wiki;
+ this.stateTrackerTitle = options.stateTrackerTitle || "$:/state/http-requests";
+ this.requests = []; // Array of {id: string,request: HttpClientRequest}
+ this.updateRequestTracker();
+}
+
+/*
+Return the index into this.requests[] corresponding to a given ID. Returns null if not found
+*/
+HttpClient.prototype.getRequestIndex = function(targetId) {
+ var targetIndex = null;
+ $tw.utils.each(this.requests,function(requestInfo,index) {
+ if(requestInfo.id === targetId) {
+ targetIndex = index;
+ }
+ });
+ return targetIndex;
+};
+
+/*
+Update the state tiddler that is tracking the outstanding requests
+*/
+HttpClient.prototype.updateRequestTracker = function() {
+ this.wiki.addTiddler({title: this.stateTrackerTitle, text: "" + this.requests.length});
+};
+
+HttpClient.prototype.initiateHttpRequest = function(options) {
+ var self = this,
+ id = this.nextId,
+ request = new HttpClientRequest(options);
+ this.nextId += 1;
+ this.requests.push({id: id, request: request});
+ this.updateRequestTracker();
+ request.send(function(err) {
+ var targetIndex = self.getRequestIndex(id);
+ if(targetIndex !== null) {
+ self.requests.splice(targetIndex,1);
+ self.updateRequestTracker();
+ }
+ });
+ return id;
+};
+
+HttpClient.prototype.cancelAllHttpRequests = function() {
+ var self = this;
+ if(this.requests.length > 0) {
+ for(var t=this.requests.length - 1; t--; t>=0) {
+ var requestInfo = this.requests[t];
+ requestInfo.request.cancel();
+ }
+ }
+ this.requests = [];
+ this.updateRequestTracker();
+};
+
+HttpClient.prototype.cancelHttpRequest = function(targetId) {
+ var targetIndex = this.getRequestIndex(targetId);
+ if(targetIndex !== null) {
+ this.requests[targetIndex].request.cancel();
+ this.requests.splice(targetIndex,1);
+ this.updateRequestTracker();
+ }
+};
+
+/*
+Initiate an HTTP request. Options:
+wiki: wiki to be used for executing action strings
+url: URL for request
+method: method eg GET, POST
+body: text of request body
+binary: set to "yes" to force binary processing of response payload
+oncompletion: action string to be invoked on completion
+onprogress: action string to be invoked on progress updates
+bindStatus: optional title of tiddler to which status ("pending", "complete", "error") should be written
+bindProgress: optional title of tiddler to which the progress of the request (0 to 100) should be bound
+variables: hashmap of variable name to string value passed to action strings
+headers: hashmap of header name to header value to be sent with the request
+passwordHeaders: hashmap of header name to password store name to be sent with the request
+queryStrings: hashmap of query string parameter name to parameter value to be sent with the request
+passwordQueryStrings: hashmap of query string parameter name to password store name to be sent with the request
+basicAuthUsername: plain username for basic authentication
+basicAuthUsernameFromStore: name of password store entry containing username
+basicAuthPassword: plain password for basic authentication
+basicAuthPasswordFromStore: name of password store entry containing password
+bearerAuthToken: plain text token for bearer authentication
+bearerAuthTokenFromStore: name of password store entry contain bear authorization token
+*/
+function HttpClientRequest(options) {
+ var self = this;
+ console.log("Initiating an HTTP request",options)
+ this.wiki = options.wiki;
+ this.completionActions = options.oncompletion;
+ this.progressActions = options.onprogress;
+ this.bindStatus = options["bindStatus"];
+ this.bindProgress = options["bindProgress"];
+ this.method = options.method || "GET";
+ this.body = options.body || "";
+ this.binary = options.binary || "";
+ this.useDefaultHeaders = options.useDefaultHeaders !== "false" ? true : false,
+ this.variables = options.variables;
+ var url = options.url;
+ $tw.utils.each(options.queryStrings,function(value,name) {
+ url = $tw.utils.setQueryStringParameter(url,name,value);
+ });
+ $tw.utils.each(options.passwordQueryStrings,function(value,name) {
+ url = $tw.utils.setQueryStringParameter(url,name,$tw.utils.getPassword(value) || "");
+ });
+ this.url = url;
+ this.requestHeaders = {};
+ $tw.utils.each(options.headers,function(value,name) {
+ self.requestHeaders[name] = value;
+ });
+ $tw.utils.each(options.passwordHeaders,function(value,name) {
+ self.requestHeaders[name] = $tw.utils.getPassword(value) || "";
+ });
+ this.basicAuthUsername = options.basicAuthUsername || (options.basicAuthUsernameFromStore && $tw.utils.getPassword(options.basicAuthUsernameFromStore)) || "";
+ this.basicAuthPassword = options.basicAuthPassword || (options.basicAuthPasswordFromStore && $tw.utils.getPassword(options.basicAuthPasswordFromStore)) || "";
+ this.bearerAuthToken = options.bearerAuthToken || (options.bearerAuthTokenFromStore && $tw.utils.getPassword(options.bearerAuthTokenFromStore)) || "";
+ if(this.basicAuthUsername && this.basicAuthPassword) {
+ this.requestHeaders.Authorization = "Basic " + $tw.utils.base64Encode(this.basicAuthUsername + ":" + this.basicAuthPassword);
+ } else if(this.bearerAuthToken) {
+ this.requestHeaders.Authorization = "Bearer " + this.bearerAuthToken;
+ }
+}
+
+HttpClientRequest.prototype.send = function(callback) {
+ var self = this,
+ setBinding = function(title,text) {
+ if(title) {
+ self.wiki.addTiddler(new $tw.Tiddler({title: title, text: text}));
+ }
+ };
+ if(this.url) {
+ setBinding(this.bindStatus,"pending");
+ setBinding(this.bindProgress,"0");
+ // Set the request tracker tiddler
+ var requestTrackerTitle = this.wiki.generateNewTitle("$:/temp/HttpRequest");
+ this.wiki.addTiddler({
+ title: requestTrackerTitle,
+ tags: "$:/tags/HttpRequest",
+ text: JSON.stringify({
+ url: this.url,
+ type: this.method,
+ status: "inprogress",
+ headers: this.requestHeaders,
+ data: this.body
+ })
+ });
+ this.xhr = $tw.utils.httpRequest({
+ url: this.url,
+ type: this.method,
+ useDefaultHeaders: this.useDefaultHeaders,
+ headers: this.requestHeaders,
+ data: this.body,
+ returnProp: this.binary === "" ? "responseText" : "response",
+ responseType: this.binary === "" ? "text" : "arraybuffer",
+ callback: function(err,data,xhr) {
+ var hasSucceeded = xhr.status >= 200 && xhr.status < 300,
+ completionCode = hasSucceeded ? "complete" : "error",
+ headers = {};
+ $tw.utils.each(xhr.getAllResponseHeaders().split("\r\n"),function(line) {
+ var pos = line.indexOf(":");
+ if(pos !== -1) {
+ headers[line.substr(0,pos)] = line.substr(pos + 1).trim();
+ }
+ });
+ setBinding(self.bindStatus,completionCode);
+ setBinding(self.bindProgress,"100");
+ var resultVariables = {
+ status: xhr.status.toString(),
+ statusText: xhr.statusText,
+ error: (err || "").toString(),
+ data: (data || "").toString(),
+ headers: JSON.stringify(headers)
+ };
+ /* Convert data from binary to base64 */
+ if (xhr.responseType === "arraybuffer") {
+ var binary = "",
+ bytes = new Uint8Array(data),
+ len = bytes.byteLength;
+ for (var i=0; i<len; i++) {
+ binary += String.fromCharCode(bytes[i]);
+ }
+ resultVariables.data = $tw.utils.base64Encode(binary,true);
+ }
+ self.wiki.addTiddler(new $tw.Tiddler(self.wiki.getTiddler(requestTrackerTitle),{
+ status: completionCode,
+ }));
+ self.wiki.invokeActionString(self.completionActions,undefined,$tw.utils.extend({},self.variables,resultVariables),{parentWidget: $tw.rootWidget});
+ callback(hasSucceeded ? null : xhr.statusText);
+ // console.log("Back!",err,data,xhr);
+ },
+ progress: function(lengthComputable,loaded,total) {
+ if(lengthComputable) {
+ setBinding(self.bindProgress,"" + Math.floor((loaded/total) * 100))
+ }
+ self.wiki.invokeActionString(self.progressActions,undefined,$tw.utils.extend({},self.variables,{
+ lengthComputable: lengthComputable ? "yes" : "no",
+ loaded: loaded,
+ total: total
+ }),{parentWidget: $tw.rootWidget});
+ }
+ });
+ }
+};
+
+HttpClientRequest.prototype.cancel = function() {
+ if(this.xhr) {
+ this.xhr.abort();
+ }
+};
+
+exports.HttpClient = HttpClient;
+
+/*
+Make an HTTP request. Options are:
url: URL to retrieve
headers: hashmap of headers to send
type: GET, PUT, POST etc
callback: function invoked with (err,data,xhr)
+ progress: optional function invoked with (lengthComputable,loaded,total)
returnProp: string name of the property to return as first argument of callback
+ responseType: "text" or "arraybuffer"
*/
exports.httpRequest = function(options) {
var type = options.type || "GET",
url = options.url,
- headers = options.headers || {accept: "application/json"},
+ useDefaultHeaders = options.useDefaultHeaders !== false ? true : false,
+ headers = options.headers || (useDefaultHeaders ? {accept: "application/json"} : {}),
hasHeader = function(targetHeader) {
targetHeader = targetHeader.toLowerCase();
var result = false;
@@ -34,6 +256,23 @@ exports.httpRequest = function(options) {
});
return result;
},
+ getHeader = function(targetHeader) {
+ return headers[targetHeader] || headers[targetHeader.toLowerCase()];
+ },
+ isSimpleRequest = function(type,headers) {
+ if(["GET","HEAD","POST"].indexOf(type) === -1) {
+ return false;
+ }
+ for(var header in headers) {
+ if(["accept","accept-language","content-language","content-type"].indexOf(header.toLowerCase()) === -1) {
+ return false;
+ }
+ }
+ if(hasHeader("Content-Type") && ["application/x-www-form-urlencoded","multipart/form-data","text/plain"].indexOf(getHeader["Content-Type"]) === -1) {
+ return false;
+ }
+ return true;
+ },
returnProp = options.returnProp || "responseText",
request = new XMLHttpRequest(),
data = "",
@@ -54,31 +293,41 @@ exports.httpRequest = function(options) {
}
}
}
+ request.responseType = options.responseType || "text";
// Set up the state change handler
request.onreadystatechange = function() {
if(this.readyState === 4) {
- if(this.status === 200 || this.status === 201 || this.status === 204) {
+ if(this.status >= 200 && this.status < 300) {
// Success!
options.callback(null,this[returnProp],this);
return;
}
// Something went wrong
- options.callback($tw.language.getString("Error/XMLHttpRequest") + ": " + this.status,null,this);
+ options.callback($tw.language.getString("Error/XMLHttpRequest") + ": " + this.status,this[returnProp],this);
}
};
+ // Handle progress
+ if(options.progress) {
+ request.onprogress = function(event) {
+ console.log("Progress event",event)
+ options.progress(event.lengthComputable,event.loaded,event.total);
+ };
+ }
// Make the request
request.open(type,url,true);
+ // Headers
if(headers) {
$tw.utils.each(headers,function(header,headerTitle,object) {
request.setRequestHeader(headerTitle,header);
});
}
- if(data && !hasHeader("Content-Type")) {
+ if(data && !hasHeader("Content-Type") && useDefaultHeaders) {
request.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");
}
- if(!hasHeader("X-Requested-With")) {
+ if(!hasHeader("X-Requested-With") && !isSimpleRequest(type,headers) && useDefaultHeaders) {
request.setRequestHeader("X-Requested-With","TiddlyWiki");
}
+ // Send data
try {
request.send(data);
} catch(e) {
@@ -87,4 +336,17 @@ exports.httpRequest = function(options) {
return request;
};
-})();
+exports.setQueryStringParameter = function(url,paramName,paramValue) {
+ var URL = $tw.browser ? window.URL : require("url").URL,
+ newUrl;
+ try {
+ newUrl = new URL(url);
+ } catch(e) {
+ }
+ if(newUrl && paramName) {
+ newUrl.searchParams.set(paramName,paramValue || "");
+ return newUrl.toString();
+ } else {
+ return url;
+ }
+};
diff --git a/core/modules/utils/dom/keyboard.js b/core/modules/utils/dom/keyboard.js
index 0ba1af5a0..926753a65 100644
--- a/core/modules/utils/dom/keyboard.js
+++ b/core/modules/utils/dom/keyboard.js
@@ -6,10 +6,7 @@ module-type: utils
Keyboard utilities; now deprecated. Instead, use $tw.keyboardManager
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
["parseKeyDescriptor","checkKeyDescriptor"].forEach(function(method) {
@@ -21,5 +18,3 @@ Keyboard utilities; now deprecated. Instead, use $tw.keyboardManager
}
};
});
-
-})();
diff --git a/core/modules/utils/dom/modal.js b/core/modules/utils/dom/modal.js
index db66b1abc..a7b538ec3 100644
--- a/core/modules/utils/dom/modal.js
+++ b/core/modules/utils/dom/modal.js
@@ -6,10 +6,7 @@ module-type: utils
Modal message mechanism
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var widget = require("$:/core/modules/widgets/widget.js");
@@ -26,6 +23,8 @@ Display a modal dialogue
options: see below
Options include:
downloadLink: Text of a big download link to include
+ event: widget event
+ variables: from event.paramObject
*/
Modal.prototype.display = function(title,options) {
options = options || {};
@@ -105,7 +104,7 @@ Modal.prototype.display = function(title,options) {
parentWidget: $tw.rootWidget
});
navigatorWidgetNode.render(modalBody,null);
-
+
// Render the title of the message
var headerWidgetNode = this.wiki.makeTranscludeWidget(title,{
field: "subtitle",
@@ -144,6 +143,7 @@ Modal.prototype.display = function(title,options) {
link.setAttribute("href",tiddler.fields.help);
link.setAttribute("target","_blank");
link.setAttribute("rel","noopener noreferrer");
+ link.setAttribute("class","tc-tiddlylink-external");
link.appendChild(this.srcDocument.createTextNode("Help"));
modalFooterHelp.appendChild(link);
modalFooterHelp.style.float = "left";
@@ -209,6 +209,10 @@ Modal.prototype.display = function(title,options) {
headerWidgetNode.addEventListener("tm-close-tiddler",closeHandler,false);
bodyWidgetNode.addEventListener("tm-close-tiddler",closeHandler,false);
footerWidgetNode.addEventListener("tm-close-tiddler",closeHandler,false);
+ // Whether to close the modal dialog when the mask (area outside the modal) is clicked
+ if(tiddler.fields && (tiddler.fields["mask-closable"] === "yes" || tiddler.fields["mask-closable"] === "true" || tiddler.fields["mask-closable"] === "" || "mask-closable" in tiddler.fields === false)) {
+ modalBackdrop.addEventListener("click",closeHandler,false);
+ }
// Set the initial styles for the message
$tw.utils.setStyle(modalBackdrop,[
{opacity: "0"}
@@ -243,8 +247,7 @@ Modal.prototype.adjustPageClass = function() {
if(windowContainer) {
$tw.utils.toggleClass(windowContainer,"tc-modal-displayed",this.modalCount > 0);
}
+ $tw.utils.toggleClass(this.srcDocument.body,"tc-modal-prevent-scroll",this.modalCount > 0);
};
exports.Modal = Modal;
-
-})();
diff --git a/core/modules/utils/dom/notifier.js b/core/modules/utils/dom/notifier.js
index 3897b0e52..8743b83be 100644
--- a/core/modules/utils/dom/notifier.js
+++ b/core/modules/utils/dom/notifier.js
@@ -6,10 +6,7 @@ module-type: utils
Notifier mechanism
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var widget = require("$:/core/modules/widgets/widget.js");
@@ -36,8 +33,9 @@ Notifier.prototype.display = function(title,options) {
if(!tiddler) {
return;
}
- // Add classes
+ // Add classes and roles
$tw.utils.addClass(notification,"tc-notification");
+ notification.setAttribute("role","alert");
// Create the variables
var variables = $tw.utils.extend({currentTiddler: title},options.variables);
// Render the body of the notification
@@ -87,5 +85,3 @@ Notifier.prototype.display = function(title,options) {
};
exports.Notifier = Notifier;
-
-})();
diff --git a/core/modules/utils/dom/popup.js b/core/modules/utils/dom/popup.js
index 4ae1a44cd..6ed7c4bca 100644
--- a/core/modules/utils/dom/popup.js
+++ b/core/modules/utils/dom/popup.js
@@ -6,10 +6,7 @@ module-type: utils
Module that creates a $tw.utils.Popup object prototype that manages popups in the browser
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -22,6 +19,19 @@ var Popup = function(options) {
this.popups = []; // Array of {title:,wiki:,domNode:} objects
};
+/*
+Global regular expression for parsing the location of a popup.
+This is also used by the Reveal widget.
+*/
+exports.popupLocationRegExp = /^(@?)\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/
+
+/*
+Objekt containing the available prefixes for coordinates build with the `buildCoordinates` function:
+ - csOffsetParent: Uses a coordinate system based on the offset parent (no prefix).
+ - csAbsolute: Use an absolute coordinate system (prefix "@").
+*/
+exports.coordinatePrefix = { csOffsetParent: "", csAbsolute: "@" }
+
/*
Trigger a popup open or closed. Parameters are in a hashmap:
title: title of the tiddler where the popup details are stored
@@ -136,8 +146,17 @@ Popup.prototype.show = function(options) {
height: options.domNode.offsetHeight
};
}
- var popupRect = "(" + rect.left + "," + rect.top + "," +
- rect.width + "," + rect.height + ")";
+ if(options.absolute && options.domNode) {
+ // Walk the offsetParent chain and add the position of the offsetParents to make
+ // the position absolute to the root node of the page.
+ var currentNode = options.domNode.offsetParent;
+ while(currentNode) {
+ rect.left += currentNode.offsetLeft;
+ rect.top += currentNode.offsetTop;
+ currentNode = currentNode.offsetParent;
+ }
+ }
+ var popupRect = exports.buildCoordinates(options.absolute?exports.coordinatePrefix.csAbsolute:exports.coordinatePrefix.csOffsetParent,rect);
if(options.noStateReference) {
options.wiki.setText(options.title,"text",undefined,popupRect);
} else {
@@ -145,7 +164,7 @@ Popup.prototype.show = function(options) {
}
// Add the click handler if we have any popups
if(this.popups.length > 0) {
- this.rootElement.addEventListener("click",this,true);
+ this.rootElement.addEventListener("click",this,true);
}
};
@@ -172,13 +191,52 @@ Popup.prototype.cancel = function(level) {
};
/*
-Returns true if the specified title and text identifies an active popup
+Returns true if the specified title and text identifies an active popup.
+This function is safe to call, even if the popup class was not initialized.
*/
-Popup.prototype.readPopupState = function(text) {
- var popupLocationRegExp = /^\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/;
- return popupLocationRegExp.test(text);
+exports.readPopupState = function(text) {
+ return exports.popupLocationRegExp.test(text);
};
-exports.Popup = Popup;
+/*
+Parses a coordinate string in the format `(x,y,w,h)` or `@(x,y,z,h)` and returns
+an object containing the position, width and height. The absolute-Mark is boolean
+value that indicates the coordinate system of the coordinates. If they start with
+an `@`, `absolute` is set to true and the coordinates are relative to the root
+element. If the initial `@` is missing, they are relative to the offset parent
+element and `absoute` is false.
+This function is safe to call, even if the popup class was not initialized.
+*/
+exports.parseCoordinates = function(coordinates) {
+ var match = exports.popupLocationRegExp.exec(coordinates);
+ if(match) {
+ return {
+ absolute: (match[1] === "@"),
+ left: parseFloat(match[2]),
+ top: parseFloat(match[3]),
+ width: parseFloat(match[4]),
+ height: parseFloat(match[5])
+ };
+ } else {
+ return false;
+ }
+}
-})();
+/*
+Builds a coordinate string from a coordinate system identifier and an object
+containing the left, top, width and height values.
+Use constants defined in coordinatePrefix to specify a coordinate system.
+If one of the parameters is invalid for building a coordinate string `(0,0,0,0)`
+will be returned.
+This function is safe to call, even if the popup class was not initialized.
+*/
+exports.buildCoordinates = function(prefix,position) {
+ var coord = prefix + "(" + position.left + "," + position.top + "," + position.width + "," + position.height + ")";
+ if (exports.popupLocationRegExp.test(coord)) {
+ return coord;
+ } else {
+ return "(0,0,0,0)";
+ }
+}
+
+exports.Popup = Popup;
diff --git a/core/modules/utils/dom/scroller.js b/core/modules/utils/dom/scroller.js
index 3f4c71cef..84be12c50 100644
--- a/core/modules/utils/dom/scroller.js
+++ b/core/modules/utils/dom/scroller.js
@@ -6,10 +6,7 @@ module-type: utils
Module that creates a $tw.utils.Scroller object prototype that manages scrolling in the browser
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -49,10 +46,14 @@ Handle an event
*/
PageScroller.prototype.handleEvent = function(event) {
if(event.type === "tm-scroll") {
+ var options = {};
+ if($tw.utils.hop(event.paramObject,"animationDuration")) {
+ options.animationDuration = event.paramObject.animationDuration;
+ }
if(event.paramObject && event.paramObject.selector) {
- this.scrollSelectorIntoView(null,event.paramObject.selector);
+ this.scrollSelectorIntoView(null,event.paramObject.selector,null,options);
} else {
- this.scrollIntoView(event.target);
+ this.scrollIntoView(event.target,null,options);
}
return false; // Event was handled
}
@@ -62,10 +63,10 @@ PageScroller.prototype.handleEvent = function(event) {
/*
Handle a scroll event hitting the page document
*/
-PageScroller.prototype.scrollIntoView = function(element,callback) {
+PageScroller.prototype.scrollIntoView = function(element,callback,options) {
var self = this,
- duration = $tw.utils.getAnimationDuration(),
- srcWindow = element ? element.ownerDocument.defaultView : window;
+ duration = $tw.utils.hop(options,"animationDuration") ? parseInt(options.animationDuration) : $tw.utils.getAnimationDuration(),
+ srcWindow = element ? element.ownerDocument.defaultView : window;
// Now get ready to scroll the body
this.cancelScroll(srcWindow);
this.startTime = Date.now();
@@ -103,7 +104,7 @@ PageScroller.prototype.scrollIntoView = function(element,callback) {
if(duration <= 0) {
t = 1;
} else {
- t = ((Date.now()) - self.startTime) / duration;
+ t = ((Date.now()) - self.startTime) / duration;
}
if(t >= 1) {
self.cancelScroll(srcWindow);
@@ -122,14 +123,12 @@ PageScroller.prototype.scrollIntoView = function(element,callback) {
drawFrame();
};
-PageScroller.prototype.scrollSelectorIntoView = function(baseElement,selector,callback) {
- baseElement = baseElement || document.body;
- var element = baseElement.querySelector(selector);
+PageScroller.prototype.scrollSelectorIntoView = function(baseElement,selector,callback,options) {
+ baseElement = baseElement || document;
+ var element = $tw.utils.querySelectorSafe(selector,baseElement);
if(element) {
- this.scrollIntoView(element,callback);
+ this.scrollIntoView(element,callback,options);
}
};
exports.PageScroller = PageScroller;
-
-})();
diff --git a/core/modules/utils/edition-info.js b/core/modules/utils/edition-info.js
deleted file mode 100644
index d3e7054b0..000000000
--- a/core/modules/utils/edition-info.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*\
-title: $:/core/modules/utils/edition-info.js
-type: application/javascript
-module-type: utils-node
-
-Information about the available editions
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-var fs = require("fs"),
- path = require("path");
-
-var editionInfo;
-
-exports.getEditionInfo = function() {
- if(!editionInfo) {
- // Enumerate the edition paths
- var editionPaths = $tw.getLibraryItemSearchPaths($tw.config.editionsPath,$tw.config.editionsEnvVar);
- editionInfo = {};
- for(var editionIndex=0; editionIndex<editionPaths.length; editionIndex++) {
- var editionPath = editionPaths[editionIndex];
- // Enumerate the folders
- var entries = fs.readdirSync(editionPath);
- for(var entryIndex=0; entryIndex<entries.length; entryIndex++) {
- var entry = entries[entryIndex];
- // Check if directories have a valid tiddlywiki.info
- if(!editionInfo[entry] && $tw.utils.isDirectory(path.resolve(editionPath,entry))) {
- var info;
- try {
- info = JSON.parse(fs.readFileSync(path.resolve(editionPath,entry,"tiddlywiki.info"),"utf8"));
- } catch(ex) {
- }
- if(info) {
- editionInfo[entry] = info;
- }
- }
- }
- }
- }
- return editionInfo;
-};
-
-})();
diff --git a/core/modules/utils/errors.js b/core/modules/utils/errors.js
new file mode 100644
index 000000000..40e0a4f8f
--- /dev/null
+++ b/core/modules/utils/errors.js
@@ -0,0 +1,19 @@
+/*\
+title: $:/core/modules/utils/errors.js
+type: application/javascript
+module-type: utils
+
+Custom errors for TiddlyWiki.
+
+\*/
+function TranscludeRecursionError() {
+ Error.apply(this,arguments);
+ this.signatures = Object.create(null);
+};
+
+/* Maximum permitted depth of the widget tree for recursion detection */
+TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH = 1000;
+
+TranscludeRecursionError.prototype = Object.create(Error);
+
+exports.TranscludeRecursionError = TranscludeRecursionError;
diff --git a/core/modules/utils/escapecss.js b/core/modules/utils/escapecss.js
new file mode 100644
index 000000000..f2248c445
--- /dev/null
+++ b/core/modules/utils/escapecss.js
@@ -0,0 +1,100 @@
+/*\
+title: $:/core/modules/utils/escapecss.js
+type: application/javascript
+module-type: utils
+
+Provides CSS.escape() functionality.
+
+\*/
+
+"use strict";
+
+// TODO -- resolve this construction
+exports.escapeCSS = (function() {
+ // use browser's native CSS.escape() function if available
+ if ($tw.browser && window.CSS && window.CSS.escape) {
+ return window.CSS.escape;
+ }
+
+ // otherwise, a utility method is provided
+ // see also https://drafts.csswg.org/cssom/#serialize-an-identifier
+
+ /*! https://mths.be/cssescape v1.5.1 by @mathias | MIT license */
+ return function(value) {
+ if (arguments.length == 0) {
+ throw new TypeError('`CSS.escape` requires an argument.');
+ }
+ var string = String(value);
+ var length = string.length;
+ var index = -1;
+ var codeUnit;
+ var result = '';
+ var firstCodeUnit = string.charCodeAt(0);
+ while (++index < length) {
+ codeUnit = string.charCodeAt(index);
+ // Note: there’s no need to special-case astral symbols, surrogate
+ // pairs, or lone surrogates.
+
+ // If the character is NULL (U+0000), then the REPLACEMENT CHARACTER
+ // (U+FFFD).
+ if (codeUnit == 0x0000) {
+ result += '\uFFFD';
+ continue;
+ }
+
+ if (
+ // If the character is in the range [\1-\1F] (U+0001 to U+001F) or is
+ // U+007F, […]
+ (codeUnit >= 0x0001 && codeUnit <= 0x001F) || codeUnit == 0x007F ||
+ // If the character is the first character and is in the range [0-9]
+ // (U+0030 to U+0039), […]
+ (index == 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
+ // If the character is the second character and is in the range [0-9]
+ // (U+0030 to U+0039) and the first character is a `-` (U+002D), […]
+ (
+ index == 1 &&
+ codeUnit >= 0x0030 && codeUnit <= 0x0039 &&
+ firstCodeUnit == 0x002D
+ )
+ ) {
+ // https://drafts.csswg.org/cssom/#escape-a-character-as-code-point
+ result += '\\' + codeUnit.toString(16) + ' ';
+ continue;
+ }
+
+ if (
+ // If the character is the first character and is a `-` (U+002D), and
+ // there is no second character, […]
+ index == 0 &&
+ length == 1 &&
+ codeUnit == 0x002D
+ ) {
+ result += '\\' + string.charAt(index);
+ continue;
+ }
+
+ // If the character is not handled by one of the above rules and is
+ // greater than or equal to U+0080, is `-` (U+002D) or `_` (U+005F), or
+ // is in one of the ranges [0-9] (U+0030 to U+0039), [A-Z] (U+0041 to
+ // U+005A), or [a-z] (U+0061 to U+007A), […]
+ if (
+ codeUnit >= 0x0080 ||
+ codeUnit == 0x002D ||
+ codeUnit == 0x005F ||
+ codeUnit >= 0x0030 && codeUnit <= 0x0039 ||
+ codeUnit >= 0x0041 && codeUnit <= 0x005A ||
+ codeUnit >= 0x0061 && codeUnit <= 0x007A
+ ) {
+ // the character itself
+ result += string.charAt(index);
+ continue;
+ }
+
+ // Otherwise, the escaped character.
+ // https://drafts.csswg.org/cssom/#escape-a-character
+ result += '\\' + string.charAt(index);
+
+ }
+ return result;
+ };
+})();
diff --git a/core/modules/utils/fakedom.js b/core/modules/utils/fakedom.js
index ed371100e..764ac84f8 100755
--- a/core/modules/utils/fakedom.js
+++ b/core/modules/utils/fakedom.js
@@ -6,10 +6,7 @@ module-type: global
A barebones implementation of DOM interfaces needed by the rendering mechanism.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Sequence number used to enable us to track objects for testing
@@ -42,7 +39,7 @@ var TW_TextNode = function(text) {
this.textContent = text + "";
};
-TW_TextNode.prototype = Object.create(TW_Node.prototype);
+Object.setPrototypeOf(TW_TextNode.prototype,TW_Node.prototype);
Object.defineProperty(TW_TextNode.prototype, "nodeType", {
get: function() {
@@ -56,36 +53,64 @@ Object.defineProperty(TW_TextNode.prototype, "formattedTextContent", {
}
});
-var TW_Element = function(tag,namespace) {
+var TW_Style = function(el) {
+ // Define the internal style object
+ var styleObject = {
+ // Method to get the entire style object
+ get: function() {
+ return el._style;
+ },
+ // Method to set styles using a string (e.g. "color:red; background-color:blue;")
+ set: function(str) {
+ var self = this;
+ str = str || "";
+ $tw.utils.each(str.split(";"),function(declaration) {
+ var parts = declaration.split(":"),
+ name = $tw.utils.trim(parts[0]),
+ value = $tw.utils.trim(parts[1]);
+ if(name && value) {
+ el._style[$tw.utils.convertStyleNameToPropertyName(name)] = value;
+ }
+ });
+ },
+ // Method to set a specific property without transforming the property name, such as a custom property
+ setProperty: function(name, value) {
+ el._style[name] = value;
+ }
+ };
+
+ // Return a Proxy to handle direct access to individual style properties
+ return new Proxy(styleObject, {
+ get: function(target, property) {
+ // If the property exists on styleObject, return it (get, set, setProperty methods)
+ if (property in target) {
+ return target[property];
+ }
+ // Otherwise, return the corresponding property from _style
+ return el._style[$tw.utils.convertStyleNameToPropertyName(property)] || "";
+ },
+ set: function(target, property, value) {
+ // Set the property in _style
+ el._style[$tw.utils.convertStyleNameToPropertyName(property)] = value;
+ return true;
+ }
+ });
+};
+
+var TW_Element = function(tag, namespace) {
bumpSequenceNumber(this);
this.isTiddlyWikiFakeDom = true;
this.tag = tag;
this.attributes = {};
this.isRaw = false;
this.children = [];
- this._style = {};
+ this._style = {}; // Internal style object
+ this.style = new TW_Style(this); // Proxy for style management
this.namespaceURI = namespace || "http://www.w3.org/1999/xhtml";
};
-TW_Element.prototype = Object.create(TW_Node.prototype);
-Object.defineProperty(TW_Element.prototype, "style", {
- get: function() {
- return this._style;
- },
- set: function(str) {
- var self = this;
- str = str || "";
- $tw.utils.each(str.split(";"),function(declaration) {
- var parts = declaration.split(":"),
- name = $tw.utils.trim(parts[0]),
- value = $tw.utils.trim(parts[1]);
- if(name && value) {
- self._style[$tw.utils.convertStyleNameToPropertyName(name)] = value;
- }
- });
- }
-});
+Object.setPrototypeOf(TW_Element.prototype,TW_Node.prototype);
Object.defineProperty(TW_Element.prototype, "nodeType", {
get: function() {
@@ -104,7 +129,11 @@ TW_Element.prototype.setAttribute = function(name,value) {
if(this.isRaw) {
throw "Cannot setAttribute on a raw TW_Element";
}
- this.attributes[name] = value + "";
+ if(name === "style") {
+ this.style.set(value);
+ } else {
+ this.attributes[name] = value + "";
+ }
};
TW_Element.prototype.setAttributeNS = function(namespace,name,value) {
@@ -235,7 +264,7 @@ Object.defineProperty(TW_Element.prototype, "innerHTML", {
if(node instanceof TW_Element) {
b.push(node.outerHTML);
} else if(node instanceof TW_TextNode) {
- b.push($tw.utils.htmlEncode(node.textContent));
+ b.push($tw.utils.htmlTextEncode(node.textContent));
}
});
return b.join("");
@@ -321,5 +350,3 @@ var document = {
};
exports.fakeDocument = document;
-
-})();
diff --git a/core/modules/utils/linked-list.js b/core/modules/utils/linked-list.js
index 06242b454..8d7f44676 100644
--- a/core/modules/utils/linked-list.js
+++ b/core/modules/utils/linked-list.js
@@ -7,7 +7,8 @@ This is a doubly-linked indexed list intended for manipulation, particularly
pushTop, which it does with significantly better performance than an array.
\*/
-(function(){
+
+"use strict";
function LinkedList() {
this.clear();
@@ -15,10 +16,11 @@ function LinkedList() {
LinkedList.prototype.clear = function() {
// LinkedList performs the duty of both the head and tail node
- this.next = Object.create(null);
- this.prev = Object.create(null);
- this.first = undefined;
- this.last = undefined;
+ this.next = new LLMap();
+ this.prev = new LLMap();
+ // Linked list head initially points to itself
+ this.next.set(null, null);
+ this.prev.set(null, null);
this.length = 0;
};
@@ -41,28 +43,29 @@ Push behaves like array.push and accepts multiple string arguments. But it also
accepts a single array argument too, to be consistent with its other methods.
*/
LinkedList.prototype.push = function(/* values */) {
- var values = arguments;
+ var i, values = arguments;
if($tw.utils.isArray(values[0])) {
values = values[0];
}
- for(var i = 0; i < values.length; i++) {
+ for(i = 0; i < values.length; i++) {
_assertString(values[i]);
}
- for(var i = 0; i < values.length; i++) {
+ for(i = 0; i < values.length; i++) {
_linkToEnd(this,values[i]);
}
return this.length;
};
LinkedList.prototype.pushTop = function(value) {
+ var t;
if($tw.utils.isArray(value)) {
- for (var t=0; t<value.length; t++) {
+ for (t=0; t<value.length; t++) {
_assertString(value[t]);
}
- for(var t=0; t<value.length; t++) {
+ for(t=0; t<value.length; t++) {
_removeOne(this,value[t]);
}
- for(var t=0; t<value.length; t++) {
+ for(t=0; t<value.length; t++) {
_linkToEnd(this,value[t]);
}
} else {
@@ -74,11 +77,11 @@ LinkedList.prototype.pushTop = function(value) {
LinkedList.prototype.each = function(callback) {
var visits = Object.create(null),
- value = this.first;
- while(value !== undefined) {
+ value = this.next.get(null);
+ while(value !== null) {
callback(value);
- var next = this.next[value];
- if(typeof next === "object") {
+ var next = this.next.get(value);
+ if(Array.isArray(next)) {
var i = visits[value] || 0;
visits[value] = i+1;
value = next[i];
@@ -95,92 +98,89 @@ LinkedList.prototype.toArray = function() {
return output;
};
+LinkedList.prototype.makeTiddlerIterator = function(wiki) {
+ var self = this;
+ return function(callback) {
+ self.each(function(title) {
+ callback(wiki.getTiddler(title),title);
+ });
+ };
+};
+
function _removeOne(list,value) {
- var prevEntry = list.prev[value],
- nextEntry = list.next[value],
+ var nextEntry = list.next.get(value);
+ if(nextEntry === undefined) {
+ return;
+ }
+ var prevEntry = list.prev.get(value),
prev = prevEntry,
- next = nextEntry;
- if(typeof nextEntry === "object") {
+ next = nextEntry,
+ ref;
+ if(Array.isArray(nextEntry)) {
next = nextEntry[0];
prev = prevEntry[0];
}
// Relink preceding element.
- if(list.first === value) {
- list.first = next
- } else if(prev !== undefined) {
- if(typeof list.next[prev] === "object") {
- if(next === undefined) {
- // Must have been last, and 'i' would be last element.
- list.next[prev].pop();
- } else {
- var i = list.next[prev].indexOf(value);
- list.next[prev][i] = next;
- }
- } else {
- list.next[prev] = next;
- }
+ ref = list.next.get(prev);
+ if(Array.isArray(ref)) {
+ var i = ref.indexOf(value);
+ ref[i] = next;
} else {
- return;
+ list.next.set(prev,next);
}
+
// Now relink following element
- // Check "next !== undefined" rather than "list.last === value" because
- // we need to know if the FIRST value is the last in the list, not the last.
- if(next !== undefined) {
- if(typeof list.prev[next] === "object") {
- if(prev === undefined) {
- // Must have been first, and 'i' would be 0.
- list.prev[next].shift();
- } else {
- var i = list.prev[next].indexOf(value);
- list.prev[next][i] = prev;
- }
- } else {
- list.prev[next] = prev;
- }
+ ref = list.prev.get(next);
+ if(Array.isArray(ref)) {
+ var i = ref.indexOf(value);
+ ref[i] = prev;
} else {
- list.last = prev;
+ list.prev.set(next,prev);
}
+
// Delink actual value. If it uses arrays, just remove first entries.
- if(typeof nextEntry === "object") {
+ if(Array.isArray(nextEntry) && nextEntry.length > 1) {
nextEntry.shift();
prevEntry.shift();
} else {
- list.next[value] = undefined;
- list.prev[value] = undefined;
+ list.next.set(value,undefined);
+ list.prev.set(value,undefined);
}
list.length -= 1;
};
// Sticks the given node onto the end of the list.
function _linkToEnd(list,value) {
- if(list.first === undefined) {
- list.first = value;
+ var old = list.next.get(value);
+ var last = list.prev.get(null);
+ // Does it already exists?
+ if(old !== undefined) {
+ if(!Array.isArray(old)) {
+ old = [old];
+ list.next.set(value,old);
+ list.prev.set(value,[list.prev.get(value)]);
+ }
+ old.push(null);
+ list.prev.get(value).push(last);
} else {
- // Does it already exists?
- if(list.first === value || list.prev[value] !== undefined) {
- if(typeof list.next[value] === "string") {
- list.next[value] = [list.next[value]];
- list.prev[value] = [list.prev[value]];
- } else if(typeof list.next[value] === "undefined") {
- // list.next[value] must be undefined.
- // Special case. List already has 1 value. It's at the end.
- list.next[value] = [];
- list.prev[value] = [list.prev[value]];
- }
- list.prev[value].push(list.last);
- // We do NOT append a new value onto "next" list. Iteration will
- // figure out it must point to End-of-List on its own.
- } else {
- list.prev[value] = list.last;
- }
- // Make the old last point to this new one.
- if(typeof list.next[list.last] === "object") {
- list.next[list.last].push(value);
- } else {
- list.next[list.last] = value;
- }
+ list.next.set(value,null);
+ list.prev.set(value,last);
+ }
+ // Make the old last point to this new one.
+ if(value !== last) {
+ var array = list.next.get(last);
+ if(Array.isArray(array)) {
+ array[array.length-1] = value;
+ } else {
+ list.next.set(last,value);
+ }
+ list.prev.set(null,value);
+ } else {
+ // Edge case, the pushed value was already the last value.
+ // The second-to-last nextPtr for that value must point to itself now.
+ var array = list.next.get(last);
+ array[array.length-2] = value;
}
- list.last = value;
list.length += 1;
};
@@ -190,6 +190,18 @@ function _assertString(value) {
}
};
-exports.LinkedList = LinkedList;
+var LLMap = function() {
+ this.map = Object.create(null);
+};
-})();
+// Just a wrapper so our object map can also accept null.
+LLMap.prototype = {
+ set: function(key,val) {
+ (key === null) ? (this.null = val) : (this.map[key] = val);
+ },
+ get: function(key) {
+ return (key === null) ? this.null : this.map[key];
+ }
+};
+
+exports.LinkedList = LinkedList;
diff --git a/core/modules/utils/logger.js b/core/modules/utils/logger.js
index b3981986d..da0d66923 100644
--- a/core/modules/utils/logger.js
+++ b/core/modules/utils/logger.js
@@ -6,10 +6,7 @@ module-type: utils
A basic logging implementation
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var ALERT_TAG = "$:/tags/Alert";
@@ -45,10 +42,12 @@ Logger.prototype.log = function(/* args */) {
self.saveBufferLogger.buffer += " " + arg;
});
this.saveBufferLogger.buffer += "\n";
- this.saveBufferLogger.buffer = this.saveBufferLogger.buffer.slice(-this.saveBufferLogger.saveLimit);
+ this.saveBufferLogger.buffer = this.saveBufferLogger.buffer.slice(-this.saveBufferLogger.saveLimit);
}
if(console !== undefined && console.log !== undefined) {
- return Function.apply.call(console.log, console, [$tw.utils.terminalColour(this.colour),this.componentName + ":"].concat(Array.prototype.slice.call(arguments,0)).concat($tw.utils.terminalColour()));
+ var logMessage = [$tw.utils.terminalColour(this.colour) + this.componentName + ":"].concat(Array.prototype.slice.call(arguments,0));
+ logMessage[logMessage.length-1] += $tw.utils.terminalColour();
+ return Function.apply.call(console.log, console, logMessage);
}
}
};
@@ -111,7 +110,7 @@ Logger.prototype.alert = function(/* args */) {
} else {
// Print an orange message to the console if not in the browser
console.error("\x1b[1;33m" + text + "\x1b[0m");
- }
+ }
}
};
@@ -132,5 +131,3 @@ Logger.prototype.clearAlerts = function() {
};
exports.Logger = Logger;
-
-})();
diff --git a/core/modules/utils/parsetree.js b/core/modules/utils/parsetree.js
index c61c728fd..410f92181 100644
--- a/core/modules/utils/parsetree.js
+++ b/core/modules/utils/parsetree.js
@@ -6,15 +6,44 @@ module-type: utils
Parse tree utility functions.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
+/*
+Add attribute to parse tree node
+Can be invoked as (node,name,value) or (node,attr)
+*/
exports.addAttributeToParseTreeNode = function(node,name,value) {
+ var attribute = typeof name === "object" ? name : {name: name, type: "string", value: value};
+ name = attribute.name;
node.attributes = node.attributes || {};
- node.attributes[name] = {type: "string", value: value};
+ node.orderedAttributes = node.orderedAttributes || [];
+ node.attributes[name] = attribute;
+ var foundIndex = -1;
+ $tw.utils.each(node.orderedAttributes,function(attr,index) {
+ if(attr.name === name) {
+ foundIndex = index;
+ }
+ });
+ if(foundIndex === -1) {
+ node.orderedAttributes.push(attribute);
+ } else {
+ node.orderedAttributes[foundIndex] = attribute;
+ }
+};
+
+exports.getOrderedAttributesFromParseTreeNode = function(node) {
+ if(node.orderedAttributes) {
+ return node.orderedAttributes;
+ } else {
+ var attributes = [];
+ $tw.utils.each(node.attributes,function(attribute) {
+ attributes.push(attribute);
+ });
+ return attributes.sort(function(a,b) {
+ return a.name < b.name ? -1 : (a.name > b.name ? 1 : 0);
+ });
+ }
};
exports.getAttributeValueFromParseTreeNode = function(node,name,defaultValue) {
@@ -25,26 +54,41 @@ exports.getAttributeValueFromParseTreeNode = function(node,name,defaultValue) {
};
exports.addClassToParseTreeNode = function(node,classString) {
- var classes = [];
+ var classes = [],
+ attribute;
node.attributes = node.attributes || {};
- node.attributes["class"] = node.attributes["class"] || {type: "string", value: ""};
- if(node.attributes["class"].type === "string") {
- if(node.attributes["class"].value !== "") {
- classes = node.attributes["class"].value.split(" ");
+ attribute = node.attributes["class"];
+ if(!attribute) {
+ // If the class attribute does not exist, we must create it first.
+ attribute = {name: "class", type: "string", value: ""};
+ node.attributes["class"] = attribute;
+ node.orderedAttributes = node.orderedAttributes || [];
+ node.orderedAttributes.push(attribute);
+ }
+ if(attribute.type === "string") {
+ if(attribute.value !== "") {
+ classes = attribute.value.split(" ");
}
if(classString !== "") {
$tw.utils.pushTop(classes,classString.split(" "));
}
- node.attributes["class"].value = classes.join(" ");
+ attribute.value = classes.join(" ");
}
};
exports.addStyleToParseTreeNode = function(node,name,value) {
- node.attributes = node.attributes || {};
- node.attributes.style = node.attributes.style || {type: "string", value: ""};
- if(node.attributes.style.type === "string") {
- node.attributes.style.value += name + ":" + value + ";";
- }
+ var attribute;
+ node.attributes = node.attributes || {};
+ attribute = node.attributes.style;
+ if(!attribute) {
+ attribute = {name: "style", type: "string", value: ""};
+ node.attributes.style = attribute;
+ node.orderedAttributes = node.orderedAttributes || [];
+ node.orderedAttributes.push(attribute);
+ }
+ if(attribute.type === "string") {
+ attribute.value += name + ":" + value + ";";
+ }
};
exports.findParseTreeNode = function(nodeArray,search) {
@@ -75,5 +119,3 @@ exports.getParseTreeText = function getParseTreeText(tree) {
}
return output.join("");
};
-
-})();
diff --git a/core/modules/utils/performance.js b/core/modules/utils/performance.js
index 9908be4d7..f8311d977 100644
--- a/core/modules/utils/performance.js
+++ b/core/modules/utils/performance.js
@@ -6,10 +6,7 @@ module-type: global
Performance measurement.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
function Performance(enabled) {
@@ -21,7 +18,7 @@ function Performance(enabled) {
Performance.prototype.showGreeting = function() {
if($tw.browser) {
- this.logger.log("Execute $tw.perf.log(); to see filter execution timings");
+ this.logger.log("Execute $tw.perf.log(); to see filter execution timings");
}
};
@@ -87,5 +84,3 @@ Performance.prototype.measure = function(name,fn) {
};
exports.Performance = Performance;
-
-})();
diff --git a/core/modules/utils/pluginmaker.js b/core/modules/utils/pluginmaker.js
index 1fc1a3986..f64bbec85 100644
--- a/core/modules/utils/pluginmaker.js
+++ b/core/modules/utils/pluginmaker.js
@@ -6,10 +6,7 @@ module-type: utils
A quick and dirty way to pack up plugins within the browser.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -24,10 +21,8 @@ exports.repackPlugin = function(title,additionalTiddlers,excludeTiddlers) {
throw "No such tiddler as " + title;
}
// Extract the JSON
- var jsonPluginTiddler;
- try {
- jsonPluginTiddler = JSON.parse(pluginTiddler.fields.text);
- } catch(e) {
+ var jsonPluginTiddler = $tw.utils.parseJSONSafe(pluginTiddler.fields.text,null);
+ if(!jsonPluginTiddler) {
throw "Cannot parse plugin tiddler " + title + "\n" + $tw.language.getString("Error/Caption") + ": " + e;
}
// Get the list of tiddlers
@@ -77,5 +72,3 @@ exports.repackPlugin = function(title,additionalTiddlers,excludeTiddlers) {
// Return a heartwarming confirmation
return "Plugin " + title + " successfully saved";
};
-
-})();
diff --git a/core/modules/utils/transliterate.js b/core/modules/utils/transliterate.js
index 275aa1d50..37c5502bf 100644
--- a/core/modules/utils/transliterate.js
+++ b/core/modules/utils/transliterate.js
@@ -6,10 +6,7 @@ module-type: utils
Transliteration static utility functions.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -199,6 +196,8 @@ exports.transliterationPairs = {
"Nj":"N",
"Ñ":"N",
"NJ":"NJ",
+ "ð":"d",
+ "Ð":"D",
"Ó":"O",
"Ŏ":"O",
"Ǒ":"O",
@@ -265,6 +264,8 @@ exports.transliterationPairs = {
"Ɽ":"R",
"Ꜿ":"C",
"Ǝ":"E",
+ "ß":"ss",
+ "ẞ":"SS",
"Ś":"S",
"Ṥ":"S",
"Š":"S",
@@ -275,6 +276,8 @@ exports.transliterationPairs = {
"Ṡ":"S",
"Ṣ":"S",
"Ṩ":"S",
+ "þ": "th",
+ "Þ": "TH",
"Ť":"T",
"Ţ":"T",
"Ṱ":"T",
@@ -907,7 +910,8 @@ exports.transliterationPairs = {
"т":"t",
"ь":"'",
"б":"b",
- "ю":"yu"
+ "ю":"yu",
+ "…":"..."
};
exports.transliterate = function(str) {
@@ -917,9 +921,7 @@ exports.transliterate = function(str) {
};
exports.transliterateToSafeASCII = function(str) {
- return str.replace(/[^\x00-\x7F]/g,function(ch) {
+ return str.replace(/[^\x20-\x7F]/g,function(ch) {
return exports.transliterationPairs[ch] || ""
});
};
-
-})();
diff --git a/core/modules/utils/utils.js b/core/modules/utils/utils.js
index 4c9c3e96d..3e1cfabd5 100644
--- a/core/modules/utils/utils.js
+++ b/core/modules/utils/utils.js
@@ -6,14 +6,9 @@ module-type: utils
Various static utility functions.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
-var base64utf8 = require("$:/core/modules/utils/base64-utf8/base64-utf8.module.js");
-
/*
Display a message, in colour if we're on a terminal
*/
@@ -95,6 +90,20 @@ exports.repeat = function(str,count) {
return result;
};
+/*
+Check if a string starts with another string
+*/
+exports.startsWith = function(str,search) {
+ return str.substring(0, search.length) === search;
+};
+
+/*
+Check if a string ends with another string
+*/
+exports.endsWith = function(str,search) {
+ return str.substring(str.length - search.length) === search;
+};
+
/*
Trim whitespace from the start and end of a string
Thanks to Steven Levithan, http://blog.stevenlevithan.com/archives/faster-trim-javascript
@@ -150,7 +159,7 @@ Convert a string to title case (ie capitalise each initial letter)
exports.toTitleCase = function(str) {
return (str || "").replace(/(^|\s)\S/g, function(c) {return c.toUpperCase();});
}
-
+
/*
Find the line break preceding a given position in a string
Returns position immediately after that line break, or the start of the string
@@ -223,6 +232,7 @@ exports.removeArrayEntries = function(array,value) {
array.splice(p,1);
}
}
+ return array;
};
/*
@@ -294,10 +304,56 @@ exports.slowInSlowOut = function(t) {
return (1 - ((Math.cos(t * Math.PI) + 1) / 2));
};
+exports.formatTitleString = function(template,options) {
+ var base = options.base || "",
+ separator = options.separator || "",
+ counter = options.counter || "";
+ var result = "",
+ t = template,
+ matches = [
+ [/^\$basename\$/i, function() {
+ return base;
+ }],
+ [/^\$count:(\d+)\$/i, function(match) {
+ return $tw.utils.pad(counter,match[1]);
+ }],
+ [/^\$separator\$/i, function() {
+ return separator;
+ }],
+ [/^\$count\$/i, function() {
+ return counter + "";
+ }]
+ ];
+ while(t.length){
+ var matchString = "",
+ found = false;
+ $tw.utils.each(matches, function(m) {
+ var match = m[0].exec(t);
+ if(match) {
+ found = true;
+ matchString = m[1].call(null,match);
+ t = t.substr(match[0].length);
+ return false;
+ }
+ });
+ if(found) {
+ result += matchString;
+ } else {
+ result += t.charAt(0);
+ t = t.substr(1);
+ }
+ }
+ result = result.replace(/\\(.)/g,"$1");
+ return result;
+};
+
exports.formatDateString = function(date,template) {
var result = "",
t = template,
matches = [
+ [/^TIMESTAMP/, function() {
+ return date.getTime();
+ }],
[/^0hh12/, function() {
return $tw.utils.pad($tw.utils.getHours12(date));
}],
@@ -341,6 +397,15 @@ exports.formatDateString = function(date,template) {
[/^0WW/, function() {
return $tw.utils.pad($tw.utils.getWeek(date));
}],
+ [/^0ddddd/, function() {
+ return $tw.utils.pad(Math.floor((date - new Date(date.getFullYear(), 0, 0)) / 1000 / 60 / 60 / 24),3);
+ }],
+ [/^ddddd/, function() {
+ return Math.floor((date - new Date(date.getFullYear(), 0, 0)) / 1000 / 60 / 60 / 24);
+ }],
+ [/^dddd/, function() {
+ return [7,1,2,3,4,5,6][date.getDay()];
+ }],
[/^ddd/, function() {
return $tw.language.getString("Date/Short/Day/" + date.getDay());
}],
@@ -397,7 +462,7 @@ exports.formatDateString = function(date,template) {
// 'return raw UTC (tiddlywiki style) date string.'
if(t.indexOf("[UTC]") == 0 ) {
if(t == "[UTC]YYYY0MM0DD0hh0mm0ssXXX")
- return $tw.utils.stringifyDate(new Date());
+ return $tw.utils.stringifyDate(date || new Date());
var offset = date.getTimezoneOffset() ; // in minutes
date = new Date(date.getTime()+offset*60*1000) ;
t = t.substr(5) ;
@@ -515,6 +580,15 @@ exports.htmlEncode = function(s) {
}
};
+// Converts like htmlEncode, but forgets the double quote for brevity
+exports.htmlTextEncode = function(s) {
+ if(s) {
+ return s.toString().replace(/&/mg,"&").replace(/</mg,"<").replace(/>/mg,">");
+ } else {
+ return "";
+ }
+};
+
// Converts all HTML entities to their character equivalents
exports.entityDecode = function(s) {
var converter = String.fromCodePoint || String.fromCharCode,
@@ -608,9 +682,19 @@ exports.escapeRegExp = function(s) {
return s.replace(/[\-\/\\\^\$\*\+\?\.\(\)\|\[\]\{\}]/g, '\\$&');
};
+/*
+Extended version of encodeURIComponent that encodes additional characters including
+those that are illegal within filepaths on various platforms including Windows
+*/
+exports.encodeURIComponentExtended = function(s) {
+ return encodeURIComponent(s).replace(/[!'()*]/g,function(c) {
+ return "%" + c.charCodeAt(0).toString(16).toUpperCase();
+ });
+};
+
// Checks whether a link target is external, i.e. not a tiddler title
exports.isLinkExternal = function(to) {
- var externalRegExp = /^(?:file|http|https|mailto|ftp|irc|news|data|skype):[^\s<>{}\[\]`|"\\^]+(?:\/|\b)/i;
+ var externalRegExp = /^(?:file|http|https|mailto|ftp|irc|news|obsidian|data|skype):[^\s<>{}\[\]`|"\\^]+(?:\/|\b)/i;
return externalRegExp.test(to);
};
@@ -618,7 +702,7 @@ exports.nextTick = function(fn) {
/*global window: false */
if(typeof process === "undefined") {
// Apparently it would be faster to use postMessage - http://dbaron.org/log/20100309-faster-timeouts
- window.setTimeout(fn,4);
+ window.setTimeout(fn,0);
} else {
process.nextTick(fn);
}
@@ -690,9 +774,8 @@ exports.isValidFieldName = function(name) {
if(!name || typeof name !== "string") {
return false;
}
- name = name.toLowerCase().trim();
- var fieldValidatorRegEx = /^[a-z0-9\-\._]+$/mg;
- return fieldValidatorRegEx.test(name);
+ // Since v5.2.x, there are no restrictions on characters in field names
+ return name;
};
/*
@@ -733,18 +816,78 @@ exports.hashString = function(str) {
},0);
};
+/*
+Cryptographic hash function as used by sha256 filter operator
+options.length .. number of characters returned defaults to 64
+*/
+exports.sha256 = function(str, options) {
+ options = options || {}
+ return $tw.sjcl.codec.hex.fromBits($tw.sjcl.hash.sha256.hash(str)).substr(0,options.length || 64);
+}
+
+/*
+Base64 utility functions that work in either browser or Node.js
+*/
+if(typeof window !== 'undefined') {
+ exports.btoa = function(binstr) { return window.btoa(binstr); }
+ exports.atob = function(b64) { return window.atob(b64); }
+} else {
+ exports.btoa = function(binstr) {
+ return Buffer.from(binstr, 'binary').toString('base64');
+ }
+ exports.atob = function(b64) {
+ return Buffer.from(b64, 'base64').toString('binary');
+ }
+}
+
+exports.base64ToBytes = function(base64) {
+ const binString = exports.atob(base64);
+ return Uint8Array.from(binString, (m) => m.codePointAt(0));
+};
+
+exports.bytesToBase64 = function(bytes) {
+ const binString = Array.from(bytes, (byte) => String.fromCodePoint(byte)).join("");
+ return exports.btoa(binString);
+};
+
+exports.base64EncodeUtf8 = function(str) {
+ if ($tw.browser) {
+ return exports.bytesToBase64(new TextEncoder().encode(str));
+ } else {
+ const buff = Buffer.from(str, "utf-8");
+ return buff.toString("base64");
+ }
+};
+
+exports.base64DecodeUtf8 = function(str) {
+ if ($tw.browser) {
+ return new TextDecoder().decode(exports.base64ToBytes(str));
+ } else {
+ const buff = Buffer.from(str, "base64");
+ return buff.toString("utf-8");
+ }
+};
+
/*
Decode a base64 string
*/
-exports.base64Decode = function(string64) {
- return base64utf8.base64.decode.call(base64utf8,string64);
+exports.base64Decode = function(string64,binary,urlsafe) {
+ const encoded = urlsafe ? string64.replace(/_/g,'/').replace(/-/g,'+') : string64;
+ if(binary) return exports.atob(encoded)
+ else return exports.base64DecodeUtf8(encoded);
};
/*
Encode a string to base64
*/
-exports.base64Encode = function(string64) {
- return base64utf8.base64.encode.call(base64utf8,string64);
+exports.base64Encode = function(string64,binary,urlsafe) {
+ let encoded;
+ if(binary) encoded = exports.btoa(string64);
+ else encoded = exports.base64EncodeUtf8(string64);
+ if(urlsafe) {
+ encoded = encoded.replace(/\+/g,'-').replace(/\//g,'_');
+ }
+ return encoded;
};
/*
@@ -792,7 +935,7 @@ exports.makeDataUri = function(text,type,_canonical_uri) {
parts.push(type);
parts.push(isBase64 ? ";base64" : "");
parts.push(",");
- parts.push(isBase64 ? text : encodeURIComponent(text));
+ parts.push(isBase64 ? text : encodeURIComponent(text));
}
return parts.join("");
};
@@ -813,7 +956,7 @@ IE does not have sign function
*/
exports.sign = Math.sign || function(x) {
x = +x; // convert to a number
- if (x === 0 || isNaN(x)) {
+ if(x === 0 || isNaN(x)) {
return x;
}
return x > 0 ? 1 : -1;
@@ -826,7 +969,7 @@ exports.strEndsWith = function(str,ending,position) {
if(str.endsWith) {
return str.endsWith(ending,position);
} else {
- if (typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > str.length) {
+ if(typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > str.length) {
position = str.length;
}
position -= ending.length;
@@ -867,7 +1010,9 @@ exports.stringifyNumber = function(num) {
exports.makeCompareFunction = function(type,options) {
options = options || {};
- var gt = options.invert ? -1 : +1,
+ // set isCaseSensitive to true if not defined in options
+ var isCaseSensitive = (options.isCaseSensitive === false) ? false : true,
+ gt = options.invert ? -1 : +1,
lt = options.invert ? +1 : -1,
compare = function(a,b) {
if(a > b) {
@@ -886,7 +1031,11 @@ exports.makeCompareFunction = function(type,options) {
return compare($tw.utils.parseInt(a),$tw.utils.parseInt(b));
},
"string": function(a,b) {
- return compare("" + a,"" +b);
+ if(!isCaseSensitive) {
+ a = a.toLowerCase();
+ b = b.toLowerCase();
+ }
+ return compare("" + a,"" + b);
},
"date": function(a,b) {
var dateA = $tw.utils.parseDate(a),
@@ -900,10 +1049,15 @@ exports.makeCompareFunction = function(type,options) {
return compare(dateA,dateB);
},
"version": function(a,b) {
- return $tw.utils.compareVersions(a,b);
+ return compare($tw.utils.compareVersions(a,b),0);
+ },
+ "alphanumeric": function(a,b) {
+ if(!isCaseSensitive) {
+ a = a.toLowerCase();
+ b = b.toLowerCase();
+ }
+ return options.invert ? b.localeCompare(a,undefined,{numeric: true,sensitivity: "base"}) : a.localeCompare(b,undefined,{numeric: true,sensitivity: "base"});
}
};
return (types[type] || types[options.defaultType] || types.number);
};
-
-})();
diff --git a/core/modules/widgets/action-confirm.js b/core/modules/widgets/action-confirm.js
index eb762f050..c2ca39b64 100644
--- a/core/modules/widgets/action-confirm.js
+++ b/core/modules/widgets/action-confirm.js
@@ -5,10 +5,7 @@ type: application/javascript
module-type: widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -58,9 +55,10 @@ Invoke the action associated with this widget
*/
ConfirmWidget.prototype.invokeAction = function(triggeringWidget,event) {
var invokeActions = true,
- handled = true;
+ handled = true,
+ win = event && event.event && event.event.view ? event.event.view : window;
if(this.prompt) {
- invokeActions = confirm(this.message);
+ invokeActions = win.confirm(this.message);
}
if(invokeActions) {
handled = this.invokeActions(triggeringWidget,event);
@@ -73,5 +71,3 @@ ConfirmWidget.prototype.allowActionPropagation = function() {
};
exports["action-confirm"] = ConfirmWidget;
-
-})();
\ No newline at end of file
diff --git a/core/modules/widgets/action-createtiddler.js b/core/modules/widgets/action-createtiddler.js
index d1d1786f7..d010e6465 100644
--- a/core/modules/widgets/action-createtiddler.js
+++ b/core/modules/widgets/action-createtiddler.js
@@ -6,10 +6,7 @@ module-type: widget
Action widget to create a new tiddler with a unique name and specified fields.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw:false, require:false, exports:false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -27,8 +24,11 @@ CreateTiddlerWidget.prototype = new Widget();
Render this widget into the DOM
*/
CreateTiddlerWidget.prototype.render = function(parent,nextSibling) {
+ this.parentDomNode = parent;
this.computeAttributes();
this.execute();
+ // Render children
+ this.renderChildren(parent,nextSibling);
};
/*
@@ -44,7 +44,8 @@ CreateTiddlerWidget.prototype.execute = function() {
this.actionTemplate = this.getAttribute("$template");
this.useTemplate = !!this.actionTemplate;
this.actionOverwrite = this.getAttribute("$overwrite","no");
-
+ // Construct the child widgets
+ this.makeChildWidgets();
};
/*
@@ -86,21 +87,22 @@ CreateTiddlerWidget.prototype.invokeAction = function(triggeringWidget,event) {
if (!this.hasBase && this.useTemplate) {
title = this.wiki.generateNewTitle(this.actionTemplate);
} else if (!this.hasBase && !this.useTemplate) {
- // If NO $basetitle AND NO $template use initial title
- // DON'T overwrite any stuff
+ // If no $basetitle and no $template then use initial title
title = this.wiki.generateNewTitle(title);
}
var templateTiddler = this.wiki.getTiddler(this.actionTemplate) || {};
- var tiddler = this.wiki.addTiddler(new $tw.Tiddler(templateTiddler.fields,creationFields,fields,modificationFields,{title: title}));
+ this.wiki.addTiddler(new $tw.Tiddler(templateTiddler.fields,creationFields,fields,modificationFields,{title: title}));
+ var draftTitle = this.wiki.generateDraftTitle(title);
if(this.actionSaveTitle) {
this.wiki.setTextReference(this.actionSaveTitle,title,this.getVariable("currentTiddler"));
}
if(this.actionSaveDraftTitle) {
- this.wiki.setTextReference(this.actionSaveDraftTitle,this.wiki.generateDraftTitle(title),this.getVariable("currentTiddler"));
+ this.wiki.setTextReference(this.actionSaveDraftTitle,draftTitle,this.getVariable("currentTiddler"));
}
+ this.setVariable("createTiddler-title",title);
+ this.setVariable("createTiddler-draftTitle",draftTitle);
+ this.refreshChildren();
return true; // Action was invoked
};
exports["action-createtiddler"] = CreateTiddlerWidget;
-
-})();
diff --git a/core/modules/widgets/action-deletefield.js b/core/modules/widgets/action-deletefield.js
index 45425bf4e..fd55e2270 100644
--- a/core/modules/widgets/action-deletefield.js
+++ b/core/modules/widgets/action-deletefield.js
@@ -6,10 +6,7 @@ module-type: widget
Action widget to delete fields of a tiddler.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -36,7 +33,8 @@ Compute the internal state of the widget
*/
DeleteFieldWidget.prototype.execute = function() {
this.actionTiddler = this.getAttribute("$tiddler",this.getVariable("currentTiddler"));
- this.actionField = this.getAttribute("$field");
+ this.actionField = this.getAttribute("$field",null);
+ this.actionTimestamp = this.getAttribute("$timestamp","yes") === "yes";
};
/*
@@ -59,7 +57,7 @@ DeleteFieldWidget.prototype.invokeAction = function(triggeringWidget,event) {
tiddler = this.wiki.getTiddler(self.actionTiddler),
removeFields = {},
hasChanged = false;
- if(this.actionField && tiddler) {
+ if((this.actionField !== null) && tiddler) {
removeFields[this.actionField] = undefined;
if(this.actionField in tiddler.fields) {
hasChanged = true;
@@ -69,16 +67,18 @@ DeleteFieldWidget.prototype.invokeAction = function(triggeringWidget,event) {
$tw.utils.each(this.attributes,function(attribute,name) {
if(name.charAt(0) !== "$" && name !== "title") {
removeFields[name] = undefined;
- hasChanged = true;
+ if(name in tiddler.fields) {
+ hasChanged = true;
+ }
}
});
if(hasChanged) {
- this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getCreationFields(),tiddler,removeFields,this.wiki.getModificationFields()));
+ var creationFields = this.actionTimestamp ? this.wiki.getCreationFields() : {};
+ var modificationFields = this.actionTimestamp ? this.wiki.getModificationFields() : {};
+ this.wiki.addTiddler(new $tw.Tiddler(creationFields,tiddler,removeFields,modificationFields));
}
}
return true; // Action was invoked
};
exports["action-deletefield"] = DeleteFieldWidget;
-
-})();
diff --git a/core/modules/widgets/action-deletetiddler.js b/core/modules/widgets/action-deletetiddler.js
index 816f9f55e..fa80620b7 100644
--- a/core/modules/widgets/action-deletetiddler.js
+++ b/core/modules/widgets/action-deletetiddler.js
@@ -6,10 +6,7 @@ module-type: widget
Action widget to delete a tiddler.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -69,5 +66,3 @@ DeleteTiddlerWidget.prototype.invokeAction = function(triggeringWidget,event) {
};
exports["action-deletetiddler"] = DeleteTiddlerWidget;
-
-})();
diff --git a/core/modules/widgets/action-listops.js b/core/modules/widgets/action-listops.js
index 6da84a3e5..29cf9f8de 100644
--- a/core/modules/widgets/action-listops.js
+++ b/core/modules/widgets/action-listops.js
@@ -6,10 +6,6 @@ module-type: widget
Action widget to apply list operations to any tiddler field (defaults to the 'list' field of the current tiddler)
\*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
var ActionListopsWidget = function(parseTreeNode, options) {
@@ -44,9 +40,7 @@ ActionListopsWidget.prototype.execute = function() {
*/
ActionListopsWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(changedAttributes.$tiddler || changedAttributes.$filter ||
- changedAttributes.$subfilter || changedAttributes.$field ||
- changedAttributes.$index || changedAttributes.$tags) {
+ if($tw.utils.count(changedAttributes) > 0) {
this.refreshSelf();
return true;
}
@@ -60,12 +54,10 @@ ActionListopsWidget.prototype.invokeAction = function(triggeringWidget,
//Apply the specified filters to the lists
var field = this.listField,
index,
- type = "!!",
list = this.listField;
if(this.listIndex) {
field = undefined;
index = this.listIndex;
- type = "##";
list = this.listIndex;
}
if(this.filter) {
@@ -74,23 +66,20 @@ ActionListopsWidget.prototype.invokeAction = function(triggeringWidget,
.filterTiddlers(this.filter, this)));
}
if(this.subfilter) {
- var subfilter = "[list[" + this.target + type + list + "]] " + this.subfilter;
- this.wiki.setText(this.target, field, index, $tw.utils.stringifyList(
- this.wiki
- .filterTiddlers(subfilter, this)));
+ var inputList = this.wiki.getTiddlerList(this.target,field,index),
+ subfilter = "[all[]] " + this.subfilter;
+ this.wiki.setText(this.target, field, index, $tw.utils.stringifyList(this.wiki.filterTiddlers(subfilter,this,this.wiki.makeTiddlerIterator(inputList))));
}
if(this.filtertags) {
var tiddler = this.wiki.getTiddler(this.target),
oldtags = tiddler ? (tiddler.fields.tags || []).slice(0) : [],
- tagfilter = "[list[" + this.target + "!!tags]] " + this.filtertags,
+ tagfilter = $tw.utils.stringifyList(oldtags) + " " + this.filtertags,
newtags = this.wiki.filterTiddlers(tagfilter,this);
if($tw.utils.stringifyList(oldtags.sort()) !== $tw.utils.stringifyList(newtags.sort())) {
- this.wiki.setText(this.target,"tags",undefined,$tw.utils.stringifyList(newtags));
+ this.wiki.setText(this.target,"tags",undefined,$tw.utils.stringifyList(newtags));
}
}
return true; // Action was invoked
};
exports["action-listops"] = ActionListopsWidget;
-
-})();
diff --git a/core/modules/widgets/action-log.js b/core/modules/widgets/action-log.js
index eacef94bc..3f8caf047 100644
--- a/core/modules/widgets/action-log.js
+++ b/core/modules/widgets/action-log.js
@@ -6,10 +6,7 @@ module-type: widget
Action widget to log debug messages
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -62,17 +59,22 @@ LogWidget.prototype.log = function() {
$tw.utils.each(this.attributes,function(attribute,name) {
if(name.substring(0,2) !== "$$") {
data[name] = attribute;
- }
+ }
});
for(var v in this.variables) {
- allVars[v] = this.getVariable(v,{defaultValue:""});
- }
+ var variable = this.parentWidget && this.parentWidget.variables[v];
+ if(variable && variable.isFunctionDefinition) {
+ allVars[v] = variable.value;
+ } else {
+ allVars[v] = this.getVariable(v,{defaultValue:""});
+ }
+ }
if(this.filter) {
filteredVars = this.wiki.compileFilter(this.filter).call(this.wiki,this.wiki.makeTiddlerIterator(allVars));
$tw.utils.each(filteredVars,function(name) {
data[name] = allVars[name];
- });
+ });
}
dataCount = $tw.utils.count(data);
@@ -89,5 +91,3 @@ LogWidget.prototype.log = function() {
}
exports["action-log"] = LogWidget;
-
-})();
diff --git a/core/modules/widgets/action-navigate.js b/core/modules/widgets/action-navigate.js
index adac959d5..67c7713db 100644
--- a/core/modules/widgets/action-navigate.js
+++ b/core/modules/widgets/action-navigate.js
@@ -6,10 +6,7 @@ module-type: widget
Action widget to navigate to a tiddler
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -70,11 +67,20 @@ NavigateWidget.prototype.invokeAction = function(triggeringWidget,event) {
navigateFromNode: triggeringWidget,
navigateFromClientRect: bounds && { top: bounds.top, left: bounds.left, width: bounds.width, right: bounds.right, bottom: bounds.bottom, height: bounds.height
},
- navigateSuppressNavigation: suppressNavigation
+ navigateFromClientTop: bounds && bounds.top,
+ navigateFromClientLeft: bounds && bounds.left,
+ navigateFromClientWidth: bounds && bounds.width,
+ navigateFromClientRight: bounds && bounds.right,
+ navigateFromClientBottom: bounds && bounds.bottom,
+ navigateFromClientHeight: bounds && bounds.height,
+ navigateSuppressNavigation: suppressNavigation,
+ metaKey: event.metaKey,
+ ctrlKey: event.ctrlKey,
+ altKey: event.altKey,
+ shiftKey: event.shiftKey,
+ event: event
});
return true; // Action was invoked
};
exports["action-navigate"] = NavigateWidget;
-
-})();
diff --git a/core/modules/widgets/action-popup.js b/core/modules/widgets/action-popup.js
index af17b3f51..b44b3a524 100644
--- a/core/modules/widgets/action-popup.js
+++ b/core/modules/widgets/action-popup.js
@@ -6,14 +6,13 @@ module-type: widget
Action widget to trigger a popup.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
+var Popup = require("$:/core/modules/utils/dom/popup.js");
+
var ActionPopupWidget = function(parseTreeNode,options) {
this.initialise(parseTreeNode,options);
};
@@ -37,6 +36,7 @@ Compute the internal state of the widget
ActionPopupWidget.prototype.execute = function() {
this.actionState = this.getAttribute("$state");
this.actionCoords = this.getAttribute("$coords");
+ this.floating = this.getAttribute("$floating","no") === "yes";
};
/*
@@ -56,19 +56,20 @@ Invoke the action associated with this widget
*/
ActionPopupWidget.prototype.invokeAction = function(triggeringWidget,event) {
// Trigger the popup
- var popupLocationRegExp = /^\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/,
- match = popupLocationRegExp.exec(this.actionCoords || "");
- if(match) {
+ var coordinates = Popup.parseCoordinates(this.actionCoords || "");
+ if(coordinates) {
$tw.popup.triggerPopup({
domNode: null,
domNodeRect: {
- left: parseFloat(match[1]),
- top: parseFloat(match[2]),
- width: parseFloat(match[3]),
- height: parseFloat(match[4])
+ left: coordinates.left,
+ top: coordinates.top,
+ width: coordinates.width,
+ height: coordinates.height
},
title: this.actionState,
- wiki: this.wiki
+ wiki: this.wiki,
+ floating: this.floating,
+ absolute: coordinates.absolute
});
} else {
$tw.popup.cancel(0);
@@ -77,5 +78,3 @@ ActionPopupWidget.prototype.invokeAction = function(triggeringWidget,event) {
};
exports["action-popup"] = ActionPopupWidget;
-
-})();
diff --git a/core/modules/widgets/action-sendmessage.js b/core/modules/widgets/action-sendmessage.js
index c53314b2d..7b9e6453f 100644
--- a/core/modules/widgets/action-sendmessage.js
+++ b/core/modules/widgets/action-sendmessage.js
@@ -6,10 +6,7 @@ module-type: widget
Action widget to send a message
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -39,6 +36,8 @@ SendMessageWidget.prototype.execute = function() {
this.actionParam = this.getAttribute("$param");
this.actionName = this.getAttribute("$name");
this.actionValue = this.getAttribute("$value","");
+ this.actionNames = this.getAttribute("$names");
+ this.actionValues = this.getAttribute("$values");
};
/*
@@ -59,13 +58,20 @@ Invoke the action associated with this widget
SendMessageWidget.prototype.invokeAction = function(triggeringWidget,event) {
// Get the string parameter
var param = this.actionParam;
- // Assemble the attributes as a hashmap
+ // Assemble the parameters as a hashmap
var paramObject = Object.create(null);
- var count = 0;
+ // Add names/values pairs if present
+ if(this.actionNames && this.actionValues) {
+ var names = this.wiki.filterTiddlers(this.actionNames,this),
+ values = this.wiki.filterTiddlers(this.actionValues,this);
+ $tw.utils.each(names,function(name,index) {
+ paramObject[name] = values[index] || "";
+ });
+ }
+ // Add raw parameters
$tw.utils.each(this.attributes,function(attribute,name) {
if(name.charAt(0) !== "$") {
paramObject[name] = attribute;
- count++;
}
});
// Add name/value pair if present
@@ -73,17 +79,16 @@ SendMessageWidget.prototype.invokeAction = function(triggeringWidget,event) {
paramObject[this.actionName] = this.actionValue;
}
// Dispatch the message
- this.dispatchEvent({
+ var params = {
type: this.actionMessage,
param: param,
paramObject: paramObject,
+ event: event,
tiddlerTitle: this.getVariable("currentTiddler"),
- navigateFromTitle: this.getVariable("storyTiddler"),
- event: event
- });
+ navigateFromTitle: this.getVariable("storyTiddler")
+ };
+ this.dispatchEvent(params);
return true; // Action was invoked
};
exports["action-sendmessage"] = SendMessageWidget;
-
-})();
diff --git a/core/modules/widgets/action-setfield.js b/core/modules/widgets/action-setfield.js
index 98079f00c..2d2c6ce47 100644
--- a/core/modules/widgets/action-setfield.js
+++ b/core/modules/widgets/action-setfield.js
@@ -6,10 +6,7 @@ module-type: widget
Action widget to set a single field or index on a tiddler.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -35,7 +32,7 @@ SetFieldWidget.prototype.render = function(parent,nextSibling) {
Compute the internal state of the widget
*/
SetFieldWidget.prototype.execute = function() {
- this.actionTiddler = this.getAttribute("$tiddler",this.getVariable("currentTiddler"));
+ this.actionTiddler = this.getAttribute("$tiddler") || (!this.hasParseTreeNodeAttribute("$tiddler") && this.getVariable("currentTiddler"));
this.actionField = this.getAttribute("$field");
this.actionIndex = this.getAttribute("$index");
this.actionValue = this.getAttribute("$value");
@@ -46,11 +43,7 @@ SetFieldWidget.prototype.execute = function() {
Refresh the widget by ensuring our attributes are up to date
*/
SetFieldWidget.prototype.refresh = function(changedTiddlers) {
- var changedAttributes = this.computeAttributes();
- if(changedAttributes["$tiddler"] || changedAttributes["$field"] || changedAttributes["$index"] || changedAttributes["$value"]) {
- this.refreshSelf();
- return true;
- }
+ // Nothing to refresh
return this.refreshChildren(changedTiddlers);
};
@@ -60,18 +53,18 @@ Invoke the action associated with this widget
SetFieldWidget.prototype.invokeAction = function(triggeringWidget,event) {
var self = this,
options = {};
- options.suppressTimestamp = !this.actionTimestamp;
- if((typeof this.actionField == "string") || (typeof this.actionIndex == "string") || (typeof this.actionValue == "string")) {
- this.wiki.setText(this.actionTiddler,this.actionField,this.actionIndex,this.actionValue,options);
- }
- $tw.utils.each(this.attributes,function(attribute,name) {
- if(name.charAt(0) !== "$") {
- self.wiki.setText(self.actionTiddler,name,undefined,attribute,options);
+ if(this.actionTiddler) {
+ options.suppressTimestamp = !this.actionTimestamp;
+ if((typeof this.actionField == "string") || (typeof this.actionIndex == "string") || (typeof this.actionValue == "string")) {
+ this.wiki.setText(this.actionTiddler,this.actionField,this.actionIndex,this.actionValue,options);
}
- });
+ $tw.utils.each(this.attributes,function(attribute,name) {
+ if(name.charAt(0) !== "$") {
+ self.wiki.setText(self.actionTiddler,name,undefined,attribute,options);
+ }
+ });
+ }
return true; // Action was invoked
};
exports["action-setfield"] = SetFieldWidget;
-
-})();
diff --git a/core/modules/widgets/action-setmultiplefields.js b/core/modules/widgets/action-setmultiplefields.js
new file mode 100644
index 000000000..1e2326394
--- /dev/null
+++ b/core/modules/widgets/action-setmultiplefields.js
@@ -0,0 +1,80 @@
+/*\
+title: $:/core/modules/widgets/action-setmultiplefields.js
+type: application/javascript
+module-type: widget
+
+Action widget to set multiple fields or indexes on a tiddler
+
+\*/
+
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var SetMultipleFieldsWidget = function(parseTreeNode,options) {
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+SetMultipleFieldsWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+SetMultipleFieldsWidget.prototype.render = function(parent,nextSibling) {
+ this.computeAttributes();
+ this.execute();
+};
+
+/*
+Compute the internal state of the widget
+*/
+SetMultipleFieldsWidget.prototype.execute = function() {
+ this.actionTiddler = this.getAttribute("$tiddler",this.getVariable("currentTiddler"));
+ this.actionFields = this.getAttribute("$fields");
+ this.actionIndexes = this.getAttribute("$indexes");
+ this.actionValues = this.getAttribute("$values");
+ this.actionTimestamp = this.getAttribute("$timestamp","yes") === "yes";
+};
+
+/*
+Refresh the widget by ensuring our attributes are up to date
+*/
+SetMultipleFieldsWidget.prototype.refresh = function(changedTiddlers) {
+ var changedAttributes = this.computeAttributes();
+ if(changedAttributes["$tiddler"] || changedAttributes["$fields"] || changedAttributes["$indexes"] || changedAttributes["$values"] || changedAttributes["$timestamp"]) {
+ this.refreshSelf();
+ return true;
+ }
+ return this.refreshChildren(changedTiddlers);
+};
+
+/*
+Invoke the action associated with this widget
+*/
+SetMultipleFieldsWidget.prototype.invokeAction = function(triggeringWidget,event) {
+ var tiddler = this.wiki.getTiddler(this.actionTiddler),
+ names, values = this.wiki.filterTiddlers(this.actionValues,this);
+ if(this.actionFields) {
+ var additions = {};
+ names = this.wiki.filterTiddlers(this.actionFields,this);
+ $tw.utils.each(names,function(fieldname,index) {
+ additions[fieldname] = values[index] || "";
+ });
+ var creationFields = this.actionTimestamp ? this.wiki.getCreationFields() : undefined,
+ modificationFields = this.actionTimestamp ? this.wiki.getModificationFields() : undefined;
+ this.wiki.addTiddler(new $tw.Tiddler(creationFields,tiddler,{title: this.actionTiddler},modificationFields,additions));
+ } else if(this.actionIndexes) {
+ var data = this.wiki.getTiddlerData(this.actionTiddler,Object.create(null));
+ names = this.wiki.filterTiddlers(this.actionIndexes,this);
+ $tw.utils.each(names,function(name,index) {
+ data[name] = values[index] || "";
+ });
+ this.wiki.setTiddlerData(this.actionTiddler,data,{},{suppressTimestamp: !this.actionTimestamp});
+ }
+ return true; // Action was invoked
+};
+
+exports["action-setmultiplefields"] = SetMultipleFieldsWidget;
diff --git a/core/modules/widgets/audio.js b/core/modules/widgets/audio.js
new file mode 100644
index 000000000..7bd073c4f
--- /dev/null
+++ b/core/modules/widgets/audio.js
@@ -0,0 +1,103 @@
+/*\
+title: $:/core/modules/widgets/audio.js
+type: application/javascript
+module-type: widget
+
+Basic Audio widget for displaying audio files.
+This is a simple implementation that can be overridden by plugins
+for more advanced functionality.
+
+\*/
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var AudioWidget = function(parseTreeNode,options) {
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+AudioWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+AudioWidget.prototype.render = function(parent,nextSibling) {
+ this.parentDomNode = parent;
+ this.computeAttributes();
+ this.execute();
+
+ // Create audio element
+ var audioElement = this.document.createElement("audio");
+ audioElement.setAttribute("controls", this.getAttribute("controls", "controls"));
+ audioElement.setAttribute("style", this.getAttribute("style", "width: 100%; object-fit: contain"));
+ audioElement.className = "tw-audio-element";
+
+ // Set source
+ if(this.audioSource) {
+ if (this.audioSource.indexOf("data:") === 0) {
+ audioElement.setAttribute("src", this.audioSource);
+ } else {
+ var sourceElement = this.document.createElement("source");
+ sourceElement.setAttribute("src", this.audioSource);
+ if(this.audioType) {
+ sourceElement.setAttribute("type", this.audioType);
+ }
+ audioElement.appendChild(sourceElement);
+ }
+ }
+
+ // Insert the audio into the DOM
+ parent.insertBefore(audioElement, nextSibling);
+ this.domNodes.push(audioElement);
+};
+
+/*
+Compute the internal state of the widget
+*/
+AudioWidget.prototype.execute = function() {
+ // Get the audio source and type
+ this.audioSource = this.getAttribute("src");
+ this.audioType = this.getAttribute("type");
+ this.audioControls = this.getAttribute("controls", "controls");
+
+ // Try to get from tiddler attribute
+ if(!this.audioSource && this.getAttribute("tiddler")) {
+ var tiddlerTitle = this.getAttribute("tiddler");
+ var tiddler = this.wiki.getTiddler(tiddlerTitle);
+ if(tiddler) {
+ if(tiddler.fields._canonical_uri) {
+ this.audioSource = tiddler.fields._canonical_uri;
+ this.audioType = tiddler.fields.type;
+ } else if(tiddler.fields.text) {
+ this.audioSource = "data:" + tiddler.fields.type + ";base64," + tiddler.fields.text;
+ this.audioType = tiddler.fields.type;
+ }
+ }
+ }
+
+ // Make sure we have a tiddler for saving timestamps
+ this.tiddlerTitle = this.getAttribute("tiddler");
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+*/
+AudioWidget.prototype.refresh = function(changedTiddlers) {
+ var changedAttributes = this.computeAttributes();
+ if(changedAttributes.src || changedAttributes.type || changedAttributes.controls || changedAttributes.tiddler) {
+ this.refreshSelf();
+ return true;
+ } else {
+ return false;
+ }
+};
+
+exports.audio = AudioWidget;
+
+
diff --git a/core/modules/widgets/browse.js b/core/modules/widgets/browse.js
index de3c91fb8..b0173f6e2 100644
--- a/core/modules/widgets/browse.js
+++ b/core/modules/widgets/browse.js
@@ -6,10 +6,7 @@ module-type: widget
Browse widget for browsing for files to import
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -42,6 +39,9 @@ BrowseWidget.prototype.render = function(parent,nextSibling) {
if(this.tooltip) {
domNode.setAttribute("title",this.tooltip);
}
+ if(this.tabIndex) {
+ domNode.setAttribute("tabindex", this.tabIndex);
+ }
// Nw.js supports "nwsaveas" to force a "save as" dialogue that allows a new or existing file to be selected
if(this.nwsaveas) {
domNode.setAttribute("nwsaveas",this.nwsaveas);
@@ -56,6 +56,9 @@ BrowseWidget.prototype.render = function(parent,nextSibling) {
if(this.nwdirectory) {
domNode.setAttribute("nwdirectory",this.nwdirectory);
}
+ if(this.isDisabled === "yes") {
+ domNode.setAttribute("disabled", true);
+ }
// Add a click event handler
domNode.addEventListener("change",function (event) {
if(self.message) {
@@ -70,6 +73,11 @@ BrowseWidget.prototype.render = function(parent,nextSibling) {
}
return false;
},false);
+ // Assign data- attributes
+ this.assignAttributes(domNode,{
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
// Insert element
parent.insertBefore(domNode,nextSibling);
this.renderChildren(domNode,null);
@@ -89,15 +97,20 @@ BrowseWidget.prototype.execute = function() {
this.accept = this.getAttribute("accept");
this.webkitdirectory = this.getAttribute("webkitdirectory");
this.nwdirectory = this.getAttribute("nwdirectory");
+ this.tabIndex = this.getAttribute("tabindex");
+ this.isDisabled = this.getAttribute("disabled", "no");
};
/*
Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
*/
BrowseWidget.prototype.refresh = function(changedTiddlers) {
+ var changedAttributes = this.computeAttributes();
+ if($tw.utils.count(changedAttributes) > 0) {
+ this.refreshSelf();
+ return true;
+ }
return false;
};
exports.browse = BrowseWidget;
-
-})();
diff --git a/core/modules/widgets/button.js b/core/modules/widgets/button.js
index 5b15c875f..8f6f14376 100644
--- a/core/modules/widgets/button.js
+++ b/core/modules/widgets/button.js
@@ -6,14 +6,13 @@ module-type: widget
Button widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
+var Popup = require("$:/core/modules/utils/dom/popup.js");
+
var ButtonWidget = function(parseTreeNode,options) {
this.initialise(parseTreeNode,options);
};
@@ -46,7 +45,8 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
isPoppedUp = (this.popup || this.popupTitle) && this.isPoppedUp();
if(this.selectedClass) {
if((this.set || this.setTitle) && this.setTo && this.isSelected()) {
- $tw.utils.pushTop(classes,this.selectedClass.split(" "));
+ $tw.utils.pushTop(classes, this.selectedClass.split(" "));
+ domNode.setAttribute("aria-checked", "true");
}
if(isPoppedUp) {
$tw.utils.pushTop(classes,this.selectedClass.split(" "));
@@ -56,6 +56,15 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
$tw.utils.pushTop(classes,"tc-popup-handle");
}
domNode.className = classes.join(" ");
+ // Assign data- attributes
+ this.assignAttributes(domNode,{
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
+ this.assignAttributes(domNode,{
+ sourcePrefix: "aria-",
+ destPrefix: "aria-"
+ });
// Assign other attributes
if(this.style) {
domNode.setAttribute("style",this.style);
@@ -63,8 +72,11 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
if(this.tooltip) {
domNode.setAttribute("title",this.tooltip);
}
- if(this["aria-label"]) {
- domNode.setAttribute("aria-label",this["aria-label"]);
+ if (this.role) {
+ domNode.setAttribute("role", this.role);
+ }
+ if(this.popup || this.popupTitle) {
+ domNode.setAttribute("aria-expanded",isPoppedUp ? "true" : "false");
}
// Set the tabindex
if(this.tabIndex) {
@@ -140,7 +152,7 @@ ButtonWidget.prototype.isSelected = function() {
ButtonWidget.prototype.isPoppedUp = function() {
var tiddler = this.popupTitle ? this.wiki.getTiddler(this.popupTitle) : this.wiki.getTiddler(this.popup);
- var result = tiddler && tiddler.fields.text ? $tw.popup.readPopupState(tiddler.fields.text) : false;
+ var result = tiddler && tiddler.fields.text ? Popup.readPopupState(tiddler.fields.text) : false;
return result;
};
@@ -166,6 +178,7 @@ ButtonWidget.prototype.triggerPopup = function(event) {
if(this.popupTitle) {
$tw.popup.triggerPopup({
domNode: this.domNodes[0],
+ absolute: (this.popupAbsCoords === "yes"),
title: this.popupTitle,
wiki: this.wiki,
noStateReference: true
@@ -173,6 +186,7 @@ ButtonWidget.prototype.triggerPopup = function(event) {
} else {
$tw.popup.triggerPopup({
domNode: this.domNodes[0],
+ absolute: (this.popupAbsCoords === "yes"),
title: this.popup,
wiki: this.wiki
});
@@ -202,7 +216,7 @@ ButtonWidget.prototype.execute = function() {
this.setTo = this.getAttribute("setTo");
this.popup = this.getAttribute("popup");
this.hover = this.getAttribute("hover");
- this["aria-label"] = this.getAttribute("aria-label");
+ this.role = this.getAttribute("role");
this.tooltip = this.getAttribute("tooltip");
this.style = this.getAttribute("style");
this["class"] = this.getAttribute("class","");
@@ -215,6 +229,7 @@ ButtonWidget.prototype.execute = function() {
this.setField = this.getAttribute("setField");
this.setIndex = this.getAttribute("setIndex");
this.popupTitle = this.getAttribute("popupTitle");
+ this.popupAbsCoords = this.getAttribute("popupAbsCoords", "no");
this.tabIndex = this.getAttribute("tabindex");
this.isDisabled = this.getAttribute("disabled","no");
// Make child widgets
@@ -224,7 +239,7 @@ ButtonWidget.prototype.execute = function() {
ButtonWidget.prototype.updateDomNodeClasses = function() {
var domNodeClasses = this.domNode.className.split(" "),
oldClasses = this.class.split(" "),
- newClasses;
+ newClasses;
this["class"] = this.getAttribute("class","");
newClasses = this.class.split(" ");
//Remove classes assigned from the old value of class attribute
@@ -237,22 +252,31 @@ ButtonWidget.prototype.updateDomNodeClasses = function() {
//Add new classes from updated class attribute.
$tw.utils.pushTop(domNodeClasses,newClasses);
this.domNode.className = domNodeClasses.join(" ");
-}
+};
/*
Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
*/
ButtonWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled) {
+ if(changedAttributes.tooltip || changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.popupAbsCoords || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) {
this.refreshSelf();
return true;
- } else if(changedAttributes["class"]) {
- this.updateDomNodeClasses();
+ } else {
+ if(changedAttributes["class"]) {
+ this.updateDomNodeClasses();
+ }
+ this.assignAttributes(this.domNodes[0],{
+ changedAttributes: changedAttributes,
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
+ this.assignAttributes(this.domNodes[0],{
+ sourcePrefix: "aria-",
+ destPrefix: "aria-"
+ });
}
return this.refreshChildren(changedTiddlers);
};
exports.button = ButtonWidget;
-
-})();
diff --git a/core/modules/widgets/checkbox.js b/core/modules/widgets/checkbox.js
index 8ea47deb4..7fe62fb42 100644
--- a/core/modules/widgets/checkbox.js
+++ b/core/modules/widgets/checkbox.js
@@ -6,10 +6,7 @@ module-type: widget
Checkbox widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -27,6 +24,7 @@ CheckboxWidget.prototype = new Widget();
Render this widget into the DOM
*/
CheckboxWidget.prototype.render = function(parent,nextSibling) {
+ var isChecked;
// Save the parent dom node
this.parentDomNode = parent;
// Compute our attributes
@@ -35,11 +33,19 @@ CheckboxWidget.prototype.render = function(parent,nextSibling) {
this.execute();
// Create our elements
this.labelDomNode = this.document.createElement("label");
- this.labelDomNode.setAttribute("class",this.checkboxClass);
+ this.labelDomNode.setAttribute("class","tc-checkbox " + this.checkboxClass);
this.inputDomNode = this.document.createElement("input");
this.inputDomNode.setAttribute("type","checkbox");
- if(this.getValue()) {
+ isChecked = this.getValue();
+ if(isChecked) {
this.inputDomNode.setAttribute("checked","true");
+ $tw.utils.addClass(this.labelDomNode,"tc-checkbox-checked");
+ }
+ if(isChecked === undefined && this.checkboxIndeterminate === "yes") {
+ this.inputDomNode.indeterminate = true;
+ }
+ if(this.tabIndex) {
+ this.inputDomNode.setAttribute("tabindex", this.tabIndex);
}
if(this.isDisabled === "yes") {
this.inputDomNode.setAttribute("disabled",true);
@@ -47,6 +53,11 @@ CheckboxWidget.prototype.render = function(parent,nextSibling) {
this.labelDomNode.appendChild(this.inputDomNode);
this.spanDomNode = this.document.createElement("span");
this.labelDomNode.appendChild(this.spanDomNode);
+ // Assign data- attributes
+ this.assignAttributes(this.inputDomNode,{
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
// Add a click event handler
$tw.utils.addEventListeners(this.inputDomNode,[
{name: "change", handlerObject: this, handlerMethod: "handleChangeEvent"}
@@ -59,20 +70,25 @@ CheckboxWidget.prototype.render = function(parent,nextSibling) {
CheckboxWidget.prototype.getValue = function() {
var tiddler = this.wiki.getTiddler(this.checkboxTitle);
- if(tiddler) {
- if(this.checkboxTag) {
- if(this.checkboxInvertTag) {
+ if(tiddler || this.checkboxFilter) {
+ if(tiddler && this.checkboxTag) {
+ if(this.checkboxInvertTag === "yes") {
return !tiddler.hasTag(this.checkboxTag);
} else {
return tiddler.hasTag(this.checkboxTag);
}
}
- if(this.checkboxField) {
+ if(tiddler && (this.checkboxField || this.checkboxIndex)) {
+ // Same logic applies to fields and indexes
var value;
- if($tw.utils.hop(tiddler.fields,this.checkboxField)) {
- value = tiddler.fields[this.checkboxField] || "";
+ if(this.checkboxField) {
+ if($tw.utils.hop(tiddler.fields,this.checkboxField)) {
+ value = tiddler.fields[this.checkboxField] || "";
+ } else {
+ value = this.checkboxDefault || "";
+ }
} else {
- value = this.checkboxDefault || "";
+ value = this.wiki.extractTiddlerDataItem(tiddler,this.checkboxIndex,this.checkboxDefault || "");
}
if(value === this.checkboxChecked) {
return true;
@@ -80,21 +96,65 @@ CheckboxWidget.prototype.getValue = function() {
if(value === this.checkboxUnchecked) {
return false;
}
+ // Neither value found: were both specified?
+ if(this.checkboxChecked && !this.checkboxUnchecked) {
+ return false; // Absence of checked value
+ }
+ if(this.checkboxUnchecked && !this.checkboxChecked) {
+ return true; // Absence of unchecked value
+ }
+ if(this.checkboxChecked && this.checkboxUnchecked) {
+ // Both specified but neither found: indeterminate or false, depending
+ if(this.checkboxIndeterminate === "yes") {
+ return undefined;
+ } else {
+ return false;
+ }
+ }
}
- if(this.checkboxIndex) {
- var value = this.wiki.extractTiddlerDataItem(tiddler,this.checkboxIndex,this.checkboxDefault || "");
- if(value === this.checkboxChecked) {
+ if(this.checkboxListField || this.checkboxListIndex || this.checkboxFilter) {
+ // Same logic applies to lists and filters
+ var list;
+ if(this.checkboxListField) {
+ if($tw.utils.hop(tiddler.fields,this.checkboxListField)) {
+ list = tiddler.getFieldList(this.checkboxListField) || [];
+ } else {
+ list = $tw.utils.parseStringArray(this.checkboxDefault || "") || [];
+ }
+ } else if(this.checkboxListIndex) {
+ list = $tw.utils.parseStringArray(this.wiki.extractTiddlerDataItem(tiddler,this.checkboxListIndex,this.checkboxDefault || "")) || [];
+ } else {
+ list = this.wiki.filterTiddlers(this.checkboxFilter,this) || [];
+ }
+ if(list.indexOf(this.checkboxChecked) !== -1) {
return true;
}
- if(value === this.checkboxUnchecked) {
+ if(list.indexOf(this.checkboxUnchecked) !== -1) {
return false;
}
+ // Neither one present
+ if(this.checkboxChecked && !this.checkboxUnchecked) {
+ return false; // Absence of checked value
+ }
+ if(this.checkboxUnchecked && !this.checkboxChecked) {
+ return true; // Absence of unchecked value
+ }
+ if(this.checkboxChecked && this.checkboxUnchecked) {
+ // Both specified but neither found: indeterminate or false, depending
+ if(this.checkboxIndeterminate === "yes") {
+ return undefined;
+ } else {
+ return false;
+ }
+ }
+ // Neither specified, so empty list is false, non-empty is true
+ return !!list.length;
}
} else {
if(this.checkboxTag) {
return false;
}
- if(this.checkboxField) {
+ if(this.checkboxField || this.checkboxIndex) {
if(this.checkboxDefault === this.checkboxChecked) {
return true;
}
@@ -114,7 +174,8 @@ CheckboxWidget.prototype.handleChangeEvent = function(event) {
hasChanged = false,
tagCheck = false,
hasTag = tiddler && tiddler.hasTag(this.checkboxTag),
- value = checked ? this.checkboxChecked : this.checkboxUnchecked;
+ value = checked ? this.checkboxChecked : this.checkboxUnchecked,
+ notValue = checked ? this.checkboxUnchecked : this.checkboxChecked;
if(this.checkboxTag && this.checkboxInvertTag === "yes") {
tagCheck = hasTag === checked;
} else {
@@ -148,9 +209,64 @@ CheckboxWidget.prototype.handleChangeEvent = function(event) {
hasChanged = true;
}
}
+ // Set the list field (or index) if specified
+ if(this.checkboxListField || this.checkboxListIndex) {
+ var fieldContents, listContents, oldPos, newPos;
+ if(this.checkboxListField) {
+ fieldContents = (tiddler ? tiddler.fields[this.checkboxListField] : undefined) || [];
+ } else {
+ fieldContents = this.wiki.extractTiddlerDataItem(this.checkboxTitle,this.checkboxListIndex);
+ }
+ if($tw.utils.isArray(fieldContents)) {
+ // Make a copy so we can modify it without changing original that's refrenced elsewhere
+ listContents = fieldContents.slice(0);
+ } else if(fieldContents === undefined) {
+ listContents = [];
+ } else if(typeof fieldContents === "string") {
+ listContents = $tw.utils.parseStringArray(fieldContents);
+ // No need to copy since parseStringArray returns a fresh array, not refrenced elsewhere
+ } else {
+ // Field was neither an array nor a string; it's probably something that shouldn't become
+ // an array (such as a date field), so bail out *without* triggering actions
+ return;
+ }
+ oldPos = notValue ? listContents.indexOf(notValue) : -1;
+ newPos = value ? listContents.indexOf(value) : -1;
+ if(oldPos === -1 && newPos !== -1) {
+ // old value absent, new value present: no change needed
+ } else if(oldPos === -1) {
+ // neither one was present
+ if(value) {
+ listContents.push(value);
+ hasChanged = true;
+ } else {
+ // value unspecified? then leave list unchanged
+ }
+ } else if(newPos === -1) {
+ // old value present, new value absent
+ if(value) {
+ listContents[oldPos] = value;
+ hasChanged = true;
+ } else {
+ listContents.splice(oldPos, 1)
+ hasChanged = true;
+ }
+ } else {
+ // both were present: just remove the old one, leave new alone
+ listContents.splice(oldPos, 1)
+ hasChanged = true;
+ }
+ if(this.checkboxListField) {
+ newFields[this.checkboxListField] = $tw.utils.stringifyList(listContents);
+ }
+ // The listIndex case will be handled in the if(hasChanged) block below
+ }
if(hasChanged) {
if(this.checkboxIndex) {
this.wiki.setText(this.checkboxTitle,"",this.checkboxIndex,value);
+ } else if(this.checkboxListIndex) {
+ var listIndexValue = (listContents && listContents.length) ? $tw.utils.stringifyList(listContents) : undefined;
+ this.wiki.setText(this.checkboxTitle,"",this.checkboxListIndex,listIndexValue);
} else {
this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getCreationFields(),fallbackFields,tiddler,newFields,this.wiki.getModificationFields()));
}
@@ -179,12 +295,17 @@ CheckboxWidget.prototype.execute = function() {
this.checkboxTag = this.getAttribute("tag");
this.checkboxField = this.getAttribute("field");
this.checkboxIndex = this.getAttribute("index");
+ this.checkboxListField = this.getAttribute("listField");
+ this.checkboxListIndex = this.getAttribute("listIndex");
+ this.checkboxFilter = this.getAttribute("filter");
this.checkboxChecked = this.getAttribute("checked");
this.checkboxUnchecked = this.getAttribute("unchecked");
this.checkboxDefault = this.getAttribute("default");
+ this.checkboxIndeterminate = this.getAttribute("indeterminate","no");
this.checkboxClass = this.getAttribute("class","");
this.checkboxInvertTag = this.getAttribute("invertTag","");
this.isDisabled = this.getAttribute("disabled","no");
+ this.tabIndex = this.getAttribute();
// Make the child widgets
this.makeChildWidgets();
};
@@ -194,19 +315,29 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
*/
CheckboxWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(changedAttributes.tiddler || changedAttributes.tag || changedAttributes.invertTag || changedAttributes.field || changedAttributes.index || changedAttributes.checked || changedAttributes.unchecked || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.disabled) {
+ if(changedAttributes.tiddler || changedAttributes.tag || changedAttributes.invertTag || changedAttributes.field || changedAttributes.index || changedAttributes.listField || changedAttributes.listIndex || changedAttributes.filter || changedAttributes.checked || changedAttributes.unchecked || changedAttributes["default"] || changedAttributes.indeterminate || changedAttributes["class"] || changedAttributes.disabled || changedAttributes.tabindex) {
this.refreshSelf();
return true;
} else {
var refreshed = false;
if(changedTiddlers[this.checkboxTitle]) {
- this.inputDomNode.checked = this.getValue();
+ var isChecked = this.getValue();
+ this.inputDomNode.checked = !!isChecked;
+ this.inputDomNode.indeterminate = (isChecked === undefined);
refreshed = true;
+ if(isChecked) {
+ $tw.utils.addClass(this.labelDomNode,"tc-checkbox-checked");
+ } else {
+ $tw.utils.removeClass(this.labelDomNode,"tc-checkbox-checked");
+ }
}
+ this.assignAttributes(this.inputDomNode,{
+ changedAttributes: changedAttributes,
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
return this.refreshChildren(changedTiddlers) || refreshed;
}
};
exports.checkbox = CheckboxWidget;
-
-})();
diff --git a/core/modules/widgets/codeblock.js b/core/modules/widgets/codeblock.js
index b0447d7fb..0c709c8e2 100644
--- a/core/modules/widgets/codeblock.js
+++ b/core/modules/widgets/codeblock.js
@@ -6,10 +6,7 @@ module-type: widget
Code block node widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -52,9 +49,13 @@ CodeBlockWidget.prototype.execute = function() {
Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
*/
CodeBlockWidget.prototype.refresh = function(changedTiddlers) {
- return false;
+ var changedAttributes = this.computeAttributes();
+ if(changedAttributes.code || changedAttributes.language) {
+ this.refreshSelf();
+ return true;
+ } else {
+ return false;
+ }
};
exports.codeblock = CodeBlockWidget;
-
-})();
diff --git a/core/modules/widgets/count.js b/core/modules/widgets/count.js
index b7ee45452..57acc6fe2 100644
--- a/core/modules/widgets/count.js
+++ b/core/modules/widgets/count.js
@@ -6,10 +6,7 @@ module-type: widget
Count widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -68,5 +65,3 @@ CountWidget.prototype.refresh = function(changedTiddlers) {
};
exports.count = CountWidget;
-
-})();
diff --git a/core/modules/widgets/data.js b/core/modules/widgets/data.js
new file mode 100644
index 000000000..50eafc63f
--- /dev/null
+++ b/core/modules/widgets/data.js
@@ -0,0 +1,188 @@
+/*\
+title: $:/core/modules/widgets/data.js
+type: application/javascript
+module-type: widget
+
+Widget to dynamically represent one or more tiddlers
+
+\*/
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var DataWidget = function(parseTreeNode,options) {
+ this.dataWidgetTag = parseTreeNode.type;
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+DataWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+DataWidget.prototype.render = function(parent,nextSibling) {
+ this.parentDomNode = parent;
+ this.computeAttributes();
+ this.execute();
+ this.dataPayload = this.computeDataTiddlerValues(); // Array of $tw.Tiddler objects
+ this.domNode = this.document.createTextNode(this.readDataTiddlerValuesAsJson());
+ parent.insertBefore(this.domNode,nextSibling);
+ this.domNodes.push(this.domNode);
+};
+
+/*
+Compute the internal state of the widget
+*/
+DataWidget.prototype.execute = function() {
+ // Nothing to do here
+};
+
+/*
+Read the tiddler value(s) from a data widget as an array of tiddler field objects (not $tw.Tiddler objects)
+*/
+DataWidget.prototype.readDataTiddlerValues = function() {
+ var results = [];
+ $tw.utils.each(this.dataPayload,function(tiddler,index) {
+ results.push(tiddler.getFieldStrings());
+ });
+ return results;
+};
+
+/*
+Read the tiddler value(s) from a data widget as an array of tiddler field objects (not $tw.Tiddler objects)
+*/
+DataWidget.prototype.readDataTiddlerValuesAsJson = function() {
+ return JSON.stringify(this.readDataTiddlerValues(),null,4);
+};
+
+/*
+Compute list of tiddlers from a data widget
+*/
+DataWidget.prototype.computeDataTiddlerValues = function() {
+ var self = this;
+ // Read any attributes not prefixed with $
+ var item = Object.create(null);
+ $tw.utils.each(this.attributes,function(value,name) {
+ if(name.charAt(0) !== "$") {
+ item[name] = value;
+ }
+ });
+ // Deal with $tiddler, $filter or $compound-tiddler attributes
+ var tiddlers = [],
+ compoundTiddlers,
+ title;
+ if(this.hasAttribute("$tiddler")) {
+ title = this.getAttribute("$tiddler");
+ if(title) {
+ var tiddler = this.wiki.getTiddler(title);
+ if(tiddler) {
+ tiddlers.push(tiddler);
+ }
+ }
+ }
+ if(this.hasAttribute("$filter")) {
+ var filter = this.getAttribute("$filter");
+ if(filter) {
+ var titles = this.wiki.filterTiddlers(filter);
+ $tw.utils.each(titles,function(title) {
+ var tiddler = self.wiki.getTiddler(title);
+ if(tiddler) {
+ tiddlers.push(tiddler);
+ }
+ });
+ }
+ }
+ if(this.hasAttribute("$compound-tiddler")) {
+ title = this.getAttribute("$compound-tiddler");
+ if(title) {
+ tiddlers.push.apply(tiddlers,this.extractCompoundTiddler(title));
+ }
+ }
+ if(this.hasAttribute("$compound-filter")) {
+ filter = this.getAttribute("$compound-filter");
+ if(filter) {
+ compoundTiddlers = this.wiki.filterTiddlers(filter);
+ $tw.utils.each(compoundTiddlers, function(title){
+ tiddlers.push.apply(tiddlers,self.extractCompoundTiddler(title));
+ });
+ }
+ }
+ // Return the literal item if none of the special attributes were used
+ if(!this.hasAttribute("$tiddler") && !this.hasAttribute("$filter") && !this.hasAttribute("$compound-tiddler") && !this.hasAttribute("$compound-filter")) {
+ if(Object.keys(item).length > 0 && !!item.title) {
+ return [new $tw.Tiddler(item)];
+ } else {
+ return [];
+ }
+ } else {
+ // Apply the item fields to each of the tiddlers
+ if(Object.keys(item).length > 0) {
+ $tw.utils.each(tiddlers,function(tiddler,index) {
+ tiddlers[index] = new $tw.Tiddler(tiddler,item);
+ });
+ }
+ return tiddlers;
+ }
+};
+
+/*
+Helper to extract tiddlers from text/vnd.tiddlywiki-multiple tiddlers
+*/
+DataWidget.prototype.extractCompoundTiddler = function(title) {
+ var tiddler = this.wiki.getTiddler(title);
+ if(tiddler && tiddler.fields.type === "text/vnd.tiddlywiki-multiple") {
+ var text = tiddler.fields.text || "",
+ rawTiddlers = text.split(/\r?\n\+\r?\n/),
+ tiddlers = [];
+ $tw.utils.each(rawTiddlers,function(rawTiddler) {
+ var fields = Object.create(null),
+ split = rawTiddler.split(/\r?\n\r?\n/mg);
+ if(split.length >= 1) {
+ fields = $tw.utils.parseFields(split[0],fields);
+ }
+ if(split.length >= 2) {
+ fields.text = split.slice(1).join("\n\n");
+ }
+ tiddlers.push(new $tw.Tiddler(fields));
+ });
+ return tiddlers;
+ } else {
+ return [];
+ }
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+*/
+DataWidget.prototype.refresh = function(changedTiddlers) {
+ var changedAttributes = this.computeAttributes();
+ var newPayload = this.computeDataTiddlerValues();
+ if(hasPayloadChanged(this.dataPayload,newPayload)) {
+ this.dataPayload = newPayload;
+ this.domNode.textContent = this.readDataTiddlerValuesAsJson();
+ return true;
+ } else {
+ return false;
+ }
+};
+
+/*
+Compare two arrays of tiddlers and return true if they are different
+*/
+function hasPayloadChanged(a,b) {
+ if(a.length === b.length) {
+ for(var t=0; t<a.length; t++) {
+ if(!(a[t].isEqual(b[t]))) {
+ return true;
+ }
+ }
+ return false;
+ } else {
+ return true;
+ }
+}
+
+exports.data = DataWidget;
diff --git a/core/modules/widgets/diff-text.js b/core/modules/widgets/diff-text.js
index 0dca1042c..32cc4f1d8 100644
--- a/core/modules/widgets/diff-text.js
+++ b/core/modules/widgets/diff-text.js
@@ -6,10 +6,7 @@ module-type: widget
Widget to display a diff between two texts
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget,
@@ -39,7 +36,7 @@ DiffTextWidget.prototype.render = function(parent,nextSibling) {
this.execute();
// Create the diff
var dmpObject = new dmp.diff_match_patch(),
- diffs = dmpObject.diff_main(this.getAttribute("source"),this.getAttribute("dest"));
+ diffs = dmpObject.diff_main(this.getAttribute("source",""),this.getAttribute("dest",""));
// Apply required cleanup
switch(this.getAttribute("cleanup","semantic")) {
case "none":
@@ -144,5 +141,3 @@ DiffTextWidget.prototype.refresh = function(changedTiddlers) {
};
exports["diff-text"] = DiffTextWidget;
-
-})();
diff --git a/core/modules/widgets/draggable.js b/core/modules/widgets/draggable.js
index e12f2c693..0bb2fc169 100644
--- a/core/modules/widgets/draggable.js
+++ b/core/modules/widgets/draggable.js
@@ -6,10 +6,7 @@ module-type: widget
Draggable widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -27,7 +24,10 @@ DraggableWidget.prototype = new Widget();
Render this widget into the DOM
*/
DraggableWidget.prototype.render = function(parent,nextSibling) {
- var self = this;
+ var self = this,
+ tag,
+ domNode,
+ classes = [];
// Save the parent dom node
this.parentDomNode = parent;
// Compute our attributes
@@ -35,30 +35,41 @@ DraggableWidget.prototype.render = function(parent,nextSibling) {
// Execute our logic
this.execute();
// Sanitise the specified tag
- var tag = this.draggableTag;
+ tag = this.draggableTag;
if($tw.config.htmlUnsafeElements.indexOf(tag) !== -1) {
tag = "div";
}
// Create our element
- var domNode = this.document.createElement(tag);
+ domNode = this.document.createElement(tag);
// Assign classes
- var classes = ["tc-draggable"];
if(this.draggableClasses) {
classes.push(this.draggableClasses);
}
+ if(!this.dragHandleSelector && this.dragEnable) {
+ classes.push("tc-draggable");
+ }
domNode.setAttribute("class",classes.join(" "));
- // Add event handlers
- $tw.utils.makeDraggable({
- domNode: domNode,
- dragTiddlerFn: function() {return self.getAttribute("tiddler");},
- dragFilterFn: function() {return self.getAttribute("filter");},
- startActions: self.startActions,
- endActions: self.endActions,
- widget: this
+ // Assign data- attributes and style. attributes
+ this.assignAttributes(domNode,{
+ sourcePrefix: "data-",
+ destPrefix: "data-"
});
- // Insert the link into the DOM and render any children
+ // Insert the node into the DOM and render any children
parent.insertBefore(domNode,nextSibling);
this.renderChildren(domNode,null);
+ // Add event handlers
+ if(this.dragEnable) {
+ $tw.utils.makeDraggable({
+ domNode: domNode,
+ dragTiddlerFn: function() {return self.getAttribute("tiddler");},
+ dragFilterFn: function() {return self.getAttribute("filter");},
+ startActions: self.startActions,
+ endActions: self.endActions,
+ dragImageType: self.dragImageType,
+ widget: this,
+ selector: self.dragHandleSelector
+ });
+ }
this.domNodes.push(domNode);
};
@@ -71,22 +82,49 @@ DraggableWidget.prototype.execute = function() {
this.draggableClasses = this.getAttribute("class");
this.startActions = this.getAttribute("startactions");
this.endActions = this.getAttribute("endactions");
+ this.dragImageType = this.getAttribute("dragimagetype");
+ this.dragHandleSelector = this.getAttribute("selector");
+ this.dragEnable = this.getAttribute("enable","yes") === "yes";
// Make the child widgets
this.makeChildWidgets();
};
+
+DraggableWidget.prototype.updateDomNodeClasses = function() {
+ var domNodeClasses = this.domNodes[0].className.split(" "),
+ oldClasses = this.draggableClasses.split(" ");
+ this.draggableClasses = this.getAttribute("class");
+ //Remove classes assigned from the old value of class attribute
+ $tw.utils.each(oldClasses,function(oldClass){
+ var i = domNodeClasses.indexOf(oldClass);
+ if(i !== -1) {
+ domNodeClasses.splice(i,1);
+ }
+ });
+ //Add new classes from updated class attribute.
+ $tw.utils.pushTop(domNodeClasses,this.draggableClasses);
+ this.domNodes[0].setAttribute("class",domNodeClasses.join(" "))
+}
+
/*
Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
*/
DraggableWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(changedAttributes.tag || changedAttributes["class"]) {
+ if(changedAttributes.tag || changedAttributes.selector || changedAttributes.dragimagetype || changedAttributes.enable || changedAttributes.startactions || changedAttributes.endactions) {
this.refreshSelf();
return true;
+ } else {
+ if(changedAttributes["class"]) {
+ this.updateDomNodeClasses();
+ }
+ this.assignAttributes(this.domNodes[0],{
+ changedAttributes: changedAttributes,
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
}
return this.refreshChildren(changedTiddlers);
};
exports.draggable = DraggableWidget;
-
-})();
diff --git a/core/modules/widgets/droppable.js b/core/modules/widgets/droppable.js
index c9878930d..fe528d08f 100644
--- a/core/modules/widgets/droppable.js
+++ b/core/modules/widgets/droppable.js
@@ -6,10 +6,7 @@ module-type: widget
Droppable widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -42,6 +39,11 @@ DroppableWidget.prototype.render = function(parent,nextSibling) {
domNode = this.document.createElement(tag);
this.domNode = domNode;
this.assignDomNodeClasses();
+ // Assign data- attributes and style. attributes
+ this.assignAttributes(domNode,{
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
// Add event handlers
if(this.droppableEnable) {
$tw.utils.addEventListeners(domNode,[
@@ -49,7 +51,7 @@ DroppableWidget.prototype.render = function(parent,nextSibling) {
{name: "dragover", handlerObject: this, handlerMethod: "handleDragOverEvent"},
{name: "dragleave", handlerObject: this, handlerMethod: "handleDragLeaveEvent"},
{name: "drop", handlerObject: this, handlerMethod: "handleDropEvent"}
- ]);
+ ]);
} else {
$tw.utils.addClass(this.domNode,this.disabledClass);
}
@@ -120,11 +122,23 @@ DroppableWidget.prototype.handleDropEvent = function(event) {
// Remove highlighting
$tw.utils.removeClass(this.domNodes[0],"tc-dragover");
// Try to import the various data types we understand
- $tw.utils.importDataTransfer(dataTransfer,null,function(fieldsArray) {
- fieldsArray.forEach(function(fields) {
- self.performActions(fields.title || fields.text,event);
+ if(this.droppableActions) {
+ $tw.utils.importDataTransfer(dataTransfer,null,function(fieldsArray) {
+ fieldsArray.forEach(function(fields) {
+ self.performActions(fields.title || fields.text,event);
+ });
});
- });
+ }
+ // Send a TitleList to performListActions
+ if(this.droppableListActions) {
+ $tw.utils.importDataTransfer(dataTransfer,null,function(fieldsArray) {
+ var titleList = [];
+ fieldsArray.forEach(function(fields) {
+ titleList.push(fields.title || fields.text);
+ });
+ self.performListActions($tw.utils.stringifyList(titleList),event);
+ });
+ }
// Tell the browser that we handled the drop
event.preventDefault();
// Stop the drop ripple up to any parent handlers
@@ -132,6 +146,13 @@ DroppableWidget.prototype.handleDropEvent = function(event) {
return false;
};
+DroppableWidget.prototype.performListActions = function(titleList,event) {
+ if(this.droppableListActions) {
+ var modifierKey = $tw.keyboardManager.getEventModifierKeyDescriptor(event);
+ this.invokeActionString(this.droppableListActions,this,event,{actionTiddlerList: titleList, modifier: modifierKey});
+ }
+};
+
DroppableWidget.prototype.performActions = function(title,event) {
if(this.droppableActions) {
var modifierKey = $tw.keyboardManager.getEventModifierKeyDescriptor(event);
@@ -144,6 +165,7 @@ Compute the internal state of the widget
*/
DroppableWidget.prototype.execute = function() {
this.droppableActions = this.getAttribute("actions");
+ this.droppableListActions = this.getAttribute("listActions");
this.droppableEffect = this.getAttribute("effect","copy");
this.droppableTag = this.getAttribute("tag");
this.droppableEnable = (this.getAttribute("enable") || "yes") === "yes";
@@ -155,7 +177,7 @@ DroppableWidget.prototype.execute = function() {
DroppableWidget.prototype.assignDomNodeClasses = function() {
var classes = this.getAttribute("class","").split(" ");
classes.push("tc-droppable");
- this.domNode.className = classes.join(" ");
+ this.domNode.className = classes.join(" ");
};
/*
@@ -163,15 +185,21 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
*/
DroppableWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(changedAttributes.tag || changedAttributes.enable || changedAttributes.disabledClass || changedAttributes.actions || changedAttributes.effect) {
+ if(changedAttributes.tag || changedAttributes.enable || changedAttributes.disabledClass ||
+ changedAttributes.actions|| changedAttributes.listActions || changedAttributes.effect) {
this.refreshSelf();
return true;
- } else if(changedAttributes["class"]) {
- this.assignDomNodeClasses();
+ } else {
+ if(changedAttributes["class"]) {
+ this.assignDomNodeClasses();
+ }
+ this.assignAttributes(this.domNodes[0],{
+ changedAttributes: changedAttributes,
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
}
return this.refreshChildren(changedTiddlers);
};
exports.droppable = DroppableWidget;
-
-})();
\ No newline at end of file
diff --git a/core/modules/widgets/dropzone.js b/core/modules/widgets/dropzone.js
index 08af202bb..7d7d8b815 100644
--- a/core/modules/widgets/dropzone.js
+++ b/core/modules/widgets/dropzone.js
@@ -6,12 +6,11 @@ module-type: widget
Dropzone widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
+var IMPORT_TITLE = "$:/Import";
+
var Widget = require("$:/core/modules/widgets/widget.js").widget;
var DropZoneWidget = function(parseTreeNode,options) {
@@ -35,6 +34,7 @@ DropZoneWidget.prototype.render = function(parent,nextSibling) {
this.execute();
// Create element
var domNode = this.document.createElement("div");
+ this.domNode = domNode;
domNode.className = this.dropzoneClass || "tc-dropzone";
// Add event handlers
if(this.dropzoneEnable) {
@@ -45,10 +45,8 @@ DropZoneWidget.prototype.render = function(parent,nextSibling) {
{name: "drop", handlerObject: this, handlerMethod: "handleDropEvent"},
{name: "paste", handlerObject: this, handlerMethod: "handlePasteEvent"},
{name: "dragend", handlerObject: this, handlerMethod: "handleDragEndEvent"}
- ]);
+ ]);
}
- domNode.addEventListener("click",function (event) {
- },false);
// Insert element
parent.insertBefore(domNode,nextSibling);
this.renderChildren(domNode,null);
@@ -57,12 +55,46 @@ DropZoneWidget.prototype.render = function(parent,nextSibling) {
this.currentlyEntered = [];
};
+// Handler for transient event listeners added when the dropzone has an active drag in progress
+DropZoneWidget.prototype.handleEvent = function(event) {
+ if(event.type === "click") {
+ if(this.currentlyEntered.length) {
+ this.resetState();
+ }
+ } else if(event.type === "dragenter") {
+ if(event.target && event.target !== this.domNode && !$tw.utils.domContains(this.domNode,event.target)) {
+ this.resetState();
+ }
+ } else if(event.type === "dragleave") {
+ // Check if drag left the window
+ if(event.relatedTarget === null || (event.relatedTarget && event.relatedTarget.nodeName === "HTML")) {
+ this.resetState();
+ }
+ }
+};
+
+// Reset the state of the dropzone after a drag has ended
+DropZoneWidget.prototype.resetState = function() {
+ $tw.utils.removeClass(this.domNode,"tc-dragover");
+ this.currentlyEntered = [];
+ this.document.body.removeEventListener("click",this,true);
+ this.document.body.removeEventListener("dragenter",this,true);
+ this.document.body.removeEventListener("dragleave",this,true);
+ this.dragInProgress = false;
+};
+
DropZoneWidget.prototype.enterDrag = function(event) {
if(this.currentlyEntered.indexOf(event.target) === -1) {
this.currentlyEntered.push(event.target);
}
- // If we're entering for the first time we need to apply highlighting
- $tw.utils.addClass(this.domNodes[0],"tc-dragover");
+ if(!this.dragInProgress) {
+ this.dragInProgress = true;
+ // If we're entering for the first time we need to apply highlighting
+ $tw.utils.addClass(this.domNodes[0],"tc-dragover");
+ this.document.body.addEventListener("click",this,true);
+ this.document.body.addEventListener("dragenter",this,true);
+ this.document.body.addEventListener("dragleave",this,true);
+ }
};
DropZoneWidget.prototype.leaveDrag = function(event) {
@@ -72,15 +104,17 @@ DropZoneWidget.prototype.leaveDrag = function(event) {
}
// Remove highlighting if we're leaving externally
if(this.currentlyEntered.length === 0) {
- $tw.utils.removeClass(this.domNodes[0],"tc-dragover");
+ this.resetState();
}
};
DropZoneWidget.prototype.handleDragEnterEvent = function(event) {
- // Check for this window being the source of the drag
if($tw.dragInProgress) {
return false;
}
+ if(this.filesOnly && !$tw.utils.dragEventContainsFiles(event)) {
+ return false;
+ }
this.enterDrag(event);
// Tell the browser that we're ready to handle the drop
event.preventDefault();
@@ -99,7 +133,10 @@ DropZoneWidget.prototype.handleDragOverEvent = function(event) {
}
// Tell the browser that we're still interested in the drop
event.preventDefault();
- event.dataTransfer.dropEffect = "copy"; // Explicitly show this is a copy
+ // Check if this is a synthetic event, IE does not allow accessing dropEffect outside of original event handler
+ if(event.isTrusted) {
+ event.dataTransfer.dropEffect = "copy"; // Explicitly show this is a copy
+ }
};
DropZoneWidget.prototype.handleDragLeaveEvent = function(event) {
@@ -107,13 +144,41 @@ DropZoneWidget.prototype.handleDragLeaveEvent = function(event) {
};
DropZoneWidget.prototype.handleDragEndEvent = function(event) {
- $tw.utils.removeClass(this.domNodes[0],"tc-dragover");
+ this.resetState();
+};
+
+DropZoneWidget.prototype.filterByContentTypes = function(tiddlerFieldsArray) {
+ var filteredTypes,
+ filtered = [],
+ types = [];
+ $tw.utils.each(tiddlerFieldsArray,function(tiddlerFields) {
+ types.push(tiddlerFields.type || "");
+ });
+ filteredTypes = this.wiki.filterTiddlers(this.contentTypesFilter,this,this.wiki.makeTiddlerIterator(types));
+ $tw.utils.each(tiddlerFieldsArray,function(tiddlerFields) {
+ if(filteredTypes.indexOf(tiddlerFields.type) !== -1) {
+ filtered.push(tiddlerFields);
+ }
+ });
+ return filtered;
+};
+
+DropZoneWidget.prototype.readFileCallback = function(tiddlerFieldsArray) {
+ if(this.contentTypesFilter) {
+ tiddlerFieldsArray = this.filterByContentTypes(tiddlerFieldsArray);
+ }
+ if(tiddlerFieldsArray.length) {
+ this.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray), autoOpenOnImport: this.autoOpenOnImport, importTitle: this.importTitle});
+ if(this.actions) {
+ this.invokeActionString(this.actions,this,event,{importTitle: this.importTitle});
+ }
+ }
};
DropZoneWidget.prototype.handleDropEvent = function(event) {
var self = this,
readFileCallback = function(tiddlerFieldsArray) {
- self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray), autoOpenOnImport: self.autoOpenOnImport, importTitle: self.importTitle});
+ self.readFileCallback(tiddlerFieldsArray);
};
this.leaveDrag(event);
// Check for being over a TEXTAREA or INPUT
@@ -127,10 +192,11 @@ DropZoneWidget.prototype.handleDropEvent = function(event) {
var self = this,
dataTransfer = event.dataTransfer;
// Remove highlighting
- $tw.utils.removeClass(this.domNodes[0],"tc-dragover");
+ this.resetState();
// Import any files in the drop
var numFiles = 0;
- if(dataTransfer.files) {
+ // If we have type text/vnd.tiddlywiki then skip trying to import files
+ if(dataTransfer.files && !$tw.utils.dragEventContainsType(event,"text/vnd.tiddler")) {
numFiles = this.wiki.readFiles(dataTransfer.files,{
callback: readFileCallback,
deserializer: this.dropzoneDeserializer
@@ -138,7 +204,23 @@ DropZoneWidget.prototype.handleDropEvent = function(event) {
}
// Try to import the various data types we understand
if(numFiles === 0) {
- $tw.utils.importDataTransfer(dataTransfer,this.wiki.generateNewTitle("Untitled"),readFileCallback);
+ var fallbackTitle = self.wiki.generateNewTitle("Untitled");
+ //Use the deserializer specified if any
+ if(this.dropzoneDeserializer) {
+ for(var t= 0; t<dataTransfer.items.length; t++) {
+ var item = dataTransfer.items[t];
+ if(item.kind === "string") {
+ item.getAsString(function(str){
+ var tiddlerFields = self.wiki.deserializeTiddlers(null,str,{title: fallbackTitle},{deserializer:self.dropzoneDeserializer});
+ if(tiddlerFields && tiddlerFields.length) {
+ readFileCallback(tiddlerFields);
+ }
+ })
+ }
+ }
+ } else {
+ $tw.utils.importDataTransfer(dataTransfer,fallbackTitle,readFileCallback);
+ }
}
// Tell the browser that we handled the drop
event.preventDefault();
@@ -147,12 +229,34 @@ DropZoneWidget.prototype.handleDropEvent = function(event) {
};
DropZoneWidget.prototype.handlePasteEvent = function(event) {
- var self = this,
- readFileCallback = function(tiddlerFieldsArray) {
- self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray), autoOpenOnImport: self.autoOpenOnImport, importTitle: self.importTitle});
+ var self = this;
+ var readFileCallback = function(tiddlerFieldsArray) {
+ self.readFileCallback(tiddlerFieldsArray);
+ };
+ var getItem = function(type) {
+ type = type || "text/plain";
+ return function(str) {
+ // Use the deserializer specified if any
+ if(self.dropzoneDeserializer) {
+ tiddlerFields = self.wiki.deserializeTiddlers(null,str,{title: self.wiki.generateNewTitle("Untitled " + type)},{deserializer:self.dropzoneDeserializer});
+ if(tiddlerFields && tiddlerFields.length) {
+ readFileCallback(tiddlerFields);
+ }
+ } else {
+ tiddlerFields = {
+ title: self.wiki.generateNewTitle("Untitled " + type),
+ text: str,
+ type: type
+ };
+ if($tw.log.IMPORT) {
+ console.log("Importing string '" + str + "', type: '" + type + "'");
+ }
+ readFileCallback([tiddlerFields]);
+ }
+ }
};
// Let the browser handle it if we're in a textarea or input box
- if(["TEXTAREA","INPUT"].indexOf(event.target.tagName) == -1 && !event.target.isContentEditable) {
+ if(["TEXTAREA","INPUT"].indexOf(event.target.tagName) == -1 && !event.target.isContentEditable && !event.twEditor) {
var self = this,
items = event.clipboardData.items;
// Enumerate the clipboard items
@@ -164,20 +268,26 @@ DropZoneWidget.prototype.handlePasteEvent = function(event) {
callback: readFileCallback,
deserializer: this.dropzoneDeserializer
});
+ } else if(item.kind === "string" && !["text/html", "text/plain", "Text"].includes(item.type) && $tw.utils.itemHasValidDataType(item)) {
+ // Try to import the various data types we understand
+ var fallbackTitle = self.wiki.generateNewTitle("Untitled");
+ //Use the deserializer specified if any
+ if(this.dropzoneDeserializer) {
+ item.getAsString(function(str){
+ var tiddlerFields = self.wiki.deserializeTiddlers(null,str,{title: fallbackTitle},{deserializer:self.dropzoneDeserializer});
+ if(tiddlerFields && tiddlerFields.length) {
+ readFileCallback(tiddlerFields);
+ }
+ });
+ } else {
+ $tw.utils.importPaste(item,fallbackTitle,readFileCallback);
+ }
} else if(item.kind === "string") {
// Create tiddlers from string items
- var type = item.type;
- item.getAsString(function(str) {
- var tiddlerFields = {
- title: self.wiki.generateNewTitle("Untitled"),
- text: str,
- type: type
- };
- if($tw.log.IMPORT) {
- console.log("Importing string '" + str + "', type: '" + type + "'");
- }
- self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify([tiddlerFields]), autoOpenOnImport: self.autoOpenOnImport, importTitle: self.importTitle});
- });
+ var tiddlerFields;
+ // It's important to give getAsString a closure with the right type
+ // So it can be added to the import queue
+ item.getAsString(getItem(item.type));
}
}
// Tell the browser that we've handled the paste
@@ -194,7 +304,10 @@ DropZoneWidget.prototype.execute = function() {
this.dropzoneDeserializer = this.getAttribute("deserializer");
this.dropzoneEnable = (this.getAttribute("enable") || "yes") === "yes";
this.autoOpenOnImport = this.getAttribute("autoOpenOnImport");
- this.importTitle = this.getAttribute("importTitle");
+ this.importTitle = this.getAttribute("importTitle",IMPORT_TITLE);
+ this.actions = this.getAttribute("actions");
+ this.contentTypesFilter = this.getAttribute("contentTypesFilter");
+ this.filesOnly = this.getAttribute("filesOnly","no") === "yes";
// Make child widgets
this.makeChildWidgets();
};
@@ -204,7 +317,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
*/
DropZoneWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(changedAttributes.enable || changedAttributes.autoOpenOnImport || changedAttributes.importTitle || changedAttributes.deserializer || changedAttributes.class) {
+ if($tw.utils.count(changedAttributes) > 0) {
this.refreshSelf();
return true;
}
@@ -212,5 +325,3 @@ DropZoneWidget.prototype.refresh = function(changedTiddlers) {
};
exports.dropzone = DropZoneWidget;
-
-})();
diff --git a/core/modules/widgets/edit-binary.js b/core/modules/widgets/edit-binary.js
index a4a18f63d..bb9581df7 100644
--- a/core/modules/widgets/edit-binary.js
+++ b/core/modules/widgets/edit-binary.js
@@ -6,10 +6,7 @@ module-type: widget
Edit-binary widget; placeholder for editing binary tiddlers
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var BINARY_WARNING_MESSAGE = "$:/core/ui/BinaryWarning";
@@ -103,5 +100,3 @@ EditBinaryWidget.prototype.refresh = function(changedTiddlers) {
};
exports["edit-binary"] = EditBinaryWidget;
-
-})();
diff --git a/core/modules/widgets/edit-bitmap.js b/core/modules/widgets/edit-bitmap.js
index c6c3dde8c..3065384b3 100644
--- a/core/modules/widgets/edit-bitmap.js
+++ b/core/modules/widgets/edit-bitmap.js
@@ -6,10 +6,7 @@ module-type: widget
Edit-bitmap widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
// Default image sizes
@@ -156,7 +153,7 @@ EditBitmapWidget.prototype.loadCanvas = function() {
};
// Get the current bitmap into an image object
if(tiddler && tiddler.fields.type && tiddler.fields.text) {
- currImage.src = "data:" + tiddler.fields.type + ";base64," + tiddler.fields.text;
+ currImage.src = "data:" + tiddler.fields.type + ";base64," + tiddler.fields.text;
} else {
currImage.width = DEFAULT_IMAGE_WIDTH;
currImage.height = DEFAULT_IMAGE_HEIGHT;
@@ -339,5 +336,3 @@ EditBitmapWidget.prototype.saveChanges = function() {
};
exports["edit-bitmap"] = EditBitmapWidget;
-
-})();
diff --git a/core/modules/widgets/edit-shortcut.js b/core/modules/widgets/edit-shortcut.js
index b70328d5a..9a45b6ec0 100644
--- a/core/modules/widgets/edit-shortcut.js
+++ b/core/modules/widgets/edit-shortcut.js
@@ -6,10 +6,7 @@ module-type: widget
Widget to display an editable keyboard shortcut
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -33,7 +30,7 @@ EditShortcutWidget.prototype.render = function(parent,nextSibling) {
this.inputNode = this.document.createElement("input");
// Assign classes
if(this.shortcutClass) {
- this.inputNode.className = this.shortcutClass;
+ this.inputNode.className = this.shortcutClass;
}
// Assign other attributes
if(this.shortcutStyle) {
@@ -48,6 +45,9 @@ EditShortcutWidget.prototype.render = function(parent,nextSibling) {
if(this.shortcutAriaLabel) {
this.inputNode.setAttribute("aria-label",this.shortcutAriaLabel);
}
+ if(this.isDisabled === "yes") {
+ this.inputNode.setAttribute("disabled", true);
+ }
// Assign the current shortcut
this.updateInputNode();
// Add event handlers
@@ -77,6 +77,7 @@ EditShortcutWidget.prototype.execute = function() {
this.shortcutTooltip = this.getAttribute("tooltip");
this.shortcutAriaLabel = this.getAttribute("aria-label");
this.shortcutFocus = this.getAttribute("focus");
+ this.isDisabled = this.getAttribute("disabled", "no");
};
/*
@@ -117,7 +118,7 @@ EditShortcutWidget.prototype.handleKeydownEvent = function(event) {
// Ignore the keydown if it was already handled
event.preventDefault();
event.stopPropagation();
- return true;
+ return true;
} else {
return false;
}
@@ -138,17 +139,15 @@ Selectively refreshes the widget if needed. Returns true if the widget needed re
*/
EditShortcutWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.placeholder || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.style || changedAttributes.tooltip || changedAttributes["aria-label"] || changedAttributes.focus) {
+ if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.placeholder || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.style || changedAttributes.tooltip || changedAttributes["aria-label"] || changedAttributes.focus || changedAttributes.disabled) {
this.refreshSelf();
return true;
} else if(changedTiddlers[this.shortcutTiddler]) {
this.updateInputNode();
return true;
} else {
- return false;
+ return false;
}
};
exports["edit-shortcut"] = EditShortcutWidget;
-
-})();
diff --git a/core/modules/widgets/edit-text.js b/core/modules/widgets/edit-text.js
index bc7b77490..28dc5f79c 100644
--- a/core/modules/widgets/edit-text.js
+++ b/core/modules/widgets/edit-text.js
@@ -6,10 +6,7 @@ module-type: widget
Edit-text widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var editTextWidgetFactory = require("$:/core/modules/editor/factory.js").editTextWidgetFactory,
@@ -17,5 +14,3 @@ var editTextWidgetFactory = require("$:/core/modules/editor/factory.js").editTex
SimpleEngine = require("$:/core/modules/editor/engines/simple.js").SimpleEngine;
exports["edit-text"] = editTextWidgetFactory(FramedEngine,SimpleEngine);
-
-})();
diff --git a/core/modules/widgets/edit.js b/core/modules/widgets/edit.js
index e7bd49b93..ed2ad0b35 100644
--- a/core/modules/widgets/edit.js
+++ b/core/modules/widgets/edit.js
@@ -6,10 +6,7 @@ module-type: widget
Edit widget is a meta-widget chooses the appropriate actual editting widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -43,15 +40,6 @@ EditWidget.prototype.execute = function() {
// Get our parameters
this.editTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler"));
this.editField = this.getAttribute("field","text");
- this.editIndex = this.getAttribute("index");
- this.editClass = this.getAttribute("class");
- this.editPlaceholder = this.getAttribute("placeholder");
- this.editTabIndex = this.getAttribute("tabindex");
- this.editFocus = this.getAttribute("focus","");
- this.editCancelPopups = this.getAttribute("cancelPopups","");
- this.editInputActions = this.getAttribute("inputActions");
- this.editRefreshTitle = this.getAttribute("refreshTitle");
- this.editAutoComplete = this.getAttribute("autocomplete");
// Choose the appropriate edit widget
this.editorType = this.getEditorType();
// Make the child widgets
@@ -89,8 +77,8 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
*/
EditWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- // Refresh if an attribute has changed, or the type associated with the target tiddler has changed
- if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || (changedTiddlers[this.editTitle] && this.getEditorType() !== this.editorType)) {
+ // Refresh if the editor type has changed
+ if(changedAttributes.tiddler || changedAttributes.field || (this.getEditorType() !== this.editorType)) {
this.refreshSelf();
return true;
} else {
@@ -99,5 +87,3 @@ EditWidget.prototype.refresh = function(changedTiddlers) {
};
exports.edit = EditWidget;
-
-})();
diff --git a/core/modules/widgets/element.js b/core/modules/widgets/element.js
index 41ed4ebd1..8b0a88e86 100755
--- a/core/modules/widgets/element.js
+++ b/core/modules/widgets/element.js
@@ -6,10 +6,7 @@ module-type: widget
Element widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -34,6 +31,10 @@ ElementWidget.prototype.render = function(parent,nextSibling) {
if($tw.config.htmlUnsafeElements.indexOf(this.tag) !== -1) {
this.tag = "safe-" + this.tag;
}
+ // Restrict tag name to digits, letts and dashes
+ this.tag = this.tag.replace(/[^0-9a-zA-Z\-]/mg,"");
+ // Default to a span
+ this.tag = this.tag || "span";
// Adjust headings by the current base level
var headingLevel = ["h1","h2","h3","h4","h5","h6"].indexOf(this.tag);
if(headingLevel !== -1) {
@@ -42,16 +43,22 @@ ElementWidget.prototype.render = function(parent,nextSibling) {
this.tag = "h" + headingLevel;
}
// Select the namespace for the tag
- var tagNamespaces = {
+ var XHTML_NAMESPACE = "http://www.w3.org/1999/xhtml",
+ tagNamespaces = {
svg: "http://www.w3.org/2000/svg",
math: "http://www.w3.org/1998/Math/MathML",
- body: "http://www.w3.org/1999/xhtml"
+ body: XHTML_NAMESPACE
};
this.namespace = tagNamespaces[this.tag];
if(this.namespace) {
this.setVariable("namespace",this.namespace);
} else {
- this.namespace = this.getVariable("namespace",{defaultValue: "http://www.w3.org/1999/xhtml"});
+ if(this.hasAttribute("xmlns")) {
+ this.namespace = this.getAttribute("xmlns");
+ this.setVariable("namespace",this.namespace);
+ } else {
+ this.namespace = this.getVariable("namespace",{defaultValue: XHTML_NAMESPACE});
+ }
}
// Invoke the th-rendering-element hook
var parseTreeNodes = $tw.hooks.invokeHook("th-rendering-element",null,this);
@@ -67,6 +74,8 @@ ElementWidget.prototype.render = function(parent,nextSibling) {
// Create the DOM node and render children
var domNode = this.document.createElementNS(this.namespace,this.tag);
this.assignAttributes(domNode,{excludeEventAttributes: true});
+ // Allow hooks to manipulate the DOM node. Eg: Add debug info
+ $tw.hooks.invokeHook("th-dom-rendering-element", domNode, this);
parent.insertBefore(domNode,nextSibling);
this.renderChildren(domNode,null);
this.domNodes.push(domNode);
@@ -81,7 +90,7 @@ ElementWidget.prototype.refresh = function(changedTiddlers) {
if(hasChangedAttributes) {
if(!this.isReplaced) {
// Update our attributes
- this.assignAttributes(this.domNodes[0],{excludeEventAttributes: true});
+ this.assignAttributes(this.domNodes[0],{excludeEventAttributes: true});
} else {
// If we were replaced then completely refresh ourselves
return this.refreshSelf();
@@ -91,5 +100,3 @@ ElementWidget.prototype.refresh = function(changedTiddlers) {
};
exports.element = ElementWidget;
-
-})();
diff --git a/core/modules/widgets/encrypt.js b/core/modules/widgets/encrypt.js
index 28dfdaf78..edfbe4429 100644
--- a/core/modules/widgets/encrypt.js
+++ b/core/modules/widgets/encrypt.js
@@ -6,10 +6,7 @@ module-type: widget
Encrypt widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -65,5 +62,3 @@ EncryptWidget.prototype.refresh = function(changedTiddlers) {
};
exports.encrypt = EncryptWidget;
-
-})();
diff --git a/core/modules/widgets/entity.js b/core/modules/widgets/entity.js
index 0b5e68375..a88f32c3d 100755
--- a/core/modules/widgets/entity.js
+++ b/core/modules/widgets/entity.js
@@ -6,10 +6,7 @@ module-type: widget
HTML entity widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -51,10 +48,8 @@ EntityWidget.prototype.refresh = function(changedTiddlers) {
this.refreshSelf();
return true;
} else {
- return false;
+ return false;
}
};
exports.entity = EntityWidget;
-
-})();
diff --git a/core/modules/widgets/error.js b/core/modules/widgets/error.js
new file mode 100644
index 000000000..efbb2cbfb
--- /dev/null
+++ b/core/modules/widgets/error.js
@@ -0,0 +1,58 @@
+/*\
+title: $:/core/modules/widgets/error.js
+type: application/javascript
+module-type: widget
+
+Error widget
+
+\*/
+
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var ErrorWidget = function(parseTreeNode,options) {
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+ErrorWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+ErrorWidget.prototype.render = function(parent,nextSibling) {
+ this.parentDomNode = parent;
+ this.computeAttributes();
+ this.execute();
+ var message = this.getAttribute("$message","Unknown error"),
+ domNode = this.document.createElement("span");
+ domNode.appendChild(this.document.createTextNode(message));
+ domNode.className = "tc-error";
+ parent.insertBefore(domNode,nextSibling);
+ this.domNodes.push(domNode);
+};
+
+/*
+Compute the internal state of the widget
+*/
+ErrorWidget.prototype.execute = function() {
+ // Nothing to do for a text node
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+*/
+ErrorWidget.prototype.refresh = function(changedTiddlers) {
+ var changedAttributes = this.computeAttributes();
+ if(changedAttributes["$message"]) {
+ this.refreshSelf();
+ return true;
+ } else {
+ return false;
+ }
+};
+
+exports.error = ErrorWidget;
diff --git a/core/modules/widgets/eventcatcher.js b/core/modules/widgets/eventcatcher.js
index c014f8997..aac6519a4 100644
--- a/core/modules/widgets/eventcatcher.js
+++ b/core/modules/widgets/eventcatcher.js
@@ -6,10 +6,7 @@ module-type: widget
Event handler widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -37,51 +34,43 @@ EventWidget.prototype.render = function(parent,nextSibling) {
var tag = this.parseTreeNode.isBlock ? "div" : "span";
if(this.elementTag && $tw.config.htmlUnsafeElements.indexOf(this.elementTag) === -1) {
tag = this.elementTag;
- }
+ }
var domNode = this.document.createElement(tag);
this.domNode = domNode;
// Assign classes
- this.assignDomNodeClasses();
+ this.assignDomNodeClasses();
// Add our event handler
$tw.utils.each(this.types,function(type) {
domNode.addEventListener(type,function(event) {
var selector = self.getAttribute("selector"),
- actions = self.getAttribute("actions-"+type),
+ matchSelector = self.getAttribute("matchSelector"),
+ actions = self.getAttribute("$"+type),
+ stopPropagation = self.getAttribute("stopPropagation","onaction"),
selectedNode = event.target,
selectedNodeRect,
catcherNodeRect,
variables = {};
+ // Firefox can fire dragover and dragenter events on text nodes instead of their parents
+ if(selectedNode.nodeType === 3) {
+ selectedNode = selectedNode.parentNode;
+ }
+ // Check that the selected node matches any matchSelector
+ if(matchSelector && !$tw.utils.domMatchesSelector(selectedNode,matchSelector)) {
+ return false;
+ }
if(selector) {
// Search ancestors for a node that matches the selector
- while(!selectedNode.matches(selector) && selectedNode !== domNode) {
+ while(!$tw.utils.domMatchesSelector(selectedNode,selector) && selectedNode !== domNode) {
selectedNode = selectedNode.parentNode;
}
- // If we found one, copy the attributes as variables, otherwise exit
- if(selectedNode.matches(selector)) {
- $tw.utils.each(selectedNode.attributes,function(attribute) {
- variables["dom-" + attribute.name] = attribute.value.toString();
- });
- //Add a variable with a popup coordinate string for the selected node
- variables["tv-popup-coords"] = "(" + selectedNode.offsetLeft + "," + selectedNode.offsetTop +"," + selectedNode.offsetWidth + "," + selectedNode.offsetHeight + ")";
-
- //Add variables for offset of selected node
- variables["tv-selectednode-posx"] = selectedNode.offsetLeft.toString();
- variables["tv-selectednode-posy"] = selectedNode.offsetTop.toString();
- variables["tv-selectednode-width"] = selectedNode.offsetWidth.toString();
- variables["tv-selectednode-height"] = selectedNode.offsetHeight.toString();
-
- //Add variables for event X and Y position relative to selected node
- selectedNodeRect = selectedNode.getBoundingClientRect();
- variables["event-fromselected-posx"] = (event.clientX - selectedNodeRect.left).toString();
- variables["event-fromselected-posy"] = (event.clientY - selectedNodeRect.top).toString();
-
- //Add variables for event X and Y position relative to event catcher node
- catcherNodeRect = self.domNode.getBoundingClientRect();
- variables["event-fromcatcher-posx"] = (event.clientX - catcherNodeRect.left).toString();
- variables["event-fromcatcher-posy"] = (event.clientY - catcherNodeRect.top).toString();
- } else {
+ // Exit if we didn't find one
+ if(selectedNode === domNode) {
return false;
}
+ // Only set up variables if we have actions to invoke
+ if(actions) {
+ variables = $tw.utils.collectDOMVariables(selectedNode,self.domNode,event);
+ }
}
// Execute our actions with the variables
if(actions) {
@@ -106,6 +95,8 @@ EventWidget.prototype.render = function(parent,nextSibling) {
variables["event-detail"] = event.detail.toString();
}
self.invokeActionString(actions,self,event,variables);
+ }
+ if((actions && stopPropagation === "onaction") || stopPropagation === "always") {
event.preventDefault();
event.stopPropagation();
return true;
@@ -125,7 +116,12 @@ Compute the internal state of the widget
EventWidget.prototype.execute = function() {
var self = this;
// Get attributes that require a refresh on change
- this.types = this.getAttribute("events","").split(" ");
+ this.types = [];
+ $tw.utils.each(this.attributes,function(value,key) {
+ if(key.charAt(0) === "$") {
+ self.types.push(key.slice(1));
+ }
+ });
this.elementTag = this.getAttribute("tag");
// Make child widgets
this.makeChildWidgets();
@@ -134,23 +130,22 @@ EventWidget.prototype.execute = function() {
EventWidget.prototype.assignDomNodeClasses = function() {
var classes = this.getAttribute("class","").split(" ");
classes.push("tc-eventcatcher");
- this.domNode.className = classes.join(" ");
+ this.domNode.className = classes.join(" ");
};
/*
Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
*/
EventWidget.prototype.refresh = function(changedTiddlers) {
- var changedAttributes = this.computeAttributes();
- if(changedAttributes["events"] || changedAttributes["tag"]) {
+ var changedAttributes = this.computeAttributes(),
+ changedAttributesCount = $tw.utils.count(changedAttributes);
+ if(changedAttributesCount === 1 && changedAttributes["class"]) {
+ this.assignDomNodeClasses();
+ } else if(changedAttributesCount > 0) {
this.refreshSelf();
return true;
- } else if(changedAttributes["class"]) {
- this.assignDomNodeClasses();
}
return this.refreshChildren(changedTiddlers);
};
exports.eventcatcher = EventWidget;
-
-})();
diff --git a/core/modules/widgets/fieldmangler.js b/core/modules/widgets/fieldmangler.js
index a8b18ffa1..811318e99 100644
--- a/core/modules/widgets/fieldmangler.js
+++ b/core/modules/widgets/fieldmangler.js
@@ -6,10 +6,7 @@ module-type: widget
Field mangler widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -58,7 +55,7 @@ FieldManglerWidget.prototype.refresh = function(changedTiddlers) {
this.refreshSelf();
return true;
} else {
- return this.refreshChildren(changedTiddlers);
+ return this.refreshChildren(changedTiddlers);
}
};
@@ -67,32 +64,18 @@ FieldManglerWidget.prototype.handleRemoveFieldEvent = function(event) {
deletion = {};
deletion[event.param] = undefined;
this.wiki.addTiddler(new $tw.Tiddler(tiddler,deletion));
- return true;
+ return false;
};
FieldManglerWidget.prototype.handleAddFieldEvent = function(event) {
var tiddler = this.wiki.getTiddler(this.mangleTitle),
addition = this.wiki.getModificationFields(),
- hadInvalidFieldName = false,
addField = function(name,value) {
- var trimmedName = name.toLowerCase().trim();
- if(!$tw.utils.isValidFieldName(trimmedName)) {
- if(!hadInvalidFieldName) {
- alert($tw.language.getString(
- "InvalidFieldName",
- {variables:
- {fieldName: trimmedName}
- }
- ));
- hadInvalidFieldName = true;
- return;
- }
- } else {
- if(!value && tiddler) {
- value = tiddler.fields[trimmedName];
- }
- addition[trimmedName] = value || "";
+ var trimmedName = name.trim();
+ if(!value && tiddler) {
+ value = tiddler.fields[trimmedName];
}
+ addition[trimmedName] = value || "";
return;
};
addition.title = this.mangleTitle;
@@ -105,7 +88,7 @@ FieldManglerWidget.prototype.handleAddFieldEvent = function(event) {
}
}
this.wiki.addTiddler(new $tw.Tiddler(tiddler,addition));
- return true;
+ return false;
};
FieldManglerWidget.prototype.handleRemoveTagEvent = function(event) {
@@ -122,7 +105,7 @@ FieldManglerWidget.prototype.handleRemoveTagEvent = function(event) {
this.wiki.addTiddler(new $tw.Tiddler(tiddler,modification));
}
}
- return true;
+ return false;
};
FieldManglerWidget.prototype.handleAddTagEvent = function(event) {
@@ -133,16 +116,14 @@ FieldManglerWidget.prototype.handleAddTagEvent = function(event) {
if(tag !== "") {
modification.tags = (tiddler.fields.tags || []).slice(0);
$tw.utils.pushTop(modification.tags,tag);
- this.wiki.addTiddler(new $tw.Tiddler(tiddler,modification));
+ this.wiki.addTiddler(new $tw.Tiddler(tiddler,modification));
}
} else if(typeof event.param === "string" && event.param.trim() !== "" && this.mangleTitle.trim() !== "") {
var tag = [];
tag.push(event.param.trim());
this.wiki.addTiddler(new $tw.Tiddler({title: this.mangleTitle, tags: tag},modification));
}
- return true;
+ return false;
};
exports.fieldmangler = FieldManglerWidget;
-
-})();
diff --git a/core/modules/widgets/fields.js b/core/modules/widgets/fields.js
index 0e32443ad..db558e3b6 100755
--- a/core/modules/widgets/fields.js
+++ b/core/modules/widgets/fields.js
@@ -6,10 +6,7 @@ module-type: widget
Fields widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -110,5 +107,3 @@ FieldsWidget.prototype.refresh = function(changedTiddlers) {
};
exports.fields = FieldsWidget;
-
-})();
diff --git a/core/modules/widgets/fill.js b/core/modules/widgets/fill.js
new file mode 100644
index 000000000..3a93a2b02
--- /dev/null
+++ b/core/modules/widgets/fill.js
@@ -0,0 +1,28 @@
+/*\
+title: $:/core/modules/widgets/fill.js
+type: application/javascript
+module-type: widget
+
+Sub-widget used by the transclude widget for specifying values for slots within transcluded content. It doesn't do anything by itself because the transclude widget only ever deals with the parse tree nodes, and doesn't instantiate the widget itself
+
+\*/
+
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var FillWidget = function(parseTreeNode,options) {
+ // Initialise
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+FillWidget.prototype = new Widget();
+
+FillWidget.prototype.execute = function() {
+ // Do nothing. Make no child widgets. $Fill widgets should be invisible when naturally encountered. Instead, their parseTreeNodes are made available to $slot widgets that want it.
+};
+
+exports.fill = FillWidget;
diff --git a/core/modules/widgets/genesis.js b/core/modules/widgets/genesis.js
new file mode 100644
index 000000000..3084ad285
--- /dev/null
+++ b/core/modules/widgets/genesis.js
@@ -0,0 +1,116 @@
+/*\
+title: $:/core/modules/widgets/genesis.js
+type: application/javascript
+module-type: widget
+
+Genesis widget for dynamically creating widgets
+
+\*/
+
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var GenesisWidget = function(parseTreeNode,options) {
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+GenesisWidget.prototype = new Widget();
+
+GenesisWidget.prototype.computeAttributes = function(options) {
+ options = options || Object.create(null);
+ options.filterFn = function(name) {
+ // Only compute our own attributes which start with a single dollar
+ return name.charAt(0) === "$" && name.charAt(1) !== "$";
+ }
+ return Widget.prototype.computeAttributes.call(this,options);
+};
+
+/*
+Render this widget into the DOM
+*/
+GenesisWidget.prototype.render = function(parent,nextSibling) {
+ this.parentDomNode = parent;
+ this.computeAttributes();
+ this.execute();
+ this.renderChildren(parent,nextSibling);
+};
+
+/*
+Compute the internal state of the widget
+*/
+GenesisWidget.prototype.execute = function() {
+ var self = this;
+ // Collect attributes
+ this.genesisType = this.getAttribute("$type");
+ this.genesisRemappable = this.getAttribute("$remappable","yes") === "yes";
+ this.genesisNames = this.getAttribute("$names","");
+ this.genesisValues = this.getAttribute("$values","");
+ this.genesisIsBlock = this.getAttribute("$mode",this.parseTreeNode.isBlock && "block") === "block";
+ // Do not create a child widget if the $type attribute is missing or blank
+ if(!this.genesisType) {
+ this.makeChildWidgets(this.parseTreeNode.children);
+ return;
+ }
+ // Construct parse tree
+ var isElementWidget = this.genesisType.charAt(0) !== "$",
+ nodeType = isElementWidget ? "element" : this.genesisType.substr(1),
+ nodeTag = isElementWidget ? this.genesisType : undefined;
+ var parseTreeNodes = [{
+ type: nodeType,
+ tag: nodeTag,
+ attributes: {},
+ orderedAttributes: [],
+ isBlock: this.genesisIsBlock,
+ children: this.parseTreeNode.children || [],
+ isNotRemappable: !this.genesisRemappable
+ }];
+ // Apply attributes in $names/$values
+ this.attributeNames = [];
+ this.attributeValues = [];
+ if(this.genesisNames && this.genesisValues) {
+ this.attributeNames = this.wiki.filterTiddlers(self.genesisNames,this);
+ this.attributeValues = this.wiki.filterTiddlers(self.genesisValues,this);
+ $tw.utils.each(this.attributeNames,function(varname,index) {
+ $tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],varname,self.attributeValues[index] || "");
+ });
+ }
+ // Apply explicit attributes
+ $tw.utils.each($tw.utils.getOrderedAttributesFromParseTreeNode(this.parseTreeNode),function(attribute) {
+ var name = attribute.name;
+ if(name.charAt(0) === "$") {
+ if(name.charAt(1) === "$") {
+ // Double $$ is changed to a single $
+ name = name.substr(1);
+ } else {
+ // Single dollar is ignored
+ return;
+ }
+ }
+ $tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],$tw.utils.extend({},attribute,{name: name}));
+ });
+ // Construct the child widgets
+ this.makeChildWidgets(parseTreeNodes);
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+*/
+GenesisWidget.prototype.refresh = function(changedTiddlers) {
+ var changedAttributes = this.computeAttributes(),
+ filterNames = this.getAttribute("$names",""),
+ filterValues = this.getAttribute("$values",""),
+ attributeNames = this.wiki.filterTiddlers(filterNames,this),
+ attributeValues = this.wiki.filterTiddlers(filterValues,this);
+ if($tw.utils.count(changedAttributes) > 0 || !$tw.utils.isArrayEqual(this.attributeNames,attributeNames) || !$tw.utils.isArrayEqual(this.attributeValues,attributeValues)) {
+ this.refreshSelf();
+ return true;
+ } else {
+ return this.refreshChildren(changedTiddlers);
+ }
+};
+
+exports.genesis = GenesisWidget;
diff --git a/core/modules/widgets/image.js b/core/modules/widgets/image.js
index 4ecafbd2b..a8fddc789 100644
--- a/core/modules/widgets/image.js
+++ b/core/modules/widgets/image.js
@@ -22,10 +22,7 @@ Tiddlers that contain wikitext could be rendered to a DIV of the usual size of a
The width and height attributes are interpreted as a number of pixels, and do not need to include the "px" suffix.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -58,24 +55,25 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
if(this.wiki.isImageTiddler(this.imageSource)) {
var type = tiddler.fields.type,
text = tiddler.fields.text,
- _canonical_uri = tiddler.fields._canonical_uri;
+ _canonical_uri = tiddler.fields._canonical_uri,
+ typeInfo = $tw.config.contentTypeInfo[type] || {},
+ deserializerType = typeInfo.deserializerType || type;
// If the tiddler has body text then it doesn't need to be lazily loaded
if(text) {
- // Render the appropriate element for the image type
- switch(type) {
- case "application/pdf":
+ // Render the appropriate element for the image type by looking up the encoding in the content type info
+ var encoding = typeInfo.encoding || "utf8";
+ if (encoding === "base64") {
+ // .pdf .png .jpg etc.
+ src = "data:" + deserializerType + ";base64," + text;
+ if (deserializerType === "application/pdf") {
tag = "embed";
- src = "data:application/pdf;base64," + text;
- break;
- case "image/svg+xml":
- src = "data:image/svg+xml," + encodeURIComponent(text);
- break;
- default:
- src = "data:" + type + ";base64," + text;
- break;
+ }
+ } else {
+ // .svg .tid .xml etc.
+ src = "data:" + deserializerType + "," + encodeURIComponent(text);
}
} else if(_canonical_uri) {
- switch(type) {
+ switch(deserializerType) {
case "application/pdf":
tag = "embed";
src = _canonical_uri;
@@ -86,7 +84,7 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
default:
src = _canonical_uri;
break;
- }
+ }
} else {
// Just trigger loading of the tiddler
this.wiki.getTiddlerText(this.imageSource);
@@ -97,7 +95,10 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
var domNode = this.document.createElement(tag);
domNode.setAttribute("src",src);
if(this.imageClass) {
- domNode.setAttribute("class",this.imageClass);
+ domNode.setAttribute("class",this.imageClass);
+ }
+ if(this.imageUsemap) {
+ domNode.setAttribute("usemap",this.imageUsemap);
}
if(this.imageWidth) {
domNode.setAttribute("width",this.imageWidth);
@@ -106,11 +107,24 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
domNode.setAttribute("height",this.imageHeight);
}
if(this.imageTooltip) {
- domNode.setAttribute("title",this.imageTooltip);
+ domNode.setAttribute("title",this.imageTooltip);
}
if(this.imageAlt) {
- domNode.setAttribute("alt",this.imageAlt);
+ domNode.setAttribute("alt",this.imageAlt);
}
+ if(this.lazyLoading && tag === "img") {
+ domNode.setAttribute("loading",this.lazyLoading);
+ }
+ // Add classes when the image loads or fails
+ $tw.utils.addClass(domNode,"tc-image-loading");
+ domNode.addEventListener("load",function() {
+ $tw.utils.removeClass(domNode,"tc-image-loading");
+ $tw.utils.addClass(domNode,"tc-image-loaded");
+ },false);
+ domNode.addEventListener("error",function() {
+ $tw.utils.removeClass(domNode,"tc-image-loading");
+ $tw.utils.addClass(domNode,"tc-image-error");
+ },false);
// Insert element
parent.insertBefore(domNode,nextSibling);
this.domNodes.push(domNode);
@@ -125,8 +139,10 @@ ImageWidget.prototype.execute = function() {
this.imageWidth = this.getAttribute("width");
this.imageHeight = this.getAttribute("height");
this.imageClass = this.getAttribute("class");
+ this.imageUsemap = this.getAttribute("usemap");
this.imageTooltip = this.getAttribute("tooltip");
this.imageAlt = this.getAttribute("alt");
+ this.lazyLoading = this.getAttribute("loading");
};
/*
@@ -134,14 +150,12 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
*/
ImageWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(changedAttributes.source || changedAttributes.width || changedAttributes.height || changedAttributes["class"] || changedAttributes.tooltip || changedTiddlers[this.imageSource]) {
+ if(changedAttributes.source || changedAttributes.width || changedAttributes.height || changedAttributes["class"] || changedAttributes.usemap || changedAttributes.tooltip || changedTiddlers[this.imageSource]) {
this.refreshSelf();
return true;
} else {
- return false;
+ return false;
}
};
exports.image = ImageWidget;
-
-})();
diff --git a/core/modules/widgets/importvariables.js b/core/modules/widgets/importvariables.js
index 56cc0852c..befee4a90 100644
--- a/core/modules/widgets/importvariables.js
+++ b/core/modules/widgets/importvariables.js
@@ -6,10 +6,7 @@ module-type: widget
Import variable definitions from other tiddlers
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -39,48 +36,57 @@ Compute the internal state of the widget
ImportVariablesWidget.prototype.execute = function(tiddlerList) {
var widgetPointer = this;
// Got to flush all the accumulated variables
- this.variables = new this.variablesConstructor();
+ this.variables = Object.create(null);
+ if(this.parentWidget) {
+ Object.setPrototypeOf(this.variables,this.parentWidget.variables);
+ }
// Get our parameters
this.filter = this.getAttribute("filter");
// Compute the filter
this.tiddlerList = tiddlerList || this.wiki.filterTiddlers(this.filter,this);
// Accumulate the <$set> widgets from each tiddler
$tw.utils.each(this.tiddlerList,function(title) {
- var parser = widgetPointer.wiki.parseTiddler(title);
+ var parser = widgetPointer.wiki.parseTiddler(title,{parseAsInline:true, configTrimWhiteSpace:false});
if(parser) {
var parseTreeNode = parser.tree[0];
- while(parseTreeNode && parseTreeNode.type === "set") {
+ while(parseTreeNode && ["setvariable","set","parameters"].indexOf(parseTreeNode.type) !== -1) {
var node = {
type: "set",
attributes: parseTreeNode.attributes,
params: parseTreeNode.params,
- isMacroDefinition: parseTreeNode.isMacroDefinition
+ isMacroDefinition: parseTreeNode.isMacroDefinition,
+ isFunctionDefinition: parseTreeNode.isFunctionDefinition,
+ isProcedureDefinition: parseTreeNode.isProcedureDefinition,
+ isWidgetDefinition: parseTreeNode.isWidgetDefinition,
+ configTrimWhiteSpace: parseTreeNode.configTrimWhiteSpace
};
- if (parseTreeNode.isMacroDefinition) {
- // Macro definitions can be folded into
- // current widget instead of adding
- // another link to the chain.
- var widget = widgetPointer.makeChildWidget(node);
- widget.computeAttributes();
- widget.execute();
- // We SHALLOW copy over all variables
- // in widget. We can't use
- // $tw.utils.assign, because that copies
- // up the prototype chain, which we
- // don't want.
- $tw.utils.each(Object.keys(widget.variables), function(key) {
- widgetPointer.variables[key] = widget.variables[key];
- });
- } else {
- widgetPointer.children = [widgetPointer.makeChildWidget(node)];
- // No more regenerating children for
- // this widget. If it needs to refresh,
- // it'll do so along with the the whole
- // importvariable tree.
- if (widgetPointer != this) {
- widgetPointer.makeChildWidgets = function(){};
+ if(parseTreeNode.type === "set" || parseTreeNode.type === "setvariable") {
+ if(parseTreeNode.isMacroDefinition || parseTreeNode.isProcedureDefinition || parseTreeNode.isWidgetDefinition || parseTreeNode.isFunctionDefinition) {
+ // Macro definitions can be folded into
+ // current widget instead of adding
+ // another link to the chain.
+ var widget = widgetPointer.makeChildWidget(node);
+ widget.computeAttributes();
+ widget.execute();
+ // We SHALLOW copy over all variables
+ // in widget. We can't use
+ // $tw.utils.assign, because that copies
+ // up the prototype chain, which we
+ // don't want.
+ $tw.utils.each(Object.keys(widget.variables), function(key) {
+ widgetPointer.variables[key] = widget.variables[key];
+ });
+ } else {
+ widgetPointer.children = [widgetPointer.makeChildWidget(node)];
+ // No more regenerating children for
+ // this widget. If it needs to refresh,
+ // it'll do so along with the the whole
+ // importvariable tree.
+ if (widgetPointer != this) {
+ widgetPointer.makeChildWidgets = function(){};
+ }
+ widgetPointer = widgetPointer.children[0];
}
- widgetPointer = widgetPointer.children[0];
}
parseTreeNode = parseTreeNode.children && parseTreeNode.children[0];
}
@@ -118,10 +124,8 @@ ImportVariablesWidget.prototype.refresh = function(changedTiddlers) {
this.renderChildren(this.parentDomNode,this.findNextSiblingDomNode());
return true;
} else {
- return this.refreshChildren(changedTiddlers);
+ return this.refreshChildren(changedTiddlers);
}
};
exports.importvariables = ImportVariablesWidget;
-
-})();
diff --git a/core/modules/widgets/jsontiddler.js b/core/modules/widgets/jsontiddler.js
new file mode 100644
index 000000000..8d16ae862
--- /dev/null
+++ b/core/modules/widgets/jsontiddler.js
@@ -0,0 +1,86 @@
+/*\
+title: $:/core/modules/widgets/jsontiddler.js
+type: application/javascript
+module-type: widget
+
+Render a tiddler as JSON text
+
+\*/
+
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var JSONTiddlerWidget = function(parseTreeNode,options) {
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+JSONTiddlerWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+JSONTiddlerWidget.prototype.render = function(parent,nextSibling) {
+ var self = this;
+ this.parentDomNode = parent;
+ this.computeAttributes();
+ this.execute();
+ // Collect the fields from the optional base tiddler
+ var fields = this.getTiddlerFields();
+ // Add custom fields specified in attributes starting with $
+ $tw.utils.each(this.attributes,function(attribute,name) {
+ if(name.charAt(0) === "$") {
+ fields[name.slice(1)] = attribute;
+ }
+ });
+ // JSONify
+ var json = JSON.stringify(fields);
+ // Escape unsafe script characters
+ if(this.attEscapeUnsafeScriptChars) {
+ json = json.replace(/</g,"\\u003C");
+ }
+ // Update the DOM
+ var textNode = this.document.createTextNode(json);
+ parent.insertBefore(textNode,nextSibling);
+ this.domNodes.push(textNode);
+};
+
+/*
+Compute the internal state of the widget
+*/
+JSONTiddlerWidget.prototype.execute = function() {
+ this.attTiddler = this.getAttribute("tiddler");
+ this.attExclude = this.getAttribute("exclude","");
+ this.attEscapeUnsafeScriptChars = this.getAttribute("escapeUnsafeScriptChars","no") === "yes";
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+*/
+JSONTiddlerWidget.prototype.refresh = function(changedTiddlers) {
+ var changedAttributes = this.computeAttributes();
+ if($tw.utils.count(changedAttributes) > 0 || (this.attTiddler && changedTiddlers[this.attTiddler])) {
+ this.refreshSelf();
+ return true;
+ } else {
+ return false;
+ }
+};
+
+JSONTiddlerWidget.prototype.getTiddlerFields = function() {
+ var fields = {};
+ if(this.attTiddler) {
+ var tiddler = this.wiki.getTiddler(this.attTiddler);
+ if(tiddler) {
+ fields = tiddler.getFieldStrings({exclude: this.attExclude.split(" ")});
+ } else {
+ fields = {title: this.attTiddler};
+ }
+ }
+ return fields;
+};
+
+exports.jsontiddler = JSONTiddlerWidget;
diff --git a/core/modules/widgets/keyboard.js b/core/modules/widgets/keyboard.js
index 471d35e37..f4f6c2906 100644
--- a/core/modules/widgets/keyboard.js
+++ b/core/modules/widgets/keyboard.js
@@ -6,10 +6,7 @@ module-type: widget
Keyboard shortcut widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -40,31 +37,47 @@ KeyboardWidget.prototype.render = function(parent,nextSibling) {
// Create element
var domNode = this.document.createElement(tag);
// Assign classes
- var classes = (this["class"] || "").split(" ");
- classes.push("tc-keyboard");
- domNode.className = classes.join(" ");
+ this.domNode = domNode;
+ this.assignDomNodeClasses();
// Add a keyboard event handler
- domNode.addEventListener("keydown",function (event) {
- if($tw.keyboardManager.checkKeyDescriptors(event,self.keyInfoArray)) {
- var handled = self.invokeActions(self,event);
- if(self.actions) {
- self.invokeActionString(self.actions,self,event);
- }
- self.dispatchMessage(event);
- if(handled || self.actions || self.message) {
- event.preventDefault();
- event.stopPropagation();
- }
- return true;
- }
- return false;
- },false);
+ $tw.utils.addEventListeners(domNode,[
+ {name: "keydown", handlerObject: this, handlerMethod: "handleChangeEvent"}
+ ]);
// Insert element
parent.insertBefore(domNode,nextSibling);
this.renderChildren(domNode,null);
this.domNodes.push(domNode);
};
+KeyboardWidget.prototype.handleChangeEvent = function(event) {
+ if ($tw.keyboardManager.handleKeydownEvent(event, {onlyPriority: true})) {
+ return true;
+ }
+
+ var keyInfo = $tw.keyboardManager.getMatchingKeyDescriptor(event,this.keyInfoArray);
+ if(keyInfo) {
+ var handled = this.invokeActions(this,event);
+ if(this.actions) {
+ var variables = {
+ "event-key": event.key,
+ "event-code": event.code,
+ "modifier": $tw.keyboardManager.getEventModifierKeyDescriptor(event)
+ };
+ if(keyInfo.keyDescriptor) {
+ variables["event-key-descriptor"] = keyInfo.keyDescriptor;
+ }
+ this.invokeActionString(this.actions,this,event,variables);
+ }
+ this.dispatchMessage(event);
+ if(handled || this.actions || this.message) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ return true;
+ }
+ return false;
+}
+
KeyboardWidget.prototype.dispatchMessage = function(event) {
this.dispatchEvent({type: this.message, param: this.param, tiddlerTitle: this.getVariable("currentTiddler")});
};
@@ -80,35 +93,42 @@ KeyboardWidget.prototype.execute = function() {
this.param = this.getAttribute("param","");
this.key = this.getAttribute("key","");
this.tag = this.getAttribute("tag","");
- this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key);
- this["class"] = this.getAttribute("class","");
- if(this.key.substr(0,2) === "((" && this.key.substr(-2,2) === "))") {
- this.shortcutTiddlers = [];
- var name = this.key.substring(2,this.key.length -2);
- $tw.utils.each($tw.keyboardManager.lookupNames,function(platformDescriptor) {
- self.shortcutTiddlers.push("$:/config/" + platformDescriptor + "/" + name);
- });
+ if($tw.keyboardManager) {
+ this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key);
+ if(this.key.substr(0,2) === "((" && this.key.substr(-2,2) === "))") {
+ this.shortcutTiddlers = [];
+ var name = this.key.substring(2,this.key.length -2);
+ $tw.utils.each($tw.keyboardManager.lookupNames,function(platformDescriptor) {
+ self.shortcutTiddlers.push("$:/config/" + platformDescriptor + "/" + name);
+ });
+ }
}
// Make child widgets
this.makeChildWidgets();
};
+KeyboardWidget.prototype.assignDomNodeClasses = function() {
+ var classes = this.getAttribute("class","").split(" ");
+ classes.push("tc-keyboard");
+ this.domNode.className = classes.join(" ");
+};
+
/*
Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
*/
KeyboardWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(changedAttributes.message || changedAttributes.param || changedAttributes.key || changedAttributes["class"] || changedAttributes.tag) {
+ if(changedAttributes.message || changedAttributes.param || changedAttributes.key || changedAttributes.tag) {
this.refreshSelf();
return true;
+ } else if(changedAttributes["class"]) {
+ this.assignDomNodeClasses();
}
// Update the keyInfoArray if one of its shortcut-config-tiddlers has changed
- if(this.shortcutTiddlers && $tw.utils.hopArray(changedTiddlers,this.shortcutTiddlers)) {
+ if(this.shortcutTiddlers && $tw.utils.hopArray(changedTiddlers,this.shortcutTiddlers) && $tw.keyboardManager) {
this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key);
}
return this.refreshChildren(changedTiddlers);
};
exports.keyboard = KeyboardWidget;
-
-})();
diff --git a/core/modules/widgets/let.js b/core/modules/widgets/let.js
new file mode 100644
index 000000000..3cc09ad94
--- /dev/null
+++ b/core/modules/widgets/let.js
@@ -0,0 +1,91 @@
+/*\
+title: $:/core/modules/widgets/let.js
+type: application/javascript
+module-type: widget
+
+This widget allows defining multiple variables at once, while allowing
+the later variables to depend upon the earlier ones.
+
+```
+\define helloworld() Hello world!
+<$let currentTiddler="target" value={{!!value}} currentTiddler="different">
+ {{!!value}} will be different from <<value>>
+</$let>
+```
+
+\*/
+
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var LetWidget = function(parseTreeNode,options) {
+ // Initialise
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+LetWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+LetWidget.prototype.render = function(parent,nextSibling) {
+ this.parentDomNode = parent;
+ this.computeAttributes();
+ this.execute();
+ this.renderChildren(parent,nextSibling);
+};
+
+LetWidget.prototype.computeAttributes = function() {
+ // Before computing attributes, we must make clear that none of the
+ // existing attributes are staged for lookup, even on a refresh
+ var changedAttributes = {},
+ self = this;
+ this.currentValueFor = Object.create(null);
+ $tw.utils.each($tw.utils.getOrderedAttributesFromParseTreeNode(this.parseTreeNode),function(attribute) {
+ var value = self.computeAttribute(attribute),
+ name = attribute.name;
+ // Now that it's prepped, we're allowed to look this variable up
+ // when defining later variables
+ if(value !== undefined) {
+ self.currentValueFor[name] = value;
+ }
+ });
+ // Run through again, setting variables and looking for differences
+ $tw.utils.each(this.currentValueFor,function(value,name) {
+ if (self.attributes[name] !== value) {
+ self.attributes[name] = value;
+ self.setVariable(name,value);
+ changedAttributes[name] = true;
+ }
+ });
+ return changedAttributes;
+};
+
+LetWidget.prototype.getVariableInfo = function(name,options) {
+ // Special handling: If this variable exists in this very $let, we can
+ // use it, but only if it's been staged.
+ if ($tw.utils.hop(this.currentValueFor,name)) {
+ return {
+ text: this.currentValueFor[name]
+ };
+ }
+ return Widget.prototype.getVariableInfo.call(this,name,options);
+};
+
+/*
+Refresh the widget by ensuring our attributes are up to date
+*/
+LetWidget.prototype.refresh = function(changedTiddlers) {
+ var changedAttributes = this.computeAttributes();
+ if($tw.utils.count(changedAttributes) > 0) {
+ this.refreshSelf();
+ return true;
+ }
+ return this.refreshChildren(changedTiddlers);
+};
+
+exports["let"] = LetWidget;
diff --git a/core/modules/widgets/link.js b/core/modules/widgets/link.js
index 76822668b..d2c599542 100755
--- a/core/modules/widgets/link.js
+++ b/core/modules/widgets/link.js
@@ -6,10 +6,7 @@ module-type: widget
Link widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -43,6 +40,15 @@ LinkWidget.prototype.render = function(parent,nextSibling) {
} else {
// Just insert the link text
var domNode = this.document.createElement("span");
+ // Assign data- attributes
+ this.assignAttributes(domNode,{
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
+ this.assignAttributes(domNode,{
+ sourcePrefix: "aria-",
+ destPrefix: "aria-"
+ });
parent.insertBefore(domNode,nextSibling);
this.renderChildren(domNode,null);
this.domNodes.push(domNode);
@@ -77,7 +83,7 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
}
}
if(this.linkClasses) {
- classes.push(this.linkClasses);
+ classes.push(this.linkClasses);
}
} else if(this.overrideClasses !== "") {
classes.push(this.overrideClasses)
@@ -97,8 +103,8 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
// Expand the tv-wikilink-template variable to construct the href
var wikiLinkTemplateMacro = this.getVariable("tv-wikilink-template"),
wikiLinkTemplate = wikiLinkTemplateMacro ? wikiLinkTemplateMacro.trim() : "#$uri_encoded$";
- wikiLinkText = $tw.utils.replaceString(wikiLinkTemplate,"$uri_encoded$",encodeURIComponent(this.to));
- wikiLinkText = $tw.utils.replaceString(wikiLinkText,"$uri_doubleencoded$",encodeURIComponent(encodeURIComponent(this.to)));
+ wikiLinkText = $tw.utils.replaceString(wikiLinkTemplate,"$uri_encoded$",$tw.utils.encodeURIComponentExtended(this.to));
+ wikiLinkText = $tw.utils.replaceString(wikiLinkText,"$uri_doubleencoded$",$tw.utils.encodeURIComponentExtended($tw.utils.encodeURIComponentExtended(this.to)));
}
// Override with the value of tv-get-export-link if defined
wikiLinkText = this.getVariable("tv-get-export-link",{params: [{name: "to",value: this.to}],defaultValue: wikiLinkText});
@@ -123,9 +129,13 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
});
domNode.setAttribute("title",tooltipText);
}
- if(this["aria-label"]) {
- domNode.setAttribute("aria-label",this["aria-label"]);
+ if(this.role) {
+ domNode.setAttribute("role",this.role);
}
+ this.assignAttributes(domNode,{
+ sourcePrefix: "aria-",
+ destPrefix: "aria-"
+ })
// Add a click event handler
$tw.utils.addEventListeners(domNode,[
{name: "click", handlerObject: this, handlerMethod: "handleClickEvent"},
@@ -137,7 +147,14 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
dragTiddlerFn: function() {return self.to;},
widget: this
});
+ } else if(this.draggable === "no") {
+ domNode.setAttribute("draggable","false");
}
+ // Assign data- attributes
+ this.assignAttributes(domNode,{
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
// Insert the link into the DOM and render any children
parent.insertBefore(domNode,nextSibling);
this.renderChildren(domNode,null);
@@ -154,6 +171,12 @@ LinkWidget.prototype.handleClickEvent = function(event) {
navigateFromNode: this,
navigateFromClientRect: { top: bounds.top, left: bounds.left, width: bounds.width, right: bounds.right, bottom: bounds.bottom, height: bounds.height
},
+ navigateFromClientTop: bounds.top,
+ navigateFromClientLeft: bounds.left,
+ navigateFromClientWidth: bounds.width,
+ navigateFromClientRight: bounds.right,
+ navigateFromClientBottom: bounds.bottom,
+ navigateFromClientHeight: bounds.height,
navigateSuppressNavigation: event.metaKey || event.ctrlKey || (event.button === 1),
metaKey: event.metaKey,
ctrlKey: event.ctrlKey,
@@ -175,7 +198,7 @@ LinkWidget.prototype.execute = function() {
// Pick up our attributes
this.to = this.getAttribute("to",this.getVariable("currentTiddler"));
this.tooltip = this.getAttribute("tooltip");
- this["aria-label"] = this.getAttribute("aria-label");
+ this.role = this.getAttribute("role");
this.linkClasses = this.getAttribute("class");
this.overrideClasses = this.getAttribute("overrideClass");
this.tabIndex = this.getAttribute("tabindex");
@@ -201,7 +224,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
*/
LinkWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(changedAttributes.to || changedTiddlers[this.to] || changedAttributes["aria-label"] || changedAttributes.tooltip) {
+ if($tw.utils.count(changedAttributes) > 0 || changedTiddlers[this.to]) {
this.refreshSelf();
return true;
}
@@ -209,5 +232,3 @@ LinkWidget.prototype.refresh = function(changedTiddlers) {
};
exports.link = LinkWidget;
-
-})();
diff --git a/core/modules/widgets/linkcatcher.js b/core/modules/widgets/linkcatcher.js
index 616a54c32..d95b523ad 100644
--- a/core/modules/widgets/linkcatcher.js
+++ b/core/modules/widgets/linkcatcher.js
@@ -6,10 +6,7 @@ module-type: widget
Linkcatcher widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -61,7 +58,7 @@ LinkCatcherWidget.prototype.refresh = function(changedTiddlers) {
this.refreshSelf();
return true;
} else {
- return this.refreshChildren(changedTiddlers);
+ return this.refreshChildren(changedTiddlers);
}
};
@@ -92,16 +89,11 @@ LinkCatcherWidget.prototype.handleNavigateEvent = function(event) {
this.executingActions = false;
}
} else {
- // This is a navigate event generated by the actions of this linkcatcher, so we don't trap it again, but just pass it to the parent
- this.parentWidget.dispatchEvent({
- type: "tm-navigate",
- param: event.navigateTo,
- navigateTo: event.navigateTo
- });
+ // This is a navigate event generated by the actions of this linkcatcher,
+ // so we don't trap it again, but just pass it to the parent
+ this.parentWidget.dispatchEvent(event);
}
return false;
};
exports.linkcatcher = LinkCatcherWidget;
-
-})();
diff --git a/core/modules/widgets/list.js b/core/modules/widgets/list.js
index a49bf01ea..96ea44db1 100755
--- a/core/modules/widgets/list.js
+++ b/core/modules/widgets/list.js
@@ -6,10 +6,7 @@ module-type: widget
List and list item widgets
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -28,6 +25,18 @@ Inherit from the base widget class
*/
ListWidget.prototype = new Widget();
+ListWidget.prototype.initialise = function(parseTreeNode,options) {
+ // Bail if parseTreeNode is undefined, meaning that the ListWidget constructor was called without any arguments so that it can be subclassed
+ if(parseTreeNode === undefined) {
+ return;
+ }
+ // First call parent constructor to set everything else up
+ Widget.prototype.initialise.call(this,parseTreeNode,options);
+ // Now look for <$list-template> and <$list-empty> widgets as immediate child widgets
+ // This is safe to do during initialization because parse trees never change after creation
+ this.findExplicitTemplates();
+}
+
/*
Render this widget into the DOM
*/
@@ -38,8 +47,8 @@ ListWidget.prototype.render = function(parent,nextSibling) {
$tw.modules.applyMethods("storyview",this.storyViews);
}
this.parentDomNode = parent;
- this.computeAttributes();
- this.execute();
+ var changedAttributes = this.computeAttributes();
+ this.execute(changedAttributes);
this.renderChildren(parent,nextSibling);
// Construct the storyview
var StoryView = this.storyViews[this.storyViewName];
@@ -51,18 +60,27 @@ ListWidget.prototype.render = function(parent,nextSibling) {
} else {
this.storyview = null;
}
+ if(this.storyview && this.storyview.renderEnd) {
+ this.storyview.renderEnd();
+ }
};
/*
Compute the internal state of the widget
*/
-ListWidget.prototype.execute = function() {
+ListWidget.prototype.execute = function(changedAttributes) {
+ var self = this;
// Get our attributes
this.template = this.getAttribute("template");
this.editTemplate = this.getAttribute("editTemplate");
this.variableName = this.getAttribute("variable","currentTiddler");
+ this.counterName = this.getAttribute("counter");
this.storyViewName = this.getAttribute("storyview");
this.historyTitle = this.getAttribute("history");
+ // Create join template only if needed
+ if(this.join === undefined || (changedAttributes && changedAttributes.join)) {
+ this.join = this.makeJoinTemplate();
+ }
// Compose the list elements
this.list = this.getTiddlerList();
var members = [],
@@ -72,7 +90,7 @@ ListWidget.prototype.execute = function() {
members = this.getEmptyMessage();
} else {
$tw.utils.each(this.list,function(title,index) {
- members.push(self.makeItemTemplate(title));
+ members.push(self.makeItemTemplate(title,index));
});
}
// Construct the child widgets
@@ -81,18 +99,57 @@ ListWidget.prototype.execute = function() {
this.history = [];
};
+ListWidget.prototype.findExplicitTemplates = function() {
+ var self = this;
+ this.explicitListTemplate = null;
+ this.explicitEmptyTemplate = null;
+ this.explicitJoinTemplate = null;
+ this.hasTemplateInBody = false;
+ var searchChildren = function(childNodes) {
+ var foundInlineTemplate = false;
+ $tw.utils.each(childNodes,function(node) {
+ if(node.type === "list-template") {
+ self.explicitListTemplate = node.children;
+ } else if(node.type === "list-empty") {
+ self.explicitEmptyTemplate = node.children;
+ } else if(node.type === "list-join") {
+ self.explicitJoinTemplate = node.children;
+ } else if(node.type === "element" && node.tag === "p") {
+ searchChildren(node.children);
+ foundInlineTemplate = true;
+ } else {
+ foundInlineTemplate = true;
+ }
+ });
+ return foundInlineTemplate;
+ };
+ this.hasTemplateInBody = searchChildren(this.parseTreeNode.children);
+}
+
ListWidget.prototype.getTiddlerList = function() {
+ var limit = $tw.utils.getInt(this.getAttribute("limit",""),undefined);
var defaultFilter = "[!is[system]sort[title]]";
- return this.wiki.filterTiddlers(this.getAttribute("filter",defaultFilter),this);
+ var results = this.wiki.filterTiddlers(this.getAttribute("filter",defaultFilter),this);
+ if(limit !== undefined) {
+ if(limit >= 0) {
+ results = results.slice(0,limit);
+ } else {
+ results = results.slice(limit);
+ }
+ }
+ return results;
};
ListWidget.prototype.getEmptyMessage = function() {
var parser,
- emptyMessage = this.getAttribute("emptyMessage","");
- // this.wiki.parseText() calls
- // new Parser(..), which should only be done, if needed, because it's heavy!
- if (emptyMessage === "") {
- return [];
+ emptyMessage = this.getAttribute("emptyMessage");
+ // If emptyMessage attribute is not present or empty then look for an explicit empty template
+ if(!emptyMessage) {
+ if(this.explicitEmptyTemplate) {
+ return this.explicitEmptyTemplate;
+ } else {
+ return [];
+ }
}
parser = this.wiki.parseText("text/vnd.tiddlywiki",emptyMessage,{parseAsInline: true});
if(parser) {
@@ -102,14 +159,33 @@ ListWidget.prototype.getEmptyMessage = function() {
}
};
+/*
+Compose the template for a join between list items
+*/
+ListWidget.prototype.makeJoinTemplate = function() {
+ var parser,
+ join = this.getAttribute("join","");
+ if(join) {
+ parser = this.wiki.parseText("text/vnd.tiddlywiki",join,{parseAsInline:true})
+ if(parser) {
+ return parser.tree;
+ } else {
+ return [];
+ }
+ } else {
+ return this.explicitJoinTemplate; // May be null, and that's fine
+ }
+};
+
/*
Compose the template for a list item
*/
-ListWidget.prototype.makeItemTemplate = function(title) {
+ListWidget.prototype.makeItemTemplate = function(title,index) {
// Check if the tiddler is a draft
var tiddler = this.wiki.getTiddler(title),
isDraft = tiddler && tiddler.hasField("draft.of"),
template = this.template,
+ join = this.join,
templateTree;
if(isDraft && this.editTemplate) {
template = this.editTemplate;
@@ -118,17 +194,31 @@ ListWidget.prototype.makeItemTemplate = function(title) {
if(template) {
templateTree = [{type: "transclude", attributes: {tiddler: {type: "string", value: template}}}];
} else {
+ // Check for child nodes of the list widget
if(this.parseTreeNode.children && this.parseTreeNode.children.length > 0) {
- templateTree = this.parseTreeNode.children;
- } else {
+ // Check for a <$list-item> widget
+ if(this.explicitListTemplate) {
+ templateTree = this.explicitListTemplate;
+ } else if(this.hasTemplateInBody) {
+ templateTree = this.parseTreeNode.children;
+ }
+ }
+ if(!templateTree || templateTree.length === 0) {
// Default template is a link to the title
templateTree = [{type: "element", tag: this.parseTreeNode.isBlock ? "div" : "span", children: [{type: "link", attributes: {to: {type: "string", value: title}}, children: [
- {type: "text", text: title}
+ {type: "text", text: title}
]}]}];
}
}
// Return the list item
- return {type: "listitem", itemTitle: title, variableName: this.variableName, children: templateTree};
+ var parseTreeNode = {type: "listitem", itemTitle: title, variableName: this.variableName, children: templateTree, join: join};
+ parseTreeNode.isLast = index === this.list.length - 1;
+ if(this.counterName) {
+ parseTreeNode.counter = (index + 1).toString();
+ parseTreeNode.counterName = this.counterName;
+ parseTreeNode.isFirst = index === 0;
+ }
+ return parseTreeNode;
};
/*
@@ -142,7 +232,7 @@ ListWidget.prototype.refresh = function(changedTiddlers) {
this.storyview.refreshStart(changedTiddlers,changedAttributes);
}
// Completely refresh if any of our attributes have changed
- if(changedAttributes.filter || changedAttributes.template || changedAttributes.editTemplate || changedAttributes.emptyMessage || changedAttributes.storyview || changedAttributes.history) {
+ if(changedAttributes.filter || changedAttributes.variable || changedAttributes.counter || changedAttributes.template || changedAttributes.editTemplate || changedAttributes.join || changedAttributes.emptyMessage || changedAttributes.storyview || changedAttributes.history) {
this.refreshSelf();
result = true;
} else {
@@ -211,23 +301,82 @@ ListWidget.prototype.handleListChanges = function(changedTiddlers) {
this.removeChildDomNodes();
this.children = [];
}
- // Cycle through the list, inserting and removing list items as needed
- var hasRefreshed = false;
- for(var t=0; t<this.list.length; t++) {
- var index = this.findListItem(t,this.list[t]);
- if(index === undefined) {
- // The list item must be inserted
- this.insertListItem(t,this.list[t]);
- hasRefreshed = true;
- } else {
- // There are intervening list items that must be removed
- for(var n=index-1; n>=t; n--) {
- this.removeListItem(n);
+ // If we are providing an counter variable then we must refresh the items, otherwise we can rearrange them
+ var hasRefreshed = false,t;
+ if(this.counterName) {
+ var mustRefreshOldLast = false;
+ var oldLength = this.children.length;
+ // Cycle through the list and remove and re-insert the first item that has changed, and all the remaining items
+ for(t=0; t<this.list.length; t++) {
+ if(hasRefreshed || !this.children[t] || this.children[t].parseTreeNode.itemTitle !== this.list[t]) {
+ if(this.children[t]) {
+ this.removeListItem(t);
+ }
+ this.insertListItem(t,this.list[t]);
+ if(!hasRefreshed && t === oldLength) {
+ mustRefreshOldLast = true;
+ }
hasRefreshed = true;
+ } else {
+ // Refresh the item we're reusing
+ var refreshed = this.children[t].refresh(changedTiddlers);
+ hasRefreshed = hasRefreshed || refreshed;
+ }
+ }
+ // If items were inserted then we must recreate the item that used to be at the last position as it is no longer last
+ if(mustRefreshOldLast && oldLength > 0) {
+ var oldLastIdx = oldLength-1;
+ this.removeListItem(oldLastIdx);
+ this.insertListItem(oldLastIdx,this.list[oldLastIdx]);
+ }
+ // If there are items to remove and we have not refreshed then recreate the item that will now be at the last position
+ if(!hasRefreshed && this.children.length > this.list.length) {
+ this.removeListItem(this.list.length-1);
+ this.insertListItem(this.list.length-1,this.list[this.list.length-1]);
+ }
+ } else {
+ // Cycle through the list, inserting and removing list items as needed
+ var mustRecreateLastItem = false;
+ if(this.join && this.join.length) {
+ if(this.children.length !== this.list.length) {
+ mustRecreateLastItem = true;
+ } else if(prevList[prevList.length-1] !== this.list[this.list.length-1]) {
+ mustRecreateLastItem = true;
+ }
+ }
+ var isLast = false, wasLast = false;
+ for(t=0; t<this.list.length; t++) {
+ isLast = t === this.list.length-1;
+ var index = this.findListItem(t,this.list[t]);
+ wasLast = index === this.children.length-1;
+ if(wasLast && (index !== t || this.children.length !== this.list.length)) {
+ mustRecreateLastItem = !!(this.join && this.join.length);
+ }
+ if(index === undefined) {
+ // The list item must be inserted
+ if(isLast && mustRecreateLastItem && t>0) {
+ // First re-create previosly-last item that will no longer be last
+ this.removeListItem(t-1);
+ this.insertListItem(t-1,this.list[t-1]);
+ }
+ this.insertListItem(t,this.list[t]);
+ hasRefreshed = true;
+ } else {
+ // There are intervening list items that must be removed
+ for(var n=index-1; n>=t; n--) {
+ this.removeListItem(n);
+ hasRefreshed = true;
+ }
+ // Refresh the item we're reusing, or recreate if necessary
+ if(mustRecreateLastItem && (isLast || wasLast)) {
+ this.removeListItem(t);
+ this.insertListItem(t,this.list[t]);
+ hasRefreshed = true;
+ } else {
+ var refreshed = this.children[t].refresh(changedTiddlers);
+ hasRefreshed = hasRefreshed || refreshed;
+ }
}
- // Refresh the item we're reusing
- var refreshed = this.children[t].refresh(changedTiddlers);
- hasRefreshed = hasRefreshed || refreshed;
}
}
// Remove any left over items
@@ -257,7 +406,7 @@ Insert a new list item at the specified index
*/
ListWidget.prototype.insertListItem = function(index,title) {
// Create, insert and render the new child widgets
- var widget = this.makeChildWidget(this.makeItemTemplate(title));
+ var widget = this.makeChildWidget(this.makeItemTemplate(title,index));
widget.parentDomNode = this.parentDomNode; // Hack to enable findNextSiblingDomNode() to work
this.children.splice(index,0,widget);
var nextSibling = widget.findNextSiblingDomNode();
@@ -311,8 +460,22 @@ Compute the internal state of the widget
ListItemWidget.prototype.execute = function() {
// Set the current list item title
this.setVariable(this.parseTreeNode.variableName,this.parseTreeNode.itemTitle);
+ if(this.parseTreeNode.counterName) {
+ this.setVariable(this.parseTreeNode.counterName,this.parseTreeNode.counter);
+ this.setVariable(this.parseTreeNode.counterName + "-first",this.parseTreeNode.isFirst ? "yes" : "no");
+ this.setVariable(this.parseTreeNode.counterName + "-last",this.parseTreeNode.isLast ? "yes" : "no");
+ }
+ // Add join if needed
+ var children = this.parseTreeNode.children,
+ join = this.parseTreeNode.join;
+ if(join && join.length && !this.parseTreeNode.isLast) {
+ children = children.slice(0);
+ $tw.utils.each(join,function(joinNode) {
+ children.push(joinNode);
+ })
+ }
// Construct the child widgets
- this.makeChildWidgets();
+ this.makeChildWidgets(children);
};
/*
@@ -324,4 +487,35 @@ ListItemWidget.prototype.refresh = function(changedTiddlers) {
exports.listitem = ListItemWidget;
-})();
+/*
+Make <$list-template> and <$list-empty> widgets that do nothing
+*/
+var ListTemplateWidget = function(parseTreeNode,options) {
+ // Main initialisation inherited from widget.js
+ this.initialise(parseTreeNode,options);
+};
+ListTemplateWidget.prototype = new Widget();
+ListTemplateWidget.prototype.render = function() {}
+ListTemplateWidget.prototype.refresh = function() { return false; }
+
+exports["list-template"] = ListTemplateWidget;
+
+var ListEmptyWidget = function(parseTreeNode,options) {
+ // Main initialisation inherited from widget.js
+ this.initialise(parseTreeNode,options);
+};
+ListEmptyWidget.prototype = new Widget();
+ListEmptyWidget.prototype.render = function() {}
+ListEmptyWidget.prototype.refresh = function() { return false; }
+
+exports["list-empty"] = ListEmptyWidget;
+
+var ListJoinWidget = function(parseTreeNode,options) {
+ // Main initialisation inherited from widget.js
+ this.initialise(parseTreeNode,options);
+};
+ListJoinWidget.prototype = new Widget();
+ListJoinWidget.prototype.render = function() {}
+ListJoinWidget.prototype.refresh = function() { return false; }
+
+exports["list-join"] = ListJoinWidget;
diff --git a/core/modules/widgets/log.js b/core/modules/widgets/log.js
index 2615547ad..332c79fc2 100644
--- a/core/modules/widgets/log.js
+++ b/core/modules/widgets/log.js
@@ -6,10 +6,7 @@ module-type: widget-subclass
Widget to log debug messages
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
exports.baseClass = "action-log";
@@ -23,8 +20,6 @@ exports.constructor = function(parseTreeNode,options) {
exports.prototype = {};
exports.prototype.render = function(event) {
- Object.getPrototypeOf(Object.getPrototypeOf(this)).render.call(this,event);
+ Object.getPrototypeOf(Object.getPrototypeOf(this)).render.call(this,event);
Object.getPrototypeOf(Object.getPrototypeOf(this)).log.call(this);
}
-
-})();
\ No newline at end of file
diff --git a/core/modules/widgets/macrocall.js b/core/modules/widgets/macrocall.js
index 2381d0360..75a927a62 100644
--- a/core/modules/widgets/macrocall.js
+++ b/core/modules/widgets/macrocall.js
@@ -6,10 +6,7 @@ module-type: widget
Macrocall widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -37,59 +34,37 @@ MacroCallWidget.prototype.render = function(parent,nextSibling) {
Compute the internal state of the widget
*/
MacroCallWidget.prototype.execute = function() {
- // Get the parse type if specified
+ this.macroName = this.parseTreeNode.name || this.getAttribute("$name"),
this.parseType = this.getAttribute("$type","text/vnd.tiddlywiki");
this.renderOutput = this.getAttribute("$output","text/html");
// Merge together the parameters specified in the parse tree with the specified attributes
var params = this.parseTreeNode.params ? this.parseTreeNode.params.slice(0) : [];
$tw.utils.each(this.attributes,function(attribute,name) {
if(name.charAt(0) !== "$") {
- params.push({name: name, value: attribute});
+ params.push({name: name, value: attribute});
}
});
- // Get the macro value
- var macroName = this.parseTreeNode.name || this.getAttribute("$name"),
- variableInfo = this.getVariableInfo(macroName,{params: params}),
- text = variableInfo.text,
- parseTreeNodes;
- // Are we rendering to HTML?
- if(this.renderOutput === "text/html") {
- // If so we'll return the parsed macro
- // Check if we've already cached parsing this macro
- var mode = this.parseTreeNode.isBlock ? "blockParser" : "inlineParser",
- parser;
- if(variableInfo.srcVariable && variableInfo.srcVariable[mode]) {
- parser = variableInfo.srcVariable[mode];
- } else {
- parser = this.wiki.parseText(this.parseType,text,
- {parseAsInline: !this.parseTreeNode.isBlock});
- if(variableInfo.isCacheable && variableInfo.srcVariable) {
- variableInfo.srcVariable[mode] = parser;
- }
- }
- var parseTreeNodes = parser ? parser.tree : [];
- // Wrap the parse tree in a vars widget assigning the parameters to variables named "__paramname__"
- var attributes = {};
- $tw.utils.each(variableInfo.params,function(param) {
- var name = "__" + param.name + "__";
- attributes[name] = {
- name: name,
- type: "string",
- value: param.value
- };
- });
+ // Make a transclude widget
+ var positionalName = 0,
parseTreeNodes = [{
- type: "vars",
- attributes: attributes,
- children: parseTreeNodes
+ type: "transclude",
+ isBlock: this.parseTreeNode.isBlock,
+ children: this.parseTreeNode.children
}];
- } else if(this.renderOutput === "text/raw") {
- parseTreeNodes = [{type: "text", text: text}];
- } else {
- // Otherwise, we'll render the text
- var plainText = this.wiki.renderText("text/plain",this.parseType,text,{parentWidget: this});
- parseTreeNodes = [{type: "text", text: plainText}];
- }
+ $tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"$variable",this.macroName);
+ $tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"$type",this.parseType);
+ $tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"$output",this.renderOutput);
+ $tw.utils.each(params,function(param) {
+ var name = param.name;
+ if(name) {
+ if(name.charAt(0) === "$") {
+ name = "$" + name;
+ }
+ $tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],name,param.value);
+ } else {
+ $tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],(positionalName++) + "",param.value);
+ }
+ });
// Construct the child widgets
this.makeChildWidgets(parseTreeNodes);
};
@@ -109,5 +84,3 @@ MacroCallWidget.prototype.refresh = function(changedTiddlers) {
};
exports.macrocall = MacroCallWidget;
-
-})();
diff --git a/core/modules/widgets/messagecatcher.js b/core/modules/widgets/messagecatcher.js
new file mode 100644
index 000000000..44cb60f41
--- /dev/null
+++ b/core/modules/widgets/messagecatcher.js
@@ -0,0 +1,105 @@
+/*\
+title: $:/core/modules/widgets/messagecatcher.js
+type: application/javascript
+module-type: widget
+
+Message catcher widget
+
+\*/
+
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var MessageCatcherWidget = function(parseTreeNode,options) {
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+MessageCatcherWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+MessageCatcherWidget.prototype.render = function(parent,nextSibling) {
+ var self = this;
+ // Remember parent
+ this.parentDomNode = parent;
+ // Compute attributes and execute state
+ this.computeAttributes();
+ this.execute();
+ // Helper to add an event handler
+ var addEventHandler = function(type,actions) {
+ if(type && actions) {
+ var isActionStringExecuting = false;
+ self.addEventListener(
+ type,
+ function(event) {
+ // Don't trap the event if it came from one of our action handlers
+ if(isActionStringExecuting) {
+ return true;
+ }
+ // Collect all the event properties into variables
+ var collectProps = function(obj,prefix) {
+ prefix = prefix || "";
+ var props = {},
+ names = [];
+ $tw.utils.each(obj,function(value,name) {
+ if(["string","boolean","number"].indexOf(typeof value) !== -1) {
+ names.push(name);
+ props[prefix + "-" + name] = value.toString();
+ }
+ });
+ props["list-" + prefix] = $tw.utils.stringifyList(names);
+ return props;
+ };
+ var variables = $tw.utils.extend(
+ {},
+ collectProps(event.paramObject,"event-paramObject"),
+ collectProps(event,"event"),
+ {
+ modifier: $tw.keyboardManager.getEventModifierKeyDescriptor(event)
+ });
+ isActionStringExecuting = true;
+ self.invokeActionString(actions,self,event,variables);
+ isActionStringExecuting = false;
+ return false;
+ }
+ );
+ }
+ }
+ // Add the main event handler
+ addEventHandler(this.getAttribute("type"),this.getAttribute("actions"));
+ // Add any other event handlers
+ $tw.utils.each(this.attributes,function(value,key) {
+ if(key.charAt(0) === "$") {
+ addEventHandler(key.slice(1),value);
+ }
+ });
+ // Render children
+ this.renderChildren(parent,nextSibling);
+};
+
+/*
+Compute the internal state of the widget
+*/
+MessageCatcherWidget.prototype.execute = function() {
+ // Make child widgets
+ this.makeChildWidgets();
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+*/
+MessageCatcherWidget.prototype.refresh = function(changedTiddlers) {
+ var changedAttributes = this.computeAttributes();
+ if($tw.utils.count(changedAttributes) > 0) {
+ this.refreshSelf();
+ return true;
+ }
+ return this.refreshChildren(changedTiddlers);
+};
+
+exports.messagecatcher = MessageCatcherWidget;
diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js
index 02eee8c43..793bc8416 100755
--- a/core/modules/widgets/navigator.js
+++ b/core/modules/widgets/navigator.js
@@ -6,10 +6,7 @@ module-type: widget
Navigator widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var IMPORT_TITLE = "$:/Import";
@@ -44,8 +41,7 @@ NavigatorWidget.prototype.render = function(parent,nextSibling) {
{type: "tm-fold-tiddler", handler: "handleFoldTiddlerEvent"},
{type: "tm-fold-other-tiddlers", handler: "handleFoldOtherTiddlersEvent"},
{type: "tm-fold-all-tiddlers", handler: "handleFoldAllTiddlersEvent"},
- {type: "tm-unfold-all-tiddlers", handler: "handleUnfoldAllTiddlersEvent"},
- {type: "tm-rename-tiddler", handler: "handleRenameTiddlerEvent"}
+ {type: "tm-unfold-all-tiddlers", handler: "handleUnfoldAllTiddlersEvent"}
]);
this.parentDomNode = parent;
this.computeAttributes();
@@ -95,7 +91,7 @@ NavigatorWidget.prototype.saveStoryList = function(storyList) {
{title: this.storyTitle},
storyTiddler,
{list: storyList}
- ));
+ ));
}
};
@@ -105,7 +101,7 @@ NavigatorWidget.prototype.removeTitleFromStory = function(storyList,title) {
while(p !== -1) {
storyList.splice(p,1);
p = storyList.indexOf(title);
- }
+ }
}
};
@@ -122,7 +118,7 @@ NavigatorWidget.prototype.replaceFirstTitleInStory = function(storyList,oldTitle
} while(pos !== -1);
} else {
storyList.splice(0,0,newTitle);
- }
+ }
}
};
@@ -160,6 +156,7 @@ NavigatorWidget.prototype.handleNavigateEvent = function(event) {
// Close a specified tiddler
NavigatorWidget.prototype.handleCloseTiddlerEvent = function(event) {
+ event = $tw.hooks.invokeHook("th-closing-tiddler",event);
var title = event.param || event.tiddlerTitle,
storyList = this.getStoryList();
// Look for tiddlers with this title to close
@@ -183,7 +180,8 @@ NavigatorWidget.prototype.handleCloseOtherTiddlersEvent = function(event) {
// Place a tiddler in edit mode
NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) {
- var editTiddler = $tw.hooks.invokeHook("th-editing-tiddler",event);
+ var editTiddler = $tw.hooks.invokeHook("th-editing-tiddler",event),
+ win = event.event && event.event.view ? event.event.view : window;
if(!editTiddler) {
return false;
}
@@ -192,7 +190,7 @@ NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) {
return self.wiki.isShadowTiddler(title) && !self.wiki.tiddlerExists(title);
}
function confirmEditShadow(title) {
- return confirm($tw.language.getString(
+ return win.confirm($tw.language.getString(
"ConfirmEditShadowTiddler",
{variables:
{title: title}
@@ -225,10 +223,8 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
storyList = this.getStoryList(),
originalTitle = tiddler ? tiddler.fields["draft.of"] : "",
originalTiddler = originalTitle ? this.wiki.getTiddler(originalTitle) : undefined,
- confirmationTitle;
- if(!tiddler) {
- return false;
- }
+ confirmationTitle,
+ win = event.event && event.event.view ? event.event.view : window;
// Check if the tiddler we're deleting is in draft mode
if(originalTitle) {
// If so, we'll prompt for confirmation referencing the original tiddler
@@ -238,7 +234,7 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
confirmationTitle = title;
}
// Seek confirmation
- if((this.wiki.getTiddler(originalTitle) || (tiddler.fields.text || "") !== "") && !confirm($tw.language.getString(
+ if(((originalTitle && this.wiki.getTiddler(originalTitle)) || (tiddler && ((tiddler.fields.text || "") !== ""))) && !win.confirm($tw.language.getString(
"ConfirmDeleteTiddler",
{variables:
{title: confirmationTitle}
@@ -255,8 +251,10 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
this.removeTitleFromStory(storyList,originalTitle);
}
// Invoke the hook function and delete this tiddler
- $tw.hooks.invokeHook("th-deleting-tiddler",tiddler);
- this.wiki.deleteTiddler(title);
+ if(tiddler) {
+ $tw.hooks.invokeHook("th-deleting-tiddler",tiddler);
+ this.wiki.deleteTiddler(title);
+ }
// Remove the closed tiddler from the story
this.removeTitleFromStory(storyList,title);
this.saveStoryList(storyList);
@@ -276,6 +274,8 @@ NavigatorWidget.prototype.makeDraftTiddler = function(targetTitle) {
}
// Get the current value of the tiddler we're editing
var tiddler = this.wiki.getTiddler(targetTitle);
+ var defaultType = this.wiki.getTiddlerText("$:/config/DefaultMissingType", "").trim();
+ var defaultFields = { type: defaultType };
// Save the initial value of the draft tiddler
draftTitle = this.generateDraftTitle(targetTitle);
var draftTiddler = new $tw.Tiddler({
@@ -287,7 +287,8 @@ NavigatorWidget.prototype.makeDraftTiddler = function(targetTitle) {
"draft.title": targetTitle,
"draft.of": targetTitle
},
- this.wiki.getModificationFields()
+ this.wiki.getModificationFields(),
+ tiddler === null || tiddler === undefined ? defaultFields : {}
);
this.wiki.addTiddler(draftTiddler);
return draftTiddler;
@@ -304,7 +305,8 @@ NavigatorWidget.prototype.generateDraftTitle = function(title) {
NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
var title = event.param || event.tiddlerTitle,
tiddler = this.wiki.getTiddler(title),
- storyList = this.getStoryList();
+ storyList = this.getStoryList(),
+ win = event.event && event.event.view ? event.event.view : window;
// Replace the original tiddler with the draft
if(tiddler) {
var draftTitle = (tiddler.fields["draft.title"] || "").trim(),
@@ -313,7 +315,7 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
var isRename = draftOf !== draftTitle,
isConfirmed = true;
if(isRename && this.wiki.tiddlerExists(draftTitle)) {
- isConfirmed = confirm($tw.language.getString(
+ isConfirmed = win.confirm($tw.language.getString(
"ConfirmOverwriteTiddler",
{variables:
{title: draftTitle}
@@ -362,6 +364,7 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
// Take a tiddler out of edit mode without saving the changes
NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) {
event = $tw.hooks.invokeHook("th-cancelling-tiddler", event);
+ var win = event.event && event.event.view ? event.event.view : window;
// Flip the specified tiddler from draft back to the original
var draftTitle = event.param || event.tiddlerTitle,
draftTiddler = this.wiki.getTiddler(draftTitle),
@@ -372,7 +375,7 @@ NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) {
originalTiddler = this.wiki.getTiddler(originalTitle),
storyList = this.getStoryList();
if(this.wiki.isDraftModified(draftTitle)) {
- isConfirmed = confirm($tw.language.getString(
+ isConfirmed = win.confirm($tw.language.getString(
"ConfirmCancelTiddler",
{variables:
{title: draftTitle}
@@ -409,7 +412,8 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
event = $tw.hooks.invokeHook("th-new-tiddler", event);
// Get the story details
var storyList = this.getStoryList(),
- templateTiddler, additionalFields, title, draftTitle, existingTiddler;
+ templateTiddler, additionalFields, title, draftTitle, existingTiddler,
+ templateHasTags = false;
// Get the template tiddler (if any)
if(typeof event.param === "string") {
// Get the template tiddler
@@ -454,8 +458,10 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
// Merge tags
mergedTags = $tw.utils.pushTop(mergedTags,$tw.utils.parseStringArray(additionalFields.tags));
}
+ var additionalFieldsHasTags = !!(additionalFields && (additionalFields.tags === ""));
if(templateTiddler && templateTiddler.fields.tags) {
// Merge tags
+ templateHasTags = true;
mergedTags = $tw.utils.pushTop(mergedTags,templateTiddler.fields.tags);
}
// Save the draft tiddler
@@ -471,7 +477,8 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
{
title: draftTitle,
"draft.of": title,
- tags: mergedTags
+ // If template or additionalFields have "tags" even if empty a tags field will be created.
+ tags: ((mergedTags.length > 0) || templateHasTags || additionalFieldsHasTags) ? mergedTags : undefined
},this.wiki.getModificationFields());
this.wiki.addTiddler(draftTiddler);
// Update the story to insert the new draft at the top and remove any existing tiddler
@@ -494,13 +501,10 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
// Import JSON tiddlers into a pending import tiddler
NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
// Get the tiddlers
- var tiddlers = [];
- try {
- tiddlers = JSON.parse(event.param);
- } catch(e) {
- }
+ var tiddlers = $tw.utils.parseJSONSafe(event.param,[]);
// Get the current $:/Import tiddler
- var importTitle = event.importTitle ? event.importTitle : IMPORT_TITLE,
+ var paramObject = event.paramObject || {},
+ importTitle = event.importTitle || paramObject.importTitle || IMPORT_TITLE,
importTiddler = this.wiki.getTiddler(importTitle),
importData = this.wiki.getTiddlerData(importTitle,{}),
newFields = new Object({
@@ -522,10 +526,15 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
});
// Give the active upgrader modules a chance to process the incoming tiddlers
var messages = this.wiki.invokeUpgraders(incomingTiddlers,importData.tiddlers);
+ // Deselect any disabled, but _not_ suppressed tiddlers
+ var systemMessage = $tw.language.getString("Import/Upgrader/Tiddler/Unselected");
$tw.utils.each(messages,function(message,title) {
newFields["message-" + title] = message;
+ if(message.indexOf(systemMessage) !== -1) {
+ newFields["selection-" + title] = "unchecked";
+ }
});
- // Deselect any suppressed tiddlers
+ // Deselect suppressed tiddlers ... they have been removed and can't be selected anymore
$tw.utils.each(importData.tiddlers,function(tiddler,title) {
if($tw.utils.count(tiddler) === 0) {
newFields["selection-" + title] = "unchecked";
@@ -536,7 +545,7 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
newFields.text = JSON.stringify(importData,null,$tw.config.preferences.jsonSpaces);
this.wiki.addTiddler(new $tw.Tiddler(importTiddler,newFields));
// Update the story and history details
- var autoOpenOnImport = event.autoOpenOnImport ? event.autoOpenOnImport : this.getVariable("tv-auto-open-on-import");
+ var autoOpenOnImport = event.autoOpenOnImport || paramObject.autoOpenOnImport || this.getVariable("tv-auto-open-on-import");
if(autoOpenOnImport !== "no") {
var storyList = this.getStoryList(),
history = [];
@@ -557,10 +566,12 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
var self = this,
importTiddler = this.wiki.getTiddler(event.param),
- importData = this.wiki.getTiddlerDataCached(event.param,{tiddlers: {}}),
+ importData,
importReport = [];
- // Add the tiddlers to the store
importReport.push($tw.language.getString("Import/Imported/Hint") + "\n");
+ // If you need to modify the import tiddler payload then consider th-importing-tiddler instead
+ importTiddler = $tw.hooks.invokeHook("th-before-importing",importTiddler);
+ importData = this.wiki.getTiddlerDataCached(event.param,{tiddlers: {}}),
$tw.utils.each(importData.tiddlers,function(tiddlerFields) {
var title = tiddlerFields.title;
if(title && importTiddler && importTiddler.fields["selection-" + title] !== "unchecked") {
@@ -569,7 +580,10 @@ NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
} else {
var tiddler = new $tw.Tiddler(tiddlerFields);
}
+ // th-importing-tiddler doesn't allow user interaction by default
+ // If you want to use the default UI then use: $:/core/modules/upgraders/ instead
tiddler = $tw.hooks.invokeHook("th-importing-tiddler",tiddler);
+ // Add the tiddlers to the store
self.wiki.addTiddler(tiddler);
importReport.push("# [[" + tiddler.fields.title + "]]");
}
@@ -621,16 +635,4 @@ NavigatorWidget.prototype.handleUnfoldAllTiddlersEvent = function(event) {
});
};
-NavigatorWidget.prototype.handleRenameTiddlerEvent = function(event) {
- var options = {},
- paramObject = event.paramObject || {},
- from = paramObject.from || event.tiddlerTitle,
- to = paramObject.to;
- options.dontRenameInTags = (paramObject.renameInTags === "false" || paramObject.renameInTags === "no") ? true : false;
- options.dontRenameInLists = (paramObject.renameInLists === "false" || paramObject.renameInLists === "no") ? true : false;
- this.wiki.renameTiddler(from,to,options);
-};
-
exports.navigator = NavigatorWidget;
-
-})();
diff --git a/core/modules/widgets/parameters.js b/core/modules/widgets/parameters.js
new file mode 100644
index 000000000..638db8054
--- /dev/null
+++ b/core/modules/widgets/parameters.js
@@ -0,0 +1,103 @@
+/*\
+title: $:/core/modules/widgets/parameters.js
+type: application/javascript
+module-type: widget
+
+Widget for definition of transclusion parameters
+
+\*/
+
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget,
+ TranscludeWidget = require("$:/core/modules/widgets/transclude.js").transclude;
+
+var ParametersWidget = function(parseTreeNode,options) {
+ // Initialise
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+ParametersWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+ParametersWidget.prototype.render = function(parent,nextSibling) {
+ // Call the constructor
+ Widget.call(this);
+ this.parentDomNode = parent;
+ this.computeAttributes();
+ this.execute();
+ this.renderChildren(parent,nextSibling);
+};
+
+/*
+Compute the internal state of the widget
+*/
+ParametersWidget.prototype.execute = function() {
+ var self = this;
+ this.parametersDepth = Math.max(parseInt(this.getAttribute("$depth","1"),10) || 1,1);
+ // Find the parent transclusions
+ var pointer = this.parentWidget,
+ depth = this.parametersDepth;
+ while(pointer) {
+ if(pointer instanceof TranscludeWidget) {
+ depth--;
+ if(depth <= 0) {
+ break;
+ }
+ }
+ pointer = pointer.parentWidget;
+ }
+ // Process each parameter
+ if(pointer instanceof TranscludeWidget) {
+ // Get the value for each defined parameter
+ $tw.utils.each($tw.utils.getOrderedAttributesFromParseTreeNode(self.parseTreeNode),function(attr,index) {
+ var name = attr.name;
+ // If the attribute name starts with $$ then reduce to a single dollar
+ if(name.substr(0,2) === "$$") {
+ name = name.substr(1);
+ }
+ var value = pointer.getTransclusionParameter(name,index,self.getAttribute(attr.name,""));
+ self.setVariable(name,value);
+ });
+ // Assign any metaparameters
+ $tw.utils.each(pointer.getTransclusionMetaParameters(),function(getValue,name) {
+ var variableName = self.getAttribute("$" + name);
+ if(variableName) {
+ self.setVariable(variableName,getValue(name));
+ }
+ });
+ } else {
+ // There is no parent transclude. i.e. direct rendering.
+ // We use default values only.
+ $tw.utils.each($tw.utils.getOrderedAttributesFromParseTreeNode(self.parseTreeNode),function(attr,index) {
+ var name = attr.name;
+ // If the attribute name starts with $$ then reduce to a single dollar
+ if(name.substr(0,2) === "$$") {
+ name = name.substr(1);
+ }
+ var value = self.getAttribute(attr.name,"");
+ self.setVariable(name,value);
+ });
+ }
+ // Construct the child widgets
+ this.makeChildWidgets();
+};
+
+/*
+Refresh the widget by ensuring our attributes are up to date
+*/
+ParametersWidget.prototype.refresh = function(changedTiddlers) {
+ var changedAttributes = this.computeAttributes();
+ if(Object.keys(changedAttributes).length) {
+ this.refreshSelf();
+ return true;
+ }
+ return this.refreshChildren(changedTiddlers);
+};
+
+exports.parameters = ParametersWidget;
diff --git a/core/modules/widgets/password.js b/core/modules/widgets/password.js
index 1d2e4ca69..59b084940 100644
--- a/core/modules/widgets/password.js
+++ b/core/modules/widgets/password.js
@@ -6,10 +6,7 @@ module-type: widget
Password widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -78,5 +75,3 @@ PasswordWidget.prototype.refresh = function(changedTiddlers) {
};
exports.password = PasswordWidget;
-
-})();
diff --git a/core/modules/widgets/qualify.js b/core/modules/widgets/qualify.js
index 07a5c8b4e..438d88d65 100644
--- a/core/modules/widgets/qualify.js
+++ b/core/modules/widgets/qualify.js
@@ -6,10 +6,7 @@ module-type: widget
Qualify text to a variable
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -62,5 +59,3 @@ QualifyWidget.prototype.refresh = function(changedTiddlers) {
};
exports.qualify = QualifyWidget;
-
-})();
diff --git a/core/modules/widgets/radio.js b/core/modules/widgets/radio.js
index 43b6e5dab..4587df65f 100644
--- a/core/modules/widgets/radio.js
+++ b/core/modules/widgets/radio.js
@@ -6,10 +6,7 @@ module-type: widget
Set a field or index at a given tiddler via radio buttons
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -40,8 +37,15 @@ RadioWidget.prototype.render = function(parent,nextSibling) {
);
this.inputDomNode = this.document.createElement("input");
this.inputDomNode.setAttribute("type","radio");
+ this.assignAttributes(this.inputDomNode,{
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
if(isChecked) {
- this.inputDomNode.setAttribute("checked","true");
+ this.inputDomNode.checked = true;
+ }
+ if(this.tabIndex) {
+ this.inputDomNode.setAttribute("tabindex", this.tabIndex);
}
if(this.isDisabled === "yes") {
this.inputDomNode.setAttribute("disabled",true);
@@ -62,10 +66,14 @@ RadioWidget.prototype.render = function(parent,nextSibling) {
RadioWidget.prototype.getValue = function() {
var value,
tiddler = this.wiki.getTiddler(this.radioTitle);
- if (this.radioIndex) {
- value = this.wiki.extractTiddlerDataItem(this.radioTitle,this.radioIndex);
+ if(tiddler) {
+ if(this.radioIndex) {
+ value = this.wiki.extractTiddlerDataItem(this.radioTitle,this.radioIndex,this.radioDefault);
+ } else {
+ value = tiddler.getFieldString(this.radioField,this.radioDefault);
+ }
} else {
- value = tiddler && tiddler.getFieldString(this.radioField);
+ value = this.radioDefault;
}
return value;
};
@@ -101,7 +109,9 @@ RadioWidget.prototype.execute = function() {
this.radioIndex = this.getAttribute("index");
this.radioValue = this.getAttribute("value");
this.radioClass = this.getAttribute("class","");
+ this.radioDefault = this.getAttribute("default");
this.isDisabled = this.getAttribute("disabled","no");
+ this.tabIndex = this.getAttribute("tabindex");
this.radioActions = this.getAttribute("actions","");
// Make the child widgets
this.makeChildWidgets();
@@ -112,14 +122,16 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
*/
RadioWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(($tw.utils.count(changedAttributes) > 0) || changedTiddlers[this.radioTitle]) {
+ if(($tw.utils.count(changedAttributes) > 0)) {
this.refreshSelf();
return true;
+ } else if(changedTiddlers[this.radioTitle]) {
+ this.inputDomNode.checked = this.getValue() === this.radioValue;
+ $tw.utils.toggleClass(this.labelDomNode,"tc-radio-selected",this.inputDomNode.checked);
+ return this.refreshChildren(changedTiddlers);
} else {
return this.refreshChildren(changedTiddlers);
}
};
exports.radio = RadioWidget;
-
-})();
diff --git a/core/modules/widgets/range.js b/core/modules/widgets/range.js
index 4dd55dc3c..7c2d60c45 100644
--- a/core/modules/widgets/range.js
+++ b/core/modules/widgets/range.js
@@ -6,10 +6,7 @@ module-type: widget
Range widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -46,10 +43,17 @@ RangeWidget.prototype.render = function(parent,nextSibling) {
if(this.increment){
this.inputDomNode.setAttribute("step", this.increment);
}
+ if(this.tabIndex) {
+ this.inputDomNode.setAttribute("tabindex", this.tabIndex);
+ }
if(this.isDisabled === "yes") {
this.inputDomNode.setAttribute("disabled",true);
}
this.inputDomNode.value = this.getValue();
+ this.assignAttributes(this.inputDomNode,{
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
// Add a click event handler
$tw.utils.addEventListeners(this.inputDomNode,[
{name:"mousedown", handlerObject:this, handlerMethod:"handleMouseDownEvent"},
@@ -90,8 +94,6 @@ RangeWidget.prototype.getActionVariables = function(options) {
// actionsStart
RangeWidget.prototype.handleMouseDownEvent = function(event) {
- this.mouseDown = true; // TODO remove once IE is gone.
- this.startValue = this.inputDomNode.value; // TODO remove this line once IE is gone!
this.handleEvent(event);
// Trigger actions
if(this.actionsMouseDown) {
@@ -102,26 +104,16 @@ RangeWidget.prototype.handleMouseDownEvent = function(event) {
// actionsStop
RangeWidget.prototype.handleMouseUpEvent = function(event) {
- this.mouseDown = false; // TODO remove once IE is gone.
this.handleEvent(event);
// Trigger actions
if(this.actionsMouseUp) {
var variables = this.getActionVariables()
this.invokeActionString(this.actionsMouseUp,this,event,variables);
}
- // TODO remove the following if() once IE is gone!
- if ($tw.browser.isIE) {
- if (this.startValue !== this.inputDomNode.value) {
- this.handleChangeEvent(event);
- this.startValue = this.inputDomNode.value;
- }
- }
}
RangeWidget.prototype.handleChangeEvent = function(event) {
- if (this.mouseDown) { // TODO refactor this function once IE is gone.
- this.handleInputEvent(event);
- }
+ this.handleInputEvent(event);
};
RangeWidget.prototype.handleInputEvent = function(event) {
@@ -148,8 +140,6 @@ RangeWidget.prototype.handleEvent = function(event) {
Compute the internal state of the widget
*/
RangeWidget.prototype.execute = function() {
- // TODO remove the next 1 lines once IE is gone!
- this.mouseUp = true; // Needed for IE10
// Get the parameters from the attributes
this.tiddlerTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler"));
this.tiddlerField = this.getAttribute("field","text");
@@ -160,6 +150,7 @@ RangeWidget.prototype.execute = function() {
this.defaultValue = this.getAttribute("default","");
this.elementClass = this.getAttribute("class","");
this.isDisabled = this.getAttribute("disabled","no");
+ this.tabIndex = this.getAttribute("tabindex");
// Actions since 5.1.23
// Next 2 only fire once!
this.actionsMouseDown = this.getAttribute("actionsStart","");
@@ -192,5 +183,3 @@ RangeWidget.prototype.refresh = function(changedTiddlers) {
};
exports.range = RangeWidget;
-
-})();
diff --git a/core/modules/widgets/raw.js b/core/modules/widgets/raw.js
index 6ea592d3e..3de52a892 100644
--- a/core/modules/widgets/raw.js
+++ b/core/modules/widgets/raw.js
@@ -6,10 +6,7 @@ module-type: widget
Raw widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -32,7 +29,7 @@ RawWidget.prototype.render = function(parent,nextSibling) {
var div = this.document.createElement("div");
div.innerHTML=this.parseTreeNode.html;
parent.insertBefore(div,nextSibling);
- this.domNodes.push(div);
+ this.domNodes.push(div);
};
/*
@@ -49,5 +46,3 @@ RawWidget.prototype.refresh = function(changedTiddlers) {
};
exports.raw = RawWidget;
-
-})();
diff --git a/core/modules/widgets/reveal.js b/core/modules/widgets/reveal.js
index 2431e7195..f57f1cf42 100755
--- a/core/modules/widgets/reveal.js
+++ b/core/modules/widgets/reveal.js
@@ -6,14 +6,13 @@ module-type: widget
Reveal widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
+var Popup = require("$:/core/modules/utils/dom/popup.js");
+
var RevealWidget = function(parseTreeNode,options) {
this.initialise(parseTreeNode,options);
};
@@ -72,7 +71,7 @@ RevealWidget.prototype.positionPopup = function(domNode) {
case "belowright":
left = this.popup.left + this.popup.width;
top = this.popup.top + this.popup.height;
- break;
+ break;
case "right":
left = this.popup.left + this.popup.width;
top = this.popup.top;
@@ -84,7 +83,7 @@ RevealWidget.prototype.positionPopup = function(domNode) {
case "aboveleft":
left = this.popup.left - domNode.offsetWidth;
top = this.popup.top - domNode.offsetHeight;
- break;
+ break;
default: // Below
left = this.popup.left;
top = this.popup.top + this.popup.height;
@@ -94,6 +93,13 @@ RevealWidget.prototype.positionPopup = function(domNode) {
left = Math.max(0,left);
top = Math.max(0,top);
}
+ if (this.popup.absolute) {
+ // Traverse the offsetParent chain and correct the offset to make it relative to the parent node.
+ for (var offsetParentDomNode = domNode.offsetParent; offsetParentDomNode; offsetParentDomNode = offsetParentDomNode.offsetParent) {
+ left -= offsetParentDomNode.offsetLeft;
+ top -= offsetParentDomNode.offsetTop;
+ }
+ }
domNode.style.left = left + "px";
domNode.style.top = top + "px";
};
@@ -183,19 +189,11 @@ RevealWidget.prototype.compareStateText = function(state) {
};
RevealWidget.prototype.readPopupState = function(state) {
- var popupLocationRegExp = /^\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/,
- match = popupLocationRegExp.exec(state);
+ this.popup = Popup.parseCoordinates(state);
// Check if the state matches the location regexp
- if(match) {
+ if(this.popup) {
// If so, we're open
this.isOpen = true;
- // Get the location
- this.popup = {
- left: parseFloat(match[1]),
- top: parseFloat(match[2]),
- width: parseFloat(match[3]),
- height: parseFloat(match[4])
- };
} else {
// If not, we're closed
this.isOpen = false;
@@ -226,7 +224,7 @@ RevealWidget.prototype.refresh = function(changedTiddlers) {
this.refreshSelf();
return true;
}
- } else if(this.type === "popup" && this.updatePopupPosition && (changedTiddlers[this.state] || changedTiddlers[this.stateTitle])) {
+ } else if(this.type === "popup" && this.isOpen && this.updatePopupPosition && (changedTiddlers[this.state] || changedTiddlers[this.stateTitle])) {
this.positionPopup(this.domNode);
}
if(changedAttributes.style) {
@@ -234,7 +232,7 @@ RevealWidget.prototype.refresh = function(changedTiddlers) {
}
if(changedAttributes["class"]) {
this.assignDomNodeClasses();
- }
+ }
return this.refreshChildren(changedTiddlers);
}
};
@@ -274,5 +272,3 @@ RevealWidget.prototype.updateState = function() {
};
exports.reveal = RevealWidget;
-
-})();
diff --git a/core/modules/widgets/scrollable.js b/core/modules/widgets/scrollable.js
index 23be39efd..42705a61b 100644
--- a/core/modules/widgets/scrollable.js
+++ b/core/modules/widgets/scrollable.js
@@ -6,12 +6,11 @@ module-type: widget
Scrollable widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
+var DEBOUNCE_INTERVAL = 100; // Delay after last scroll event before updating the bound tiddler
+
var Widget = require("$:/core/modules/widgets/widget.js").widget;
var ScrollableWidget = function(parseTreeNode,options) {
@@ -38,10 +37,14 @@ ScrollableWidget.prototype.handleScrollEvent = function(event) {
if(this.outerDomNode.scrollWidth <= this.outerDomNode.offsetWidth && this.outerDomNode.scrollHeight <= this.outerDomNode.offsetHeight && this.fallthrough === "yes") {
return true;
}
+ var options = {};
+ if($tw.utils.hop(event.paramObject,"animationDuration")) {
+ options.animationDuration = event.paramObject.animationDuration;
+ }
if(event.paramObject && event.paramObject.selector) {
- this.scrollSelectorIntoView(null,event.paramObject.selector);
+ this.scrollSelectorIntoView(null,event.paramObject.selector,null,options);
} else {
- this.scrollIntoView(event.target);
+ this.scrollIntoView(event.target,null,options);
}
return false; // Handled event
};
@@ -49,9 +52,9 @@ ScrollableWidget.prototype.handleScrollEvent = function(event) {
/*
Scroll an element into view
*/
-ScrollableWidget.prototype.scrollIntoView = function(element) {
- var duration = $tw.utils.getAnimationDuration(),
- srcWindow = element ? element.ownerDocument.defaultView : window;
+ScrollableWidget.prototype.scrollIntoView = function(element,callback,options) {
+ var duration = $tw.utils.hop(options,"animationDuration") ? parseInt(options.animationDuration) : $tw.utils.getAnimationDuration(),
+ srcWindow = element ? element.ownerDocument.defaultView : window;
this.cancelScroll();
this.startTime = Date.now();
var scrollPosition = {
@@ -97,7 +100,7 @@ ScrollableWidget.prototype.scrollIntoView = function(element) {
if(duration <= 0) {
t = 1;
} else {
- t = ((Date.now()) - self.startTime) / duration;
+ t = ((Date.now()) - self.startTime) / duration;
}
if(t >= 1) {
self.cancelScroll();
@@ -114,11 +117,11 @@ ScrollableWidget.prototype.scrollIntoView = function(element) {
}
};
-ScrollableWidget.prototype.scrollSelectorIntoView = function(baseElement,selector,callback) {
- baseElement = baseElement || document.body;
- var element = baseElement.querySelector(selector);
+ScrollableWidget.prototype.scrollSelectorIntoView = function(baseElement,selector,callback,options) {
+ baseElement = baseElement || document;
+ var element = $tw.utils.querySelectorSafe(selector,baseElement);
if(element) {
- this.scrollIntoView(element,callback);
+ this.scrollIntoView(element,callback,options);
}
};
@@ -167,6 +170,53 @@ ScrollableWidget.prototype.render = function(parent,nextSibling) {
parent.insertBefore(this.outerDomNode,nextSibling);
this.renderChildren(this.innerDomNode,null);
this.domNodes.push(this.outerDomNode);
+ // If the scroll position is bound to a tiddler
+ if(this.scrollableBind) {
+ // After a delay for rendering, scroll to the bound position
+ this.updateScrollPositionFromBoundTiddler();
+ // Set up event listener
+ this.currentListener = this.listenerFunction.bind(this);
+ this.outerDomNode.addEventListener("scroll", this.currentListener);
+ }
+};
+
+ScrollableWidget.prototype.listenerFunction = function(event) {
+ var self = this;
+ clearTimeout(this.timeout);
+ this.timeout = setTimeout(function() {
+ var existingTiddler = self.wiki.getTiddler(self.scrollableBind),
+ newTiddlerFields = {
+ title: self.scrollableBind,
+ "scroll-left": self.outerDomNode.scrollLeft.toString(),
+ "scroll-top": self.outerDomNode.scrollTop.toString()
+ };
+ if(!existingTiddler || (existingTiddler.fields["title"] !== newTiddlerFields["title"]) || (existingTiddler.fields["scroll-left"] !== newTiddlerFields["scroll-left"] || existingTiddler.fields["scroll-top"] !== newTiddlerFields["scroll-top"])) {
+ self.wiki.addTiddler(new $tw.Tiddler(existingTiddler,newTiddlerFields));
+ }
+ }, DEBOUNCE_INTERVAL);
+}
+
+ScrollableWidget.prototype.updateScrollPositionFromBoundTiddler = function() {
+ // Bail if we're running on the fakedom
+ if(!this.outerDomNode.scrollTo) {
+ return;
+ }
+ var tiddler = this.wiki.getTiddler(this.scrollableBind);
+ if(tiddler) {
+ var scrollLeftTo = this.outerDomNode.scrollLeft;
+ if(parseFloat(tiddler.fields["scroll-left"]).toString() === tiddler.fields["scroll-left"]) {
+ scrollLeftTo = parseFloat(tiddler.fields["scroll-left"]);
+ }
+ var scrollTopTo = this.outerDomNode.scrollTop;
+ if(parseFloat(tiddler.fields["scroll-top"]).toString() === tiddler.fields["scroll-top"]) {
+ scrollTopTo = parseFloat(tiddler.fields["scroll-top"]);
+ }
+ this.outerDomNode.scrollTo({
+ top: scrollTopTo,
+ left: scrollLeftTo,
+ behavior: "instant"
+ })
+ }
};
/*
@@ -174,6 +224,7 @@ Compute the internal state of the widget
*/
ScrollableWidget.prototype.execute = function() {
// Get attributes
+ this.scrollableBind = this.getAttribute("bind");
this.fallthrough = this.getAttribute("fallthrough","yes");
this["class"] = this.getAttribute("class");
// Make child widgets
@@ -189,9 +240,22 @@ ScrollableWidget.prototype.refresh = function(changedTiddlers) {
this.refreshSelf();
return true;
}
- return this.refreshChildren(changedTiddlers);
+ // If the bound tiddler has changed, update the eventListener and update scroll position
+ if(changedAttributes["bind"]) {
+ if(this.currentListener) {
+ this.outerDomNode.removeEventListener("scroll", this.currentListener, false);
+ }
+ this.scrollableBind = this.getAttribute("bind");
+ this.currentListener = this.listenerFunction.bind(this);
+ this.outerDomNode.addEventListener("scroll", this.currentListener);
+ }
+ // Refresh children
+ var result = this.refreshChildren(changedTiddlers);
+ // If the bound tiddler has changed, update scroll position
+ if(changedAttributes["bind"] || changedTiddlers[this.getAttribute("bind")]) {
+ this.updateScrollPositionFromBoundTiddler();
+ }
+ return result;
};
exports.scrollable = ScrollableWidget;
-
-})();
diff --git a/core/modules/widgets/select.js b/core/modules/widgets/select.js
index 6efeb588f..8bc23542c 100644
--- a/core/modules/widgets/select.js
+++ b/core/modules/widgets/select.js
@@ -16,10 +16,7 @@ Select widget:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -40,8 +37,38 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
this.parentDomNode = parent;
this.computeAttributes();
this.execute();
- this.renderChildren(parent,nextSibling);
+ //Create element
+ var domNode = this.document.createElement("select");
+ if(this.selectClass) {
+ domNode.className = this.selectClass;
+ }
+ // Assign data- attributes
+ this.assignAttributes(domNode,{
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
+ if(this.selectMultiple) {
+ domNode.setAttribute("multiple","multiple");
+ }
+ if(this.isDisabled === "yes") {
+ domNode.setAttribute("disabled", true);
+ }
+ if(this.selectSize) {
+ domNode.setAttribute("size",this.selectSize);
+ }
+ if(this.selectTabindex) {
+ domNode.setAttribute("tabindex",this.selectTabindex);
+ }
+ if(this.selectTooltip) {
+ domNode.setAttribute("title",this.selectTooltip);
+ }
+ this.parentDomNode.insertBefore(domNode,nextSibling);
+ this.renderChildren(domNode,null);
+ this.domNodes.push(domNode);
this.setSelectValue();
+ if(this.selectFocus == "yes") {
+ this.getSelectDomNode().focus();
+ }
$tw.utils.addEventListeners(this.getSelectDomNode(),[
{name: "change", handlerObject: this, handlerMethod: "handleChangeEvent"}
]);
@@ -110,7 +137,7 @@ SelectWidget.prototype.setSelectValue = function() {
Get the DOM node of the select element
*/
SelectWidget.prototype.getSelectDomNode = function() {
- return this.children[0].domNodes[0];
+ return this.domNodes[0];
};
// Return an array of the selected opion values
@@ -142,26 +169,12 @@ SelectWidget.prototype.execute = function() {
this.selectDefault = this.getAttribute("default");
this.selectMultiple = this.getAttribute("multiple", false);
this.selectSize = this.getAttribute("size");
+ this.selectTabindex = this.getAttribute("tabindex");
this.selectTooltip = this.getAttribute("tooltip");
+ this.selectFocus = this.getAttribute("focus");
+ this.isDisabled = this.getAttribute("disabled","no");
// Make the child widgets
- var selectNode = {
- type: "element",
- tag: "select",
- children: this.parseTreeNode.children
- };
- if(this.selectClass) {
- $tw.utils.addAttributeToParseTreeNode(selectNode,"class",this.selectClass);
- }
- if(this.selectMultiple) {
- $tw.utils.addAttributeToParseTreeNode(selectNode,"multiple","multiple");
- }
- if(this.selectSize) {
- $tw.utils.addAttributeToParseTreeNode(selectNode,"size",this.selectSize);
- }
- if(this.selectTooltip) {
- $tw.utils.addAttributeToParseTreeNode(selectNode,"title",this.selectTooltip);
- }
- this.makeChildWidgets([selectNode]);
+ this.makeChildWidgets();
};
/*
@@ -170,12 +183,21 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
SelectWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
// If we're using a different tiddler/field/index then completely refresh ourselves
- if(changedAttributes.selectTitle || changedAttributes.selectField || changedAttributes.selectIndex || changedAttributes.selectTooltip) {
+ if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tooltip || changedAttributes.tabindex || changedAttributes.disabled) {
this.refreshSelf();
return true;
- // If the target tiddler value has changed, just update setting and refresh the children
} else {
+ if(changedAttributes.class) {
+ this.selectClass = this.getAttribute("class");
+ this.getSelectDomNode().setAttribute("class",this.selectClass);
+ }
+ this.assignAttributes(this.getSelectDomNode(),{
+ changedAttributes: changedAttributes,
+ sourcePrefix: "data-",
+ destPrefix: "data-"
+ });
var childrenRefreshed = this.refreshChildren(changedTiddlers);
+ // If the target tiddler value has changed, just update setting and refresh the children
if(changedTiddlers[this.selectTitle] || childrenRefreshed) {
this.setSelectValue();
}
@@ -184,5 +206,3 @@ SelectWidget.prototype.refresh = function(changedTiddlers) {
};
exports.select = SelectWidget;
-
-})();
diff --git a/core/modules/widgets/setmultiplevariables.js b/core/modules/widgets/setmultiplevariables.js
new file mode 100644
index 000000000..c2c3f65de
--- /dev/null
+++ b/core/modules/widgets/setmultiplevariables.js
@@ -0,0 +1,75 @@
+/*\
+title: $:/core/modules/widgets/setmultiplevariables.js
+type: application/javascript
+module-type: widget
+
+Widget to set multiple variables at once from a list of names and a list of values
+
+\*/
+
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var SetMultipleVariablesWidget = function(parseTreeNode,options) {
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+SetMultipleVariablesWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+SetMultipleVariablesWidget.prototype.render = function(parent,nextSibling) {
+ this.parentDomNode = parent;
+ this.computeAttributes();
+ this.execute();
+ this.renderChildren(parent,nextSibling);
+};
+
+/*
+Compute the internal state of the widget
+*/
+SetMultipleVariablesWidget.prototype.execute = function() {
+ // Setup our variables
+ this.setVariables();
+ // Construct the child widgets
+ this.makeChildWidgets();
+};
+
+
+SetMultipleVariablesWidget.prototype.setVariables = function() {
+ // Set the variables
+ var self = this,
+ filterNames = this.getAttribute("$names",""),
+ filterValues = this.getAttribute("$values","");
+ this.variableNames = [];
+ this.variableValues = [];
+ if(filterNames && filterValues) {
+ this.variableNames = this.wiki.filterTiddlers(filterNames,this);
+ this.variableValues = this.wiki.filterTiddlers(filterValues,this);
+ $tw.utils.each(this.variableNames,function(varname,index) {
+ self.setVariable(varname,self.variableValues[index]);
+ });
+ }
+};
+
+/*
+Refresh the widget by ensuring our attributes are up to date
+*/
+SetMultipleVariablesWidget.prototype.refresh = function(changedTiddlers) {
+ var filterNames = this.getAttribute("$names",""),
+ filterValues = this.getAttribute("$values",""),
+ variableNames = this.wiki.filterTiddlers(filterNames,this),
+ variableValues = this.wiki.filterTiddlers(filterValues,this);
+ if(!$tw.utils.isArrayEqual(this.variableNames,variableNames) || !$tw.utils.isArrayEqual(this.variableValues,variableValues)) {
+ this.refreshSelf();
+ return true;
+ }
+ return this.refreshChildren(changedTiddlers);
+};
+
+exports["setmultiplevariables"] = SetMultipleVariablesWidget;
diff --git a/core/modules/widgets/setvariable.js b/core/modules/widgets/setvariable.js
index 40dbadf16..688268a8d 100755
--- a/core/modules/widgets/setvariable.js
+++ b/core/modules/widgets/setvariable.js
@@ -6,10 +6,7 @@ module-type: widget
Set variable widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -48,7 +45,17 @@ SetWidget.prototype.execute = function() {
this.setValue = this.getAttribute("value");
this.setEmptyValue = this.getAttribute("emptyValue");
// Set context variable
- this.setVariable(this.setName,this.getValue(),this.parseTreeNode.params,!!this.parseTreeNode.isMacroDefinition);
+ if(this.parseTreeNode.isMacroDefinition) {
+ this.setVariable(this.setName,this.getValue(),this.parseTreeNode.params,true);
+ } else if(this.parseTreeNode.isFunctionDefinition) {
+ this.setVariable(this.setName,this.getValue(),this.parseTreeNode.params,undefined,{isFunctionDefinition: true});
+ } else if(this.parseTreeNode.isProcedureDefinition) {
+ this.setVariable(this.setName,this.getValue(),this.parseTreeNode.params,undefined,{isProcedureDefinition: true, configTrimWhiteSpace: this.parseTreeNode.configTrimWhiteSpace});
+ } else if(this.parseTreeNode.isWidgetDefinition) {
+ this.setVariable(this.setName,this.getValue(),this.parseTreeNode.params,undefined,{isWidgetDefinition: true, configTrimWhiteSpace: this.parseTreeNode.configTrimWhiteSpace});
+ } else {
+ this.setVariable(this.setName,this.getValue());
+ }
// Construct the child widgets
this.makeChildWidgets();
};
@@ -63,7 +70,7 @@ SetWidget.prototype.getValue = function() {
if(this.setSubTiddler) {
tiddler = this.wiki.getSubTiddler(this.setTiddler,this.setSubTiddler);
} else {
- tiddler = this.wiki.getTiddler(this.setTiddler);
+ tiddler = this.wiki.getTiddler(this.setTiddler);
}
if(!tiddler) {
value = this.setEmptyValue;
@@ -84,7 +91,7 @@ SetWidget.prototype.getValue = function() {
if(select !== undefined) {
value = results[select] || "";
} else {
- value = $tw.utils.stringifyList(results);
+ value = $tw.utils.stringifyList(results);
}
}
if(results.length === 0 && this.setEmptyValue !== undefined) {
@@ -112,5 +119,3 @@ SetWidget.prototype.refresh = function(changedTiddlers) {
exports.setvariable = SetWidget;
exports.set = SetWidget;
-
-})();
diff --git a/core/modules/widgets/slot.js b/core/modules/widgets/slot.js
new file mode 100644
index 000000000..37c671c90
--- /dev/null
+++ b/core/modules/widgets/slot.js
@@ -0,0 +1,77 @@
+/*\
+title: $:/core/modules/widgets/slot.js
+type: application/javascript
+module-type: widget
+
+Widget for definition of slots within transcluded content. The values provided by the translusion are passed to the slot.
+
+\*/
+
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget,
+ TranscludeWidget = require("$:/core/modules/widgets/transclude.js").transclude;
+
+var SlotWidget = function(parseTreeNode,options) {
+ // Initialise
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+SlotWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+SlotWidget.prototype.render = function(parent,nextSibling) {
+ // Call the constructor
+ Widget.call(this);
+ this.parentDomNode = parent;
+ this.computeAttributes();
+ this.execute();
+ this.renderChildren(parent,nextSibling);
+};
+
+/*
+Compute the internal state of the widget
+*/
+SlotWidget.prototype.execute = function() {
+ var self = this;
+ this.slotName = this.getAttribute("$name");
+ this.slotDepth = parseInt(this.getAttribute("$depth","1"),10) || 1;
+ // Find the parent transclusions
+ var pointer = this.parentWidget,
+ depth = this.slotDepth;
+ while(pointer) {
+ if(pointer instanceof TranscludeWidget && pointer.hasVisibleSlots()) {
+ depth--;
+ if(depth <= 0) {
+ break;
+ }
+ }
+ pointer = pointer.parentWidget;
+ }
+ var parseTreeNodes = [{type: "text", attributes: {text: {type: "string", value: "Missing slot reference!"}}}];
+ if(pointer instanceof TranscludeWidget) {
+ // Get the parse tree nodes comprising the slot contents
+ parseTreeNodes = pointer.getTransclusionSlotFill(this.slotName,this.parseTreeNode.children);
+ }
+ // Construct the child widgets
+ this.makeChildWidgets(parseTreeNodes);
+};
+
+/*
+Refresh the widget by ensuring our attributes are up to date
+*/
+SlotWidget.prototype.refresh = function(changedTiddlers) {
+ var changedAttributes = this.computeAttributes();
+ if(changedAttributes["$name"] || changedAttributes["$depth"]) {
+ this.refreshSelf();
+ return true;
+ }
+ return this.refreshChildren(changedTiddlers);
+};
+
+exports.slot = SlotWidget;
diff --git a/core/modules/widgets/testcase.js b/core/modules/widgets/testcase.js
new file mode 100644
index 000000000..ccdce7ac5
--- /dev/null
+++ b/core/modules/widgets/testcase.js
@@ -0,0 +1,161 @@
+/*\
+title: $:/core/modules/widgets/testcase.js
+type: application/javascript
+module-type: widget
+
+Widget to display a test case
+
+\*/
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var TestCaseWidget = function(parseTreeNode,options) {
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+TestCaseWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+TestCaseWidget.prototype.render = function(parent,nextSibling) {
+ var self = this;
+ this.parentDomNode = parent;
+ this.computeAttributes();
+ this.execute();
+ // Create container DOM node
+ var domNode = this.document.createElement("div");
+ domNode.setAttribute("class", "tc-test-case " + this.testcaseClass);
+ this.domNodes.push(domNode);
+ parent.insertBefore(domNode,nextSibling);
+ // Render the children into a hidden DOM node
+ var parser = {
+ tree: [{
+ type: "widget",
+ attributes: {},
+ orderedAttributes: [],
+ children: this.parseTreeNode.children || []
+ }]
+ };
+ this.contentRoot = this.wiki.makeWidget(parser,{
+ document: $tw.fakeDocument,
+ parentWidget: this
+ });
+ this.contentContainer = $tw.fakeDocument.createElement("div");
+ this.contentRoot.render(this.contentContainer,null);
+ // Create a wiki
+ this.testcaseWiki = new $tw.Wiki();
+ // Always load the core plugin
+ var loadTiddler = function(title) {
+ var tiddler = self.wiki.getTiddler(title);
+ if(tiddler) {
+ self.testcaseWiki.addTiddler(tiddler);
+ }
+ }
+ loadTiddler("$:/core");
+ loadTiddler("$:/plugins/tiddlywiki/codemirror");
+ // Load tiddlers from child data widgets
+ var tiddlers = [];
+ this.findChildrenDataWidgets(this.contentRoot.children,"data",function(widget) {
+ Array.prototype.push.apply(tiddlers,widget.readDataTiddlerValues());
+ });
+ var jsonPayload = JSON.stringify(tiddlers);
+ this.testcaseWiki.addTiddlers(tiddlers);
+ // Unpack plugin tiddlers
+ this.testcaseWiki.readPluginInfo();
+ this.testcaseWiki.registerPluginTiddlers("plugin");
+ this.testcaseWiki.unpackPluginTiddlers();
+ this.testcaseWiki.addIndexersToWiki();
+ // Generate a `transclusion` variable that depends on the values of the payload tiddlers so that the template can easily make unique state tiddlers
+ this.setVariable("transclusion",$tw.utils.hashString(jsonPayload));
+ // Generate a `payloadTiddlers` variable that contains the payload in JSON format
+ this.setVariable("payloadTiddlers",jsonPayload);
+ // Only run the tests if the testcase output and expected results were specified, and those tiddlers actually exist in the wiki
+ var shouldRunTests = false;
+ if(this.testcaseTestOutput && this.testcaseWiki.tiddlerExists(this.testcaseTestOutput) && this.testcaseTestExpectedResult && this.testcaseWiki.tiddlerExists(this.testcaseTestExpectedResult)) {
+ shouldRunTests = true;
+ }
+ // Render the test rendering if required
+ if(shouldRunTests) {
+ var testcaseOutputContainer = $tw.fakeDocument.createElement("div");
+ var testcaseOutputWidget = this.testcaseWiki.makeTranscludeWidget(this.testcaseTestOutput,{
+ document: $tw.fakeDocument,
+ parseAsInline: false,
+ parentWidget: this,
+ variables: {
+ currentTiddler: this.testcaseTestOutput
+ }
+ });
+ testcaseOutputWidget.render(testcaseOutputContainer);
+ }
+ // Clear changes queue
+ this.testcaseWiki.clearTiddlerEventQueue();
+ // Run the actions if provided
+ if(this.testcaseWiki.tiddlerExists(this.testcaseTestActions)) {
+ testcaseOutputWidget.invokeActionString(this.testcaseWiki.getTiddlerText(this.testcaseTestActions));
+ testcaseOutputWidget.refresh(this.testcaseWiki.changedTiddlers,testcaseOutputContainer);
+ }
+ // Set up the test result variables
+ var testResult = "",
+ outputHTML = "",
+ expectedHTML = "";
+ if(shouldRunTests) {
+ outputHTML = testcaseOutputContainer.children[0].innerHTML;
+ expectedHTML = this.testcaseWiki.getTiddlerText(this.testcaseTestExpectedResult);
+ if(outputHTML === expectedHTML) {
+ testResult = "pass";
+ } else {
+ testResult = "fail";
+ }
+ this.setVariable("outputHTML",outputHTML);
+ this.setVariable("expectedHTML",expectedHTML);
+ this.setVariable("testResult",testResult);
+ this.setVariable("currentTiddler",this.testcaseTestOutput);
+ }
+ // Don't display anything if testHideIfPass is "yes" and the tests have passed
+ if(this.testcaseHideIfPass === "yes" && testResult !== "fail") {
+ return;
+ }
+ // Render the page root template of the subwiki
+ var rootWidget = this.testcaseWiki.makeTranscludeWidget(this.testcaseTemplate,{
+ document: this.document,
+ parseAsInline: false,
+ parentWidget: this
+ });
+ rootWidget.render(domNode);
+ // Trap changes in the wiki and refresh the rendering
+ this.testcaseWiki.addEventListener("change",function(changes) {
+ rootWidget.refresh(changes,domNode);
+ });
+};
+
+/*
+Compute the internal state of the widget
+*/
+TestCaseWidget.prototype.execute = function() {
+ this.testcaseTemplate = this.getAttribute("template","$:/core/ui/testcases/DefaultTemplate");
+ this.testcaseTestOutput = this.getAttribute("testOutput");
+ this.testcaseTestActions = this.getAttribute("testActions");
+ this.testcaseTestExpectedResult = this.getAttribute("testExpectedResult");
+ this.testcaseHideIfPass = this.getAttribute("testHideIfPass");
+ this.testcaseClass = this.getAttribute("class","");
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+*/
+TestCaseWidget.prototype.refresh = function(changedTiddlers) {
+ var changedAttributes = this.computeAttributes();
+ if($tw.utils.count(changedAttributes) > 0) {
+ this.refreshSelf();
+ return true;
+ } else {
+ return this.contentRoot.refresh(changedTiddlers);
+ }
+};
+
+exports["testcase"] = TestCaseWidget;
diff --git a/core/modules/widgets/text.js b/core/modules/widgets/text.js
index e3212f590..a349b5550 100755
--- a/core/modules/widgets/text.js
+++ b/core/modules/widgets/text.js
@@ -6,10 +6,7 @@ module-type: widget
Text node widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -53,10 +50,8 @@ TextNodeWidget.prototype.refresh = function(changedTiddlers) {
this.refreshSelf();
return true;
} else {
- return false;
+ return false;
}
};
exports.text = TextNodeWidget;
-
-})();
diff --git a/core/modules/widgets/tiddler.js b/core/modules/widgets/tiddler.js
index 1296a5b09..6c08aac4e 100755
--- a/core/modules/widgets/tiddler.js
+++ b/core/modules/widgets/tiddler.js
@@ -6,10 +6,7 @@ module-type: widget
Tiddler widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -92,10 +89,8 @@ TiddlerWidget.prototype.refresh = function(changedTiddlers) {
this.refreshSelf();
return true;
} else {
- return this.refreshChildren(changedTiddlers);
+ return this.refreshChildren(changedTiddlers);
}
};
exports.tiddler = TiddlerWidget;
-
-})();
diff --git a/core/modules/widgets/transclude.js b/core/modules/widgets/transclude.js
index 1af7f9c42..9bec28b07 100755
--- a/core/modules/widgets/transclude.js
+++ b/core/modules/widgets/transclude.js
@@ -6,10 +6,7 @@ module-type: widget
Transclude widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -30,55 +27,412 @@ TranscludeWidget.prototype.render = function(parent,nextSibling) {
this.parentDomNode = parent;
this.computeAttributes();
this.execute();
- this.renderChildren(parent,nextSibling);
+ try {
+ this.renderChildren(parent,nextSibling);
+ } catch(error) {
+ if(error instanceof $tw.utils.TranscludeRecursionError) {
+ // We were infinite looping.
+ // We need to try and abort as much of the loop as we can, so we will keep "throwing" upward until we find a transclusion that has a different signature.
+ // Hopefully that will land us just outside where the loop began. That's where we want to issue an error.
+ // Rendering widgets beneath this point may result in a freezing browser if they explode exponentially.
+ var transcludeSignature = this.getVariable("transclusion");
+ if(this.getAncestorCount() > $tw.utils.TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH - 50) {
+ // For the first fifty transcludes we climb up, we simply collect signatures.
+ // We're assuming that those first 50 will likely include all transcludes involved in the loop.
+ error.signatures[transcludeSignature] = true;
+ } else if(!error.signatures[transcludeSignature]) {
+ // Now that we're past the first 50, let's look for the first signature that wasn't in the loop. That'll be where we print the error and resume rendering.
+ this.children = [this.makeChildWidget({type: "error", attributes: {
+ "$message": {type: "string", value: $tw.language.getString("Error/RecursiveTransclusion")}
+ }})];
+ this.renderChildren(parent,nextSibling);
+ return;
+ }
+ }
+ throw error;
+ }
};
/*
Compute the internal state of the widget
*/
TranscludeWidget.prototype.execute = function() {
- // Get our parameters
- this.transcludeTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler"));
- this.transcludeSubTiddler = this.getAttribute("subtiddler");
- this.transcludeField = this.getAttribute("field");
- this.transcludeIndex = this.getAttribute("index");
- this.transcludeMode = this.getAttribute("mode");
- this.recursionMarker = this.getAttribute("recursionMarker","yes");
- // Parse the text reference
+ // Get our attributes, string parameters, and slot values into properties of the widget object
+ this.collectAttributes();
+ this.collectStringParameters();
+ this.collectSlotFillParameters();
+ // Determine whether we're being used in inline or block mode
var parseAsInline = !this.parseTreeNode.isBlock;
if(this.transcludeMode === "inline") {
parseAsInline = true;
} else if(this.transcludeMode === "block") {
parseAsInline = false;
}
- var parser = this.wiki.parseTextReference(
+ // Set 'thisTiddler'
+ this.setVariable("thisTiddler",this.transcludeTitle);
+ var parseTreeNodes, target;
+ // Process the transclusion according to the output type
+ switch(this.transcludeOutput || "text/html") {
+ case "text/html":
+ // Return the parse tree nodes of the target
+ target = this.parseTransclusionTarget(parseAsInline);
+ this.parseAsInline = target.parseAsInline;
+ parseTreeNodes = target.parseTreeNodes;
+ break;
+ case "text/raw":
+ // Just return the raw text
+ target = this.getTransclusionTarget();
+ parseTreeNodes = [{type: "text", text: target.text}];
+ break;
+ default:
+ // "text/plain" is the plain text result of wikifying the text
+ target = this.parseTransclusionTarget(parseAsInline);
+ var widgetNode = this.wiki.makeWidget(target.parser,{
+ parentWidget: this,
+ document: $tw.fakeDocument
+ });
+ var container = $tw.fakeDocument.createElement("div");
+ widgetNode.render(container,null);
+ parseTreeNodes = [{type: "text", text: container.textContent}];
+ break;
+ }
+ this.sourceText = target.text;
+ this.parserType = target.type;
+ this._canonical_uri = target._canonical_uri;
+ // Set the legacy transclusion context variables only if we're not transcluding a variable
+ if(!this.transcludeVariable) {
+ var recursionMarker = this.makeRecursionMarker();
+ this.setVariable("transclusion",recursionMarker);
+ }
+ // Construct the child widgets
+ this.makeChildWidgets(parseTreeNodes);
+};
+
+/*
+Collect the attributes we need, in the process determining whether we're being used in legacy mode
+*/
+TranscludeWidget.prototype.collectAttributes = function() {
+ var self = this;
+ // Detect legacy mode
+ this.legacyMode = true;
+ $tw.utils.each(this.attributes,function(value,name) {
+ if(name.charAt(0) === "$") {
+ self.legacyMode = false;
+ }
+ });
+ // Get the attributes for the appropriate mode
+ if(this.legacyMode) {
+ this.transcludeTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler"));
+ this.transcludeSubTiddler = this.getAttribute("subtiddler");
+ this.transcludeField = this.getAttribute("field");
+ this.transcludeIndex = this.getAttribute("index");
+ this.transcludeMode = this.getAttribute("mode");
+ this.recursionMarker = this.getAttribute("recursionMarker","yes");
+ } else {
+ this.transcludeVariable = this.getAttribute("$variable");
+ this.transcludeVariableIsFunction = false;
+ this.transcludeType = this.getAttribute("$type");
+ this.transcludeOutput = this.getAttribute("$output","text/html");
+ this.transcludeTitle = this.getAttribute("$tiddler",this.getVariable("currentTiddler"));
+ this.transcludeSubTiddler = this.getAttribute("$subtiddler");
+ this.transcludeField = this.getAttribute("$field");
+ this.transcludeIndex = this.getAttribute("$index");
+ this.transcludeMode = this.getAttribute("$mode");
+ this.recursionMarker = this.getAttribute("$recursionMarker","yes");
+ }
+};
+
+/*
+Collect string parameters
+*/
+TranscludeWidget.prototype.collectStringParameters = function() {
+ var self = this;
+ this.stringParametersByName = Object.create(null);
+ if(!this.legacyMode) {
+ $tw.utils.each(this.attributes,function(value,name) {
+ if(name.charAt(0) === "$") {
+ if(name.charAt(1) === "$") {
+ // Attributes starting $$ represent parameters starting with a single $
+ name = name.slice(1);
+ } else {
+ // Attributes starting with a single $ are reserved for the widget
+ return;
+ }
+ }
+ self.stringParametersByName[name] = value;
+ });
+ }
+};
+
+/*
+Collect slot value parameters
+*/
+TranscludeWidget.prototype.collectSlotFillParameters = function() {
+ var self = this;
+ this.slotFillParseTrees = Object.create(null);
+ if(this.legacyMode) {
+ this.slotFillParseTrees["ts-missing"] = this.parseTreeNode.children;
+ } else {
+ this.slotFillParseTrees["ts-raw"] = this.parseTreeNode.children;
+ var noFillWidgetsFound = true,
+ searchParseTreeNodes = function(nodes) {
+ $tw.utils.each(nodes,function(node) {
+ if(node.type === "fill") {
+ if(node.attributes["$name"] && node.attributes["$name"].type === "string") {
+ var slotValueName = node.attributes["$name"].value;
+ self.slotFillParseTrees[slotValueName] = node.children || [];
+ }
+ noFillWidgetsFound = false;
+ } else {
+ searchParseTreeNodes(node.children);
+ }
+ });
+ };
+ searchParseTreeNodes(this.parseTreeNode.children);
+ if(noFillWidgetsFound) {
+ this.slotFillParseTrees["ts-missing"] = this.parseTreeNode.children;
+ }
+ }
+};
+
+/*
+Get transcluded details as an object {text:,type:}
+*/
+TranscludeWidget.prototype.getTransclusionTarget = function() {
+ var self = this;
+ var text;
+ // Return the text and type of the target
+ if(this.hasAttribute("$variable")) {
+ if(this.transcludeVariable) {
+ // Transcluding a variable
+ var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()});
+ this.transcludeVariableIsFunction = variableInfo.srcVariable && variableInfo.srcVariable.isFunctionDefinition;
+ text = variableInfo.text;
+ this.transcludeFunctionResult = text;
+ return {
+ text: variableInfo.text,
+ type: this.transcludeType
+ };
+ }
+ } else {
+ // Transcluding a text reference
+ var parserInfo = this.wiki.getTextReferenceParserInfo(
+ this.transcludeTitle,
+ this.transcludeField,
+ this.transcludeIndex,
+ {
+ subTiddler: this.transcludeSubTiddler,
+ defaultType: this.transcludeType
+ });
+ return {
+ text: parserInfo.text,
+ type: parserInfo.type,
+ _canonical_uri: parserInfo._canonical_uri
+ };
+ }
+};
+
+/*
+Get transcluded parse tree nodes as an object {text:,type:,parseTreeNodes:,parseAsInline:}
+*/
+TranscludeWidget.prototype.parseTransclusionTarget = function(parseAsInline) {
+ var self = this;
+ var parser;
+ // Get the parse tree
+ if(this.hasAttribute("$variable")) {
+ if(this.transcludeVariable) {
+ // Transcluding a variable
+ var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()}),
+ srcVariable = variableInfo && variableInfo.srcVariable;
+ if(srcVariable && srcVariable.isFunctionDefinition) {
+ this.transcludeVariableIsFunction = true;
+ this.transcludeFunctionResult = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
+ }
+ if(variableInfo.text) {
+ if(srcVariable && srcVariable.isFunctionDefinition) {
+ parser = {
+ tree: [{
+ type: "text",
+ text: this.transcludeFunctionResult
+ }],
+ source: this.transcludeFunctionResult,
+ type: "text/vnd.tiddlywiki"
+ };
+ if(parseAsInline) {
+ parser.tree[0] = {
+ type: "text",
+ text: this.transcludeFunctionResult
+ };
+ } else {
+ parser.tree[0] = {
+ type: "element",
+ tag: "p",
+ children: [{
+ type: "text",
+ text: this.transcludeFunctionResult
+ }]
+ }
+ }
+ } else {
+ var cacheKey = (parseAsInline ? "inlineParser" : "blockParser") + (this.transcludeType || "");
+ if(variableInfo.isCacheable && srcVariable[cacheKey]) {
+ parser = srcVariable[cacheKey];
+ } else {
+ parser = this.wiki.parseText(this.transcludeType,variableInfo.text || "",{parseAsInline: parseAsInline, configTrimWhiteSpace: srcVariable && srcVariable.configTrimWhiteSpace});
+ if(variableInfo.isCacheable) {
+ srcVariable[cacheKey] = parser;
+ }
+ }
+ }
+ if(parser) {
+ // Add parameters widget for procedures and custom widgets
+ if(srcVariable && (srcVariable.isProcedureDefinition || srcVariable.isWidgetDefinition)) {
+ parser = {
+ tree: [
+ {
+ type: "parameters",
+ children: parser.tree
+ }
+ ],
+ source: parser.source,
+ type: parser.type
+ }
+ $tw.utils.each(srcVariable.params,function(param) {
+ var name = param.name;
+ // Parameter names starting with dollar must be escaped to double dollars
+ if(name.charAt(0) === "$") {
+ name = "$" + name;
+ }
+ $tw.utils.addAttributeToParseTreeNode(parser.tree[0],name,param["default"])
+ });
+ } else if(srcVariable && !srcVariable.isFunctionDefinition) {
+ // For macros and ordinary variables, wrap the parse tree in a vars widget assigning the parameters to variables named "__paramname__"
+ parser = {
+ tree: [
+ {
+ type: "vars",
+ children: parser.tree
+ }
+ ],
+ source: parser.source,
+ type: parser.type
+ }
+ $tw.utils.each(variableInfo.params,function(param) {
+ $tw.utils.addAttributeToParseTreeNode(parser.tree[0],"__" + param.name + "__",param.value)
+ });
+ }
+ }
+ }
+ }
+ } else {
+ // Transcluding a text reference
+ parser = this.wiki.parseTextReference(
this.transcludeTitle,
this.transcludeField,
this.transcludeIndex,
{
parseAsInline: parseAsInline,
- subTiddler: this.transcludeSubTiddler
- }),
- parseTreeNodes = parser ? parser.tree : this.parseTreeNode.children;
- // Set context variables for recursion detection
- var recursionMarker = this.makeRecursionMarker();
- if(this.recursionMarker === "yes") {
- this.setVariable("transclusion",recursionMarker);
+ subTiddler: this.transcludeSubTiddler,
+ defaultType: this.transcludeType
+ });
}
- // Check for recursion
- if(parser) {
- if(this.parentWidget && this.parentWidget.hasVariable("transclusion",recursionMarker)) {
- parseTreeNodes = [{type: "element", tag: "span", attributes: {
- "class": {type: "string", value: "tc-error"}
- }, children: [
- {type: "text", text: $tw.language.getString("Error/RecursiveTransclusion")}
- ]}];
+ // Return the parse tree
+ return {
+ parser: parser,
+ parseTreeNodes: parser ? parser.tree : (this.slotFillParseTrees["ts-missing"] || []),
+ parseAsInline: parseAsInline,
+ text: parser && parser.source,
+ type: parser && parser.type
+ };
+};
+
+/*
+Fetch all the string parameters as an ordered array of {name:, value:} where the name is optional
+*/
+TranscludeWidget.prototype.getOrderedTransclusionParameters = function() {
+ var result = [];
+ // Collect the parameters
+ for(var name in this.stringParametersByName) {
+ var value = this.stringParametersByName[name];
+ result.push({name: name, value: value});
+ }
+ // Sort numerical parameter names first
+ result.sort(function(a,b) {
+ var aIsNumeric = !isNaN(a.name),
+ bIsNumeric = !isNaN(b.name);
+ if(aIsNumeric && bIsNumeric) {
+ return a.name - b.name;
+ } else if(aIsNumeric) {
+ return -1;
+ } else if(bIsNumeric) {
+ return 1;
+ } else {
+ return a.name === b.name ? 0 : (a.name < b.name ? -1 : 1);
+ }
+ });
+ // Remove names from numerical parameters
+ $tw.utils.each(result,function(param,index) {
+ if(!isNaN(param.name)) {
+ delete param.name;
+ }
+ });
+ return result;
+};
+
+/*
+Fetch the value of a parameter
+*/
+TranscludeWidget.prototype.getTransclusionParameter = function(name,index,defaultValue) {
+ if(name in this.stringParametersByName) {
+ return this.stringParametersByName[name];
+ } else {
+ var name = "" + index;
+ if(name in this.stringParametersByName) {
+ return this.stringParametersByName[name];
}
}
- // Construct the child widgets
- this.makeChildWidgets(parseTreeNodes);
+ return defaultValue;
};
+/*
+Get one of the special parameters to be provided by the parameters widget
+*/
+TranscludeWidget.prototype.getTransclusionMetaParameters = function() {
+ var self = this;
+ return {
+ "parseMode": function() {
+ return self.parseAsInline ? "inline" : "block";
+ },
+ "parseTreeNodes": function() {
+ return JSON.stringify(self.parseTreeNode.children || []);
+ },
+ "slotFillParseTreeNodes": function() {
+ return JSON.stringify(self.slotFillParseTrees);
+ },
+ "params": function() {
+ return JSON.stringify(self.stringParametersByName);
+ }
+ };
+};
+
+/*
+Fetch the value of a slot
+*/
+TranscludeWidget.prototype.getTransclusionSlotFill = function(name,defaultParseTreeNodes) {
+ if(name && this.slotFillParseTrees[name] && this.slotFillParseTrees[name].length > 0) {
+ return this.slotFillParseTrees[name];
+ } else {
+ return defaultParseTreeNodes || [];
+ }
+};
+
+/*
+Return whether this transclusion should be visible to the slot widget
+*/
+TranscludeWidget.prototype.hasVisibleSlots = function() {
+ return this.getAttribute("$fillignore","no") === "no";
+}
+
/*
Compose a string comprising the title, field and/or index to identify this transclusion for recursion detection
*/
@@ -98,19 +452,33 @@ TranscludeWidget.prototype.makeRecursionMarker = function() {
return output.join("");
};
+TranscludeWidget.prototype.parserNeedsRefresh = function() {
+ // Doesn't need to consider transcluded variables because a parent variable can't change once a widget has been created
+ var parserInfo = this.wiki.getTextReferenceParserInfo(this.transcludeTitle,this.transcludeField,this.transcludeIndex,{
+ subTiddler: this.transcludeSubTiddler,
+ defaultType: this.transcludeType
+ });
+ return (this.sourceText === undefined || parserInfo.sourceText !== this.sourceText || parserInfo.parserType !== this.parserType || parserInfo._canonical_uri !== this._canonical_uri);
+};
+
+TranscludeWidget.prototype.functionNeedsRefresh = function() {
+ var oldResult = this.transcludeFunctionResult;
+ var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()});
+ var newResult = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
+ return oldResult !== newResult;
+}
+
/*
Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
*/
TranscludeWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedTiddlers[this.transcludeTitle]) {
+ if(($tw.utils.count(changedAttributes) > 0) || (this.transcludeVariableIsFunction && this.functionNeedsRefresh()) || (!this.transcludeVariable && changedTiddlers[this.transcludeTitle] && this.parserNeedsRefresh())) {
this.refreshSelf();
return true;
} else {
- return this.refreshChildren(changedTiddlers);
+ return this.refreshChildren(changedTiddlers);
}
};
exports.transclude = TranscludeWidget;
-
-})();
diff --git a/core/modules/widgets/vars.js b/core/modules/widgets/vars.js
index cbd3e0ddc..97edab041 100644
--- a/core/modules/widgets/vars.js
+++ b/core/modules/widgets/vars.js
@@ -13,30 +13,25 @@ This widget allows multiple variables to be set in one go:
```
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
var VarsWidget = function(parseTreeNode,options) {
- // Initialise
+ // Initialise
this.initialise(parseTreeNode,options);
};
/*
Inherit from the base widget class
*/
-VarsWidget.prototype = Object.create(Widget.prototype);
+VarsWidget.prototype = new Widget();
/*
Render this widget into the DOM
*/
VarsWidget.prototype.render = function(parent,nextSibling) {
- // Call the constructor
- Widget.call(this);
this.parentDomNode = parent;
this.computeAttributes();
this.execute();
@@ -63,7 +58,7 @@ Refresh the widget by ensuring our attributes are up to date
*/
VarsWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(Object.keys(changedAttributes).length) {
+ if($tw.utils.count(changedAttributes) > 0) {
this.refreshSelf();
return true;
}
@@ -71,5 +66,3 @@ VarsWidget.prototype.refresh = function(changedTiddlers) {
};
exports["vars"] = VarsWidget;
-
-})();
diff --git a/core/modules/widgets/view.js b/core/modules/widgets/view.js
index 30da34147..e7c808645 100755
--- a/core/modules/widgets/view.js
+++ b/core/modules/widgets/view.js
@@ -6,10 +6,7 @@ module-type: widget
View widget
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -65,6 +62,9 @@ ViewWidget.prototype.execute = function() {
case "htmlencoded":
this.text = this.getValueAsHtmlEncoded();
break;
+ case "htmltextencoded":
+ this.text = this.getValueAsHtmlTextEncoded();
+ break;
case "urlencoded":
this.text = this.getValueAsUrlEncoded();
break;
@@ -105,7 +105,7 @@ ViewWidget.prototype.getValue = function(options) {
} else {
var tiddler;
if(this.viewSubtiddler) {
- tiddler = this.wiki.getSubTiddler(this.viewTitle,this.viewSubtiddler);
+ tiddler = this.wiki.getSubTiddler(this.viewTitle,this.viewSubtiddler);
} else {
tiddler = this.wiki.getTiddler(this.viewTitle);
}
@@ -118,7 +118,7 @@ ViewWidget.prototype.getValue = function(options) {
if(options.asString) {
value = tiddler.getFieldString(this.viewField);
} else {
- value = tiddler.fields[this.viewField];
+ value = tiddler.fields[this.viewField];
}
}
}
@@ -160,12 +160,16 @@ ViewWidget.prototype.getValueAsHtmlEncoded = function() {
return $tw.utils.htmlEncode(this.getValueAsText());
};
+ViewWidget.prototype.getValueAsHtmlTextEncoded = function() {
+ return $tw.utils.htmlTextEncode(this.getValueAsText());
+};
+
ViewWidget.prototype.getValueAsUrlEncoded = function() {
- return encodeURIComponent(this.getValueAsText());
+ return $tw.utils.encodeURIComponentExtended(this.getValueAsText());
};
ViewWidget.prototype.getValueAsDoubleUrlEncoded = function() {
- return encodeURIComponent(encodeURIComponent(this.getValueAsText()));
+ return $tw.utils.encodeURIComponentExtended($tw.utils.encodeURIComponentExtended(this.getValueAsText()));
};
ViewWidget.prototype.getValueAsDate = function(format) {
@@ -212,10 +216,8 @@ ViewWidget.prototype.refresh = function(changedTiddlers) {
this.refreshSelf();
return true;
} else {
- return false;
+ return false;
}
};
exports.view = ViewWidget;
-
-})();
diff --git a/core/modules/widgets/widget.js b/core/modules/widgets/widget.js
index 1925bfe00..b89df34b7 100755
--- a/core/modules/widgets/widget.js
+++ b/core/modules/widgets/widget.js
@@ -6,10 +6,7 @@ module-type: widget
Widget base class
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -38,9 +35,7 @@ Widget.prototype.initialise = function(parseTreeNode,options) {
this.parseTreeNode = parseTreeNode;
this.wiki = options.wiki;
this.parentWidget = options.parentWidget;
- this.variablesConstructor = function() {};
- this.variablesConstructor.prototype = this.parentWidget ? this.parentWidget.variables : {};
- this.variables = new this.variablesConstructor();
+ this.variables = Object.create(this.parentWidget ? this.parentWidget.variables : null);
this.document = options.document;
this.attributes = {};
this.children = [];
@@ -88,9 +83,22 @@ name: name of the variable
value: value of the variable
params: array of {name:, default:} for each parameter
isMacroDefinition: true if the variable is set via a \define macro pragma (and hence should have variable substitution performed)
+options includes:
+ isProcedureDefinition: true if the variable is set via a \procedure pragma (and hence should not have variable substitution performed)
+ isFunctionDefinition: true if the variable is set via a \function pragma (and hence should not have variable substitution performed)
+ isWidgetDefinition: true if the variable is set via a \widget pragma (and hence should not have variable substitution performed)
*/
-Widget.prototype.setVariable = function(name,value,params,isMacroDefinition) {
- this.variables[name] = {value: value, params: params, isMacroDefinition: !!isMacroDefinition};
+Widget.prototype.setVariable = function(name,value,params,isMacroDefinition,options) {
+ options = options || {};
+ this.variables[name] = {
+ value: value,
+ params: params,
+ isMacroDefinition: !!isMacroDefinition,
+ isFunctionDefinition: !!options.isFunctionDefinition,
+ isProcedureDefinition: !!options.isProcedureDefinition,
+ isWidgetDefinition: !!options.isWidgetDefinition,
+ configTrimWhiteSpace: !!options.configTrimWhiteSpace
+ };
};
/*
@@ -98,42 +106,79 @@ Get the prevailing value of a context variable
name: name of variable
options: see below
Options include
+
params: array of {name:, value:} for each parameter
defaultValue: default value if the variable is not defined
+source: optional source iterator for evaluating function invocations
+allowSelfAssigned: if true, includes the current widget in the context chain instead of just the parent
Returns an object with the following fields:
-params: array of {name:,value:} of parameters passed to wikitext variables
+params: array of {name:,value:} or {value:} of parameters to be applied
text: text of variable, with parameters properly substituted
+resultList: result of variable evaluation as an array
+srcVariable: reference to the object defining the variable
*/
Widget.prototype.getVariableInfo = function(name,options) {
options = options || {};
- var actualParams = options.params || [],
- parentWidget = this.parentWidget;
+ var self = this,
+ actualParams = options.params || [],
+ variable;
+ if(options.allowSelfAssigned) {
+ variable = this.variables[name];
+ } else {
+ variable = this.parentWidget && this.parentWidget.variables[name];
+ }
// Check for the variable defined in the parent widget (or an ancestor in the prototype chain)
- if(parentWidget && name in parentWidget.variables) {
- var variable = parentWidget.variables[name],
- originalValue = variable.value,
+ if(variable) {
+ var originalValue = variable.value,
value = originalValue,
- params = this.resolveVariableParameters(variable.params,actualParams);
- // Substitute any parameters specified in the definition
- $tw.utils.each(params,function(param) {
- value = $tw.utils.replaceString(value,new RegExp("\\$" + $tw.utils.escapeRegExp(param.name) + "\\$","mg"),param.value);
- });
- // Only substitute variable references if this variable was defined with the \define pragma
+ params = [],
+ resultList = [value];
+ // Only substitute parameter and variable references if this variable was defined with the \define pragma
if(variable.isMacroDefinition) {
- value = this.substituteVariableReferences(value);
+ params = self.resolveVariableParameters(variable.params,actualParams);
+ // Substitute any parameters specified in the definition
+ $tw.utils.each(params,function(param) {
+ value = $tw.utils.replaceString(value,new RegExp("\\$" + $tw.utils.escapeRegExp(param.name) + "\\$","mg"),param.value);
+ });
+ value = self.substituteVariableReferences(value,options);
+ resultList = [value];
+ } else if(variable.isFunctionDefinition) {
+ // Function evaluations
+ params = self.resolveVariableParameters(variable.params,actualParams);
+ var variables = options.variables || Object.create(null);
+ // Apply default parameter values
+ $tw.utils.each(variable.params,function(param,index) {
+ if(param["default"]) {
+ variables[param.name] = param["default"];
+ }
+ });
+ // Parameters are an array of {value:} or {name:, value:} pairs
+ $tw.utils.each(params,function(param) {
+ variables[param.name] = param.value;
+ });
+ resultList = this.wiki.filterTiddlers(value,this.makeFakeWidgetWithVariables(variables),options.source);
+ value = resultList[0] || "";
+ } else {
+ params = variable.params;
}
return {
text: value,
params: params,
+ resultList: resultList,
srcVariable: variable,
isCacheable: originalValue === value
};
}
// If the variable doesn't exist in the parent widget then look for a macro module
+ var text = this.evaluateMacroModule(name,actualParams);
+ if(text === undefined) {
+ text = options.defaultValue;
+ }
return {
- text: this.evaluateMacroModule(name,actualParams,options.defaultValue)
+ text: text,
+ resultList: [text]
};
};
@@ -144,6 +189,11 @@ Widget.prototype.getVariable = function(name,options) {
return this.getVariableInfo(name,options).text;
};
+/*
+Maps actual parameters onto formal parameters, returning an array of {name:,value:} objects
+formalParams - Array of {name:,default:} (default value is optional)
+actualParams - Array of string values or {name:,value:} (name is optional)
+*/
Widget.prototype.resolveVariableParameters = function(formalParams,actualParams) {
formalParams = formalParams || [];
actualParams = actualParams || [];
@@ -156,7 +206,7 @@ Widget.prototype.resolveVariableParameters = function(formalParams,actualParams)
paramInfo = formalParams[p];
paramValue = undefined;
for(var m=0; m<actualParams.length; m++) {
- if(actualParams[m].name === paramInfo.name) {
+ if(typeof actualParams[m] !== "string" && actualParams[m].name === paramInfo.name) {
paramValue = actualParams[m].value;
}
}
@@ -165,7 +215,8 @@ Widget.prototype.resolveVariableParameters = function(formalParams,actualParams)
nextAnonParameter++;
}
if(paramValue === undefined && nextAnonParameter < actualParams.length) {
- paramValue = actualParams[nextAnonParameter++].value;
+ var param = actualParams[nextAnonParameter++];
+ paramValue = typeof param === "string" ? param : param.value;
}
// If we've still not got a value, use the default, if any
paramValue = paramValue || paramInfo["default"] || "";
@@ -175,10 +226,10 @@ Widget.prototype.resolveVariableParameters = function(formalParams,actualParams)
return results;
};
-Widget.prototype.substituteVariableReferences = function(text) {
+Widget.prototype.substituteVariableReferences = function(text,options) {
var self = this;
return (text || "").replace(/\$\(([^\)\$]+)\)\$/g,function(match,p1,offset,string) {
- return self.getVariable(p1,{defaultValue: ""});
+ return options.variables && options.variables[p1] || (self.getVariable(p1,{defaultValue: ""}));
});
};
@@ -259,23 +310,54 @@ Widget.prototype.getStateQualifier = function(name) {
};
/*
-Compute the current values of the attributes of the widget. Returns a hashmap of the names of the attributes that have changed
+Make a fake widget with specified variables, suitable for variable lookup in filters
*/
-Widget.prototype.computeAttributes = function() {
+Widget.prototype.makeFakeWidgetWithVariables = function(variables) {
+ var self = this,
+ variables = variables || {};
+ return {
+ getVariable: function(name,opts) {
+ if($tw.utils.hop(variables,name)) {
+ return variables[name];
+ } else {
+ opts = opts || {};
+ opts.variables = variables;
+ return self.getVariable(name,opts);
+ };
+ },
+ getVariableInfo: function(name,opts) {
+ if($tw.utils.hop(variables,name)) {
+ return {
+ text: variables[name]
+ };
+ } else {
+ opts = opts || {};
+ opts.variables = $tw.utils.extend({},variables,opts.variables);
+ return self.getVariableInfo(name,opts);
+ };
+ },
+ makeFakeWidgetWithVariables: self.makeFakeWidgetWithVariables,
+ resolveVariableParameters: self.resolveVariableParameters,
+ wiki: self.wiki
+ };
+};
+
+/*
+Compute the current values of the attributes of the widget. Returns a hashmap of the names of the attributes that have changed.
+Options include:
+filterFn: only include attributes where filterFn(name) returns true
+*/
+Widget.prototype.computeAttributes = function(options) {
+ options = options || {};
var changedAttributes = {},
- self = this,
- value;
+ self = this;
$tw.utils.each(this.parseTreeNode.attributes,function(attribute,name) {
- if(attribute.type === "filtered") {
- value = self.wiki.filterTiddlers(attribute.filter,self)[0] || "";
- } else if(attribute.type === "indirect") {
- value = self.wiki.getTextReference(attribute.textReference,"",self.getVariable("currentTiddler"));
- } else if(attribute.type === "macro") {
- value = self.getVariable(attribute.value.name,{params: attribute.value.params});
- } else { // String attribute
- value = attribute.value;
+ if(options.filterFn) {
+ if(!options.filterFn(name)) {
+ return;
+ }
}
- // Check whether the attribute has changed
+ var value = self.computeAttribute(attribute);
if(self.attributes[name] !== value) {
self.attributes[name] = value;
changedAttributes[name] = true;
@@ -284,13 +366,38 @@ Widget.prototype.computeAttributes = function() {
return changedAttributes;
};
+Widget.prototype.computeAttribute = function(attribute) {
+ var self = this,
+ value;
+ if(attribute.type === "filtered") {
+ value = this.wiki.filterTiddlers(attribute.filter,this)[0] || "";
+ } else if(attribute.type === "indirect") {
+ value = this.wiki.getTextReference(attribute.textReference,"",this.getVariable("currentTiddler")) || "";
+ } else if(attribute.type === "macro") {
+ var variableInfo = this.getVariableInfo(attribute.value.name,{params: attribute.value.params});
+ value = variableInfo.text;
+ } else if(attribute.type === "substituted") {
+ value = this.wiki.getSubstitutedText(attribute.rawValue,this) || "";
+ } else { // String attribute
+ value = attribute.value;
+ }
+ return value;
+};
+
/*
-Check for the presence of an attribute
+Check for the presence of an evaluated attribute on the widget. Note that attributes set to a missing variable (ie attr=<<missing>>) will be treated as missing
*/
Widget.prototype.hasAttribute = function(name) {
return $tw.utils.hop(this.attributes,name);
};
+/*
+Check for the presence of a raw attribute on the widget parse tree node. Note that attributes set to a missing variable (ie attr=<<missing>>) will NOT be treated as missing
+*/
+Widget.prototype.hasParseTreeNodeAttribute = function(name) {
+ return $tw.utils.hop(this.parseTreeNode.attributes,name);
+};
+
/*
Get the value of an attribute
*/
@@ -303,56 +410,169 @@ Widget.prototype.getAttribute = function(name,defaultText) {
};
/*
-Assign the computed attributes of the widget to a domNode
+Assign the common attributes of the widget to a domNode
options include:
-excludeEventAttributes: ignores attributes whose name begins with "on"
+sourcePrefix: prefix of attributes that are to be directly assigned (defaults to the empty string meaning all attributes)
+destPrefix: prefix to be applied to attribute names that are to be directly assigned (defaults to the emtpy string which means no prefix is added)
+changedAttributes: hashmap by attribute name of attributes to process (if missing, process all attributes)
+excludeEventAttributes: ignores attributes whose name would begin with "on"
*/
Widget.prototype.assignAttributes = function(domNode,options) {
options = options || {};
- var self = this;
- $tw.utils.each(this.attributes,function(v,a) {
- // Check exclusions
- if(options.excludeEventAttributes && a.substr(0,2) === "on") {
- v = undefined;
+ var self = this,
+ changedAttributes = options.changedAttributes || this.attributes,
+ sourcePrefix = options.sourcePrefix || "",
+ destPrefix = options.destPrefix || "",
+ EVENT_ATTRIBUTE_PREFIX = "on";
+ var assignAttribute = function(name,value) {
+ // Process any CSS custom properties
+ if(name.substr(0,2) === "--" && name.length > 2) {
+ domNode.style.setProperty(name,value);
+ return;
}
- if(v !== undefined) {
- var b = a.split(":");
+ // Process any style attributes before considering sourcePrefix and destPrefix
+ if(name.substr(0,6) === "style." && name.length > 6) {
+ domNode.style[$tw.utils.unHyphenateCss(name.substr(6))] = value;
+ return;
+ }
+ // Check if the sourcePrefix is a match
+ if(name.substr(0,sourcePrefix.length) === sourcePrefix) {
+ name = destPrefix + name.substr(sourcePrefix.length);
+ } else {
+ value = undefined;
+ }
+ // Check for excluded attribute names
+ if(options.excludeEventAttributes && name.substr(0,2).toLowerCase() === EVENT_ATTRIBUTE_PREFIX) {
+ value = undefined;
+ }
+ if(value !== undefined) {
+ // Handle the xlink: namespace
+ var namespace = null;
+ if(name.substr(0,6) === "xlink:" && name.length > 6) {
+ namespace = "http://www.w3.org/1999/xlink";
+ name = name.substr(6);
+ }
// Setting certain attributes can cause a DOM error (eg xmlns on the svg element)
try {
- if (b.length == 2 && b[0] == "xlink"){
- domNode.setAttributeNS("http://www.w3.org/1999/xlink",b[1],v);
- } else {
- domNode.setAttributeNS(null,a,v);
- }
+ domNode.setAttributeNS(namespace,name,value);
} catch(e) {
}
}
- });
+ };
+ // If the parse tree node has the orderedAttributes property then use that order
+ if(this.parseTreeNode.orderedAttributes) {
+ $tw.utils.each(this.parseTreeNode.orderedAttributes,function(attribute,index) {
+ if(attribute.name in changedAttributes) {
+ assignAttribute(attribute.name,self.getAttribute(attribute.name));
+ }
+ });
+ // Otherwise update each changed attribute irrespective of order
+ } else {
+ $tw.utils.each(changedAttributes,function(value,name) {
+ assignAttribute(name,self.getAttribute(name));
+ });
+ }
+};
+
+/*
+Get the number of ancestor widgets for this widget
+*/
+Widget.prototype.getAncestorCount = function() {
+ if(this.ancestorCount === undefined) {
+ if(this.parentWidget) {
+ this.ancestorCount = this.parentWidget.getAncestorCount() + 1;
+ } else {
+ this.ancestorCount = 0;
+ }
+ }
+ return this.ancestorCount;
};
/*
Make child widgets correspondng to specified parseTreeNodes
*/
-Widget.prototype.makeChildWidgets = function(parseTreeNodes) {
+Widget.prototype.makeChildWidgets = function(parseTreeNodes,options) {
+ options = options || {};
this.children = [];
var self = this;
- $tw.utils.each(parseTreeNodes || (this.parseTreeNode && this.parseTreeNode.children),function(childNode) {
- self.children.push(self.makeChildWidget(childNode));
- });
+ // Check for too much recursion
+ if(this.getAncestorCount() > $tw.utils.TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH) {
+ throw new $tw.utils.TranscludeRecursionError();
+ } else {
+ // Create set variable widgets for each variable
+ $tw.utils.each(options.variables,function(value,name) {
+ var setVariableWidget = {
+ type: "set",
+ attributes: {
+ name: {type: "string", value: name},
+ value: {type: "string", value: value}
+ },
+ children: parseTreeNodes
+ };
+ parseTreeNodes = [setVariableWidget];
+ });
+ // Create the child widgets
+ $tw.utils.each(parseTreeNodes || (this.parseTreeNode && this.parseTreeNode.children),function(childNode) {
+ self.children.push(self.makeChildWidget(childNode));
+ });
+ }
};
/*
Construct the widget object for a parse tree node
+options include:
+ variables: optional hashmap of variables to wrap around the widget
*/
-Widget.prototype.makeChildWidget = function(parseTreeNode) {
+Widget.prototype.makeChildWidget = function(parseTreeNode,options) {
+ var self = this;
+ options = options || {};
+ // Check whether this node type is defined by a custom widget definition
+ var variableDefinitionName = "$" + parseTreeNode.type;
+ if(this.variables[variableDefinitionName]) {
+ var isOverrideable = function() {
+ // Widget is overrideable if its name contains a period, or if it is an existing JS widget and we're not in safe mode
+ return parseTreeNode.type.indexOf(".") !== -1 || (!!self.widgetClasses[parseTreeNode.type] && !$tw.safeMode);
+ };
+ if(!parseTreeNode.isNotRemappable && isOverrideable()) {
+ var variableInfo = this.getVariableInfo(variableDefinitionName,{allowSelfAssigned: true});
+ if(variableInfo && variableInfo.srcVariable && variableInfo.srcVariable.value && variableInfo.srcVariable.isWidgetDefinition) {
+ var newParseTreeNode = {
+ type: "transclude",
+ children: parseTreeNode.children,
+ isBlock: parseTreeNode.isBlock
+ };
+ $tw.utils.addAttributeToParseTreeNode(newParseTreeNode,"$variable",variableDefinitionName);
+ $tw.utils.each(parseTreeNode.attributes,function(attr,name) {
+ // If the attribute starts with a dollar then add an extra dollar so that it doesn't clash with the $xxx attributes of transclude
+ name = name.charAt(0) === "$" ? "$" + name : name;
+ $tw.utils.addAttributeToParseTreeNode(newParseTreeNode,$tw.utils.extend({},attr,{name: name}));
+ });
+ parseTreeNode = newParseTreeNode;
+ }
+ }
+ }
+ // Get the widget class for this node type
var WidgetClass = this.widgetClasses[parseTreeNode.type];
if(!WidgetClass) {
WidgetClass = this.widgetClasses.text;
parseTreeNode = {type: "text", text: "Undefined widget '" + parseTreeNode.type + "'"};
}
+ // Create set variable widgets for each variable
+ $tw.utils.each(options.variables,function(value,name) {
+ var setVariableWidget = {
+ type: "set",
+ attributes: {
+ name: {type: "string", value: name},
+ value: {type: "string", value: value}
+ },
+ children: [
+ parseTreeNode
+ ]
+ };
+ parseTreeNode = setVariableWidget;
+ });
return new WidgetClass(parseTreeNode,{
wiki: this.wiki,
- variables: {},
parentWidget: this,
document: this.document
});
@@ -405,31 +625,53 @@ Widget.prototype.addEventListeners = function(listeners) {
};
/*
-Add an event listener
+Add an event listener.
+
+Listener could return a boolean indicating whether to further propagation or not, default to `false`.
*/
Widget.prototype.addEventListener = function(type,handler) {
- var self = this;
- if(typeof handler === "string") { // The handler is a method name on this widget
- this.eventListeners[type] = function(event) {
- return self[handler].call(self,event);
- };
- } else { // The handler is a function
- this.eventListeners[type] = function(event) {
- return handler.call(self,event);
- };
+ this.eventListeners[type] = this.eventListeners[type] || [];
+ if(this.eventListeners[type].indexOf(handler) === -1) {
+ this.eventListeners[type].push(handler);
}
};
/*
-Dispatch an event to a widget. If the widget doesn't handle the event then it is also dispatched to the parent widget
+Remove an event listener
+*/
+Widget.prototype.removeEventListener = function(type,handler) {
+ if(!this.eventListeners[type]) return;
+ var index = this.eventListeners[type].indexOf(handler);
+ if(index !== -1) {
+ this.eventListeners[type].splice(index,1);
+ }
+};
+
+/*
+Dispatch an event to a widget.
+
+If the widget doesn't handle the event then it is also dispatched to the parent widget
*/
Widget.prototype.dispatchEvent = function(event) {
event.widget = event.widget || this;
- // Dispatch the event if this widget handles it
- var listener = this.eventListeners[event.type];
- if(listener) {
- // Don't propagate the event if the listener returned false
- if(!listener(event)) {
+ var listeners = this.eventListeners[event.type];
+ if(listeners) {
+ var self = this;
+ var shouldPropagate = true;
+ $tw.utils.each(listeners,function(handler) {
+ var propagate;
+ if(typeof handler === "string") {
+ // If handler is a string, call it as a method on the widget
+ propagate = self[handler].call(self,event);
+ } else {
+ // Otherwise call the function handler directly
+ propagate = handler.call(self,event);
+ }
+ if(propagate === false) {
+ shouldPropagate = false;
+ }
+ });
+ if(!shouldPropagate) {
return false;
}
}
@@ -539,10 +781,15 @@ Widget.prototype.invokeActions = function(triggeringWidget,event) {
var handled = false;
// For each child widget
for(var t=0; t<this.children.length; t++) {
- var child = this.children[t];
- // Invoke the child if it is an action widget
- if(child.invokeAction) {
+ var child = this.children[t],
+ childIsActionWidget = !!child.invokeAction,
+ actionRefreshPolicy = child.getVariable("tv-action-refresh-policy"); // Default is "once"
+ // Refresh the child if required
+ if(childIsActionWidget || actionRefreshPolicy === "always") {
child.refreshSelf();
+ }
+ // Invoke the child if it is an action widget
+ if(childIsActionWidget) {
if(child.invokeAction(triggeringWidget,event)) {
handled = true;
}
@@ -588,6 +835,33 @@ Widget.prototype.allowActionPropagation = function() {
return true;
};
-exports.widget = Widget;
+/*
+Find child <$data> widgets recursively. The tag name allows aliased versions of the widget to be found too
+*/
+Widget.prototype.findChildrenDataWidgets = function(children,tag,callback) {
+ var self = this;
+ $tw.utils.each(children,function(child) {
+ if(child.dataWidgetTag === tag) {
+ callback(child);
+ }
+ if(child.children) {
+ self.findChildrenDataWidgets(child.children,tag,callback);
+ }
+ });
+};
-})();
+/*
+Evaluate a variable with parameters. This is a static convenience method that attempts to evaluate a variable as a function, returning an array of strings
+*/
+Widget.evaluateVariable = function(widget,name,options) {
+ var result;
+ if(widget.getVariableInfo) {
+ var variableInfo = widget.getVariableInfo(name,options);
+ result = variableInfo.resultList || [variableInfo.text];
+ } else {
+ result = [widget.getVariable(name)];
+ }
+ return result;
+};
+
+exports.widget = Widget;
diff --git a/core/modules/widgets/wikify.js b/core/modules/widgets/wikify.js
index 853ebff1b..18146566b 100644
--- a/core/modules/widgets/wikify.js
+++ b/core/modules/widgets/wikify.js
@@ -6,10 +6,7 @@ module-type: widget
Widget to wikify text into a variable
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -100,7 +97,7 @@ WikifyWidget.prototype.getWidgetTree = function() {
break;
case "text":
resultNode.text = widgetNode.parseTreeNode.text;
- break;
+ break;
}
if(Object.keys(widgetNode.attributes || {}).length > 0) {
resultNode.attributes = {};
@@ -153,5 +150,3 @@ WikifyWidget.prototype.refresh = function(changedTiddlers) {
};
exports.wikify = WikifyWidget;
-
-})();
diff --git a/core/modules/wiki-bulkops.js b/core/modules/wiki-bulkops.js
index f64beccf5..ca7ca4a97 100644
--- a/core/modules/wiki-bulkops.js
+++ b/core/modules/wiki-bulkops.js
@@ -6,10 +6,7 @@ module-type: wikimethod
Bulk tiddler operations such as rename.
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
/*
@@ -46,26 +43,31 @@ function relinkTiddler(fromTitle,toTitle,options) {
if(!tiddler.fields["plugin-type"] && type !== "application/javascript") {
var tags = tiddler.fields.tags ? tiddler.fields.tags.slice(0) : undefined,
list = tiddler.fields.list ? tiddler.fields.list.slice(0) : undefined,
- isModified = false;
+ isModified = false,
+ processList = function(listField) {
+ if(listField && listField.indexOf(fromTitle) !== -1) {
+ // Remove any existing instances of the toTitle
+ var p = listField.indexOf(toTitle);
+ while(p !== -1) {
+ listField.splice(p,1);
+ p = listField.indexOf(toTitle);
+ }
+ // Replace the fromTitle with toTitle
+ $tw.utils.each(listField,function (title,index) {
+ if(title === fromTitle) {
+ listField[index] = toTitle;
+ isModified = true;
+ }
+ });
+ }
+ };
if(!options.dontRenameInTags) {
// Rename tags
- $tw.utils.each(tags,function (title,index) {
- if(title === fromTitle) {
-console.log("Renaming tag '" + tags[index] + "' to '" + toTitle + "' of tiddler '" + tiddler.fields.title + "'");
- tags[index] = toTitle;
- isModified = true;
- }
- });
+ processList(tags);
}
if(!options.dontRenameInLists) {
// Rename lists
- $tw.utils.each(list,function (title,index) {
- if(title === fromTitle) {
-console.log("Renaming list item '" + list[index] + "' to '" + toTitle + "' of tiddler '" + tiddler.fields.title + "'");
- list[index] = toTitle;
- isModified = true;
- }
- });
+ processList(list);
}
if(isModified) {
var newTiddler = new $tw.Tiddler(tiddler,{tags: tags, list: list},self.getModificationFields())
@@ -79,5 +81,3 @@ console.log("Renaming list item '" + list[index] + "' to '" + toTitle + "' of ti
exports.renameTiddler = renameTiddler;
exports.relinkTiddler = relinkTiddler;
-
-})();
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 2d66f5440..5c04b9f08 100755
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -16,10 +16,7 @@ Adds the following properties to the wiki object:
* `globalCache` is a hashmap by cache name of cache objects that are cleared whenever any tiddler change occurs
\*/
-(function(){
-/*jslint node: true, browser: true */
-/*global $tw: false */
"use strict";
var widget = require("$:/core/modules/widgets/widget.js");
@@ -50,7 +47,7 @@ exports.getTextReference = function(textRef,defaultText,currTiddlerTitle) {
if(tr.field) {
var tiddler = this.getTiddler(title);
if(tr.field === "title") { // Special case so we can return the title of a non-existent tiddler
- return title;
+ return title || defaultText;
} else if(tiddler && $tw.utils.hop(tiddler.fields,tr.field)) {
return tiddler.getFieldString(tr.field);
} else {
@@ -81,7 +78,7 @@ exports.setText = function(title,field,index,value,options) {
} else {
delete data[index];
}
- this.setTiddlerData(title,data,modificationFields);
+ this.setTiddlerData(title,data,{},{suppressTimestamp: options.suppressTimestamp});
} else {
var tiddler = this.getTiddler(title),
fields = {title: title};
@@ -111,7 +108,7 @@ exports.deleteTextReference = function(textRef,currTiddlerTitle) {
exports.addEventListener = function(type,listener) {
this.eventListeners = this.eventListeners || {};
this.eventListeners[type] = this.eventListeners[type] || [];
- this.eventListeners[type].push(listener);
+ this.eventListeners[type].push(listener);
};
exports.removeEventListener = function(type,listener) {
@@ -141,12 +138,15 @@ This method should be called after the changes it describes have been made to th
title: Title of tiddler
isDeleted: defaults to false (meaning the tiddler has been created or modified),
true if the tiddler has been deleted
+ isShadow: defaults to false (meaning the change applies to the normal tiddler),
+ true if the tiddler being changed is a shadow tiddler
*/
-exports.enqueueTiddlerEvent = function(title,isDeleted) {
+exports.enqueueTiddlerEvent = function(title,isDeleted,isShadow) {
// Record the touch in the list of changed tiddlers
this.changedTiddlers = this.changedTiddlers || Object.create(null);
this.changedTiddlers[title] = this.changedTiddlers[title] || Object.create(null);
this.changedTiddlers[title][isDeleted ? "deleted" : "modified"] = true;
+ this.changedTiddlers[title][isShadow ? "shadow" : "normal"] = true;
// Increment the change count
this.changeCount = this.changeCount || Object.create(null);
if($tw.utils.hop(this.changeCount,title)) {
@@ -190,15 +190,31 @@ exports.getChangeCount = function(title) {
/*
Generate an unused title from the specified base
+options.prefix must be a string
*/
exports.generateNewTitle = function(baseTitle,options) {
options = options || {};
- var c = 0,
- title = baseTitle;
- while(this.tiddlerExists(title) || this.isShadowTiddler(title) || this.findDraft(title)) {
- title = baseTitle +
- (options.prefix || " ") +
- (++c);
+ var title = baseTitle,
+ template = options.template || "",
+ // test if .startCount is a positive integer. If not set to 0
+ c = (parseInt(options.startCount,10) > 0) ? parseInt(options.startCount,10) : 0,
+ prefix = (typeof(options.prefix) === "string") ? options.prefix : " ";
+
+ if (template) {
+ // "count" is important to avoid an endless loop in while(...)!!
+ template = (/\$count:?(\d+)?\$/i.test(template)) ? template : template + "$count$";
+ // .formatTitleString() expects strings as input
+ title = $tw.utils.formatTitleString(template,{"base":baseTitle,"separator":prefix,"counter":c+""});
+ while(this.tiddlerExists(title) || this.isShadowTiddler(title) || this.findDraft(title)) {
+ title = $tw.utils.formatTitleString(template,{"base":baseTitle,"separator":prefix,"counter":(++c)+""});
+ }
+ } else {
+ if (c > 0) {
+ title = baseTitle + prefix + c;
+ }
+ while(this.tiddlerExists(title) || this.isShadowTiddler(title) || this.findDraft(title)) {
+ title = baseTitle + prefix + (++c);
+ }
}
return title;
};
@@ -211,9 +227,13 @@ exports.isTemporaryTiddler = function(title) {
return title && title.indexOf("$:/temp/") === 0;
};
+exports.isVolatileTiddler = function(title) {
+ return title && title.indexOf("$:/temp/volatile/") === 0;
+};
+
exports.isImageTiddler = function(title) {
var tiddler = this.getTiddler(title);
- if(tiddler) {
+ if(tiddler) {
var contentTypeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/vnd.tiddlywiki"];
return !!contentTypeInfo && contentTypeInfo.flags.indexOf("image") !== -1;
} else {
@@ -223,7 +243,7 @@ exports.isImageTiddler = function(title) {
exports.isBinaryTiddler = function(title) {
var tiddler = this.getTiddler(title);
- if(tiddler) {
+ if(tiddler) {
var contentTypeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/vnd.tiddlywiki"];
return !!contentTypeInfo && contentTypeInfo.encoding === "base64";
} else {
@@ -351,47 +371,108 @@ Sort an array of tiddler titles by a specified field
*/
exports.sortTiddlers = function(titles,sortField,isDescending,isCaseSensitive,isNumeric,isAlphaNumeric) {
var self = this;
- titles.sort(function(a,b) {
- var x,y,
- compareNumbers = function(x,y) {
- var result =
- isNaN(x) && !isNaN(y) ? (isDescending ? -1 : 1) :
- !isNaN(x) && isNaN(y) ? (isDescending ? 1 : -1) :
- (isDescending ? y - x : x - y);
- return result;
- };
- if(sortField !== "title") {
- var tiddlerA = self.getTiddler(a),
- tiddlerB = self.getTiddler(b);
- if(tiddlerA) {
- a = tiddlerA.fields[sortField] || "";
+ if(sortField === "title") {
+ if(!isNumeric && !isAlphaNumeric) {
+ if(isCaseSensitive) {
+ if(isDescending) {
+ titles.sort(function(a,b) {
+ return b.localeCompare(a);
+ });
+ } else {
+ titles.sort(function(a,b) {
+ return a.localeCompare(b);
+ });
+ }
} else {
- a = "";
+ if(isDescending) {
+ titles.sort(function(a,b) {
+ return b.toLowerCase().localeCompare(a.toLowerCase());
+ });
+ } else {
+ titles.sort(function(a,b) {
+ return a.toLowerCase().localeCompare(b.toLowerCase());
+ });
+ }
}
- if(tiddlerB) {
- b = tiddlerB.fields[sortField] || "";
- } else {
- b = "";
- }
- }
- x = Number(a);
- y = Number(b);
- if(isNumeric && (!isNaN(x) || !isNaN(y))) {
- return compareNumbers(x,y);
- } else if($tw.utils.isDate(a) && $tw.utils.isDate(b)) {
- return isDescending ? b - a : a - b;
- } else if(isAlphaNumeric) {
- return isDescending ? b.localeCompare(a,undefined,{numeric: true,sensitivity: "base"}) : a.localeCompare(b,undefined,{numeric: true,sensitivity: "base"});
} else {
+ titles.sort(function(a,b) {
+ var x,y;
+ if(isNumeric) {
+ x = Number(a);
+ y = Number(b);
+ if(isNaN(x)) {
+ if(isNaN(y)) {
+ // If neither value is a number then fall through to a textual comparison
+ } else {
+ return isDescending ? -1 : 1;
+ }
+ } else {
+ if(isNaN(y)) {
+ return isDescending ? 1 : -1;
+ } else {
+ return isDescending ? y - x : x - y;
+ }
+ }
+ }
+ if(isAlphaNumeric) {
+ return isDescending ? b.localeCompare(a,undefined,{numeric: true,sensitivity: "base"}) : a.localeCompare(b,undefined,{numeric: true,sensitivity: "base"});
+ }
+ if(!isCaseSensitive) {
+ a = a.toLowerCase();
+ b = b.toLowerCase();
+ }
+ return isDescending ? b.localeCompare(a) : a.localeCompare(b);
+ });
+ }
+ } else {
+ titles.sort(function(a,b) {
+ var x,y;
+ if(sortField !== "title") {
+ var tiddlerA = self.getTiddler(a),
+ tiddlerB = self.getTiddler(b);
+ if(tiddlerA) {
+ a = tiddlerA.fields[sortField] || "";
+ } else {
+ a = "";
+ }
+ if(tiddlerB) {
+ b = tiddlerB.fields[sortField] || "";
+ } else {
+ b = "";
+ }
+ }
+ if(isNumeric) {
+ x = Number(a);
+ y = Number(b);
+ if(isNaN(x)) {
+ if(isNaN(y)) {
+ // If neither value is a number then fall through to a textual comparison
+ } else {
+ return isDescending ? -1 : 1;
+ }
+ } else {
+ if(isNaN(y)) {
+ return isDescending ? 1 : -1;
+ } else {
+ return isDescending ? y - x : x - y;
+ }
+ }
+ }
+ if(Object.prototype.toString.call(a) === "[object Date]" && Object.prototype.toString.call(b) === "[object Date]") {
+ return isDescending ? b - a : a - b;
+ }
a = String(a);
b = String(b);
+ if(isAlphaNumeric) {
+ return isDescending ? b.localeCompare(a,undefined,{numeric: true,sensitivity: "base"}) : a.localeCompare(b,undefined,{numeric: true,sensitivity: "base"});
+ }
if(!isCaseSensitive) {
a = a.toLowerCase();
b = b.toLowerCase();
}
return isDescending ? b.localeCompare(a) : a.localeCompare(b);
- }
- });
+ });
+ }
};
/*
@@ -459,8 +540,8 @@ Return an array of tiddler titles that link to the specified tiddler
*/
exports.getTiddlerBacklinks = function(targetTitle) {
var self = this,
- backlinksIndexer = this.getIndexer("BacklinksIndexer"),
- backlinks = backlinksIndexer && backlinksIndexer.lookup(targetTitle);
+ backIndexer = this.getIndexer("BackIndexer"),
+ backlinks = backIndexer && backIndexer.subIndexers.link.lookup(targetTitle);
if(!backlinks) {
backlinks = [];
@@ -474,6 +555,86 @@ exports.getTiddlerBacklinks = function(targetTitle) {
return backlinks;
};
+
+/*
+Return an array of tiddler titles that are directly transcluded within the given parse tree. `title` is the tiddler being parsed, we will ignore its self-referential transclusions, only return
+ */
+exports.extractTranscludes = function(parseTreeRoot, title) {
+ // Count up the transcludes
+ var transcludes = [],
+ checkParseTree = function(parseTree, parentNode) {
+ for(var t=0; t<parseTree.length; t++) {
+ var parseTreeNode = parseTree[t];
+ if(parseTreeNode.type === "transclude") {
+ if(parseTreeNode.attributes.$tiddler) {
+ if(parseTreeNode.attributes.$tiddler.type === "string") {
+ var value;
+ // if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
+ if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
+ // Empty value (like `{{!!field}}`) means self-referential transclusion.
+ value = parentNode.attributes.tiddler.value || title;
+ } else {
+ value = parseTreeNode.attributes.$tiddler.value;
+ }
+ }
+ } else if(parseTreeNode.attributes.tiddler) {
+ if (parseTreeNode.attributes.tiddler.type === "string") {
+ // Old transclude widget usage
+ value = parseTreeNode.attributes.tiddler.value;
+ }
+ } else if(parseTreeNode.attributes.$field && parseTreeNode.attributes.$field.type === "string") {
+ // Empty value (like `<$transclude $field='created'/>`) means self-referential transclusion.
+ value = title;
+ } else if(parseTreeNode.attributes.field && parseTreeNode.attributes.field.type === "string") {
+ // Old usage with Empty value (like `<$transclude field='created'/>`)
+ value = title;
+ }
+ // Deduplicate the result.
+ if(value && transcludes.indexOf(value) === -1) {
+ $tw.utils.pushTop(transcludes,value);
+ }
+ }
+ if(parseTreeNode.children) {
+ checkParseTree(parseTreeNode.children,parseTreeNode);
+ }
+ }
+ };
+ checkParseTree(parseTreeRoot);
+ return transcludes;
+};
+
+
+/*
+Return an array of tiddler titles that are transcluded from the specified tiddler
+*/
+exports.getTiddlerTranscludes = function(title) {
+ var self = this;
+ // We'll cache the transcludes so they only get computed if the tiddler changes
+ return this.getCacheForTiddler(title,"transcludes",function() {
+ // Parse the tiddler
+ var parser = self.parseTiddler(title);
+ if(parser) {
+ // this will ignore self-referential transclusions from `title`
+ return self.extractTranscludes(parser.tree,title);
+ }
+ return [];
+ });
+};
+
+/*
+Return an array of tiddler titles that transclude to the specified tiddler
+*/
+exports.getTiddlerBacktranscludes = function(targetTitle) {
+ var self = this,
+ backIndexer = this.getIndexer("BackIndexer"),
+ backtranscludes = backIndexer && backIndexer.subIndexers.transclude.lookup(targetTitle);
+
+ if(!backtranscludes) {
+ backtranscludes = [];
+ }
+ return backtranscludes;
+};
+
/*
Return a hashmap of tiddler titles that are referenced but not defined. Each value is the number of times the missing tiddler is referenced
*/
@@ -564,14 +725,25 @@ Lookup a given tiddler and return a list of all the tiddlers that include it in
*/
exports.findListingsOfTiddler = function(targetTitle,fieldName) {
fieldName = fieldName || "list";
- var titles = [];
- this.each(function(tiddler,title) {
- var list = $tw.utils.parseStringArray(tiddler.fields[fieldName]);
- if(list && list.indexOf(targetTitle) !== -1) {
- titles.push(title);
- }
+ var wiki = this;
+ var listings = this.getGlobalCache("listings-" + fieldName,function() {
+ var listings = Object.create(null);
+ wiki.each(function(tiddler,title) {
+ var list = $tw.utils.parseStringArray(tiddler.fields[fieldName]);
+ if(list) {
+ for(var i = 0; i < list.length; i++) {
+ var listItem = list[i],
+ listing = listings[listItem] || [];
+ if (listing.indexOf(title) === -1) {
+ listing.push(title);
+ }
+ listings[listItem] = listing;
+ }
+ }
+ });
+ return listings;
});
- return titles;
+ return listings[targetTitle] || [];
};
/*
@@ -720,7 +892,7 @@ exports.getTiddlerDataCached = function(titleOrTiddler,defaultData) {
var self = this,
tiddler = titleOrTiddler;
if(!(tiddler instanceof $tw.Tiddler)) {
- tiddler = this.getTiddler(tiddler);
+ tiddler = this.getTiddler(tiddler);
}
if(tiddler) {
return this.getCacheForTiddler(tiddler.fields.title,"data",function() {
@@ -741,18 +913,13 @@ exports.getTiddlerData = function(titleOrTiddler,defaultData) {
var tiddler = titleOrTiddler,
data;
if(!(tiddler instanceof $tw.Tiddler)) {
- tiddler = this.getTiddler(tiddler);
+ tiddler = this.getTiddler(tiddler);
}
if(tiddler && tiddler.fields.text) {
switch(tiddler.fields.type) {
case "application/json":
// JSON tiddler
- try {
- data = JSON.parse(tiddler.fields.text);
- } catch(ex) {
- return defaultData;
- }
- return data;
+ return $tw.utils.parseJSONSafe(tiddler.fields.text,defaultData);
case "application/x-tiddler-dictionary":
return $tw.utils.parseFields(tiddler.fields.text);
}
@@ -781,19 +948,24 @@ Set a tiddlers content to a JavaScript object. Currently this is done by setting
title: title of tiddler
data: object that can be serialised to JSON
fields: optional hashmap of additional tiddler fields to be set
+options: optional hashmap of options including:
+ suppressTimestamp: if true, don't set the creation/modification timestamps
*/
-exports.setTiddlerData = function(title,data,fields) {
+exports.setTiddlerData = function(title,data,fields,options) {
+ options = options || {};
var existingTiddler = this.getTiddler(title),
+ creationFields = options.suppressTimestamp ? {} : this.getCreationFields(),
+ modificationFields = options.suppressTimestamp ? {} : this.getModificationFields(),
newFields = {
title: title
- };
+ };
if(existingTiddler && existingTiddler.fields.type === "application/x-tiddler-dictionary") {
newFields.text = $tw.utils.makeTiddlerDictionary(data);
} else {
newFields.type = "application/json";
newFields.text = JSON.stringify(data,null,$tw.config.preferences.jsonSpaces);
}
- this.addTiddler(new $tw.Tiddler(this.getCreationFields(),existingTiddler,fields,newFields,this.getModificationFields()));
+ this.addTiddler(new $tw.Tiddler(creationFields,existingTiddler,fields,newFields,modificationFields));
};
/*
@@ -830,7 +1002,7 @@ exports.clearGlobalCache = function() {
exports.getCacheForTiddler = function(title,cacheName,initializer) {
this.caches = this.caches || Object.create(null);
var caches = this.caches[title];
- if(caches && caches[cacheName]) {
+ if(caches && caches[cacheName] !== undefined) {
return caches[cacheName];
} else {
if(!caches) {
@@ -871,7 +1043,7 @@ exports.initParsers = function(moduleType) {
if(!$tw.utils.hop($tw.Wiki.parsers,type) && $tw.config.contentTypeInfo[type].encoding === "base64") {
$tw.Wiki.parsers[type] = $tw.Wiki.parsers["application/octet-stream"];
}
- });
+ });
}
};
@@ -902,7 +1074,8 @@ exports.parseText = function(type,text,options) {
return new Parser(type,text,{
parseAsInline: options.parseAsInline,
wiki: this,
- _canonical_uri: options._canonical_uri
+ _canonical_uri: options._canonical_uri,
+ configTrimWhiteSpace: options.configTrimWhiteSpace
});
};
@@ -923,40 +1096,86 @@ exports.parseTiddler = function(title,options) {
};
exports.parseTextReference = function(title,field,index,options) {
- var tiddler,text;
- if(options.subTiddler) {
- tiddler = this.getSubTiddler(title,options.subTiddler);
- } else {
+ var tiddler,
+ text,
+ parserInfo;
+ if(!options.subTiddler) {
tiddler = this.getTiddler(title);
if(field === "text" || (!field && !index)) {
this.getTiddlerText(title); // Force the tiddler to be lazily loaded
return this.parseTiddler(title,options);
}
+ }
+ parserInfo = this.getTextReferenceParserInfo(title,field,index,options);
+ if(parserInfo.sourceText !== null) {
+ return this.parseText(parserInfo.parserType,parserInfo.sourceText,options);
+ } else {
+ return null;
+ }
+};
+
+exports.getTextReferenceParserInfo = function(title,field,index,options) {
+ var defaultType = options.defaultType || "text/vnd.tiddlywiki",
+ tiddler,
+ parserInfo = {
+ sourceText : null,
+ parserType : defaultType
+ };
+ if(options.subTiddler) {
+ tiddler = this.getSubTiddler(title,options.subTiddler);
+ } else {
+ tiddler = this.getTiddler(title);
}
if(field === "text" || (!field && !index)) {
if(tiddler && tiddler.fields) {
- return this.parseText(tiddler.fields.type,tiddler.fields.text,options);
- } else {
- return null;
+ parserInfo.sourceText = tiddler.fields.text || "";
+ if(tiddler.fields.type) {
+ parserInfo.parserType = tiddler.fields.type;
+ }
+ parserInfo._canonical_uri = tiddler.fields._canonical_uri;
}
} else if(field) {
if(field === "title") {
- text = title;
- } else {
- if(!tiddler || !tiddler.hasField(field)) {
- return null;
- }
- text = tiddler.fields[field];
+ parserInfo.sourceText = title;
+ } else if(tiddler && tiddler.fields) {
+ parserInfo.sourceText = tiddler.hasField(field) ? tiddler.fields[field].toString() : null;
}
- return this.parseText("text/vnd.tiddlywiki",text.toString(),options);
} else if(index) {
this.getTiddlerText(title); // Force the tiddler to be lazily loaded
- text = this.extractTiddlerDataItem(tiddler,index,undefined);
- if(text === undefined) {
- return null;
- }
- return this.parseText("text/vnd.tiddlywiki",text,options);
+ parserInfo.sourceText = this.extractTiddlerDataItem(tiddler,index,null);
}
+ if(parserInfo.sourceText === null) {
+ parserInfo.parserType = null;
+ }
+ return parserInfo;
+}
+
+/*
+Parse a block of text of a specified MIME type
+ text: text on which to perform substitutions
+ widget
+ options: see below
+Options include:
+ substitutions: an optional array of substitutions
+*/
+exports.getSubstitutedText = function(text,widget,options) {
+ options = options || {};
+ text = text || "";
+ var self = this,
+ substitutions = options.substitutions || [],
+ output;
+ // Evaluate embedded filters and substitute with first result
+ output = text.replace(/\$\{([\S\s]+?)\}\$/g, function(match,filter) {
+ return self.filterTiddlers(filter,widget)[0] || "";
+ });
+ // Process any substitutions provided in options
+ $tw.utils.each(substitutions,function(substitute) {
+ output = $tw.utils.replaceString(output,new RegExp("\\$" + $tw.utils.escapeRegExp(substitute.name) + "\\$","mg"),substitute.value);
+ });
+ // Substitute any variable references with their values
+ return output.replace(/\$\((.+?)\)\$/g, function(match,varname) {
+ return widget.getVariable(varname,{defaultValue: ""})
+ });
};
/*
@@ -975,19 +1194,20 @@ exports.makeWidget = function(parser,options) {
children: []
},
currWidgetNode = widgetNode;
- // Create set variable widgets for each variable
- $tw.utils.each(options.variables,function(value,name) {
- var setVariableWidget = {
- type: "set",
+ // Create let variable widget for variables
+ if($tw.utils.count(options.variables) > 0) {
+ var letVariableWidget = {
+ type: "let",
attributes: {
- name: {type: "string", value: name},
- value: {type: "string", value: value}
},
children: []
};
- currWidgetNode.children = [setVariableWidget];
- currWidgetNode = setVariableWidget;
- });
+ $tw.utils.each(options.variables,function(value,name) {
+ $tw.utils.addAttributeToParseTreeNode(letVariableWidget,name,"" + value);
+ });
+ currWidgetNode.children = [letVariableWidget];
+ currWidgetNode = letVariableWidget;
+ }
// Add in the supplied parse tree nodes
currWidgetNode.children = parser ? parser.tree : [];
// Create the widget
@@ -1044,7 +1264,7 @@ exports.makeTranscludeWidget = function(title,options) {
if(options.importVariables) {
parseTreeImportVariables.attributes.filter.value = options.importVariables;
} else if(options.importPageMacros) {
- parseTreeImportVariables.attributes.filter.value = "[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]";
+ parseTreeImportVariables.attributes.filter.value = this.getTiddlerText("$:/core/config/GlobalImportFilter");
}
parseTreeDiv.tree[0].children.push(parseTreeImportVariables);
parseTreeImportVariables.children.push(parseTreeTransclude);
@@ -1105,23 +1325,28 @@ Return an array of tiddler titles that match a search string
text: The text string to search for
options: see below
Options available:
- source: an iterator function for the source tiddlers, called source(iterator), where iterator is called as iterator(tiddler,title)
+ source: an iterator function for the source tiddlers, called source(iterator),
+ where iterator is called as iterator(tiddler,title)
exclude: An array of tiddler titles to exclude from the search
invert: If true returns tiddlers that do not contain the specified string
caseSensitive: If true forces a case sensitive search
field: If specified, restricts the search to the specified field, or an array of field names
anchored: If true, forces all but regexp searches to be anchored to the start of text
excludeField: If true, the field options are inverted to specify the fields that are not to be searched
+
The search mode is determined by the first of these boolean flags to be true
literal: searches for literal string
whitespace: same as literal except runs of whitespace are treated as a single space
regexp: treats the search term as a regular expression
- words: (default) treats search string as a list of tokens, and matches if all tokens are found, regardless of adjacency or ordering
+ words: (default) treats search string as a list of tokens, and matches if all tokens are found,
+ regardless of adjacency or ordering
+ some: treats search string as a list of tokens, and matches if at least ONE token is found
*/
exports.search = function(text,options) {
options = options || {};
var self = this,
t,
+ regExpStr="",
invert = !!options.invert;
// Convert the search string into a regexp for each term
var terms, searchTermsRegExps,
@@ -1143,13 +1368,24 @@ exports.search = function(text,options) {
searchTermsRegExps = [new RegExp("(" + anchor + terms.join("\\s+") + ")",flags)];
} else if(options.regexp) {
try {
- searchTermsRegExps = [new RegExp("(" + text + ")",flags)];
+ searchTermsRegExps = [new RegExp("(" + text + ")",flags)];
} catch(e) {
searchTermsRegExps = null;
console.log("Regexp error parsing /(" + text + ")/" + flags + ": ",e);
}
- } else {
- terms = text.split(/ +/);
+ } else if(options.some) {
+ terms = text.trim().split(/[^\S\xA0]+/);
+ if(terms.length === 1 && terms[0] === "") {
+ searchTermsRegExps = null;
+ } else {
+ searchTermsRegExps = [];
+ for(t=0; t<terms.length; t++) {
+ regExpStr += (t===0) ? anchor + $tw.utils.escapeRegExp(terms[t]) : "|" + anchor + $tw.utils.escapeRegExp(terms[t]);
+ }
+ searchTermsRegExps.push(new RegExp("(" + regExpStr + ")",flags));
+ }
+ } else { // default: words
+ terms = text.split(/[^\S\xA0]+/);
if(terms.length === 1 && terms[0] === "") {
searchTermsRegExps = null;
} else {
@@ -1159,13 +1395,13 @@ exports.search = function(text,options) {
}
}
}
- // Accumulate the array of fields to be searched or excluded from the search
+// Accumulate the array of fields to be searched or excluded from the search
var fields = [];
if(options.field) {
if($tw.utils.isArray(options.field)) {
$tw.utils.each(options.field,function(fieldName) {
if(fieldName) {
- fields.push(fieldName);
+ fields.push(fieldName);
}
});
} else {
@@ -1207,7 +1443,7 @@ exports.search = function(text,options) {
// Don't search the text field if the content type is binary
var fieldName = searchFields[fieldIndex];
if(fieldName === "text" && contentTypeInfo.encoding !== "utf8") {
- break;
+ continue;
}
var str = tiddler.fields[fieldName],
t;
@@ -1242,7 +1478,7 @@ exports.search = function(text,options) {
var results = [],
source = options.source || this.each;
source(function(tiddler,title) {
- if(searchTiddler(title) !== options.invert) {
+ if(searchTiddler(title) !== invert) {
results.push(title);
}
});
@@ -1294,6 +1530,14 @@ exports.checkTiddlerText = function(title,targetText,options) {
return text === targetText;
}
+/*
+Execute an action string without an associated context widget
+*/
+exports.invokeActionString = function(actions,event,variables,options) {
+ var widget = this.makeWidget(null,{parentWidget: options.parentWidget});
+ widget.invokeActionString(actions,null,event,variables);
+};
+
/*
Read an array of browser File objects, invoking callback(tiddlerFieldsArray) once they're all read
*/
@@ -1434,7 +1678,7 @@ historyTitle: title of history tiddler (defaults to $:/HistoryList)
*/
exports.addToHistory = function(title,fromPageRect,historyTitle) {
var story = new $tw.Story({wiki: this, historyTitle: historyTitle});
- story.addToHistory(title,fromPageRect);
+ story.addToHistory(title,fromPageRect);
console.log("$tw.wiki.addToHistory() is deprecated since V5.1.23! Use the this.story.addToHistory() from the story-object!")
};
@@ -1495,6 +1739,13 @@ exports.invokeUpgraders = function(titles,tiddlers) {
// Determine whether a plugin by title is dynamically loadable
exports.doesPluginRequireReload = function(title) {
+ var tiddler = this.getTiddler(title);
+ if(tiddler && tiddler.fields.type === "application/json" && tiddler.fields["plugin-type"]) {
+ if(tiddler.fields["plugin-type"] === "import") {
+ // The import plugin never requires reloading
+ return false;
+ }
+ }
return this.doesPluginInfoRequireReload(this.getPluginInfo(title) || this.getTiddlerDataCached(title));
};
@@ -1537,6 +1788,3 @@ exports.slugify = function(title,options) {
}
return slug;
};
-
-})();
-
diff --git a/core/palettes/Blanca.tid b/core/palettes/Blanca.tid
index 5c5afa878..dc68c23ff 100644
--- a/core/palettes/Blanca.tid
+++ b/core/palettes/Blanca.tid
@@ -1,5 +1,6 @@
title: $:/palettes/Blanca
name: Blanca
+color-scheme: light
description: A clean white palette to let you focus
tags: $:/tags/Palette
type: application/x-tiddler-dictionary
@@ -17,7 +18,7 @@ code-background: #f7f7f9
code-border: #e1e1e8
code-foreground: #dd1144
dirty-indicator: #ff0000
-download-background: #66cccc
+download-background: #3aafaf
download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
@@ -25,14 +26,17 @@ dropdown-background: <<colour background>>
dropdown-border: <<colour muted-foreground>>
dropdown-tab-background-selected: #fff
dropdown-tab-background: #ececec
-dropzone-background: rgba(0,200,0,0.7)
+dropzone-background: #00d900
external-link-background-hover: inherit
external-link-background-visited: inherit
external-link-background: inherit
external-link-foreground-hover: inherit
external-link-foreground-visited: #0000aa
external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
foreground: #333333
+highlight-background: #ffff00
+highlight-foreground: #000000
message-background: #ecf2ff
message-border: #cfd6e6
message-foreground: #547599
@@ -48,26 +52,30 @@ notification-border: #999999
page-background: #ffffff
pre-background: #f5f5f5
pre-border: #cccccc
-primary: #7897f3
+primary: #6387f1
select-tag-background:
select-tag-foreground:
sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground-hover: #000000
-sidebar-controls-foreground: #ccc
-sidebar-foreground-shadow: rgba(255,255,255, 0.8)
+sidebar-controls-foreground: #aaaaaa
+sidebar-foreground-shadow: #ffffff
sidebar-foreground: #acacac
sidebar-muted-foreground-hover: #444444
-sidebar-muted-foreground: #c0c0c0
+sidebar-muted-foreground: #aaaaaa
sidebar-tab-background-selected: #ffffff
sidebar-tab-background: <<colour tab-background>>
sidebar-tab-border-selected: <<colour tab-border-selected>>
sidebar-tab-border: <<colour tab-border>>
sidebar-tab-divider: <<colour tab-divider>>
-sidebar-tab-foreground-selected:
+sidebar-tab-foreground-selected: <<colour tab-foreground>>
sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: #444444
-sidebar-tiddler-link-foreground: #7897f3
+sidebar-tiddler-link-foreground: <<colour primary>>
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-stable: #008000
+stability-experimental: #c07c00
+stability-deprecated: #ff0000
+stability-legacy: #0000ff
static-alert-foreground: #aaaaaa
tab-background-selected: #ffffff
tab-background: #eeeeee
@@ -79,10 +87,10 @@ tab-foreground: #666666
table-border: #dddddd
table-footer-background: #a8a8a8
table-header-background: #f0f0f0
-tag-background: #ffeedd
-tag-foreground: #000
+tag-background: #ffd5aa
+tag-foreground: #000000
tiddler-background: <<colour background>>
-tiddler-border: #eee
+tiddler-border: #eeeeee
tiddler-controls-foreground-hover: #888888
tiddler-controls-foreground-selected: #444444
tiddler-controls-foreground: #cccccc
@@ -93,7 +101,7 @@ tiddler-editor-fields-even: #e0e8e0
tiddler-editor-fields-odd: #f0f4f0
tiddler-info-background: #f8f8f8
tiddler-info-border: #dddddd
-tiddler-info-tab-background: #f8f8f8
+tiddler-info-tab-background: <<colour tiddler-info-background>>
tiddler-link-background: <<colour background>>
tiddler-link-foreground: <<colour primary>>
tiddler-subtitle-foreground: #c0c0c0
@@ -107,5 +115,6 @@ toolbar-close-button:
toolbar-delete-button:
toolbar-cancel-button:
toolbar-done-button:
-untagged-background: #999999
+untagged-background: #cccccc
very-muted-foreground: #888888
+network-activity-foreground: <<colour primary>>
\ No newline at end of file
diff --git a/core/palettes/Blue.tid b/core/palettes/Blue.tid
index 38a6a3e4a..b5bdecb8a 100644
--- a/core/palettes/Blue.tid
+++ b/core/palettes/Blue.tid
@@ -1,5 +1,6 @@
title: $:/palettes/Blue
name: Blue
+color-scheme: light
description: A blue theme
tags: $:/tags/Palette
type: application/x-tiddler-dictionary
@@ -32,7 +33,10 @@ external-link-background: inherit
external-link-foreground-hover: inherit
external-link-foreground-visited: #0000aa
external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
foreground: #333353
+highlight-background: #ffff00
+highlight-foreground: #000000
message-background: #ecf2ff
message-border: #cfd6e6
message-foreground: #547599
diff --git a/core/palettes/BrightMute.tid b/core/palettes/BrightMute.tid
index 9c1d3003e..bda0282b3 100644
--- a/core/palettes/BrightMute.tid
+++ b/core/palettes/BrightMute.tid
@@ -1,5 +1,6 @@
title: $:/palettes/Muted
name: Muted
+color-scheme: light
description: Bright tiddlers on a muted background
tags: $:/tags/Palette
type: application/x-tiddler-dictionary
@@ -32,7 +33,10 @@ external-link-background: inherit
external-link-foreground-hover: inherit
external-link-foreground-visited: #0000aa
external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
foreground: #333333
+highlight-background: #ffff00
+highlight-foreground: #000000
message-background: #ecf2ff
message-border: #cfd6e6
message-foreground: #547599
@@ -43,6 +47,7 @@ modal-footer-background: #f5f5f5
modal-footer-border: #dddddd
modal-header-border: #eeeeee
muted-foreground: #bbb
+network-activity-foreground: <<colour primary>>
notification-background: #ffffdd
notification-border: #999999
page-background: #6f6f70
@@ -52,22 +57,26 @@ primary: #29a6ee
select-tag-background:
select-tag-foreground:
sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: #000000
+sidebar-controls-foreground-hover: #222222
sidebar-controls-foreground: #c2c1c2
-sidebar-foreground-shadow: rgba(255,255,255,0)
+sidebar-foreground-shadow: transparent
sidebar-foreground: #d3d2d4
-sidebar-muted-foreground-hover: #444444
+sidebar-muted-foreground-hover: #333333
sidebar-muted-foreground: #c0c0c0
sidebar-tab-background-selected: #6f6f70
sidebar-tab-background: #666667
sidebar-tab-border-selected: #999
sidebar-tab-border: #515151
sidebar-tab-divider: #999
-sidebar-tab-foreground-selected:
-sidebar-tab-foreground: #999
+sidebar-tab-foreground-selected: #bfbfbf
+sidebar-tab-foreground: #b0b0b0
sidebar-tiddler-link-foreground-hover: #444444
-sidebar-tiddler-link-foreground: #d1d0d2
+sidebar-tiddler-link-foreground: #aaaaaa
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #bf616a
+stability-experimental: #d08770
+stability-legacy: #88c0d0
+stability-stable: #a3be8c
static-alert-foreground: #aaaaaa
tab-background-selected: #ffffff
tab-background: #d8d8d8
@@ -81,6 +90,7 @@ table-footer-background: #a8a8a8
table-header-background: #f0f0f0
tag-background: #d5ad34
tag-foreground: #ffffff
+testcase-accent-level-1: #b1b3e3
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-controls-foreground-hover: #888888
diff --git a/core/palettes/ContrastDark.tid b/core/palettes/ContrastDark.tid
index e12944bf7..cb40e015b 100644
--- a/core/palettes/ContrastDark.tid
+++ b/core/palettes/ContrastDark.tid
@@ -1,14 +1,15 @@
-title: $:/palettes/ContrastLight
-name: Contrast (Light)
-description: High contrast and unambiguous (light version)
+title: $:/palettes/ContrastDark
+name: Contrast (Dark)
+color-scheme: dark
+description: High contrast and unambiguous (dark version)
tags: $:/tags/Palette
type: application/x-tiddler-dictionary
-alert-background: #f00
+alert-background: #ff0000
alert-border: <<colour background>>
alert-highlight: <<colour foreground>>
-alert-muted-foreground: #800
-background: #fff
+alert-muted-foreground: #880000
+background: #000000
blockquote-bar: <<colour muted-foreground>>
button-background: <<colour background>>
button-foreground: <<colour foreground>>
@@ -16,23 +17,26 @@ button-border: <<colour foreground>>
code-background: <<colour background>>
code-border: <<colour foreground>>
code-foreground: <<colour foreground>>
-dirty-indicator: #f00
-download-background: #080
+dirty-indicator: #ff0000
+download-background: #48ff48
download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
dropdown-background: <<colour background>>
dropdown-border: <<colour muted-foreground>>
-dropdown-tab-background-selected: <<colour foreground>>
-dropdown-tab-background: <<colour foreground>>
-dropzone-background: rgba(0,200,0,0.7)
+dropdown-tab-background-selected: #868686
+dropdown-tab-background: #515151
+dropzone-background: #1aff1a
external-link-background-hover: inherit
external-link-background-visited: inherit
external-link-background: inherit
external-link-foreground-hover: inherit
-external-link-foreground-visited: #00a
-external-link-foreground: #00e
-foreground: #000
+external-link-foreground-visited: #5353ff
+external-link-foreground: #9595ff
+footnote-target-background: #4c4c4c
+foreground: #ffffff
+highlight-background: #ffff00
+highlight-foreground: #000000
message-background: <<colour foreground>>
message-border: <<colour background>>
message-foreground: <<colour background>>
@@ -48,11 +52,11 @@ notification-border: <<colour foreground>>
page-background: <<colour background>>
pre-background: <<colour background>>
pre-border: <<colour foreground>>
-primary: #00f
+primary: #8a8aff
select-tag-background:
select-tag-foreground:
sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: <<colour background>>
+sidebar-controls-foreground-hover: #ffff00
sidebar-controls-foreground: <<colour foreground>>
sidebar-foreground-shadow: rgba(0,0,0, 0)
sidebar-foreground: <<colour foreground>>
@@ -68,6 +72,10 @@ sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: <<colour foreground>>
sidebar-tiddler-link-foreground: <<colour primary>>
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-stable: #00f400
+stability-experimental: #ffaf1c
+stability-deprecated: #ff2b2b
+stability-legacy: #ceceff
static-alert-foreground: #aaaaaa
tab-background-selected: <<colour background>>
tab-background: <<colour foreground>>
@@ -77,14 +85,15 @@ tab-divider: <<colour foreground>>
tab-foreground-selected: <<colour foreground>>
tab-foreground: <<colour background>>
table-border: #dddddd
-table-footer-background: #a8a8a8
-table-header-background: #f0f0f0
-tag-background: #000
-tag-foreground: #fff
+table-footer-background: #444444
+table-header-background: #444444
+tag-background: #ffffff
+tag-foreground: #000000
+testcase-accent-level-1: #144a8c
tiddler-background: <<colour background>>
tiddler-border: <<colour foreground>>
tiddler-controls-foreground-hover: #ddd
-tiddler-controls-foreground-selected: #fdd
+tiddler-controls-foreground-selected: #ae0000
tiddler-controls-foreground: <<colour foreground>>
tiddler-editor-background: <<colour background>>
tiddler-editor-border-image: <<colour foreground>>
@@ -98,14 +107,15 @@ tiddler-link-background: <<colour background>>
tiddler-link-foreground: <<colour primary>>
tiddler-subtitle-foreground: <<colour foreground>>
tiddler-title-foreground: <<colour foreground>>
-toolbar-new-button:
-toolbar-options-button:
-toolbar-save-button:
-toolbar-info-button:
-toolbar-edit-button:
-toolbar-close-button:
-toolbar-delete-button:
-toolbar-cancel-button:
-toolbar-done-button:
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button:
+toolbar-cancel-button:
+toolbar-done-button:
untagged-background: <<colour foreground>>
very-muted-foreground: #888888
+network-activity-foreground: <<colour primary>>
\ No newline at end of file
diff --git a/core/palettes/ContrastLight.tid b/core/palettes/ContrastLight.tid
index 04280d08e..4a68e59c7 100644
--- a/core/palettes/ContrastLight.tid
+++ b/core/palettes/ContrastLight.tid
@@ -1,14 +1,15 @@
-title: $:/palettes/ContrastDark
-name: Contrast (Dark)
-description: High contrast and unambiguous (dark version)
+title: $:/palettes/ContrastLight
+name: Contrast (Light)
+color-scheme: light
+description: High contrast and unambiguous (light version)
tags: $:/tags/Palette
type: application/x-tiddler-dictionary
-alert-background: #f00
+alert-background: #ff4a4a
alert-border: <<colour background>>
alert-highlight: <<colour foreground>>
alert-muted-foreground: #800
-background: #000
+background: #fff
blockquote-bar: <<colour muted-foreground>>
button-background: <<colour background>>
button-foreground: <<colour foreground>>
@@ -17,13 +18,13 @@ code-background: <<colour background>>
code-border: <<colour foreground>>
code-foreground: <<colour foreground>>
dirty-indicator: #f00
-download-background: #080
+download-background: #008200
download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
dropdown-background: <<colour background>>
dropdown-border: <<colour muted-foreground>>
-dropdown-tab-background-selected: <<colour foreground>>
+dropdown-tab-background-selected: <<colour background>>
dropdown-tab-background: <<colour foreground>>
dropzone-background: rgba(0,200,0,0.7)
external-link-background-hover: inherit
@@ -32,7 +33,10 @@ external-link-background: inherit
external-link-foreground-hover: inherit
external-link-foreground-visited: #00a
external-link-foreground: #00e
-foreground: #fff
+footnote-target-background: #e5e5e5
+foreground: #000
+highlight-background: #ffff00
+highlight-foreground: #000000
message-background: <<colour foreground>>
message-border: <<colour background>>
message-foreground: <<colour background>>
@@ -48,13 +52,13 @@ notification-border: <<colour foreground>>
page-background: <<colour background>>
pre-background: <<colour background>>
pre-border: <<colour foreground>>
-primary: #00f
+primary: #0000ff
select-tag-background:
select-tag-foreground:
sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: <<colour background>>
+sidebar-controls-foreground-hover: #606060
sidebar-controls-foreground: <<colour foreground>>
-sidebar-foreground-shadow: rgba(0,0,0, 0)
+sidebar-foreground-shadow: #000000
sidebar-foreground: <<colour foreground>>
sidebar-muted-foreground-hover: #444444
sidebar-muted-foreground: <<colour foreground>>
@@ -68,6 +72,10 @@ sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: <<colour foreground>>
sidebar-tiddler-link-foreground: <<colour primary>>
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #ff0000
+stability-experimental: #b37400
+stability-legacy: #000075
+stability-stable: #008000
static-alert-foreground: #aaaaaa
tab-background-selected: <<colour background>>
tab-background: <<colour foreground>>
@@ -79,12 +87,12 @@ tab-foreground: <<colour background>>
table-border: #dddddd
table-footer-background: #a8a8a8
table-header-background: #f0f0f0
-tag-background: #fff
-tag-foreground: #000
+tag-background: #000
+tag-foreground: #fff
tiddler-background: <<colour background>>
tiddler-border: <<colour foreground>>
tiddler-controls-foreground-hover: #ddd
-tiddler-controls-foreground-selected: #fdd
+tiddler-controls-foreground-selected: #c5abf3
tiddler-controls-foreground: <<colour foreground>>
tiddler-editor-background: <<colour background>>
tiddler-editor-border-image: <<colour foreground>>
@@ -109,3 +117,4 @@ toolbar-cancel-button:
toolbar-done-button:
untagged-background: <<colour foreground>>
very-muted-foreground: #888888
+network-activity-foreground: <<colour primary>>
\ No newline at end of file
diff --git a/core/palettes/CupertinoDark.tid b/core/palettes/CupertinoDark.tid
index f0930f548..7031fb560 100644
--- a/core/palettes/CupertinoDark.tid
+++ b/core/palettes/CupertinoDark.tid
@@ -1,36 +1,40 @@
title: $:/palettes/CupertinoDark
tags: $:/tags/Palette
+color-scheme: dark
name: Cupertino Dark
description: A macOS inspired dark palette
type: application/x-tiddler-dictionary
-alert-background: #FF453A
-alert-border: #FF453A
+alert-background: #ff4b42
+alert-border: #950700
alert-highlight: #FFD60A
-alert-muted-foreground: <<colour muted-foreground>>
+alert-muted-foreground: #323234
background: #282828
-blockquote-bar: <<colour page-background>>
-button-foreground: <<colour background>>
+blockquote-bar: #8d8d8d
+button-foreground: <<colour foreground>>
code-background: <<colour pre-background>>
code-border: <<colour pre-border>>
-code-foreground: rgba(255, 255, 255, 0.54)
+code-foreground: #c7c7c7
dirty-indicator: #FF453A
download-background: <<colour primary>>
-download-foreground: <<colour foreground>>
+download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
dropdown-background: <<colour tiddler-info-background>>
dropdown-border: <<colour dropdown-background>>
dropdown-tab-background-selected: #3F638B
-dropdown-tab-background: #323232
+dropdown-tab-background: #707070
dropzone-background: #30D158
external-link-background-hover: transparent
external-link-background-visited: transparent
external-link-background: transparent
-external-link-foreground-hover:
+external-link-foreground-hover: #9511d5
external-link-foreground-visited: #BF5AF2
external-link-foreground: #32D74B
+footnote-target-background: #747474
foreground: #FFFFFF
+highlight-background: #ffff78
+highlight-foreground: #000000
menubar-background: #464646
menubar-foreground: #ffffff
message-background: <<colour background>>
@@ -51,46 +55,51 @@ pre-border: transparent
primary: #0A84FF
select-tag-background: <<colour background>>
select-tag-foreground: <<colour foreground>>
-sidebar-button-foreground: <<colour background>>
+sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground-hover: #FF9F0A
sidebar-controls-foreground: #8E8E93
sidebar-foreground-shadow: transparent
sidebar-foreground: rgba(255, 255, 255, 0.54)
-sidebar-muted-foreground-hover: rgba(255, 255, 255, 0.54)
-sidebar-muted-foreground: rgba(255, 255, 255, 0.38)
+sidebar-muted-foreground-hover: #acacac
+sidebar-muted-foreground: #787878
sidebar-tab-background-selected: #3F638B
sidebar-tab-background: <<colour background>>
-sidebar-tab-border-selected: <<colour background>>
-sidebar-tab-border: <<colour background>>
-sidebar-tab-divider: <<colour background>>
-sidebar-tab-foreground-selected: rgba(255, 255, 255, 0.87)
-sidebar-tab-foreground: rgba(255, 255, 255, 0.54)
-sidebar-tiddler-link-foreground-hover: rgba(255, 255, 255, 0.7)
-sidebar-tiddler-link-foreground: rgba(255, 255, 255, 0.54)
+sidebar-tab-border-selected: #313131
+sidebar-tab-border: #404040
+sidebar-tab-divider: #282828
+sidebar-tab-foreground-selected: #d2d2d2
+sidebar-tab-foreground: #d2d2d2
+sidebar-tiddler-link-foreground-hover: #535353
+sidebar-tiddler-link-foreground: #949494
site-title-foreground: #ffffff
+stability-stable: #009f00
+stability-experimental: #c07c00
+stability-deprecated: #ff0000
+stability-legacy: #6c6cff
static-alert-foreground: #B4B4B4
tab-background-selected: #3F638B
tab-background: <<colour page-background>>
tab-border-selected: <<colour page-background>>
-tab-border: <<colour page-background>>
+tab-border: #4a4a4a
tab-divider: <<colour page-background>>
-tab-foreground-selected: rgba(255, 255, 255, 0.87)
-tab-foreground: rgba(255, 255, 255, 0.54)
+tab-foreground-selected: #ffffff
+tab-foreground: #adadad
table-border: #464646
-table-footer-background: <<colour tiddler-editor-fields-odd>>
-table-header-background: <<colour tiddler-editor-fields-even>>
+table-footer-background: #7f7f7f
+table-header-background: <<colour table-border>>
tag-background: #48484A
tag-foreground: #323232
+testcase-accent-level-1: #345173
tiddler-background: <<colour background>>
tiddler-border: transparent
tiddler-controls-foreground-hover: <<colour sidebar-controls-foreground-hover>>
tiddler-controls-foreground-selected: <<colour sidebar-controls-foreground-hover>>
tiddler-controls-foreground: #48484A
-tiddler-editor-background: transparent
+tiddler-editor-background: <<colour background>>
tiddler-editor-border-image:
-tiddler-editor-border: rgba(255, 255, 255, 0.08)
-tiddler-editor-fields-even: rgba(255, 255, 255, 0.1)
-tiddler-editor-fields-odd: rgba(255, 255, 255, 0.04)
+tiddler-editor-border: #444444
+tiddler-editor-fields-even: #1f1f1f
+tiddler-editor-fields-odd: #464646
tiddler-info-background: #1E1E1E
tiddler-info-border: #1E1E1E
tiddler-info-tab-background: #3F638B
@@ -107,8 +116,8 @@ toolbar-close-button:
toolbar-delete-button:
toolbar-cancel-button:
toolbar-done-button:
-untagged-background: <<colour very-muted-foreground>>
-very-muted-foreground: #464646
+untagged-background: #5f5f5f
+very-muted-foreground: #3f3f3f
selection-background: #3F638B
selection-foreground: #ffffff
wikilist-background: <<colour page-background>>
@@ -127,3 +136,4 @@ wikilist-title: <<colour foreground>>
wikilist-title-svg: <<colour foreground>>
wikilist-toolbar-foreground: <<colour foreground>>
wikilist-url: <<colour muted-foreground>>
+network-activity-foreground: <<colour primary>>
\ No newline at end of file
diff --git a/core/palettes/DarkPhotos.tid b/core/palettes/DarkPhotos.tid
index 2a135f253..31afc138d 100644
--- a/core/palettes/DarkPhotos.tid
+++ b/core/palettes/DarkPhotos.tid
@@ -5,6 +5,7 @@ name: DarkPhotos
tags: $:/tags/Palette
title: $:/palettes/DarkPhotos
type: application/x-tiddler-dictionary
+color-scheme: light
alert-background: #ffe476
alert-border: #b99e2f
@@ -19,7 +20,7 @@ code-background: #f7f7f9
code-border: #e1e1e8
code-foreground: #dd1144
dirty-indicator: #ff0000
-download-background: #34c734
+download-background: #30b830
download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
@@ -34,7 +35,10 @@ external-link-background: inherit
external-link-foreground-hover: inherit
external-link-foreground-visited: #0000aa
external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
foreground: #333333
+highlight-background: #ffff00
+highlight-foreground: #000000
message-background: #ecf2ff
message-border: #cfd6e6
message-foreground: #547599
@@ -54,22 +58,26 @@ primary: #5778d8
select-tag-background:
select-tag-foreground:
sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: #ccf
-sidebar-controls-foreground: #fff
-sidebar-foreground-shadow: rgba(0,0,0, 0.5)
-sidebar-foreground: #fff
-sidebar-muted-foreground-hover: #444444
-sidebar-muted-foreground: #eee
-sidebar-tab-background-selected: rgba(255,255,255, 0.8)
-sidebar-tab-background: rgba(255,255,255, 0.4)
+sidebar-controls-foreground-hover: #a6a6ff
+sidebar-controls-foreground: #eeeeee
+sidebar-foreground-shadow: transparent
+sidebar-foreground: #eeeeee
+sidebar-muted-foreground-hover: #999999
+sidebar-muted-foreground: #eeeeee
+sidebar-tab-background-selected: <<colour page-background>>
+sidebar-tab-background: #e0e0e0
sidebar-tab-border-selected: <<colour tab-border-selected>>
sidebar-tab-border: <<colour tab-border>>
-sidebar-tab-divider: rgba(255,255,255, 0.2)
-sidebar-tab-foreground-selected:
+sidebar-tab-divider: #e4e4e4
+sidebar-tab-foreground-selected: #ddddff
sidebar-tab-foreground: <<colour tab-foreground>>
-sidebar-tiddler-link-foreground-hover: #aaf
-sidebar-tiddler-link-foreground: #ddf
-site-title-foreground: #fff
+sidebar-tiddler-link-foreground-hover: #aaaaff
+sidebar-tiddler-link-foreground: #ddddff
+site-title-foreground: #ffffff
+stability-stable: #008000
+stability-experimental: #c07c00
+stability-deprecated: #ff0000
+stability-legacy: #0000ff
static-alert-foreground: #aaaaaa
tab-background-selected: #ffffff
tab-background: #d8d8d8
@@ -86,7 +94,7 @@ tag-foreground: #ffffff
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-controls-foreground-hover: #888888
-tiddler-controls-foreground-selected: #444444
+tiddler-controls-foreground-selected: #6a6aff
tiddler-controls-foreground: #cccccc
tiddler-editor-background: #f8f8f8
tiddler-editor-border-image: #ffffff
@@ -111,3 +119,4 @@ toolbar-cancel-button:
toolbar-done-button:
untagged-background: #999999
very-muted-foreground: #888888
+network-activity-foreground: #11ff23
\ No newline at end of file
diff --git a/core/palettes/DesertSand.tid b/core/palettes/DesertSand.tid
index ab345d11f..632d1f66c 100644
--- a/core/palettes/DesertSand.tid
+++ b/core/palettes/DesertSand.tid
@@ -1,5 +1,6 @@
title: $:/palettes/DesertSand
tags: $:/tags/Palette
+color-scheme: light
name: Desert Sand
description: A desert sand palette
type: application/x-tiddler-dictionary
@@ -21,9 +22,9 @@ diff-equal-foreground: <<colour foreground>>
diff-insert-background: #91c093
diff-insert-foreground: <<colour foreground>>
diff-invisible-background:
-diff-invisible-foreground: <<colour muted-foreground>>
+diff-invisible-foreground: #d3d2cb
dirty-indicator: #ad3434
-download-background: #6ca16c
+download-background: #5eae62
download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
@@ -31,14 +32,16 @@ dropdown-background: <<colour background>>
dropdown-border: <<colour muted-foreground>>
dropdown-tab-background-selected: #E9E0C7
dropdown-tab-background: #BAB29C
-dropzone-background: rgba(0,200,0,0.7)
+dropzone-background: #00c600
external-link-background-hover: inherit
external-link-background-visited: inherit
external-link-background: inherit
-external-link-foreground-hover: inherit
+external-link-foreground-hover: #7474ba
external-link-foreground-visited: #313163
external-link-foreground: #555592
foreground: #2D2A23
+highlight-background: #ffff00
+highlight-foreground: #000000
menubar-background: #CDC2A6
menubar-foreground: #5A5446
message-background: #ECE5CF
@@ -67,7 +70,7 @@ sidebar-controls-foreground: #867F69
sidebar-foreground-shadow: transparent
sidebar-foreground: #867F69
sidebar-muted-foreground-hover: #706A58
-sidebar-muted-foreground: #B3A98C
+sidebar-muted-foreground: #aba081
sidebar-tab-background-selected: #e0d3af
sidebar-tab-background: #A6A193
sidebar-tab-border-selected: #C3BAA1
@@ -78,6 +81,10 @@ sidebar-tab-foreground: #2D2A23
sidebar-tiddler-link-foreground-hover: #433F35
sidebar-tiddler-link-foreground: #706A58
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #dc322f
+stability-experimental: #b58900
+stability-legacy: #268bd2
+stability-stable: #859900
static-alert-foreground: #A6A193
tab-background-selected: #E9E0C7
tab-background: #A6A193
@@ -91,6 +98,7 @@ table-footer-background: #8A8885
table-header-background: #B0AA98
tag-background: #706A58
tag-foreground: #E3D7B7
+testcase-accent-level-1: #b3adc9
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-controls-foreground-hover: #9D947B
@@ -136,3 +144,4 @@ wikilist-toolbar-foreground: #2D2A23
wikilist-droplink-dragover: rgba(255,192,192,0.5)
wikilist-button-background: #A6A193
wikilist-button-foreground: #161512
+network-activity-foreground: <<colour primary>>
\ No newline at end of file
diff --git a/core/palettes/FlexokiDark.tid b/core/palettes/FlexokiDark.tid
new file mode 100644
index 000000000..5c9bb8ede
--- /dev/null
+++ b/core/palettes/FlexokiDark.tid
@@ -0,0 +1,212 @@
+color-scheme: dark
+description: An inky color scheme for prose and code
+name: FlexokiDark
+tags: $:/tags/Palette
+title: $:/palettes/FlexokiDark
+type: application/x-tiddler-dictionary
+
+flexoki-paper: #FFFCF0
+flexoki-999: #100F0F
+flexoki-950: #1C1B1A
+flexoki-900: #282726
+flexoki-850: #343331
+flexoki-800: #403E3C
+flexoki-700: #575653
+flexoki-600: #6c6b66
+flexoki-500: #878580
+flexoki-300: #B7B5AC
+flexoki-200: #CECDC3
+flexoki-150: #DAD8CE
+flexoki-100: #E6E4D9
+flexoki-050: #F2F0E5
+flexoki-red-600: #AF3029
+flexoki-red-400: #D14D41
+flexoki-orange-600: #BC5215
+flexoki-orange-400: #DA702C
+flexoki-yellow-900: #4D3A0B
+flexoki-yellow-600: #AD8301
+flexoki-yellow-400: #D0A215
+flexoki-yellow-100: #FCEEB8
+flexoki-green-600: #66800B
+flexoki-green-400: #879A39
+flexoki-cyan-950: #142625
+flexoki-cyan-600: #227d77
+flexoki-cyan-400: #3AA99F
+flexoki-cyan-050: #EBF2E7
+flexoki-blue-600: #205EA6
+flexoki-blue-400: #4385BE
+flexoki-purple-600: #5E409D
+flexoki-purple-400: #8B7EC8
+flexoki-magenta-600: #A02F6F
+flexoki-magenta-400: #CE5D97
+
+flexoki-bg: <<colour flexoki-999>>
+flexoki-tx-2: <<colour flexoki-500>>
+flexoki-tx-3: <<colour flexoki-700>>
+flexoki-ui-3: <<colour flexoki-800>>
+flexoki-ui-2: <<colour flexoki-850>>
+flexoki-ui: <<colour flexoki-900>>
+flexoki-bg-2: <<colour flexoki-950>>
+flexoki-tx: <<colour flexoki-300>>
+flexoki-re: <<colour flexoki-red-400>>
+flexoki-or: <<colour flexoki-orange-400>>
+flexoki-ye: <<colour flexoki-yellow-400>>
+flexoki-gr: <<colour flexoki-green-400>>
+flexoki-cy: <<colour flexoki-cyan-400>>
+flexoki-bl: <<colour flexoki-blue-400>>
+flexoki-pu: <<colour flexoki-purple-400>>
+flexoki-ma: <<colour flexoki-magenta-400>>
+flexoki-re-2: <<colour flexoki-red-600>>
+flexoki-or-2: <<colour flexoki-orange-600>>
+flexoki-ye-2: <<colour flexoki-yellow-600>>
+flexoki-gr-2: <<colour flexoki-green-600>>
+flexoki-cy-2: <<colour flexoki-cyan-600>>
+flexoki-bl-2: <<colour flexoki-blue-600>>
+flexoki-pu-2: <<colour flexoki-purple-600>>
+flexoki-ma-2: <<colour flexoki-magenta-600>>
+
+alert-background: <<colour flexoki-yellow-900>>
+alert-border: <<colour flexoki-ye>>
+alert-highlight: <<colour flexoki-re>>
+alert-muted-foreground: <<colour flexoki-ye>>
+background: #100F0F
+blockquote-bar: <<colour flexoki-ma>>
+button-background: <<colour flexoki-bg-2>>
+button-foreground: <<colour flexoki-paper>>
+button-border: <<colour flexoki-600>>
+code-background: <<colour background>>
+code-border: <<colour flexoki-tx>>
+code-foreground: <<colour flexoki-tx>>
+diff-delete-background: <<colour flexoki-re>>
+diff-delete-foreground: <<colour flexoki-bg-2>>
+diff-equal-background:
+diff-equal-foreground: inherit
+diff-insert-background: <<colour flexoki-gr>>
+diff-insert-foreground: <<colour flexoki-bg-2>>
+diff-invisible-background: <<colour flexoki-ye>>
+diff-invisible-foreground: <<colour flexoki-bg-2>>
+dirty-indicator: <<colour flexoki-re>>
+download-background: <<colour flexoki-cy-2>>
+download-foreground: <<colour background>>
+dragger-background: <<colour background>>
+dragger-foreground: <<colour foreground>>
+dropdown-background: <<colour background>>
+dropdown-border: <<colour flexoki-ui-3>>
+dropdown-tab-background-selected: <<colour flexoki-ui>>
+dropdown-tab-background: <<colour flexoki-ui-3>>
+dropzone-background: <<colour flexoki-gr>>
+external-link-background-hover: inherit
+external-link-background-visited: inherit
+external-link-background: inherit
+external-link-foreground-hover: inherit
+external-link-foreground-visited: <<colour flexoki-bl>>
+external-link-foreground: <<colour flexoki-bl>>
+footnote-target-background: <<colour flexoki-bg-2>>
+foreground: #CECDC3
+highlight-background: <<colour flexoki-yellow-900>>
+highlight-foreground: inherit
+menubar-background: <<colour primary>>
+menubar-foreground: <<colour flexoki-999>>
+message-background: <<colour background>>
+message-border: <<colour foreground>>
+message-foreground: <<colour foreground>>
+modal-backdrop: <<colour foreground>>
+modal-background: <<colour background>>
+modal-border: <<colour flexoki-ui-3>>
+modal-footer-background: <<colour flexoki-ui-2>>
+modal-footer-border: <<colour flexoki-ui-3>>
+modal-header-border: <<colour flexoki-ui-3>>
+muted-foreground: <<colour flexoki-tx-2>>
+network-activity-foreground: <<colour flexoki-cy>>
+notification-background: <<colour flexoki-bg>>
+notification-border: <<colour flexoki-paper>>
+page-background: <<colour flexoki-bg-2>>
+pre-background: <<colour flexoki-bg-2>>
+pre-border: <<colour flexoki-ui-2>>
+primary: <<colour flexoki-cy>>
+selection-background: <<colour primary>>
+selection-foreground: <<colour background>>
+select-tag-background: <<colour flexoki-bg>>
+select-tag-foreground: <<colour flexoki-paper>>
+sidebar-button-foreground: <<colour foreground>>
+sidebar-controls-foreground-hover: <<colour flexoki-tx>>
+sidebar-controls-foreground: <<colour flexoki-tx-3>>
+sidebar-foreground-shadow: transparent
+sidebar-foreground: <<colour flexoki-tx>>
+sidebar-muted-foreground-hover: <<colour flexoki-tx>>
+sidebar-muted-foreground: <<colour flexoki-tx-3>>
+sidebar-tab-background-selected: <<colour flexoki-bg-2>>
+sidebar-tab-background: <<colour flexoki-ui-2>>
+sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border: <<colour tab-border>>
+sidebar-tab-divider: <<colour tab-divider>>
+sidebar-tab-foreground-selected:
+sidebar-tab-foreground: <<colour tab-foreground>>
+sidebar-tiddler-link-foreground-hover: <<colour flexoki-tx>>
+sidebar-tiddler-link-foreground: <<colour flexoki-tx-2>>
+site-title-foreground: <<colour tiddler-title-foreground>>
+stability-stable: <<colour flexoki-gr>>
+stability-experimental: <<colour flexoki-ye>>
+stability-deprecated: <<colour flexoki-re>>
+stability-legacy: <<colour flexoki-bl>>
+static-alert-foreground: #aaaaaa
+tab-background-selected: <<colour background>>
+tab-background: <<colour flexoki-bg-2>>
+tab-border-selected: <<colour flexoki-ui-3>>
+tab-border: <<colour flexoki-ui>>
+tab-divider: <<colour flexoki-ui-2>>
+tab-foreground-selected: <<colour tab-foreground>>
+tab-foreground: <<colour flexoki-tx-2>>
+table-border: <<colour flexoki-ui-2>>
+table-footer-background: <<colour flexoki-ui>>
+table-header-background: <<colour flexoki-ui>>
+tag-background: #D0A215
+tag-foreground: #100F0F
+testcase-accent-level-1: <<colour flexoki-bl-2>>
+testcase-accent-level-2: <<colour flexoki-ye-2>>
+testcase-accent-level-3: <<colour flexoki-gr-2>>
+tiddler-background: <<colour background>>
+tiddler-border: <<colour flexoki-ui-2>>
+tiddler-controls-foreground-hover: <<colour flexoki-tx-3>>
+tiddler-controls-foreground-selected: <<colour flexoki-tx-2>>
+tiddler-controls-foreground: <<colour flexoki-tx-3>>
+tiddler-editor-background: <<colour flexoki-bg-2>>
+tiddler-editor-border-image: #ffffff
+tiddler-editor-border: <<colour flexoki-ui-2>>
+tiddler-editor-fields-even: <<colour flexoki-ui-3>>
+tiddler-editor-fields-odd: <<colour flexoki-ui-2>>
+tiddler-info-background: <<colour flexoki-ui>>
+tiddler-info-border: <<colour flexoki-ui>>
+tiddler-info-tab-background: <<colour flexoki-ui>>
+tiddler-link-background: <<colour background>>
+tiddler-link-foreground: <<colour primary>>
+tiddler-subtitle-foreground: <<colour flexoki-tx-3>>
+tiddler-title-foreground: <<colour flexoki-ma>>
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button: <<colour flexoki-re>>
+toolbar-cancel-button:
+toolbar-done-button:
+untagged-background: <<colour flexoki-tx-3>>
+very-muted-foreground: <<colour flexoki-600>>
+wikilist-background: <<colour flexoki-ui>>
+wikilist-item: <<colour flexoki-black>>
+wikilist-info: <<colour flexoki-paper>>
+wikilist-title: <<colour flexoki-tx-2>>
+wikilist-title-svg: <<colour wikilist-title>>
+wikilist-url: <<colour flexoki-tx-3>>
+wikilist-button-open: <<colour flexoki-gr>>
+wikilist-button-open-hover: <<colour flexoki-gr-2>>
+wikilist-button-reveal: <<colour flexoki-cy>>
+wikilist-button-reveal-hover: <<colour flexoki-cy-2>>
+wikilist-button-remove: <<colour flexoki-re>>
+wikilist-button-remove-hover: <<colour flexoki-re-2>>
+wikilist-toolbar-background: <<colour flexoki-ui-2>>
+wikilist-toolbar-foreground: <<colour flexoki-600>>
+wikilist-droplink-dragover: <<colour flexoki-pu>>
+wikilist-button-background: <<colour flexoki-tx-3>>
+wikilist-button-foreground: <<colour flexoki-paper>>
\ No newline at end of file
diff --git a/core/palettes/FlexokiLight.tid b/core/palettes/FlexokiLight.tid
new file mode 100644
index 000000000..c3c4d2f25
--- /dev/null
+++ b/core/palettes/FlexokiLight.tid
@@ -0,0 +1,214 @@
+title: $:/palettes/FlexokiLight
+name: FlexokiLight
+description: An inky color scheme for prose and code
+tags: $:/tags/Palette
+type: application/x-tiddler-dictionary
+color-scheme: light
+
+flexoki-black: #100F0F
+flexoki-paper: #FFFCF0
+flexoki-950: #1C1B1A
+flexoki-900: #282726
+flexoki-850: #343331
+flexoki-800: #403E3C
+flexoki-700: #575653
+flexoki-600: #6F6E69
+flexoki-500: #878580
+flexoki-300: #B7B5AC
+flexoki-200: #CECDC3
+flexoki-150: #DAD8CE
+flexoki-100: #E6E4D9
+flexoki-050: #F2F0E5
+flexoki-red-600: #AF3029
+flexoki-red-400: #D14D41
+flexoki-orange-600: #BC5215
+flexoki-orange-400: #DA702C
+flexoki-yellow-900: #4D3A0B
+flexoki-yellow-600: #AD8301
+flexoki-yellow-400: #D0A215
+flexoki-yellow-100: #FCEEB8
+flexoki-green-600: #66800B
+flexoki-green-400: #879A39
+flexoki-cyan-950: #142625
+flexoki-cyan-600: #24837B
+flexoki-cyan-400: #3AA99F
+flexoki-cyan-050: #EBF2E7
+flexoki-blue-600: #205EA6
+flexoki-blue-400: #4385BE
+flexoki-purple-600: #5E409D
+flexoki-purple-400: #8B7EC8
+flexoki-magenta-600: #A02F6F
+flexoki-magenta-400: #CE5D97
+
+flexoki-tx: <<colour flexoki-black>>
+flexoki-tx-2: <<colour flexoki-600>>
+flexoki-tx-3: <<colour flexoki-300>>
+flexoki-ui-3: <<colour flexoki-200>>
+flexoki-ui-2: <<colour flexoki-150>>
+flexoki-ui: <<colour flexoki-100>>
+flexoki-bg-2: <<colour flexoki-050>>
+flexoki-bg: <<colour flexoki-paper>>
+
+flexoki-re: <<colour flexoki-red-400>>
+flexoki-or: <<colour flexoki-orange-400>>
+flexoki-ye: <<colour flexoki-yellow-400>>
+flexoki-gr: <<colour flexoki-green-400>>
+flexoki-cy: <<colour flexoki-cyan-400>>
+flexoki-bl: <<colour flexoki-blue-400>>
+flexoki-pu: <<colour flexoki-purple-400>>
+flexoki-ma: <<colour flexoki-magenta-400>>
+
+flexoki-re-2: <<colour flexoki-red-600>>
+flexoki-or-2: <<colour flexoki-orange-600>>
+flexoki-ye-2: <<colour flexoki-yellow-600>>
+flexoki-gr-2: <<colour flexoki-green-600>>
+flexoki-cy-2: <<colour flexoki-cyan-600>>
+flexoki-bl-2: <<colour flexoki-blue-600>>
+flexoki-pu-2: <<colour flexoki-purple-600>>
+flexoki-ma-2: <<colour flexoki-magenta-600>>
+
+alert-background: <<colour flexoki-yellow-100>>
+alert-border: <<colour flexoki-ye-2>>
+alert-highlight: <<colour flexoki-re-2>>
+alert-muted-foreground: <<colour flexoki-tx-2>>
+background: #FFFCF0
+blockquote-bar: <<colour flexoki-magenta-600>>
+button-background: <<colour flexoki-bg-2>>
+button-foreground: <<colour flexoki-black>>
+button-border: <<colour flexoki-500>>
+code-background: <<colour flexoki-bg>>
+code-border: <<colour flexoki-tx>>
+code-foreground: <<colour flexoki-tx>>
+diff-delete-background: <<colour flexoki-re-2>>
+diff-delete-foreground: <<colour flexoki-paper>>
+diff-equal-background:
+diff-equal-foreground: <<colour foreground>>
+diff-insert-background: <<colour flexoki-gr-2>>
+diff-insert-foreground: <<colour flexoki-paper>>
+diff-invisible-background: <<colour flexoki-ye-2>>
+diff-invisible-foreground: <<colour flexoki-paper>>
+dirty-indicator: <<colour flexoki-red-600>>
+download-background: <<colour flexoki-gr>>
+download-foreground: <<colour background>>
+dragger-background: <<colour foreground>>
+dragger-foreground: <<colour background>>
+dropdown-background: <<colour background>>
+dropdown-border: <<colour muted-foreground>>
+dropdown-tab-background-selected: <<colour background>>
+dropdown-tab-background: <<colour flexoki-bg-2>>
+dropzone-background: <<colour flexoki-gr>>
+external-link-background-hover: inherit
+external-link-background-visited: inherit
+external-link-background: inherit
+external-link-foreground-hover: inherit
+external-link-foreground-visited: <<colour flexoki-bl>>
+external-link-foreground: <<colour flexoki-bl>>
+footnote-target-background: <<colour flexoki-bg-2>>
+foreground: #100F0F
+highlight-background: <<colour flexoki-yellow-100>>
+highlight-foreground: inherit
+menubar-background: <<colour primary>>
+menubar-foreground: <<colour flexoki-paper>>
+message-background: <<colour flexoki-bg>>
+message-border: <<colour flexoki-black>>
+message-foreground: <<colour flexoki-black>>
+modal-backdrop: <<colour foreground>>
+modal-background: <<colour background>>
+modal-border: <<colour flexoki-tx-3>>
+modal-footer-background: <<colour flexoki-bg>>
+modal-footer-border: <<colour flexoki-tx-3>>
+modal-header-border: <<colour flexoki-tx-3>>
+muted-foreground: <<colour flexoki-500>>
+network-activity-foreground: <<colour flexoki-cy-2>>
+notification-background: <<colour flexoki-bg>>
+notification-border: <<color flexoki-black>>
+page-background: <<colour flexoki-bg-2>>
+pre-background: <<colour flexoki-bg-2>>
+pre-border: <<colour flexoki-ui-2>>
+primary: <<colour flexoki-cy-2>>
+selection-background: <<colour flexoki-cy-2>>
+selection-foreground: <<colour background>>
+select-tag-background: <<colour flexoki-bg>>
+select-tag-foreground: <<color flexoki-black>>
+sidebar-button-foreground: <<colour foreground>>
+sidebar-controls-foreground-hover: <<colour flexoki-tx>>
+sidebar-controls-foreground: <<colour flexoki-tx-3>>
+sidebar-foreground-shadow: transparent
+sidebar-foreground: <<colour flexoki-300>>
+sidebar-muted-foreground-hover: <<colour flexoki-700>>
+sidebar-muted-foreground: <<colour flexoki-200>>
+sidebar-tab-background-selected: <<colour flexoki-bg-2>>
+sidebar-tab-background: <<colour flexoki-ui>>
+sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border: <<colour tab-border>>
+sidebar-tab-divider: <<colour flexoki-100>>
+sidebar-tab-foreground-selected:
+sidebar-tab-foreground: <<colour tab-foreground>>
+sidebar-tiddler-link-foreground-hover: <<colour flexoki-500>>
+sidebar-tiddler-link-foreground: <<colour flexoki-700>>
+site-title-foreground: <<colour tiddler-title-foreground>>
+stability-stable: <<colour flexoki-green-600>>
+stability-experimental: <<colour flexoki-yellow-600>>
+stability-deprecated: <<colour flexoki-red-600>>
+stability-legacy: <<colour flexoki-blue-600>>
+static-alert-foreground: <<colour flexoki-tx-3>>
+tab-background-selected: <<colour background>>
+tab-background: <<colour flexoki-bg-2>>
+tab-border-selected: <<colour flexoki-ui-3>>
+tab-border: <<colour flexoki-ui>>
+tab-divider: <<colour flexoki-ui-2>>
+tab-foreground-selected: <<colour tab-foreground>>
+tab-foreground: <<colour flexoki-tx>>
+table-border: <<colour flexoki-ui-2>>
+table-footer-background: <<colour flexoki-tx-3>>
+table-header-background: <<colour flexoki-bg-2>>
+tag-background: #AD8301
+tag-foreground: #FFFCF0
+testcase-accent-level-1: <<colour flexoki-blue-400>>
+testcase-accent-level-2: <<colour flexoki-yellow-400>>
+testcase-accent-level-3: <<colour flexoki-green-400>>
+tiddler-background: <<colour background>>
+tiddler-border: <<colour background>>
+tiddler-controls-foreground-hover: <<colour flexoki-tx-3>>
+tiddler-controls-foreground-selected: <<colour flexoki-tx-2>>
+tiddler-controls-foreground: <<colour flexoki-ui-3>>
+tiddler-editor-background: <<colour flexoki-bg-2>>
+tiddler-editor-border-image: #ffffff
+tiddler-editor-border: <<colour flexoki-ui-2>>
+tiddler-editor-fields-even: <<colour flexoki-ui-3>>
+tiddler-editor-fields-odd: <<colour flexoki-ui-2>>
+tiddler-info-background: <<colour flexoki-bg-2>>
+tiddler-info-border: <<colour flexoki-200>>
+tiddler-info-tab-background: <<colour flexoki-bg>>
+tiddler-link-background: <<colour background>>
+tiddler-link-foreground: <<colour primary>>
+tiddler-subtitle-foreground: <<colour flexoki-tx-3>>
+tiddler-title-foreground: <<colour flexoki-magenta-600>>
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button: <<colour flexoki-re-2>>
+toolbar-cancel-button:
+toolbar-done-button:
+untagged-background: <<colour flexoki-tx-3>>
+very-muted-foreground: <<colour flexoki-500>>
+wikilist-background: <<colour flexoki-ui>>
+wikilist-item: <<colour flexoki-paper>>
+wikilist-info: <<colour flexoki-black>>
+wikilist-title: <<colour flexoki-tx-2>>
+wikilist-title-svg: <<colour wikilist-title>>
+wikilist-url: <<colour flexoki-tx-3>>
+wikilist-button-open: <<colour flexoki-gr-2>>
+wikilist-button-open-hover: <<colour flexoki-gr>>
+wikilist-button-reveal: <<colour flexoki-cy-2>>
+wikilist-button-reveal-hover: <<colour flexoki-cy>>
+wikilist-button-remove: <<colour flexoki-re-2>>
+wikilist-button-remove-hover: <<colour flexoki-re>>
+wikilist-toolbar-background: <<colour flexoki-ui-2>>
+wikilist-toolbar-foreground: <<colour flexoki-500>>
+wikilist-droplink-dragover: <<colour flexoki-pu>>
+wikilist-button-background: <<colour flexoki-tx-3>>
+wikilist-button-foreground: <<colour flexoki-black>>
diff --git a/core/palettes/GruvBoxDark.tid b/core/palettes/GruvBoxDark.tid
index 494a9349b..60d1c702e 100644
--- a/core/palettes/GruvBoxDark.tid
+++ b/core/palettes/GruvBoxDark.tid
@@ -1,5 +1,6 @@
title: $:/palettes/GruvboxDark
name: Gruvbox Dark
+color-scheme: dark
description: Retro groove color scheme
tags: $:/tags/Palette
type: application/x-tiddler-dictionary
@@ -8,23 +9,23 @@ license: https://github.com/morhetz/gruvbox
alert-background: #cc241d
alert-border: #cc241d
alert-highlight: #d79921
-alert-muted-foreground: #504945
+alert-muted-foreground: #272321
background: #3c3836
blockquote-bar: <<colour muted-foreground>>
-button-foreground: <<colour page-background>>
+button-foreground: <<colour foreground>>
code-background: #504945
code-border: #504945
-code-foreground: #fb4934
+code-foreground: #fc5e4b
diff-delete-background: #fb4934
diff-delete-foreground: <<colour foreground>>
diff-equal-background:
diff-equal-foreground: <<colour foreground>>
diff-insert-background: #b8bb26
-diff-insert-foreground: <<colour foreground>>
-diff-invisible-background:
-diff-invisible-foreground: <<colour muted-foreground>>
+diff-insert-foreground: <<colour background>>
+diff-invisible-background: #ffff97
+diff-invisible-foreground: #444347
dirty-indicator: #fb4934
-download-background: #b8bb26
+download-background: #1daf24
download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
@@ -39,51 +40,59 @@ external-link-background: inherit
external-link-foreground-hover: inherit
external-link-foreground-visited: #d3869b
external-link-foreground: #8ec07c
+footnote-target-background: #665c54
foreground: #fbf1c7
+highlight-background: #ffff79
+highlight-foreground: #000000
menubar-background: #504945
menubar-foreground: <<colour foreground>>
-message-background: #83a598
+message-background: #b4c9c1
message-border: #83a598
message-foreground: #3c3836
-modal-backdrop: <<colour foreground>>
+modal-backdrop: #625a57
modal-background: <<colour background>>
modal-border: #504945
modal-footer-background: #3c3836
modal-footer-border: #3c3836
modal-header-border: #3c3836
muted-foreground: #d5c4a1
+network-activity-foreground: <<colour primary>>
notification-background: <<colour primary>>
notification-border: <<colour primary>>
page-background: #282828
pre-background: #504945
pre-border: #504945
-primary: #d79921
+primary: #da9921
select-tag-background: #665c54
select-tag-foreground: <<colour foreground>>
selection-background: #458588
selection-foreground: <<colour foreground>>
-sidebar-button-foreground: <<colour page-background>>
-sidebar-controls-foreground-hover: #7c6f64
-sidebar-controls-foreground: #504945
+sidebar-button-foreground: <<colour foreground>>
+sidebar-controls-foreground-hover: #e3e0dd
+sidebar-controls-foreground: #978b84
sidebar-foreground-shadow: transparent
sidebar-foreground: #fbf1c7
-sidebar-muted-foreground-hover: #7c6f64
-sidebar-muted-foreground: #504945
+sidebar-muted-foreground-hover: <<colour sidebar-controls-foreground-hover>>
+sidebar-muted-foreground: <<colour sidebar-controls-foreground>>
sidebar-tab-background-selected: #bdae93
sidebar-tab-background: #3c3836
sidebar-tab-border-selected: <<colour tab-border-selected>>
sidebar-tab-border: #bdae93
sidebar-tab-divider: <<colour page-background>>
-sidebar-tab-foreground-selected: #282828
+sidebar-tab-foreground-selected: <<colour page-background>>
sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: #458588
sidebar-tiddler-link-foreground: #98971a
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #cc241d
+stability-experimental: #b37d1c
+stability-legacy: #529ca0
+stability-stable: #649618
static-alert-foreground: #B48EAD
tab-background-selected: #ebdbb2
tab-background: #665c54
-tab-border-selected: #665c54
-tab-border: #665c54
+tab-border-selected: <<colour tab-background-selected>>
+tab-border: #82746a
tab-divider: #bdae93
tab-foreground-selected: #282828
tab-foreground: #ebdbb2
@@ -92,6 +101,7 @@ table-footer-background: #665c54
table-header-background: #504945
tag-background: #d3869b
tag-foreground: #282828
+testcase-accent-level-1: #456d88
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-controls-foreground-hover: #7c6f64
@@ -118,7 +128,7 @@ toolbar-close-button:
toolbar-delete-button:
toolbar-cancel-button:
toolbar-done-button:
-untagged-background: #504945
+untagged-background: #887b75
very-muted-foreground: #bdae93
wikilist-background: <<colour page-background>>
wikilist-button-background: #acacac
diff --git a/core/palettes/Nord.tid b/core/palettes/Nord.tid
index 7af3b01e4..b662c2bfa 100644
--- a/core/palettes/Nord.tid
+++ b/core/palettes/Nord.tid
@@ -1,27 +1,28 @@
title: $:/palettes/Nord
name: Nord
+color-scheme: dark
description: An arctic, north-bluish color palette.
tags: $:/tags/Palette
type: application/x-tiddler-dictionary
license: MIT, arcticicestudio, https://github.com/arcticicestudio/nord/blob/develop/LICENSE.md
alert-background: #D08770
-alert-border: #D08770
-alert-highlight: #B48EAD
-alert-muted-foreground: #4C566A
+alert-border: <<colour alert-background>>
+alert-highlight: #a3436f
+alert-muted-foreground: #495367
background: #3b4252
blockquote-bar: <<colour muted-foreground>>
-button-foreground: <<colour page-background>>
+button-foreground: <<colour foreground>>
code-background: #2E3440
code-border: #2E3440
-code-foreground: #BF616A
+code-foreground: #c7747c
diff-delete-background: #BF616A
diff-delete-foreground: <<colour foreground>>
diff-equal-background:
diff-equal-foreground: <<colour foreground>>
diff-insert-background: #A3BE8C
-diff-insert-foreground: <<colour foreground>>
-diff-invisible-background:
+diff-insert-foreground: <<colour background>>
+diff-invisible-background: #f9f3b5
diff-invisible-foreground: <<colour muted-foreground>>
dirty-indicator: #BF616A
download-background: #A3BE8C
@@ -39,36 +40,40 @@ external-link-background: inherit
external-link-foreground-hover: inherit
external-link-foreground-visited: #5E81AC
external-link-foreground: #8FBCBB
+footnote-target-background: #2E3440
foreground: #d8dee9
+highlight-background: #ffff78
+highlight-foreground: #000000
menubar-background: #2E3440
menubar-foreground: #d8dee9
message-background: #2E3440
message-border: #2E3440
-message-foreground: #547599
-modal-backdrop: <<colour foreground>>
+message-foreground: #6485aa
+modal-backdrop: #435678
modal-background: <<colour background>>
modal-border: #3b4252
modal-footer-background: #3b4252
modal-footer-border: #3b4252
modal-header-border: #3b4252
-muted-foreground: #4C566A
+muted-foreground: #687693
+network-activity-foreground: <<colour primary>>
notification-background: <<colour primary>>
notification-border: #EBCB8B
page-background: #2e3440
pre-background: #2E3440
pre-border: #2E3440
-primary: #5E81AC
+primary: #7b98bb
select-tag-background: #3b4252
select-tag-foreground: <<colour foreground>>
-selection-background: #5E81AC
+selection-background: #52749e
selection-foreground: <<colour foreground>>
-sidebar-button-foreground: <<colour page-background>>
+sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground-hover: #D8DEE9
-sidebar-controls-foreground: #4C566A
+sidebar-controls-foreground: #5e6a84
sidebar-foreground-shadow: transparent
sidebar-foreground: #D8DEE9
-sidebar-muted-foreground-hover: #4C566A
-sidebar-muted-foreground: #4C566A
+sidebar-muted-foreground-hover: #9fa8bb
+sidebar-muted-foreground: #6c7b97
sidebar-tab-background-selected: #ECEFF4
sidebar-tab-background: #4C566A
sidebar-tab-border-selected: <<colour tab-border-selected>>
@@ -79,35 +84,40 @@ sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: #A3BE8C
sidebar-tiddler-link-foreground: #81A1C1
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #ff595e
+stability-experimental: #f29d00
+stability-legacy: #2ddbca
+stability-stable: #04ff04
static-alert-foreground: #B48EAD
tab-background-selected: #ECEFF4
tab-background: #4C566A
tab-border-selected: #4C566A
-tab-border: #4C566A
+tab-border: #5c6883
tab-divider: #4C566A
-tab-foreground-selected: #4C566A
+tab-foreground-selected: #6c7a97
tab-foreground: #D8DEE9
table-border: #4C566A
table-footer-background: #2e3440
table-header-background: #2e3440
tag-background: #A3BE8C
tag-foreground: #4C566A
+testcase-accent-level-1: #455e7d
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-controls-foreground-hover:
tiddler-controls-foreground-selected: #EBCB8B
-tiddler-controls-foreground: #4C566A
+tiddler-controls-foreground: #5e6a84
tiddler-editor-background: #2e3440
tiddler-editor-border-image: #2e3440
-tiddler-editor-border: #3b4252
+tiddler-editor-border: #232732
tiddler-editor-fields-even: #2e3440
-tiddler-editor-fields-odd: #2e3440
+tiddler-editor-fields-odd: #424a5b
tiddler-info-background: #2e3440
tiddler-info-border: #2e3440
tiddler-info-tab-background: #2e3440
tiddler-link-background: <<colour background>>
tiddler-link-foreground: <<colour primary>>
-tiddler-subtitle-foreground: #4C566A
+tiddler-subtitle-foreground: #5c6881
tiddler-title-foreground: #81A1C1
toolbar-new-button:
toolbar-options-button:
@@ -130,4 +140,4 @@ wikilist-button-open-hover: #A3BE8C
wikilist-button-reveal: #81A1C1
wikilist-button-reveal-hover: #81A1C1
wikilist-button-remove: #B48EAD
-wikilist-button-remove-hover: #B48EAD
+wikilist-button-remove-hover: #B48EAD
\ No newline at end of file
diff --git a/core/palettes/Rocker.tid b/core/palettes/Rocker.tid
index 79a253721..9e3e89f01 100644
--- a/core/palettes/Rocker.tid
+++ b/core/palettes/Rocker.tid
@@ -1,5 +1,6 @@
title: $:/palettes/Rocker
name: Rocker
+color-scheme: dark
description: A dark theme
tags: $:/tags/Palette
type: application/x-tiddler-dictionary
@@ -10,7 +11,7 @@ alert-highlight: #881122
alert-muted-foreground: #b99e2f
background: #ffffff
blockquote-bar: <<colour muted-foreground>>
-button-background:
+button-background: #adadad
button-foreground:
button-border:
code-background: #f7f7f9
@@ -32,7 +33,10 @@ external-link-background: inherit
external-link-foreground-hover: inherit
external-link-foreground-visited: #0000aa
external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
foreground: #333333
+highlight-background: #ffff00
+highlight-foreground: #000000
message-background: #ecf2ff
message-border: #cfd6e6
message-foreground: #547599
@@ -43,36 +47,41 @@ modal-footer-background: #f5f5f5
modal-footer-border: #dddddd
modal-header-border: #eeeeee
muted-foreground: #999999
+network-activity-foreground: <<colour primary>>
notification-background: #ffffdd
notification-border: #999999
page-background: #000
pre-background: #f5f5f5
pre-border: #cccccc
primary: #cc0000
-select-tag-background:
-select-tag-foreground:
+select-tag-background: <<colour foreground>>
+select-tag-foreground: <<colour foreground>>
sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: #000000
-sidebar-controls-foreground: #ffffff
+sidebar-controls-foreground-hover: #797979
+sidebar-controls-foreground: #cacaca
sidebar-foreground-shadow: rgba(255,255,255, 0.0)
sidebar-foreground: #acacac
sidebar-muted-foreground-hover: #444444
sidebar-muted-foreground: #c0c0c0
-sidebar-tab-background-selected: #000
+sidebar-tab-background-selected: #000000
sidebar-tab-background: <<colour tab-background>>
-sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border-selected: #7c7c7c
sidebar-tab-border: <<colour tab-border>>
sidebar-tab-divider: <<colour tab-divider>>
-sidebar-tab-foreground-selected:
+sidebar-tab-foreground-selected: #ff0909
sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: #ffbb99
sidebar-tiddler-link-foreground: #cc0000
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #ff0000
+stability-experimental: #c07c00
+stability-legacy: #0000ff
+stability-stable: #008000
static-alert-foreground: #aaaaaa
tab-background-selected: #ffffff
tab-background: #d8d8d8
tab-border-selected: #d8d8d8
-tab-border: #cccccc
+tab-border: #bbbbbb
tab-divider: #d8d8d8
tab-foreground-selected: <<colour tab-foreground>>
tab-foreground: #666666
@@ -81,6 +90,7 @@ table-footer-background: #a8a8a8
table-header-background: #f0f0f0
tag-background: #ffbb99
tag-foreground: #000
+testcase-accent-level-1: #9e9eff
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-controls-foreground-hover: #888888
@@ -108,4 +118,4 @@ toolbar-delete-button:
toolbar-cancel-button:
toolbar-done-button:
untagged-background: #999999
-very-muted-foreground: #888888
+very-muted-foreground: #888888
\ No newline at end of file
diff --git a/core/palettes/SolarFlare.tid b/core/palettes/SolarFlare.tid
index 5622b29af..08476ebcd 100644
--- a/core/palettes/SolarFlare.tid
+++ b/core/palettes/SolarFlare.tid
@@ -1,27 +1,28 @@
title: $:/palettes/SolarFlare
name: Solar Flare
+color-scheme: light
description: Warm, relaxing earth colours
tags: $:/tags/Palette
type: application/x-tiddler-dictionary
-: Background Tones
+# Background Tones
base03: #002b36
base02: #073642
-: Content Tones
+# Content Tones
base01: #586e75
base00: #657b83
base0: #839496
base1: #93a1a1
-: Background Tones
+# Background Tones
base2: #eee8d5
base3: #fdf6e3
-: Accent Colors
+# Accent Colors
yellow: #b58900
orange: #cb4b16
@@ -32,7 +33,7 @@ blue: #268bd2
cyan: #2aa198
green: #859900
-: Additional Tones (RA)
+# Additional Tones (RA)
base10: #c0c4bb
violet-muted: #7c81b0
@@ -44,9 +45,9 @@ red-hot: #ff2222
blue-hot: #2298ee
green-hot: #98ee22
-: Palette
+# Palette
-: Do not use colour macro for background and foreground
+# Do not use colour macro for background and foreground
background: #fdf6e3
download-foreground: <<colour background>>
dragger-foreground: <<colour background>>
@@ -67,24 +68,28 @@ foreground: #657b83
sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground: <<colour foreground>>
sidebar-foreground: <<colour foreground>>
-: base03
-: base02
-: base01
+# base03
+# base02
+# base01
alert-muted-foreground: <<colour base01>>
-: base00
+# base00
code-foreground: <<colour base00>>
message-foreground: <<colour base00>>
tag-foreground: <<colour base00>>
-: base0
+# base0
sidebar-tiddler-link-foreground: <<colour base0>>
-: base1
+# base1
muted-foreground: <<colour base1>>
blockquote-bar: <<colour muted-foreground>>
dropdown-border: <<colour muted-foreground>>
sidebar-muted-foreground: <<colour muted-foreground>>
tiddler-title-foreground: <<colour muted-foreground>>
site-title-foreground: <<colour tiddler-title-foreground>>
-: base2
+# base2
+ stability-deprecated: <<colour red>>
+ stability-experimental: <<colour yellow>>
+ stability-legacy: <<colour blue-hot>>
+ stability-stable: <<colour green>>
modal-footer-background: <<colour base2>>
page-background: <<colour base2>>
modal-backdrop: <<colour page-background>>
@@ -98,43 +103,54 @@ foreground: #657b83
tag-background: <<colour base2>>
tiddler-editor-background: <<colour base2>>
tiddler-info-background: <<colour base2>>
- tiddler-info-tab-background: <<colour base2>>
+ tiddler-info-tab-background: <<colour tiddler-info-border>>
tab-background: <<colour base2>>
- dropdown-tab-background: <<colour tab-background>>
-: base3
+dropdown-tab-background: <<colour tab-background>>
+# base3
alert-background: <<colour base3>>
message-background: <<colour base3>>
-: yellow
-: orange
-: red
-: magenta
+# yellow
+# orange
+# red
+# magenta
alert-highlight: <<colour magenta>>
-: violet
+# violet
external-link-foreground: <<colour violet>>
-: blue
-: cyan
-: green
-: base10
- tiddler-controls-foreground: <<colour base10>>
-: violet-muted
- external-link-foreground-visited: <<colour violet-muted>>
-: blue-muted
- primary: <<colour blue-muted>>
- download-background: <<colour primary>>
- tiddler-link-foreground: <<colour primary>>
+# blue
+# cyan
+# green
+# base10
+ tiddler-controls-foreground: <<colour base10>>
+# violet-muted
+ external-link-foreground-visited: <<colour violet-muted>>
+# blue-muted
+ primary: <<colour blue-muted>>
+ download-background: #5bb83d
+ tiddler-link-foreground: <<colour primary>>
alert-border: #b99e2f
+diff-delete-background: <<colour red>>
+diff-delete-foreground: <<colour background>>
+diff-equal-background: inherit
+diff-equal-foreground: inherit
+diff-insert-background: <<colour green>>
+diff-insert-foreground: <<colour background>>
+diff-invisible-background: <<colour yellow>>
+diff-invisible-foreground: <<colour background>>
dirty-indicator: #ff0000
-dropzone-background: rgba(0,200,0,0.7)
+dropzone-background: #008800
external-link-background-hover: inherit
external-link-background-visited: inherit
external-link-background: inherit
external-link-foreground-hover: inherit
+footnote-target-background: #ded8c5
+highlight-background: #ffff00
+highlight-foreground: #000000
message-border: #cfd6e6
modal-border: #999999
select-tag-background:
select-tag-foreground:
-sidebar-controls-foreground-hover:
+sidebar-controls-foreground-hover: #000000
sidebar-muted-foreground-hover:
sidebar-tab-background: #ded8c5
sidebar-tiddler-link-foreground-hover:
@@ -150,6 +166,7 @@ tab-divider: #d8d8d8
sidebar-tab-divider: <<colour tab-divider>>
table-border: #dddddd
table-footer-background: #a8a8a8
+testcase-accent-level-1: #bec8cc
tiddler-controls-foreground-hover: #888888
tiddler-controls-foreground-selected: #444444
tiddler-editor-border-image: #ffffff
@@ -169,3 +186,4 @@ toolbar-cancel-button:
toolbar-done-button:
untagged-background: #999999
very-muted-foreground: #888888
+network-activity-foreground: <<colour primary>>
\ No newline at end of file
diff --git a/core/palettes/SolarizedDark.tid b/core/palettes/SolarizedDark.tid
index 2a0fd5e8a..2069797f1 100644
--- a/core/palettes/SolarizedDark.tid
+++ b/core/palettes/SolarizedDark.tid
@@ -4,6 +4,7 @@ type: application/x-tiddler-dictionary
description: Precision dark colors for machines and people
license: MIT, Ethan Schoonover, https://github.com/altercation/solarized/blob/master/LICENSE
name: SolarizedDark
+color-scheme: dark
alert-background: #073642
alert-border: #93a1a1
@@ -17,7 +18,15 @@ button-foreground: #93a1a1
code-background: #073642
code-border: #586e75
code-foreground: #93a1a1
-dirty-indicator: inherit
+diff-delete-background: #dc322f
+diff-delete-foreground: #eee8d5
+diff-equal-background: inherit
+diff-equal-foreground: inherit
+diff-insert-background: #859900
+diff-insert-foreground: #073642
+diff-invisible-background: #b58900
+diff-invisible-foreground: #eee8d5
+dirty-indicator: #dc322f
download-background: #859900
download-foreground: #073642
dragger-background: #073642
@@ -31,9 +40,12 @@ external-link-background: inherit
external-link-background-hover: inherit
external-link-background-visited: inherit
external-link-foreground: #268bd2
-external-link-foreground-hover:
+external-link-foreground-hover: #1d669c
external-link-foreground-visited: #268bd2
+footnote-target-background: #073642
foreground: #839496
+highlight-background: #ffff78
+highlight-foreground: #000000
message-background: #002b36
message-border: #586e75
message-foreground: #839496
@@ -44,6 +56,7 @@ modal-footer-background: #073642
modal-footer-border: #586e75
modal-header-border: #586e75
muted-foreground: #93a1a1
+network-activity-foreground: <<colour primary>>
notification-background: #002b36
notification-border: #586e75
page-background: #073642
@@ -69,6 +82,10 @@ sidebar-tab-foreground-selected: #93a1a1
sidebar-tiddler-link-foreground: #2aa198
sidebar-tiddler-link-foreground-hover: #eee8d5
site-title-foreground: #d33682
+stability-deprecated: #aa1a9f
+stability-experimental: #806000
+stability-legacy: #1d669c
+stability-stable: #00df11
static-alert-foreground: #93a1a1
tab-background: #073642
tab-background-selected: #002b36
@@ -82,6 +99,7 @@ table-footer-background: #073642
table-header-background: #073642
tag-background: #b58900
tag-foreground: #002b36
+testcase-accent-level-1: #073642
tiddler-background: #002b36
tiddler-border: #586e75
tiddler-controls-foreground: inherit
@@ -109,4 +127,4 @@ toolbar-new-button: #839496
toolbar-options-button: #839496
toolbar-save-button: inherit
untagged-background: #586e75
-very-muted-foreground: #586e75
+very-muted-foreground: #586e75
\ No newline at end of file
diff --git a/core/palettes/SolarizedLight.tid b/core/palettes/SolarizedLight.tid
index 3c6979ec6..ce2354fb0 100644
--- a/core/palettes/SolarizedLight.tid
+++ b/core/palettes/SolarizedLight.tid
@@ -4,6 +4,7 @@ type: application/x-tiddler-dictionary
description: Precision colors for machines and people
license: MIT, Ethan Schoonover, https://github.com/altercation/solarized/blob/master/LICENSE
name: SolarizedLight
+color-scheme: light
alert-background: #eee8d5
alert-border: #586e75
@@ -17,8 +18,16 @@ button-foreground: #586e75
code-background: #eee8d5
code-border: #93a1a1
code-foreground: #586e75
-dirty-indicator: inherit
-download-background: #859900
+diff-delete-background: #dc322f
+diff-delete-foreground: #eee8d5
+diff-equal-background: inherit
+diff-equal-foreground: inherit
+diff-insert-background: #859900
+diff-insert-foreground: #eee8d5
+diff-invisible-background: #b58900
+diff-invisible-foreground: #eee8d5
+dirty-indicator: #dc322f
+download-background: #00910b
download-foreground: #eee8d5
dragger-background: #eee8d5
dragger-foreground: #657b83
@@ -33,7 +42,10 @@ external-link-background-visited: inherit
external-link-foreground: #268bd2
external-link-foreground-hover: inherit
external-link-foreground-visited: #268bd2
+footnote-target-background: #eee8d5
foreground: #657b83
+highlight-background: #ffff00
+highlight-foreground: #000000
message-background: #fdf6e3
message-border: #93a1a1
message-foreground: #657b83
@@ -44,6 +56,7 @@ modal-footer-background: #eee8d5
modal-footer-border: #93a1a1
modal-header-border: #93a1a1
muted-foreground: #586e75
+network-activity-foreground: <<colour primary>>
notification-background: #fdf6e3
notification-border: #93a1a1
page-background: #eee8d5
@@ -69,6 +82,10 @@ sidebar-tab-foreground-selected: #586e75
sidebar-tiddler-link-foreground: #2aa198
sidebar-tiddler-link-foreground-hover: #002b36
site-title-foreground: #d33682
+stability-deprecated: #d21a1a
+stability-experimental: #771e00
+stability-legacy: #227abb
+stability-stable: #576400
static-alert-foreground: #586e75
tab-background: #eee8d5
tab-background-selected: #fdf6e3
@@ -82,6 +99,7 @@ table-footer-background: #eee8d5
table-header-background: #eee8d5
tag-background: #b58900
tag-foreground: #fdf6e3
+testcase-accent-level-1: #afc2db
tiddler-background: #fdf6e3
tiddler-border: #93a1a1
tiddler-controls-foreground: inherit
diff --git a/core/palettes/SpartanDay.tid b/core/palettes/SpartanDay.tid
index 8f722d029..505427d33 100644
--- a/core/palettes/SpartanDay.tid
+++ b/core/palettes/SpartanDay.tid
@@ -3,6 +3,7 @@ tags: $:/tags/Palette
type: application/x-tiddler-dictionary
description: Cold, spartan day colors
name: Spartan Day
+color-scheme: light
alert-background: <<colour background>>
alert-border: <<colour very-muted-foreground>>
@@ -32,7 +33,10 @@ external-link-background: transparent
external-link-foreground-hover:
external-link-foreground-visited:
external-link-foreground:
+footnote-target-background: #ececec
foreground: rgba(0, 0, 0, 0.87)
+highlight-background: #ffff00
+highlight-foreground: #000000
message-background: <<colour background>>
message-border: <<colour very-muted-foreground>>
message-foreground: rgba(0, 0, 0, 0.54)
diff --git a/core/palettes/SpartanNight.tid b/core/palettes/SpartanNight.tid
index f4f672af3..b36ecb526 100644
--- a/core/palettes/SpartanNight.tid
+++ b/core/palettes/SpartanNight.tid
@@ -3,6 +3,7 @@ tags: $:/tags/Palette
type: application/x-tiddler-dictionary
description: Dark spartan colors
name: Spartan Night
+color-scheme: dark
alert-background: <<colour background>>
alert-border: <<colour very-muted-foreground>>
@@ -32,7 +33,10 @@ external-link-background: transparent
external-link-foreground-hover:
external-link-foreground-visited: #7c318c
external-link-foreground: #9e3eb3
+footnote-target-background: #494949
foreground: rgba(255, 255, 255, 0.7)
+highlight-background: #ffff78
+highlight-foreground: #000000
message-background: <<colour background>>
message-border: <<colour very-muted-foreground>>
message-foreground: rgba(255, 255, 255, 0.54)
diff --git a/core/palettes/Twilight.tid b/core/palettes/Twilight.tid
index d90fef328..bbd077218 100644
--- a/core/palettes/Twilight.tid
+++ b/core/palettes/Twilight.tid
@@ -4,6 +4,7 @@ author: Thomas Elmiger
type: application/x-tiddler-dictionary
name: Twilight
description: Delightful, soft darkness.
+color-scheme: dark
alert-background: rgb(255, 255, 102)
alert-border: rgb(232, 232, 125)
@@ -18,13 +19,13 @@ code-background: rgba(0,0,0,0.03)
code-border: rgba(0,0,0,0.08)
code-foreground: rgb(255, 94, 94)
diff-delete-background: #ffc9c9
-diff-delete-foreground: <<colour foreground>>
+diff-delete-foreground: <<colour background>>
diff-equal-background:
diff-equal-foreground: <<colour foreground>>
diff-insert-background: #aaefad
-diff-insert-foreground: <<colour foreground>>
-diff-invisible-background:
-diff-invisible-foreground: <<colour muted-foreground>>
+diff-insert-foreground: <<colour background>>
+diff-invisible-background: #fdfcbd
+diff-invisible-foreground: <<colour background>>
dirty-indicator: rgb(255, 94, 94)
download-background: #19a974
download-foreground: rgb(38, 38, 38)
@@ -41,7 +42,10 @@ external-link-background-visited: inherit
external-link-foreground: rgb(179, 179, 255)
external-link-foreground-hover: inherit
external-link-foreground-visited: rgb(153, 153, 255)
+footnote-target-background: <<colour tag-foreground>>
foreground: rgb(179, 179, 179)
+highlight-background: #ffff78
+highlight-foreground: #000000
message-background: <<colour tag-foreground>>
message-border: #96ccff
message-foreground: <<colour tag-background>>
@@ -90,6 +94,7 @@ table-footer-background: rgba(0,0,0,.4)
table-header-background: rgba(0,0,0,.1)
tag-background: rgb(255, 201, 102)
tag-foreground: rgb(25, 25, 25)
+testcase-accent-level-1: rgb(13, 52, 99)
tiddler-background: rgb(38, 38, 38)
tiddler-border: rgba(240, 196, 117, 0.7)
tiddler-controls-foreground: rgb(128, 128, 128)
diff --git a/core/palettes/Vanilla.tid b/core/palettes/Vanilla.tid
index 399bf1ac8..2228fddf1 100644
--- a/core/palettes/Vanilla.tid
+++ b/core/palettes/Vanilla.tid
@@ -3,6 +3,7 @@ name: Vanilla
description: Pale and unobtrusive
tags: $:/tags/Palette
type: application/x-tiddler-dictionary
+color-scheme: light
alert-background: #ffe476
alert-border: #b99e2f
@@ -31,7 +32,7 @@ dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
dropdown-background: <<colour background>>
dropdown-border: <<colour muted-foreground>>
-dropdown-tab-background-selected: #fff
+dropdown-tab-background-selected: #ffffff
dropdown-tab-background: #ececec
dropzone-background: rgba(0,200,0,0.7)
external-link-background-hover: inherit
@@ -40,7 +41,10 @@ external-link-background: inherit
external-link-foreground-hover: inherit
external-link-foreground-visited: #0000aa
external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
foreground: #333333
+highlight-background: #ffff00
+highlight-foreground: #000000
message-background: #ecf2ff
message-border: #cfd6e6
message-foreground: #547599
@@ -50,7 +54,8 @@ modal-border: #999999
modal-footer-background: #f5f5f5
modal-footer-border: #dddddd
modal-header-border: #eeeeee
-muted-foreground: #bbb
+muted-foreground: #bbbbbb
+network-activity-foreground: #448844
notification-background: #ffffdd
notification-border: #999999
page-background: #f4f4f4
@@ -64,7 +69,7 @@ select-tag-foreground:
sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground-hover: #000000
sidebar-controls-foreground: #aaaaaa
-sidebar-foreground-shadow: rgba(255,255,255, 0.8)
+sidebar-foreground-shadow: #ffffff
sidebar-foreground: #acacac
sidebar-muted-foreground-hover: #444444
sidebar-muted-foreground: #c0c0c0
@@ -78,6 +83,10 @@ sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: #444444
sidebar-tiddler-link-foreground: #999999
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-stable: #00b700
+stability-experimental: #c07c00
+stability-deprecated: #ff0000
+stability-legacy: #0000ff
static-alert-foreground: #aaaaaa
tab-background-selected: #ffffff
tab-background: #d8d8d8
@@ -89,8 +98,11 @@ tab-foreground: #666666
table-border: #dddddd
table-footer-background: #a8a8a8
table-header-background: #f0f0f0
-tag-background: #ec6
+tag-background: #eecc66
tag-foreground: #ffffff
+testcase-accent-level-1: #c1eaff
+testcase-accent-level-2: #E3B740
+testcase-accent-level-3: #5FD564
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-controls-foreground-hover: #888888
@@ -120,19 +132,19 @@ toolbar-done-button:
untagged-background: #999999
very-muted-foreground: #888888
wikilist-background: #e5e5e5
-wikilist-item: #fff
-wikilist-info: #000
-wikilist-title: #666
+wikilist-item: #ffffff
+wikilist-info: #000000
+wikilist-title: #666666
wikilist-title-svg: <<colour wikilist-title>>
-wikilist-url: #aaa
+wikilist-url: #aaaaaa
wikilist-button-open: #4fb82b
-wikilist-button-open-hover: green
+wikilist-button-open-hover: #009300
wikilist-button-reveal: #5778d8
-wikilist-button-reveal-hover: blue
+wikilist-button-reveal-hover: #0000ff
wikilist-button-remove: #d85778
-wikilist-button-remove-hover: red
+wikilist-button-remove-hover: #ff0000
wikilist-toolbar-background: #d3d3d3
-wikilist-toolbar-foreground: #888
-wikilist-droplink-dragover: rgba(255,192,192,0.5)
+wikilist-toolbar-foreground: #888888
+wikilist-droplink-dragover: #ffc0c0
wikilist-button-background: #acacac
-wikilist-button-foreground: #000
+wikilist-button-foreground: #000000
\ No newline at end of file
diff --git a/core/plugin.info b/core/plugin.info
index da319c2e9..8902acdea 100644
--- a/core/plugin.info
+++ b/core/plugin.info
@@ -5,5 +5,6 @@
"author": "JeremyRuston",
"core-version": ">=5.0.0",
"plugin-priority": "0",
- "list": "readme"
+ "list": "readme",
+ "stability": "STABILITY_2_STABLE"
}
diff --git a/core/templates/exporters/CsvFile.tid b/core/templates/exporters/CsvFile.tid
index 23d3bbd73..724827d89 100644
--- a/core/templates/exporters/CsvFile.tid
+++ b/core/templates/exporters/CsvFile.tid
@@ -2,5 +2,6 @@ title: $:/core/templates/exporters/CsvFile
tags: $:/tags/Exporter
description: {{$:/language/Exporters/CsvFile}}
extension: .csv
+file-type: text/csv
<$macrocall $name="csvtiddlers" filter=<<exportFilter>> format="quoted-comma-sep" $output="text/raw"/>
diff --git a/core/templates/exporters/JsonFile.tid b/core/templates/exporters/JsonFile.tid
index 9008906cc..2ae5495c1 100644
--- a/core/templates/exporters/JsonFile.tid
+++ b/core/templates/exporters/JsonFile.tid
@@ -2,5 +2,6 @@ title: $:/core/templates/exporters/JsonFile
tags: $:/tags/Exporter
description: {{$:/language/Exporters/JsonFile}}
extension: .json
+file-type: application/json
<$macrocall $name="jsontiddlers" filter=<<exportFilter>> $output="text/raw"/>
diff --git a/core/templates/exporters/StaticRiver.tid b/core/templates/exporters/StaticRiver.tid
index 4583bc1ce..3b70c9d11 100644
--- a/core/templates/exporters/StaticRiver.tid
+++ b/core/templates/exporters/StaticRiver.tid
@@ -3,6 +3,7 @@ tags: $:/tags/Exporter
description: {{$:/language/Exporters/StaticRiver}}
extension: .html
+\define tv-config-static() yes
\define tv-wikilink-template() #$uri_encoded$
\define tv-config-toolbar-icons() no
\define tv-config-toolbar-text() no
@@ -14,6 +15,7 @@ extension: .html
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="generator" content="TiddlyWiki" />
<meta name="tiddlywiki-version" content="{{$:/core/templates/version}}" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="format-detection" content="telephone=no">
<link id="faviconLink" rel="shortcut icon" href="favicon.ico">
<title>{{$:/core/wiki/title}}
diff --git a/core/templates/exporters/StaticRiverContent.tid b/core/templates/exporters/StaticRiverContent.tid
index 0b04549f9..3d42be807 100644
--- a/core/templates/exporters/StaticRiverContent.tid
+++ b/core/templates/exporters/StaticRiverContent.tid
@@ -3,5 +3,5 @@ title: $:/core/templates/exporters/StaticRiver/Content
\define renderContent()
{{{ $(exportFilter)$ ||$:/core/templates/static-tiddler}}}
\end
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
<>
diff --git a/core/templates/exporters/TidFile.tid b/core/templates/exporters/TidFile.tid
index 1dbd3503b..94f9744a8 100644
--- a/core/templates/exporters/TidFile.tid
+++ b/core/templates/exporters/TidFile.tid
@@ -2,10 +2,11 @@ title: $:/core/templates/exporters/TidFile
tags: $:/tags/Exporter
description: {{$:/language/Exporters/TidFile}}
extension: .tid
+file-type: text/vnd.tiddlywiki
condition: [compare:lte[1]]
\define renderContent()
{{{ $(exportFilter)$ +[limit[1]] ||$:/core/templates/tid-tiddler}}}
\end
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
<>
\ No newline at end of file
diff --git a/core/templates/external-js/save-all-external-js.tid b/core/templates/external-js/save-all-external-js.tid
index 51f6d6508..36bdd9f68 100644
--- a/core/templates/external-js/save-all-external-js.tid
+++ b/core/templates/external-js/save-all-external-js.tid
@@ -1,7 +1,14 @@
title: $:/core/save/all-external-js
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\whitespace trim
+\import [subfilter{$:/core/config/GlobalImportFilter}]
\define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] +[sort[title]] $(publishFilter)$
\end
-{{$:/core/templates/tiddlywiki5-external-js.html}}
+
+
+\define defaultCoreURL() %24%3A%2Fcore%2Ftemplates%2Ftiddlywiki5.js
+
+<$let coreURL={{{ [[coreURL]is[variable]thenelse] }}}>
+ {{$:/core/templates/tiddlywiki5-external-js.html}}
+
diff --git a/core/templates/external-js/save-offline-external-js.tid b/core/templates/external-js/save-offline-external-js.tid
new file mode 100644
index 000000000..bae0d16fd
--- /dev/null
+++ b/core/templates/external-js/save-offline-external-js.tid
@@ -0,0 +1,11 @@
+title: $:/core/save/offline-external-js
+
+\whitespace trim
+\import [subfilter{$:/core/config/GlobalImportFilter}]
+\define saveTiddlerFilter()
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] +[sort[title]] $(publishFilter)$
+\end
+\define defaultCoreURL() tiddlywikicore-$(version)$.js
+<$let coreURL={{{ [[coreURL]is[variable]thenelse] }}}>
+ {{$:/core/templates/tiddlywiki5-external-js.html}}
+
diff --git a/core/templates/external-js/tiddlywiki.js.load.tid b/core/templates/external-js/tiddlywiki.js.load.tid
new file mode 100644
index 000000000..496d6ed04
--- /dev/null
+++ b/core/templates/external-js/tiddlywiki.js.load.tid
@@ -0,0 +1,3 @@
+title: $:/core/templates/tiddlywiki.js/load-tiddler
+
+_load(window,<$macrocall $name="jsontiddler" $output="text/raw"/>);
\ No newline at end of file
diff --git a/core/templates/external-js/tiddlywiki.js.tid b/core/templates/external-js/tiddlywiki.js.tid
index a8170663f..f962569a2 100644
--- a/core/templates/external-js/tiddlywiki.js.tid
+++ b/core/templates/external-js/tiddlywiki.js.tid
@@ -1,15 +1,48 @@
+
title: $:/core/templates/tiddlywiki5.js
\rules only filteredtranscludeinline transcludeinline codeinline
-/*
-{{ $:/core/copyright.txt ||$:/core/templates/plain-text-tiddler}}
-`*/
-`
-{{{ [is[system]type[application/javascript]library[yes]] ||$:/core/templates/plain-text-tiddler}}}
-
-{{ $:/boot/bootprefix.js ||$:/core/templates/plain-text-tiddler}}
-
-{{$:/core/templates/tiddlywiki5.js/tiddlers}}
-
-{{ $:/boot/boot.js ||$:/core/templates/plain-text-tiddler}}
+`/*
+`{{ $:/core/copyright.txt ||$:/core/templates/plain-text-tiddler}}`
+*/
+
+$tw = (typeof $tw === 'undefined') ? Object.create(null) : $tw;
+
+$tw.preloadTiddlers = $tw.preloadTiddlers || [];
+
+_load = function(window,tiddler) {
+ "use strict";
+ var f;
+ $tw.preloadTiddlers.push(tiddler);
+ if(tiddler.library === "yes") {
+ var module = { exports:{} };
+ var moduleName = function moduleName(path) {
+ var word = path.split("/").pop();
+ word = word.substring(0,word.indexOf(".")) || word;
+ return word;
+ }
+ f = new Function("module",tiddler.text);
+ f(module);
+ window[moduleName(tiddler.title)] = module.exports;
+ } else {
+ f = new Function("window",tiddler.text);
+ f(window);
+ }
+}
+
+/* ~~ Library modules ~~ */
+
+`{{{ [is[system]type[application/javascript]library[yes]] ||$:/core/templates/tiddlywiki.js/load-tiddler}}}`
+
+/* ~~ Boot kernel prologue ~~ */
+
+`{{ $:/boot/bootprefix.js ||$:/core/templates/tiddlywiki.js/load-tiddler}}`
+
+/* ~~ Core tiddlers ~~ */
+
+`{{$:/core/templates/tiddlywiki5.js/tiddlers}}`
+
+/* ~~ Boot kernel ~~ */
+
+`{{ $:/boot/boot.js ||$:/core/templates/tiddlywiki.js/load-tiddler}}`
diff --git a/core/templates/external-js/tiddlywiki.js.tiddlers.tid b/core/templates/external-js/tiddlywiki.js.tiddlers.tid
index 322e7ae5e..3b5d1bfe6 100644
--- a/core/templates/external-js/tiddlywiki.js.tiddlers.tid
+++ b/core/templates/external-js/tiddlywiki.js.tiddlers.tid
@@ -2,4 +2,8 @@ title: $:/core/templates/tiddlywiki5.js/tiddlers
`
$tw.preloadTiddlerArray(`<$text text=<>/>`);
+$tw.preloadTiddlerArray([{
+ title: "$:/config/SaveWikiButton/Template",
+ text: "$:/core/save/offline-external-js"
+}]);
`
diff --git a/core/templates/external-js/tiddlywiki5-external-js.html.tid b/core/templates/external-js/tiddlywiki5-external-js.html.tid
index 31e583c6c..39ded2b5e 100644
--- a/core/templates/external-js/tiddlywiki5-external-js.html.tid
+++ b/core/templates/external-js/tiddlywiki5-external-js.html.tid
@@ -1,47 +1,52 @@
title: $:/core/templates/tiddlywiki5-external-js.html
-\rules only filteredtranscludeinline transcludeinline
-
-{{$:/core/templates/MOTW.html}}
+<$set name="saveTiddlerAndShadowsFilter" filter="[subfilter] [subfilterplugintiddlers[]]">
+<$set name="rawMarkupFilter" filter="[enlist] +[[$:/core]plugintiddlers[]]">
+`
+`{{$:/core/templates/MOTW.html}}`
-{{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}}
+`{{{ [enlisttag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}}`
-
+
-
+
-{{$:/core/wiki/title}}
+`{{$:/core/wiki/title}}`
-{{{ [all[shadows+tiddlers]tag[$:/core/wiki/rawmarkup]] [all[shadows+tiddlers]tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}}
-{{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified]] ||$:/core/templates/raw-static-tiddler}}}
+`{{{ [enlisttag[$:/core/wiki/rawmarkup]] ||$:/core/templates/plain-text-tiddler}}}`
+`{{{ [enlisttag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}}`
+`{{{ [enlisttag[$:/tags/RawMarkupWikified]] ||$:/core/templates/raw-static-tiddler}}}`
-{{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified/TopBody]] ||$:/core/templates/raw-static-tiddler}}}
+`{{{ [enlisttag[$:/tags/RawMarkupWikified/TopBody]] ||$:/core/templates/raw-static-tiddler}}}`
-{{$:/core/templates/store.area.template.html}}
+`{{$:/core/templates/store.area.template.html}}`
-{{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}}
+`{{{ [enlisttag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}}`
+
+
-
-
+`
+
+
\ No newline at end of file
diff --git a/core/templates/html-div-tiddler.tid b/core/templates/html-div-tiddler.tid
index 6e3001cf5..640fe766b 100644
--- a/core/templates/html-div-tiddler.tid
+++ b/core/templates/html-div-tiddler.tid
@@ -5,5 +5,5 @@ title: $:/core/templates/html-div-tiddler
This template is used for saving tiddlers as an HTML DIV tag with attributes representing the tiddler fields.
-->``>
-
`
-
\ No newline at end of file
+\whitespace trim
+
+<$list filter="[[$:/isEncrypted]get[text]else[no]match[no]]">
+ <$list filter="[[storeAreaFormat]is[variable]getvariable[]else[json]match[json]]">
+
+ ``
+ `
<$set name="resultCount" value="""<$count filter={{$:/temp/advancedsearch}}/>""">
-Are you sure you wish to delete <> tiddler(s)?
+{{$:/language/ConfirmDeleteTiddlers}}
<$button class="tc-btn">
<$action-deletetiddler $filter={{$:/temp/advancedsearch}}/>
-Delete these tiddlers
+{{$:/language/Buttons/DeleteTiddlers/Hint}}