Docs updates

Fix #6701

.eslintignore

@@ -1,15 +1,8 @@
-# Known minified files
+# Ignore "third party" code whose style we will not change.
 /boot/sjcl.js
+/core/modules/utils/base64-utf8/base64-utf8.module.js
 /core/modules/utils/base64-utf8/base64-utf8.module.min.js
 /core/modules/utils/diff-match-patch/diff_match_patch.js
-/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
+/core/modules/utils/diff-match-patch/diff_match_patch_uncompressed.js
+/core/modules/utils/dom/csscolorparser.js
+/plugins/tiddlywiki/*/files/

.eslintrc.yml

@@ -64,7 +64,23 @@ rules:
   init-declarations: 'off'
   jsx-quotes: error
   key-spacing: 'off'
-  keyword-spacing: 'off'
+  keyword-spacing:
+    - error
+    - before: true
+      after: false
+      overrides:
+        'case':
+          after: true
+        'do':
+          'after': true
+        'else':
+          after: true
+        'return':
+          after: true
+        'throw':
+          after: true
+        'try':
+          after: true
   line-comment-position: 'off'
   linebreak-style: 'off'
   lines-around-comment: 'off'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -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.

.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:"
+      value: |
+        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
+      value: |
+        - 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.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Discuss feature request
+    url: https://github.com/Jermolene/TiddlyWiki5/discussions
+    about: Open new discussion about new feature
+  - name: Talk.Tiddlywiki Forum
+    url: https://talk.tiddlywiki.org
+    about: Join the Forum

.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)

.github/workflows/ci.yml

@@ -72,3 +72,6 @@ jobs:
       - run: "./bin/ci-push.sh"
         env:
           GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }}
+      - run: "./bin/build-tw-org.sh"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }}

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.2.0
+    TW5_BUILD_VERSION=v5.2.3
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"

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

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)
@@ -256,6 +276,28 @@ $tw.utils.deepDefaults = function(object /*, sourceObjectList */) {
 	return object;
 };
 
+/*
+Convert a URIComponent encoded string to a string safely
+*/
+$tw.utils.decodeURIComponentSafe = function(s) {
+	var v = s;
+	try {
+		v = decodeURIComponent(s);
+	} catch(e) {}
+	return v;
+};
+
+/*
+Convert a URI encoded string to a string safely
+*/
+$tw.utils.decodeURISafe = function(s) {
+	var v = s;
+	try {
+		v = decodeURI(s);
+	} catch(e) {}
+	return v;
+};
+
 /*
 Convert "&amp;" to &, "&nbsp;" to nbsp, "&lt;" to <, "&gt;" to > and "&quot;" to "
 */
@@ -387,6 +429,19 @@ $tw.utils.parseFields = function(text,fields) {
 	return fields;
 };
 
+// Safely parse a string as JSON
+$tw.utils.parseJSONSafe = function(text,defaultJSON) {
+	try {
+		return JSON.parse(text);
+	} catch(e) {
+		if(typeof defaultJSON === "function") {
+			return defaultJSON(e);
+		} else {
+			return defaultJSON || {};
+		}
+	}
+};
+
 /*
 Resolves a source filepath delimited with `/` relative to a specified absolute root filepath.
 In relative paths, the special folder name `..` refers to immediate parent directory, and the
@@ -1059,7 +1114,7 @@ $tw.Wiki = function(options) {
 		tiddlerTitles = null, // Array of tiddler titles
 		getTiddlerTitles = function() {
 			if(!tiddlerTitles) {
-				tiddlerTitles = Object.keys(tiddlers);
+				tiddlerTitles = Object.keys(tiddlers).sort(function(a,b) {return a.localeCompare(b);});
 			}
 			return tiddlerTitles;
 		},
@@ -1112,10 +1167,8 @@ $tw.Wiki = function(options) {
 				}
 				// Save the new tiddler
 				tiddlers[title] = tiddler;
-				// Check we've got it's title
-				if(tiddlerTitles && tiddlerTitles.indexOf(title) === -1) {
-					tiddlerTitles.push(title);
-				}
+				// Check we've got the title
+				tiddlerTitles = $tw.utils.insertSortedArray(tiddlerTitles || [],title);
 				// Record the new tiddler state
 				updateDescriptor["new"] = {
 					tiddler: tiddler,
@@ -1300,7 +1353,7 @@ $tw.Wiki = function(options) {
 			var tiddler = tiddlers[title];
 			if(tiddler) {
 				if(tiddler.fields.type === "application/json" && tiddler.hasField("plugin-type") && tiddler.fields.text) {
-					pluginInfo[tiddler.fields.title] = JSON.parse(tiddler.fields.text);
+					pluginInfo[tiddler.fields.title] = $tw.utils.parseJSONSafe(tiddler.fields.text);
 					results.modifiedPlugins.push(tiddler.fields.title);
 				}
 			} else {
@@ -1433,7 +1486,7 @@ $tw.Wiki.prototype.defineTiddlerModules = function() {
 					}
 					break;
 				case "application/json":
-					$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],JSON.parse(tiddler.fields.text));
+					$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],$tw.utils.parseJSONSafe(tiddler.fields.text));
 					break;
 				case "application/x-tiddler-dictionary":
 					$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],$tw.utils.parseFields(tiddler.fields.text));
@@ -1622,12 +1675,7 @@ $tw.modules.define("$:/boot/tiddlerdeserializer/json","tiddlerdeserializer",{
 				}
 				return true;
 			},
-			data = {};
-		try {
-			data = JSON.parse(text);			
-		} catch(e) {
-			// Ignore JSON parse errors
-		}
+			data = $tw.utils.parseJSONSafe(text);
 		if($tw.utils.isArray(data) && isTiddlerArrayValid(data)) {
 			return data;
 		} else if(isTiddlerValid(data)) {
@@ -1667,7 +1715,7 @@ $tw.boot.decryptEncryptedTiddlers = function(callback) {
 				$tw.crypto.setPassword(data.password);
 				var decryptedText = $tw.crypto.decrypt(encryptedText);
 				if(decryptedText) {
-					var json = JSON.parse(decryptedText);
+					var json = $tw.utils.parseJSONSafe(decryptedText);
 					for(var title in json) {
 						$tw.preloadTiddler(json[title]);
 					}
@@ -1867,7 +1915,7 @@ 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"));
 	// Helper to process a file
 	var processFile = function(filename,isTiddlerFile,fields,isEditableFile) {
 		var extInfo = $tw.config.fileExtensionInfo[path.extname(filename)],
@@ -1928,6 +1976,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) {
@@ -1951,13 +2013,14 @@ $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; t<files.length; t++) {
-					var filename = files[t];
+					var thisPath = path.relative(filepath, files[t]),
+					filename = path.basename(thisPath);
 					if(filename !== "tiddlywiki.files" && !metaRegExp.test(filename) && fileRegExp.test(filename)) {
-						processFile(dirPath + path.sep + filename,dirSpec.isTiddlerFile,dirSpec.fields,dirSpec.isEditableFile);
+						processFile(thisPath,dirSpec.isTiddlerFile,dirSpec.fields,dirSpec.isEditableFile);
 					}
 				}
 			} else {
@@ -1982,7 +2045,7 @@ $tw.loadPluginFolder = function(filepath,excludeRegExp) {
 			console.log("Warning: missing plugin.info file in " + filepath);
 			return null;
 		}
-		var pluginInfo = JSON.parse(fs.readFileSync(infoPath,"utf8"));
+		var pluginInfo = $tw.utils.parseJSONSafe(fs.readFileSync(infoPath,"utf8"));
 		// Read the plugin files
 		var pluginFiles = $tw.loadTiddlersFromPath(filepath,excludeRegExp);
 		// Save the plugin tiddlers into the plugin info
@@ -2099,7 +2162,7 @@ $tw.loadWikiTiddlers = function(wikiPath,options) {
 		pluginFields;
 	// Bail if we don't have a wiki info file
 	if(fs.existsSync(wikiInfoPath)) {
-		wikiInfo = JSON.parse(fs.readFileSync(wikiInfoPath,"utf8"));
+		wikiInfo = $tw.utils.parseJSONSafe(fs.readFileSync(wikiInfoPath,"utf8"));
 	} else {
 		return null;
 	}
@@ -2533,7 +2596,7 @@ $tw.boot.isStartupTaskEligible = function(taskModule) {
 		for(t=0; t<remaining.length; t++) {
 			var task = remaining[t];
 			if(task.before && task.before.indexOf(name) !== -1) {
-				if($tw.boot.doesTaskMatchPlatform(task) || (task.name && $tw.boot.disabledStartupModules.indexOf(name) !== -1)) {
+				if($tw.boot.doesTaskMatchPlatform(task) && (!task.name || $tw.boot.disabledStartupModules.indexOf(task.name) === -1)) {
 					return false;
 				}
 			}
@@ -2612,3 +2675,4 @@ if(typeof(exports) !== "undefined") {
 } else {
 	_boot(window.$tw);
 }
+//# sourceURL=$:/boot/boot.js

boot/bootprefix.js

@@ -117,3 +117,4 @@ if(typeof(exports) === "undefined") {
 	// Export functionality as a module
 	exports.bootprefix = _bootprefix;
 }
+//# sourceURL=$:/boot/bootprefix.js

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-2022, UnaMesa Association
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

core/language/en-GB/ControlPanel.multids

@@ -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
@@ -191,6 +198,8 @@ 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
+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
@@ -201,6 +210,10 @@ 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 +225,7 @@ 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.

core/language/en-GB/Fields.multids

@@ -3,6 +3,7 @@ title: $:/language/Docs/Fields/
 _canonical_uri: The full URI of an external image tiddler
 bag: The name of the bag from which a tiddler came
 caption: The text to be displayed on a tab or button
+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]]
@@ -13,9 +14,9 @@ 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''
+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
@@ -32,7 +33,7 @@ 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

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>:
+&#32;
+<$transclude tiddler=<<commandTitle>> field="description"/></li>
 </$list>
 </ul>
 

core/language/en-GB/Misc.multids

@@ -14,7 +14,7 @@ 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

core/modules/commands/init.js

@@ -48,7 +48,7 @@ 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;

core/modules/commands/save.js

@@ -8,46 +8,60 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
 \*/
 (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 + "\"");
+	/*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";
 		}
-		$tw.utils.createFileDirectories(filepath);
-		fs.writeFileSync(filepath,tiddler.fields.text,contentTypeInfo.encoding);
-	});
-	return null;
-};
-
-exports.Command = Command;
-
-})();
+		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: {}
+					});
+					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;
+	
+	})();
+	

core/modules/commands/savelibrarytiddlers.js

@@ -69,7 +69,7 @@ Command.prototype.execute = function() {
 		$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"] || {},

core/modules/commands/savewikifolder.js

@@ -151,7 +151,7 @@ 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
+	var pluginTiddlers = $tw.utils.parseJSONSafe(pluginTiddler.fields.text).tiddlers; // A hashmap of tiddlers in the plugin
 	$tw.utils.each(pluginTiddlers,function(tiddler) {
 		self.saveTiddler(directory,new $tw.Tiddler(tiddler));
 	});

core/modules/deserializers.js

@@ -17,16 +17,13 @@ exports["application/x-tiddler-html-div"] = function(text,fields) {
 };
 
 exports["application/json"] = function(text,fields) {
-	var incoming,
-		results = [];
-	try {
-		incoming = JSON.parse(text);
-	} catch(e) {
-		incoming = [{
-			title: "JSON error: " + e,
-			text: ""
-		}]
-	}
+	var results = [],
+		incoming = $tw.utils.parseJSONSafe(text,function(err) {
+			return [{
+				title: "JSON error: " + err,
+				text: ""
+			}];
+		});
 	if(!$tw.utils.isArray(incoming)) {
 		incoming = [incoming];
 	}

core/modules/editor/engines/framed.js

@@ -34,8 +34,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["color-scheme"] || "light";
 	this.iframeDoc.open();
-	this.iframeDoc.write("");
+	this.iframeDoc.write("<meta name='color-scheme' content='" + colorScheme + "'>");
 	this.iframeDoc.close();
 	// Style the iframe
 	this.iframeNode.className = this.dummyTextArea.className;
@@ -205,7 +207,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;
 };

core/modules/editor/engines/simple.js

@@ -133,7 +133,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;
 };

core/modules/editor/factory.js

@@ -324,7 +324,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 	If there are no Files, let the browser handle it.
 	*/
 	EditTextWidget.prototype.handleDropEvent = function(event) {
-		if(event.dataTransfer.files.length) {
+		if($tw.utils.dragEventContainsFiles(event)) {
 			event.preventDefault();
 			event.stopPropagation();
 			this.dispatchDOMEvent(this.cloneEvent(event,["dataTransfer"]));

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

@@ -0,0 +1,17 @@
+/*\
+title: $:/core/modules/editor/operations/text/focus-editor.js
+type: application/javascript
+module-type: texteditoroperation
+Simply focus the Text editor
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["focus-editor"] = function(event,operation) {
+	operation = null;
+};
+
+})();

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

@@ -25,8 +25,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

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

@@ -13,16 +13,35 @@ Text editor operation to wrap the selected lines with a prefix and suffix
 "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);
+	}
 };
 
 })();

core/modules/filterrunprefixes/cascade.js

@@ -0,0 +1,53 @@
+/*\
+title: $:/core/modules/filterrunprefixes/cascade.js
+type: application/javascript
+module-type: filterrunprefix
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"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]),{
+						getVariable: function(name,opts) {
+							opts = opts || {};
+							opts.variables = {
+								"currentTiddler": "" + title,
+								"..currentTiddler": widget.getVariable("currentTiddler")
+							};
+							if(name in opts.variables) {
+								return opts.variables[name];
+							} else {
+								return widget.getVariable(name,opts);
+							}
+						}
+					});
+					if(output.length !== 0) {
+						result = output[0];
+						return false;
+					}
+				});
+				results.push(result);
+			});
+		}
+	}
+};
+
+})();

core/modules/filterrunprefixes/filter.js

@@ -16,23 +16,30 @@ Export our filter function
 exports.filter = function(operationSubFunction,options) {
 	return function(results,source,widget) {
 		if(results.length > 0) {
-			var resultsToRemove = [];
+			var resultsToRemove = [],
+				index = 0;
 			results.each(function(title) {
 				var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),{
-					getVariable: function(name) {
-						switch(name) {
-							case "currentTiddler":
-								return "" + title;
-							case "..currentTiddler":
-								return widget.getVariable("currentTiddler");
-							default:
-								return widget.getVariable(name);
+					getVariable: function(name,opts) {
+						opts = opts || {};
+						opts.variables = {
+							"currentTiddler": "" + title,
+							"..currentTiddler": widget.getVariable("currentTiddler"),
+							"index": "" + index,
+							"revIndex": "" +  (results.length - 1 - index),
+							"length": "" + results.length
+						};
+						if(name in opts.variables) {
+							return opts.variables[name];
+						} else {
+							return widget.getVariable(name,opts);
 						}
 					}
 				});
 				if(filtered.length === 0) {
 					resultsToRemove.push(title);
 				}
+				++index;
 			});
 			results.remove(resultsToRemove);
 		}

core/modules/filterrunprefixes/map.js

@@ -15,22 +15,29 @@ Export our filter prefix function
 exports.map = function(operationSubFunction,options) {
 	return function(results,source,widget) {
 		if(results.length > 0) {
-			var inputTitles = results.toArray();
+			var inputTitles = results.toArray(),
+				index = 0;
 			results.clear();
 			$tw.utils.each(inputTitles,function(title) {
 				var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),{
-					getVariable: function(name) {
-						switch(name) {
-							case "currentTiddler":
-								return "" + title;
-							case "..currentTiddler":
-								return widget.getVariable("currentTiddler");
-							default:
-								return widget.getVariable(name);
+					getVariable: function(name,opts) {
+						opts = opts || {};
+						opts.variables = {
+							"currentTiddler": "" + title,
+							"..currentTiddler": widget.getVariable("currentTiddler"),
+							"index": "" + index,
+							"revIndex": "" +  (inputTitles.length - 1 - index),
+							"length": "" + inputTitles.length
+						};
+						if(name in opts.variables) {
+							return opts.variables[name];
+						} else {
+							return widget.getVariable(name,opts);
 						}
 					}
 				});
 				results.push(filtered[0] || "");
+				++index;
 			});
 		}
 	}

core/modules/filterrunprefixes/reduce.js

@@ -15,26 +15,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 "..currentTiddler":
-								return widget.getVariable("currentTiddler");
-							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);
+					getVariable: function(name,opts) {
+						opts = opts || {};
+						opts.variables = {
+							"currentTiddler": "" + title,
+							"..currentTiddler": widget.getVariable("currentTiddler"),
+							"index": "" + index,
+							"revIndex": "" +  (results.length - 1 - index),
+							"length": "" + results.length,
+							"accumulator": "" + accumulator
+						};
+						if(name in opts.variables) {
+							return opts.variables[name];
+						} else {
+							return widget.getVariable(name,opts);
 						}
 					}
 				});

core/modules/filterrunprefixes/sort.js

@@ -26,14 +26,16 @@ exports.sort = function(operationSubFunction,options) {
 				compareFn;
 			results.each(function(title) {
 				var key = operationSubFunction(options.wiki.makeTiddlerIterator([title]),{
-					getVariable: function(name) {
-						switch(name) {
-							case "currentTiddler":
-								return "" + title;
-							case "..currentTiddler":
-								return widget.getVariable("currentTiddler");
-							default:
-								return widget.getVariable(name);
+					getVariable: function(name,opts) {
+						opts = opts || {};
+						opts.variables = {
+							"currentTiddler": "" + title,
+							"..currentTiddler": widget.getVariable("currentTiddler")
+						};
+						if(name in opts.variables) {
+							return opts.variables[name];
+						} else {
+							return widget.getVariable(name,opts);
 						}
 					}
 				});

core/modules/filters.js

@@ -95,10 +95,12 @@ 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;
 		}
 

core/modules/filters/crypto.js

@@ -0,0 +1,27 @@
+/*\
+title: $:/core/modules/filters/crypto.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operators for cryptography, using the Stanford JavaScript library
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.sha256 = function(source,operator,options) {
+	var results = [],
+		length = parseInt(operator.operand,10) || 20,
+		sha256 = function(text) {
+			return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(text)).substr(0,length);
+		};
+	source(function(tiddler,title) {
+		results.push(sha256(title));
+	});
+	return results;
+};
+
+})();

core/modules/filters/insertbefore.js

@@ -20,7 +20,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);

core/modules/filters/is/draft.js

@@ -19,13 +19,13 @@ 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);
 			}
 		});

core/modules/filters/json-ops.js

@@ -0,0 +1,167 @@
+/*\
+title: $:/core/modules/filters/json-ops.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operators for JSON operations
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["jsonget"] = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		var data = options.wiki.getTiddlerDataCached(title);
+		if(data) {
+			var item = getDataItemValueAsStrings(data,operator.operands);
+			if(item !== undefined) {
+				results.push.apply(results,item);
+			}
+		}
+	});
+	return results;
+};
+
+exports["jsonindexes"] = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		var data = options.wiki.getTiddlerDataCached(title);
+		if(data) {
+			var item = getDataItemKeysAsStrings(data,operator.operands);
+			if(item !== undefined) {
+				results.push.apply(results,item);
+			}
+		}
+	});
+	return results;
+};
+
+exports["jsontype"] = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		var data = options.wiki.getTiddlerDataCached(title);
+		if(data) {
+			var item = getDataItemType(data,operator.operands);
+			if(item !== undefined) {
+				results.push(item);
+			}
+		}
+	});
+	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
+	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 item;
+	}
+	if(typeof item === "object") {
+		if(item === null) {
+			return ["null"];
+		}
+		var results = [];
+		if($tw.utils.isArray(item)) {
+			$tw.utils.each(item,function(value) {
+				results.push.apply(results,convertDataItemValueToStrings(value));
+			});
+			return results;
+		} else {
+			$tw.utils.each(Object.keys(item).sort(),function(key) {
+				results.push.apply(results,convertDataItemValueToStrings(item[key]));
+			});
+			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;
+	}
+}
+
+/*
+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) {
+			item = item[indexes[i]];
+		}
+	}
+	return item;
+}
+
+})();
+	

core/modules/filters/listops.js

@@ -87,7 +87,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 +104,16 @@ 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);
+};
+
 })();

core/modules/filters/lookup.js

@@ -5,9 +5,11 @@ 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(){
@@ -20,10 +22,31 @@ Prepends the prefix to the selected items and returns the specified field value
 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;
 };
 

core/modules/filters/math.js

@@ -165,6 +165,35 @@ exports["standard-deviation"] = makeNumericReducingOperator(
 	}
 );
 
+//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) {

core/modules/filters/prefix.js

@@ -16,19 +16,37 @@ Filter operator for checking if a title starts with a prefix
 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;
 };

core/modules/filters/removeprefix.js

@@ -16,12 +16,22 @@ Filter operator for removing a prefix from each title in the list. Titles that d
 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;
 };
 

core/modules/filters/removesuffix.js

@@ -16,12 +16,26 @@ Filter operator for removing a suffix from each title in the list. Titles that d
 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;
 };
 

core/modules/filters/search.js

@@ -40,6 +40,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"),

core/modules/filters/strings.js

@@ -121,21 +121,23 @@ exports["search-replace"] = function(source,operator,options) {
 		flagSuffix = (suffixes[0] ? (suffixes[0][0] || "") : ""),
 		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);
 		}

core/modules/filters/suffix.js

@@ -16,19 +16,41 @@ Filter operator for checking if a title ends with a suffix
 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;
 };

core/modules/filters/untagged.js

@@ -19,7 +19,7 @@ exports.untagged = function(source,operator,options) {
 	var results = [],
 		expected = (operator.prefix === "!");
 	source(function(tiddler,title) {
-		if((tiddler && $tw.utils.isArray(tiddler.fields.tags) && tiddler.fields.tags.length > 0) === expected) {
+		if(((tiddler && $tw.utils.isArray(tiddler.fields.tags) && tiddler.fields.tags.length > 0) === expected) || (!tiddler && !expected)) {
 			results.push(title);
 		}
 	});

core/modules/parsers/parseutils.js

@@ -239,7 +239,7 @@ exports.parseFilterVariable = function(source) {
 };
 
 /*
-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 = {
@@ -248,7 +248,7 @@ exports.parseAttribute = function(source,pos) {
 	// Define our regexps
 	var reAttributeName = /([^\/\s>"'=]+)/g,
 		reUnquotedAttribute = /([^\/\s<>"'=]+)/g,
-		reFilteredValue = /\{\{\{(.+?)\}\}\}/g,
+		reFilteredValue = /\{\{\{([\S\s]+?)\}\}\}/g,
 		reIndirectValue = /\{\{([^\}]+)\}\}/g;
 	// Skip whitespace
 	pos = $tw.utils.skipWhiteSpace(source,pos);

core/modules/parsers/wikiparser/rules/html.js

@@ -66,7 +66,7 @@ exports.parse = function() {
 };
 
 /*
-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,7 +74,8 @@ exports.parseTag = function(source,pos,options) {
 		node = {
 			type: "element",
 			start: pos,
-			attributes: {}
+			attributes: {},
+			orderedAttributes: []
 		};
 	// Define our regexps
 	var reTagName = /([a-zA-Z0-9\-\$]+)/g;
@@ -106,6 +107,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

core/modules/parsers/wikiparser/wikiparser.js

@@ -231,7 +231,10 @@ WikiParser.prototype.parseBlock = function(terminatorRegExpString) {
 		return nextMatch.rule.parse();
 	}
 	// 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 }];
 };
 
 /*
@@ -307,7 +310,7 @@ 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
@@ -317,7 +320,7 @@ WikiParser.prototype.parseInlineRunUnterminated = function(options) {
 	}
 	// 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;
@@ -337,7 +340,7 @@ 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) {
@@ -350,7 +353,7 @@ WikiParser.prototype.parseInlineRunTerminated = function(terminatorRegExp,option
 		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
@@ -364,7 +367,7 @@ 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;
@@ -373,12 +376,12 @@ WikiParser.prototype.parseInlineRunTerminated = function(terminatorRegExp,option
 /*
 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});		
 	}
 };
 

core/modules/pluginswitcher.js

@@ -52,7 +52,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);

core/modules/savers/gitea.js

@@ -61,7 +61,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;
@@ -104,7 +104,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);
 		}
 	});

core/modules/savers/github.js

@@ -61,7 +61,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;
@@ -84,7 +84,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);
 				}
 			});

core/modules/savers/gitlab.js

@@ -58,7 +58,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";
@@ -82,7 +82,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);
 				}
 			});

core/modules/savers/put.js

@@ -80,6 +80,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,17 +88,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))
+				var status = xhr.status,
+					errorMsg = err;
 				if(status === 412) { // file changed on server
-					callback($tw.language.getString("Error/PutEditConflict"));
+					errorMsg = $tw.language.getString("Error/PutEditConflict");
 				} else if(status === 401) { // authentication required
-					callback($tw.language.getString("Error/PutUnauthorized"));
+					errorMsg = $tw.language.getString("Error/PutUnauthorized");
 				} else if(status === 403) { // permission denied
-					callback($tw.language.getString("Error/PutForbidden"));
-				} else {
-					callback(err); // fail
+					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) {

core/modules/savers/upload.js

@@ -64,6 +64,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 +82,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;
 };
 

core/modules/server/routes/put-tiddler.js

@@ -18,7 +18,7 @@ exports.path = /^\/recipes\/default\/tiddlers\/(.+)$/;
 
 exports.handler = function(request,response,state) {
 	var title = $tw.utils.decodeURIComponentSafe(state.params[0]),
-	fields = JSON.parse(state.data);
+	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) {
@@ -30,7 +30,7 @@ exports.handler = function(request,response,state) {
 	if(fields.revision) {
 		delete fields.revision;
 	}
-	state.wiki.addTiddler(new $tw.Tiddler(state.wiki.getCreationFields(),fields,{title: title},state.wiki.getModificationFields()));
+	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 + ":\"",

core/modules/server/server.js

@@ -34,7 +34,6 @@ function Server(options) {
 	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) {
@@ -44,7 +43,8 @@ function Server(options) {
 			}
 		}
 	}
-	$tw.utils.extend({},this.defaultVariables,options.variables);
+	// Setup the default required plugins
+	this.requiredPlugins = this.get("required-plugins").split(',');
 	// Initialise CSRF
 	this.csrfDisable = this.get("csrf-disable") === "yes";
 	// Initialize Gzip compression
@@ -52,14 +52,24 @@ function Server(options) {
 	// Initialize browser-caching
 	this.enableBrowserCache = this.get("use-browser-cache") === "yes";
 	// Initialise authorization
-	var authorizedUserName = (this.get("username") && this.get("password")) ? this.get("username") : "(anon)";
+	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 server route " + title);
+		// console.log("Loading authenticator " + title);
 		self.addAuthenticator(authenticatorDefinition.AuthenticatorClass);
 	});
 	// Load route handlers
@@ -71,15 +81,21 @@ function Server(options) {
 	this.listenOptions = null;
 	this.protocol = "http";
 	var tlsKeyFilepath = this.get("tls-key"),
-		tlsCertFilepath = this.get("tls-cert");
+		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")
+			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") || "";
 }
 
 /*
@@ -150,6 +166,7 @@ function sendResponse(request,response,statusCode,headers,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",
@@ -239,15 +256,15 @@ Server.prototype.requestHandler = function(request,response,options) {
 	state.pathPrefix = options.pathPrefix || this.get("path-prefix") || "";
 	state.sendResponse = sendResponse.bind(self,request,response);
 	// Get the principals authorized to access this resource
-	var authorizationType = this.methodMappings[request.method] || "readers";
+	state.authorizationType = options.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") {
+	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(authorizationType,null);
+	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)) {
@@ -256,7 +273,7 @@ Server.prototype.requestHandler = function(request,response,options) {
 		}
 	}
 	// Authorize with the authenticated username
-	if(!this.isAuthorized(authorizationType,state.authenticatedUsername)) {
+	if(!this.isAuthorized(state.authorizationType,state.authenticatedUsername)) {
 		response.writeHead(401,"'" + state.authenticatedUsername + "' is not authorized to access '" + this.servername + "'");
 		response.end();
 		return;
@@ -322,8 +339,16 @@ Server.prototype.listen = function(port,host,prefix) {
 		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");
+	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;

core/modules/startup/browser-messaging.js

@@ -152,7 +152,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 +170,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));
 						}
 					}

core/modules/startup/render.js

@@ -42,12 +42,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

core/modules/startup/rootwidget.js

@@ -51,6 +51,20 @@ exports.startup = function() {
 			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) {

core/modules/startup/windows.js

@@ -20,6 +20,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,22 +31,25 @@ 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;
 		// 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) {
 			return;
@@ -54,7 +59,7 @@ exports.startup = function() {
 		srcDocument.close();
 		srcDocument.title = windowTitle;
 		srcWindow.addEventListener("beforeunload",function(event) {
-			delete $tw.windows[title];
+			delete $tw.windows[windowID];
 			$tw.wiki.removeEventListener("change",refreshHandler);
 		},false);
 		// Set up the styles
@@ -88,13 +93,21 @@ 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);
 };
 
 })();

core/modules/tiddler.js

@@ -24,13 +24,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);

core/modules/upgraders/plugins.js

@@ -41,7 +41,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

core/modules/utils/crypto.js

@@ -21,7 +21,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 +33,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") {

core/modules/utils/dom/dom.js

@@ -281,5 +281,56 @@ 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(selectedNode.offsetLeft) {
+			// 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();
+		}
+	}
+	
+	if(domNode && domNode.offsetWidth) {
+		variables["tv-widgetnode-width"] = domNode.offsetWidth.toString();
+		variables["tv-widgetnode-height"] = domNode.offsetHeight.toString();
+	}
+
+	if(event && event.clientX && event.clientY) {
+		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;
+};
+
 
 })();

core/modules/utils/dom/dragndrop.js

@@ -16,21 +16,23 @@ Browser data transfer utilities, used with the clipboard and drag and drop
 Options:
 
 domNode: dom node to make draggable
+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;
+		domNode = options.domNode,
+		dragHandle = options.selector && domNode.querySelector(options.selector) || domNode;
 	// Make the dom node draggable (not necessary for anchor tags)
 	if((domNode.tagName || "").toLowerCase() !== "a") {
-		domNode.setAttribute("draggable","true");
+		dragHandle.setAttribute("draggable","true");
 	}
 	// Add event handlers
-	$tw.utils.addEventListeners(domNode,[
+	$tw.utils.addEventListeners(dragHandle,[
 		{name: "dragstart", handlerFunction: function(event) {
 			if(event.dataTransfer === undefined) {
 				return false;
@@ -39,20 +41,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 && event.target === dragHandle) {
 				// Mark the drag in progress
 				$tw.dragInProgress = domNode;
 				// Set the dragging class on the element being dragged
 				$tw.utils.addClass(event.target,"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");
@@ -112,7 +120,8 @@ exports.makeDraggable = function(options) {
 				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));
 				}
@@ -120,7 +129,10 @@ 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");
@@ -198,7 +210,7 @@ var importDataTypes = [
 ];
 
 function parseJSONTiddlers(json,fallbackTitle) {
-	var data = JSON.parse(json);
+	var data = $tw.utils.parseJSONSafe(json);
 	if(!$tw.utils.isArray(data)) {
 		data = [data];
 	}
@@ -208,10 +220,10 @@ function parseJSONTiddlers(json,fallbackTitle) {
 	return data;
 };
 
-exports.dragEventContainsFiles = function(event) {
+function dragEventContainsType(event,targetType) {
 	if(event.dataTransfer.types) {
 		for(var i=0; i<event.dataTransfer.types.length; i++) {
-			if(event.dataTransfer.types[i] === "Files") {
+			if(event.dataTransfer.types[i] === targetType) {
 				return true;
 				break;
 			}
@@ -220,4 +232,10 @@ exports.dragEventContainsFiles = function(event) {
 	return false;
 };
 
+exports.dragEventContainsFiles = function(event) {
+	return (dragEventContainsType(event,"Files") && !dragEventContainsType(event,"text/plain"));
+};
+
+exports.dragEventContainsType = dragEventContainsType;
+
 })();

core/modules/utils/dom/scroller.js

@@ -49,10 +49,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 +66,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();
@@ -122,11 +126,11 @@ PageScroller.prototype.scrollIntoView = function(element,callback) {
 	drawFrame();
 };
 
-PageScroller.prototype.scrollSelectorIntoView = function(baseElement,selector,callback) {
+PageScroller.prototype.scrollSelectorIntoView = function(baseElement,selector,callback,options) {
 	baseElement = baseElement || document.body;
 	var element = baseElement.querySelector(selector);
 	if(element) {
-		this.scrollIntoView(element,callback);
+		this.scrollIntoView(element,callback,options);
 	}
 };
 

core/modules/utils/edition-info.js

@@ -30,11 +30,7 @@ exports.getEditionInfo = function() {
 				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) {
-					}
+					var info = $tw.utils.parseJSONSafe(fs.readFileSync(path.resolve(editionPath,entry,"tiddlywiki.info"),"utf8"),null);
 					if(info) {
 						editionInfo[entry] = info;
 					}

core/modules/utils/parsetree.js

@@ -13,8 +13,26 @@ Parse tree utility functions.
 "use strict";
 
 exports.addAttributeToParseTreeNode = function(node,name,value) {
+	var attribute = {name: name, type: "string", value: value};
 	node.attributes = node.attributes || {};
-	node.attributes[name] = {type: "string", value: value};
+	node.attributes[name] = attribute;
+	if(node.orderedAttributes) {
+		node.orderedAttributes.push(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 +43,45 @@ 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;
+		if(node.orderedAttributes) {
+			// If there are orderedAttributes, we've got to add them there too.
+			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;
+		if(node.orderedAttributes) {
+			// If there are orderedAttributes, we've got to add them there too.
+			node.orderedAttributes.push(attribute);
 		}
+	}
+	if(attribute.type === "string") {
+		attribute.value += name + ":" + value + ";";
+	}
 };
 
 exports.findParseTreeNode = function(nodeArray,search) {

core/modules/utils/pluginmaker.js

@@ -24,10 +24,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

core/modules/utils/utils.js

@@ -95,6 +95,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
@@ -448,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) ;
@@ -978,22 +992,4 @@ exports.makeCompareFunction = function(type,options) {
 	return (types[type] || types[options.defaultType] || types.number);
 };
 
-exports.decodeURIComponentSafe = function(str) {
-	var value = str;
-	try {
-		value = decodeURIComponent(str);
-	} catch(e) {
-	}
-	return value;
-};
-
-exports.decodeURISafe = function(str) {
-	var value = str;
-	try {
-		value = decodeURI(str);
-	} catch(e) {
-	}
-	return value;
-};
-
 })();

core/modules/widgets/action-listops.js

@@ -71,8 +71,8 @@ ActionListopsWidget.prototype.invokeAction = function(triggeringWidget,
 	}
 	if(this.subfilter) {
 		var inputList = this.wiki.getTiddlerList(this.target,field,index),
-			subfilter = $tw.utils.stringifyList(inputList) + " " + this.subfilter;
-		this.wiki.setText(this.target, field, index, $tw.utils.stringifyList(this.wiki.filterTiddlers(subfilter,this)));
+			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),

core/modules/widgets/action-sendmessage.js

@@ -39,6 +39,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 +61,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,14 +82,15 @@ 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
 };
 

core/modules/widgets/action-setfield.js

@@ -35,7 +35,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 +46,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,15 +56,17 @@ 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
 };
 

core/modules/widgets/action-setmultiplefields.js

@@ -0,0 +1,86 @@
+/*\
+title: $:/core/modules/widgets/action-setmultiplefields.js
+type: application/javascript
+module-type: widget
+
+Action widget to set multiple fields or indexes on a tiddler
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"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;
+
+})();
+	

core/modules/widgets/button.js

@@ -247,7 +247,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 ButtonWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled) {
+	if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.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 || changedAttributes["default"]) {
 		this.refreshSelf();
 		return true;
 	} else if(changedAttributes["class"]) {

core/modules/widgets/checkbox.js

@@ -27,6 +27,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 +36,16 @@ 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.isDisabled === "yes") {
 		this.inputDomNode.setAttribute("disabled",true);
@@ -59,20 +65,25 @@ CheckboxWidget.prototype.render = function(parent,nextSibling) {
 
 CheckboxWidget.prototype.getValue = function() {
 	var tiddler = this.wiki.getTiddler(this.checkboxTitle);
-	if(tiddler) {
+	if(tiddler || this.checkboxFilter) {
 		if(this.checkboxTag) {
-			if(this.checkboxInvertTag) {
+			if(this.checkboxInvertTag === "yes") {
 				return !tiddler.hasTag(this.checkboxTag);
 			} else {
 				return tiddler.hasTag(this.checkboxTag);
 			}
 		}
-		if(this.checkboxField) {
+		if(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,15 +91,59 @@ 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) {
@@ -114,7 +169,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 +204,51 @@ CheckboxWidget.prototype.handleChangeEvent = function(event) {
 			hasChanged = true;
 		}
 	}
+	// Set the list field (or index) if specified
+	if(this.checkboxListField || this.checkboxListIndex) {
+		var listContents, oldPos, newPos;
+		if(this.checkboxListField) {
+			listContents = tiddler.getFieldList(this.checkboxListField);
+		} else {
+			listContents = $tw.utils.parseStringArray(this.wiki.extractTiddlerDataItem(this.checkboxTitle,this.checkboxListIndex) || "") || [];
+		}
+		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,9 +277,13 @@ 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");
@@ -194,14 +296,21 @@ 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) {
 		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");
+			}
 		}
 		return this.refreshChildren(changedTiddlers) || refreshed;
 	}

core/modules/widgets/codeblock.js

@@ -52,7 +52,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;

core/modules/widgets/draggable.js

@@ -27,7 +27,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,31 +38,36 @@ 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,
-		dragImageType: self.dragImageType,
-		widget: this
-	});
-	// 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);
 };
 
@@ -72,7 +80,9 @@ 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.dragImageType = this.getAttribute("dragimagetype");
+	this.dragHandleSelector = this.getAttribute("selector");
+	this.dragEnable = this.getAttribute("enable","yes") === "yes";
 	// Make the child widgets
 	this.makeChildWidgets();
 };
@@ -82,7 +92,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 DraggableWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.tag || changedAttributes["class"]) {
+	if($tw.utils.count(changedAttributes) > 0) {
 		this.refreshSelf();
 		return true;
 	}

core/modules/widgets/dropzone.js

@@ -198,7 +198,8 @@ DropZoneWidget.prototype.handleDropEvent  = function(event) {
 	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

core/modules/widgets/eventcatcher.js

@@ -46,6 +46,7 @@ EventWidget.prototype.render = function(parent,nextSibling) {
 	$tw.utils.each(this.types,function(type) {
 		domNode.addEventListener(type,function(event) {
 			var selector = self.getAttribute("selector"),
+				matchSelector = self.getAttribute("matchSelector"),
 				actions = self.getAttribute("$"+type) || self.getAttribute("actions-"+type),
 				stopPropagation = self.getAttribute("stopPropagation","onaction"),
 				selectedNode = event.target,
@@ -56,46 +57,23 @@ EventWidget.prototype.render = function(parent,nextSibling) {
 			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(!$tw.utils.domMatchesSelector(selectedNode,selector) && selectedNode !== domNode) {
 					selectedNode = selectedNode.parentNode;
 				}
-				// If we found one, copy the attributes as variables, otherwise exit
-				if($tw.utils.domMatchesSelector(selectedNode,selector)) {
-					// Only set up variables if we have actions to invoke
-					if(actions) {
-						$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();
-						
-						if(event.clientX && event.clientY) {
-							//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();
-
-							//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();
-						}
-					}
-				} 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) {

core/modules/widgets/image.js

@@ -111,6 +111,16 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
 	if(this.imageAlt) {
 		domNode.setAttribute("alt",this.imageAlt);
 	}
+	// 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);

core/modules/widgets/importvariables.js

@@ -46,7 +46,7 @@ ImportVariablesWidget.prototype.execute = function(tiddlerList) {
 	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});
 		if(parser) {
 			var parseTreeNode = parser.tree[0];
 			while(parseTreeNode && parseTreeNode.type === "set") {

core/modules/widgets/let.js

@@ -0,0 +1,96 @@
+/*\
+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>
+```
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"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;
+		if(name.charAt(0) !== "$") {
+			// Now that it's prepped, we're allowed to look this variable up
+			// when defining later variables
+			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;
+
+})();

core/modules/widgets/link.js

@@ -207,7 +207,8 @@ 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(changedAttributes.to || changedTiddlers[this.to] || changedAttributes["aria-label"] || changedAttributes.tooltip ||
+		changedAttributes["class"] || changedAttributes.tabindex || changedAttributes.draggable || changedAttributes.tag) {
 		this.refreshSelf();
 		return true;
 	}

core/modules/widgets/list.js

@@ -51,6 +51,9 @@ ListWidget.prototype.render = function(parent,nextSibling) {
 	} else {
 		this.storyview = null;
 	}
+	if(this.storyview && this.storyview.renderEnd) {
+		this.storyview.renderEnd();
+	}
 };
 
 /*

core/modules/widgets/navigator.js

@@ -44,8 +44,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();
@@ -499,11 +498,7 @@ 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,
 		importTiddler = this.wiki.getTiddler(importTitle),
@@ -636,16 +631,6 @@ 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;
 
 })();

core/modules/widgets/radio.js

@@ -64,9 +64,9 @@ RadioWidget.prototype.getValue = function() {
 		tiddler = this.wiki.getTiddler(this.radioTitle);
 	if(tiddler) {
 		if(this.radioIndex) {
-			value = this.wiki.extractTiddlerDataItem(this.radioTitle,this.radioIndex);
+			value = this.wiki.extractTiddlerDataItem(this.radioTitle,this.radioIndex,this.radioDefault);
 		} else {
-			value = tiddler.getFieldString(this.radioField);
+			value = tiddler.getFieldString(this.radioField,this.radioDefault);
 		}
 	} else {
 		value = this.radioDefault;

core/modules/widgets/scrollable.js

@@ -38,10 +38,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 +53,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 = {
@@ -114,11 +118,11 @@ ScrollableWidget.prototype.scrollIntoView = function(element) {
 	}
 };
 
-ScrollableWidget.prototype.scrollSelectorIntoView = function(baseElement,selector,callback) {
+ScrollableWidget.prototype.scrollSelectorIntoView = function(baseElement,selector,callback,options) {
 	baseElement = baseElement || document.body;
 	var element = baseElement.querySelector(selector);
 	if(element) {
-		this.scrollIntoView(element,callback);
+		this.scrollIntoView(element,callback,options);
 	}
 };
 

core/modules/widgets/setmultiplevariables.js

@@ -0,0 +1,81 @@
+/*\
+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
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"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;
+
+})();
+        

core/modules/widgets/vars.js

@@ -29,14 +29,12 @@ var VarsWidget = function(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 +61,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;
 	}

core/modules/widgets/widget.js

@@ -122,7 +122,7 @@ Widget.prototype.getVariableInfo = function(name,options) {
 		});
 		// Only substitute variable references if this variable was defined with the \define pragma
 		if(variable.isMacroDefinition) {
-			value = this.substituteVariableReferences(value);
+			value = this.substituteVariableReferences(value,options);
 		}
 		return {
 			text: value,
@@ -175,10 +175,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: ""}));
 	});
 };
 
@@ -263,19 +263,9 @@ Compute the current values of the attributes of the widget. Returns a hashmap of
 */
 Widget.prototype.computeAttributes = function() {
 	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;
-		}
-		// 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 +274,34 @@ Widget.prototype.computeAttributes = function() {
 	return changedAttributes;
 };
 
+Widget.prototype.computeAttribute = function(attribute) {
+	var 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") {
+		value = this.getVariable(attribute.value.name,{params: attribute.value.params});
+	} 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
 */
@@ -310,24 +321,40 @@ excludeEventAttributes: ignores attributes whose name begins 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 assignAttribute = function(name,value) {
+		// Check for excluded attribute names
+		if(options.excludeEventAttributes && name.substr(0,2) === "on") {
+			value = undefined;
 		}
-		if(v !== undefined) {
-			var b = a.split(":");
-			// 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);
+		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);
+			}
+			// Handle styles
+			if(name.substr(0,6) === "style." && name.length > 6) {
+				domNode.style[$tw.utils.unHyphenateCss(name.substr(6))] = value;
+			} else {
+				// Setting certain attributes can cause a DOM error (eg xmlns on the svg element)
+				try {
+					domNode.setAttributeNS(namespace,name,value);
+				} catch(e) {
 				}
-			} catch(e) {
 			}
 		}
-	});
+	}
+	// Not all parse tree nodes have the orderedAttributes property
+	if(this.parseTreeNode.orderedAttributes) {
+		$tw.utils.each(this.parseTreeNode.orderedAttributes,function(attribute,index) {
+			assignAttribute(attribute.name,self.attributes[attribute.name]);
+		});	
+	} else {
+		$tw.utils.each(Object.keys(self.attributes).sort(),function(name) {
+			assignAttribute(name,self.attributes[name]);
+		});	
+	}
 };
 
 /*
@@ -570,7 +597,7 @@ Widget.prototype.invokeActions = function(triggeringWidget,event) {
 	for(var t=0; t<this.children.length; t++) {
 		var child = this.children[t],
 			childIsActionWidget = !!child.invokeAction,
-			actionRefreshPolicy = child.getVariable("tv-action-refresh-policy");
+			actionRefreshPolicy = child.getVariable("tv-action-refresh-policy"); // Default is "once"
 		// Refresh the child if required
 		if(childIsActionWidget || actionRefreshPolicy === "always") {
 			child.refreshSelf();

core/modules/wiki-bulkops.js

@@ -46,26 +46,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())

core/modules/wiki.js

@@ -81,7 +81,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};
@@ -639,14 +639,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] || [];
 };
 
 /*
@@ -822,12 +833,7 @@ exports.getTiddlerData = function(titleOrTiddler,defaultData) {
 		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);
 		}
@@ -856,19 +862,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));
 };
 
 /*
@@ -1196,23 +1207,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,
@@ -1239,7 +1255,18 @@ exports.search = function(text,options) {
 			searchTermsRegExps = null;
 			console.log("Regexp error parsing /(" + text + ")/" + flags + ": ",e);
 		}
-	} else {
+	} else if(options.some) {
+		terms = text.trim().split(/ +/);
+		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(/ +/);
 		if(terms.length === 1 && terms[0] === "") {
 			searchTermsRegExps = null;
@@ -1250,7 +1277,7 @@ 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)) {

core/palettes/CupertinoDark.tid

@@ -11,7 +11,7 @@ alert-highlight: #FFD60A
 alert-muted-foreground: <<colour muted-foreground>>
 background: #282828
 blockquote-bar: <<colour page-background>>
-button-foreground: <<colour background>>
+button-foreground: <<colour foreground>>
 code-background: <<colour pre-background>>
 code-border: <<colour pre-border>>
 code-foreground: rgba(255, 255, 255, 0.54)
@@ -52,7 +52,7 @@ 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
@@ -87,7 +87,7 @@ 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)

core/palettes/GruvBoxDark.tid

@@ -12,7 +12,7 @@ alert-highlight: #d79921
 alert-muted-foreground: #504945
 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
@@ -63,7 +63,7 @@ select-tag-background: #665c54
 select-tag-foreground: <<colour foreground>>
 selection-background: #458588
 selection-foreground: <<colour foreground>>
-sidebar-button-foreground: <<colour page-background>>
+sidebar-button-foreground: <<colour foreground>>
 sidebar-controls-foreground-hover: #7c6f64
 sidebar-controls-foreground: #504945
 sidebar-foreground-shadow: transparent

core/palettes/Nord.tid

@@ -12,7 +12,7 @@ alert-highlight: #B48EAD
 alert-muted-foreground: #4C566A
 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
@@ -63,7 +63,7 @@ select-tag-background: #3b4252
 select-tag-foreground: <<colour foreground>>
 selection-background: #5E81AC
 selection-foreground: <<colour foreground>>
-sidebar-button-foreground: <<colour page-background>>
+sidebar-button-foreground: <<colour foreground>>
 sidebar-controls-foreground-hover: #D8DEE9
 sidebar-controls-foreground: #4C566A
 sidebar-foreground-shadow: transparent

core/templates/save-lazy-all.tid

@@ -1,9 +1,9 @@
 title: $:/core/save/lazy-all
 
 \define saveTiddlerFilter()
-[is[system]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] 
+[is[system]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] [is[tiddler]type[application/javascript]] +[sort[title]]
 \end
 \define skinnySaveTiddlerFilter()
-[!is[system]]
+[!is[system]] -[type[application/javascript]]
 \end
 {{$:/core/templates/tiddlywiki5.html}}