tiddlywiki 5.2.2 → 5.2.4

package/plugins/tiddlywiki/dynannotate/modules/dynannotate.js

@@ -16,6 +16,8 @@ var TextMap = require("$:/plugins/tiddlywiki/dynannotate/textmap.js").TextMap;
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
+var Popup = require("$:/core/modules/utils/dom/popup.js");
+
 var DynannotateWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);
 };
@@ -183,7 +185,16 @@ DynannotateWidget.prototype.applyAnnotations = function() {
 	// We'll dynamically build the click event handler so that we can reuse it
 	var clickHandlerFn = function(title) {
 		return function(event,domOverlay,modifierKey) {
-			self.invokeActionString(self.getAttribute("actions"),self,event,{annotationTiddler: title, modifier: modifierKey});
+			var bounds = domOverlay.getBoundingClientRect();
+			self.invokeActionString(self.getAttribute("actions"),self,event,{
+				annotationTiddler: title,
+				modifier: modifierKey,
+				"tv-selection-posx": (bounds.left).toString(),
+				"tv-selection-posy": (bounds.top).toString(),
+				"tv-selection-width": (bounds.width).toString(),
+				"tv-selection-height": (bounds.height).toString(),
+				"tv-selection-coords": Popup.buildCoordinates(Popup.coordinatePrefix.csOffsetParent,bounds)
+			});
 			if(self.hasAttribute("popup")) {
 				$tw.popup.triggerPopup({
 					domNode: domOverlay,
@@ -321,7 +332,7 @@ DynannotateWidget.prototype.applySnippets = function() {
 			// Output the match
 			container.appendChild($tw.utils.domMaker("span",{
 				text: textMap.string.slice(match.startPos,match.endPos),
-				"class": "tc-dynannotate-snippet-highlight " + self.getAttribute("searchClass")
+				"class": "tc-dynannotate-snippet-highlight " + self.getAttribute("searchClass","")
 			}));
 			// Does the context of this match merge into the next?
 			merged = index < matches.length - 1 && matches[index + 1].startPos - match.endPos <= 2 * contextLength;

package/plugins/tiddlywiki/dynannotate/modules/legacy-selection-tracker.js

@@ -0,0 +1,104 @@
+/*\
+title: $:/plugins/tiddlywiki/dynannotate/legacy-selection-tracker.js
+type: application/javascript
+module-type: library
+
+Legacy version of the dyannotate background daemon to track the selection
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var TextMap = require("$:/plugins/tiddlywiki/dynannotate/textmap.js").TextMap;
+
+function LegacySelectionTracker(wiki,options) {
+	options = options || {};
+	var self = this;
+	this.wiki = wiki;
+	this.allowBlankSelectionPopup = options.allowBlankSelectionPopup;
+	this.selectionPopupTitle = null;
+	document.addEventListener("selectionchange",function(event) {
+		var selection = document.getSelection();
+		if(selection && (selection.type === "Range" || (self.allowBlankSelectionPopup && !self.selectionPopupTitle))) {
+			// Look for the selection containers for each of the two ends of the selection
+			var anchorContainer = self.findSelectionContainer(selection.anchorNode),
+				focusContainer = self.findSelectionContainer(selection.focusNode);
+			// If either end of the selection then we ignore it
+			if(!!anchorContainer || !!focusContainer) {
+				var selectionRange = selection.getRangeAt(0);
+				// Check for the selection spilling outside the starting container
+				if((anchorContainer !== focusContainer) || (selectionRange.startContainer.nodeType !== Node.TEXT_NODE && selectionRange.endContainer.nodeType !== Node.TEXT_NODE)) {
+					if(self.selectionPopupTitle) {
+						self.wiki.deleteTiddler(self.selectionPopupTitle);
+						self.selectionPopupTitle = null;
+					}
+				} else {
+					self.selectionSaveTitle = anchorContainer.getAttribute("data-annotation-selection-save");
+					self.selectionPrefixSaveTitle = anchorContainer.getAttribute("data-annotation-selection-prefix-save");
+					self.selectionSuffixSaveTitle = anchorContainer.getAttribute("data-annotation-selection-suffix-save");
+					self.selectionPopupTitle = anchorContainer.getAttribute("data-annotation-selection-popup");
+					// The selection is a range so we trigger the popup
+					if(self.selectionPopupTitle) {
+						var selectionRectangle = selectionRange.getBoundingClientRect(),
+							trackingRectangle = anchorContainer.getBoundingClientRect();
+						$tw.popup.triggerPopup({
+							domNode: null,
+							domNodeRect: {
+								left: selectionRectangle.left - trackingRectangle.left,
+								top: selectionRectangle.top - trackingRectangle.top,
+								width: selectionRectangle.width,
+								height: selectionRectangle.height
+							},
+							force: true,
+							floating: true,
+							title: self.selectionPopupTitle,
+							wiki: self.wiki
+						});						
+					}
+					// Write the selection text to the specified tiddler
+					if(self.selectionSaveTitle) {
+						// Note that selection.toString() normalizes whitespace but selection.getRangeAt(0).toString() does not
+						var text = selectionRange.toString();
+						self.wiki.addTiddler(new $tw.Tiddler({title: self.selectionSaveTitle, text: text}));
+						// Build a textmap of the container so that we can find the prefix and suffix
+						var textMap = new TextMap(anchorContainer);
+						// Find the selection start in the text map and hence extract the prefix and suffix
+						var context = textMap.extractContext(selectionRange.startContainer,selectionRange.startOffset,text);
+						// Save the prefix and suffix
+						if(context) {
+							if(self.selectionPrefixSaveTitle) {
+								self.wiki.addTiddler(new $tw.Tiddler({title: self.selectionPrefixSaveTitle, text: context.prefix}));
+							}
+							if(self.selectionSuffixSaveTitle) {
+								self.wiki.addTiddler(new $tw.Tiddler({title: self.selectionSuffixSaveTitle, text: context.suffix}));
+							}
+						}
+					}
+				}
+			}
+		} else {
+			// If the selection is a caret we clear any active popup
+			if(self.selectionPopupTitle) {
+				self.wiki.deleteTiddler(self.selectionPopupTitle);
+				self.selectionPopupTitle = null;
+			}
+		}
+	});
+}
+
+LegacySelectionTracker.prototype.findSelectionContainer = function findSelectionContainer(domNode) {
+	if(domNode && domNode.nodeType === Node.ELEMENT_NODE && domNode.classList.contains("tc-dynannotation-selection-container")) {
+		return domNode;
+	}
+	if(domNode && domNode.parentNode) {
+		return findSelectionContainer(domNode.parentNode);
+	}
+	return null;
+};
+
+exports.LegacySelectionTracker = LegacySelectionTracker;
+
+})();

package/plugins/tiddlywiki/dynannotate/modules/selection-tracker.js

@@ -1,9 +1,9 @@
 /*\
 title: $:/plugins/tiddlywiki/dynannotate/selection-tracker.js
 type: application/javascript
-module-type: startup
+module-type: library
 
-Dyannotate background daemon to track the selection
+Background daemon to track the selection
 
 \*/
 (function(){
@@ -12,105 +12,160 @@ Dyannotate background daemon to track the selection
 /*global $tw: false */
 "use strict";
 
-// Export name and synchronous status
-exports.name = "dyannotate-startup";
-exports.platforms = ["browser"];
-exports.after = ["render"];
-exports.synchronous = true;
-
-var TextMap = require("$:/plugins/tiddlywiki/dynannotate/textmap.js").TextMap;
-
-exports.startup = function() {
-	$tw.dynannotate = {
-		selectionTracker: new SelectionTracker($tw.wiki,{
-			allowBlankSelectionPopup: true
-		})
-	};
-};
-
 function SelectionTracker(wiki,options) {
 	options = options || {};
 	var self = this;
 	this.wiki = wiki;
-	this.allowBlankSelectionPopup = options.allowBlankSelectionPopup;
-	this.selectionPopupTitle = null;
+	var timerId = null;
 	document.addEventListener("selectionchange",function(event) {
-		var selection = document.getSelection();
-		if(selection && (selection.type === "Range" || (self.allowBlankSelectionPopup && !self.selectionPopupTitle))) {
-			// Look for the selection containers for each of the two ends of the selection
-			var anchorContainer = self.findSelectionContainer(selection.anchorNode),
-				focusContainer = self.findSelectionContainer(selection.focusNode);
-			// If either end of the selection then we ignore it
-			if(!!anchorContainer || !!focusContainer) {
-				var selectionRange = selection.getRangeAt(0);
-				// Check for the selection spilling outside the starting container
-				if((anchorContainer !== focusContainer) || (selectionRange.startContainer.nodeType !== Node.TEXT_NODE && selectionRange.endContainer.nodeType !== Node.TEXT_NODE)) {
-					if(self.selectionPopupTitle) {
-						self.wiki.deleteTiddler(self.selectionPopupTitle);
-						self.selectionPopupTitle = null;
-					}
-				} else {
-					self.selectionSaveTitle = anchorContainer.getAttribute("data-annotation-selection-save");
-					self.selectionPrefixSaveTitle = anchorContainer.getAttribute("data-annotation-selection-prefix-save");
-					self.selectionSuffixSaveTitle = anchorContainer.getAttribute("data-annotation-selection-suffix-save");
-					self.selectionPopupTitle = anchorContainer.getAttribute("data-annotation-selection-popup");
-					// The selection is a range so we trigger the popup
-					if(self.selectionPopupTitle) {
-						var selectionRectangle = selectionRange.getBoundingClientRect(),
-							trackingRectangle = anchorContainer.getBoundingClientRect();
-						$tw.popup.triggerPopup({
-							domNode: null,
-							domNodeRect: {
-								left: selectionRectangle.left - trackingRectangle.left,
-								top: selectionRectangle.top - trackingRectangle.top,
-								width: selectionRectangle.width,
-								height: selectionRectangle.height
-							},
-							force: true,
-							floating: true,
-							title: self.selectionPopupTitle,
-							wiki: self.wiki
-						});						
-					}
-					// Write the selection text to the specified tiddler
-					if(self.selectionSaveTitle) {
-						// Note that selection.toString() normalizes whitespace but selection.getRangeAt(0).toString() does not
-						var text = selectionRange.toString();
-						self.wiki.addTiddler(new $tw.Tiddler({title: self.selectionSaveTitle, text: text}));
-						// Build a textmap of the container so that we can find the prefix and suffix
-						var textMap = new TextMap(anchorContainer);
-						// Find the selection start in the text map and hence extract the prefix and suffix
-						var context = textMap.extractContext(selectionRange.startContainer,selectionRange.startOffset,text);
-						// Save the prefix and suffix
-						if(context) {
-							if(self.selectionPrefixSaveTitle) {
-								self.wiki.addTiddler(new $tw.Tiddler({title: self.selectionPrefixSaveTitle, text: context.prefix}));
-							}
-							if(self.selectionSuffixSaveTitle) {
-								self.wiki.addTiddler(new $tw.Tiddler({title: self.selectionSuffixSaveTitle, text: context.suffix}));
-							}
+		if(timerId) {
+			clearTimeout(timerId);
+		}
+		timerId = setTimeout(function() {
+			timerId = null;
+			self.handleSelectionChange();
+		},500);
+	});
+}
+
+SelectionTracker.prototype.handleSelectionChange = function() {
+	var selection = document.getSelection();
+	if(selection && selection.type === "Range") {
+		// Helper to get the tiddler title corresponding to a chunk container
+		var getIdOfContainer = function(domNode) {
+			return domNode.id;
+		}
+		// Get information about the selection anchor and focus
+		var getSelectionInfo = function(targetDomNode,targetOffset) {
+			// Find the chunk container node
+			var domNode = targetDomNode;
+			if(domNode.nodeType === Node.TEXT_NODE) {
+				domNode = domNode.parentNode;
+			}
+			var container = domNode.closest(".dynannotate-chunk");
+			if(!container) {
+				return null;
+			}
+			// Find the index of the container within the child nodes of its parent
+			var childNodeIndex = Array.prototype.indexOf.call(container.parentNode.childNodes,container);
+			// Walk through the chunk collecting the text before and after the specified domNode and offset
+			var beforeText = null, afterText = [];
+			var splitTextResult = function() {
+					beforeText = afterText;
+					afterText = [];
+				},
+				processNode = function(domNode) {
+					// Check for a text node
+					if(domNode.nodeType === Node.TEXT_NODE) {
+						// If this is the target node then perform the split
+						if(domNode === targetDomNode) {
+							afterText.push(domNode.textContent.substring(0,targetOffset));
+							splitTextResult();
+							afterText.push(domNode.textContent.substring(targetOffset));
+						} else {
+							afterText.push(domNode.textContent);
 						}
+					} else {
+						// Process the child nodes
+						$tw.utils.each(domNode.childNodes,function(childNode,childNodeIndex) {
+							// Check whether we need to split on this child node
+							if(domNode === targetDomNode && childNodeIndex === targetOffset) {
+								splitTextResult();
+							}
+							processNode(childNode);
+						});
 					}
-				}
+				};
+			processNode(container);
+			if(beforeText === null) {
+				splitTextResult();
 			}
-		} else {
-			// If the selection is a caret we clear any active popup
-			if(self.selectionPopupTitle) {
-				self.wiki.deleteTiddler(self.selectionPopupTitle);
-				self.selectionPopupTitle = null;
+			// Return results
+			return {
+				container: container,
+				childNodeIndex: childNodeIndex,
+				beforeText: beforeText.join(""),
+				afterText: afterText.join("")
 			}
-		}
-	});
-}
 
-SelectionTracker.prototype.findSelectionContainer = function findSelectionContainer(domNode) {
-	if(domNode && domNode.nodeType === Node.ELEMENT_NODE && domNode.classList.contains("tc-dynannotation-selection-container")) {
-		return domNode;
+		}
+		var anchor = getSelectionInfo(selection.anchorNode,selection.anchorOffset),
+			focus = getSelectionInfo(selection.focusNode,selection.focusOffset);
+		// Check that the containers share a parent
+		if(anchor && focus && anchor.container.parentNode === focus.container.parentNode) {
+			// Make sure that the anchor is before the focus
+			if((anchor.childNodeIndex > focus.childNodeIndex) || (anchor.container === focus.container && anchor.beforeText.length > focus.beforeText.length)) {
+				var temp = anchor; 
+				anchor = focus; 
+				focus = temp;
+			}
+			var chunks = [];
+			// Check for the selection being all in one chunk
+			if(anchor.container === focus.container) {
+				chunks.push({
+					id: getIdOfContainer(anchor.container),
+					prefix: anchor.beforeText,
+					text: anchor.afterText.substring(0,anchor.afterText.length - focus.afterText.length),
+					suffix: focus.afterText
+				});
+			} else {
+				// We span two or more chunks
+				chunks.push({
+					id: getIdOfContainer(anchor.container),
+					prefix: anchor.beforeText,
+					text: anchor.afterText
+				});
+				// Get the titles and text of the intervening tiddlers
+				var domNode;
+				if(anchor.container !== focus.container) {
+					domNode = anchor.container.nextElementSibling;
+					while(domNode && domNode !== focus.container) {
+						chunks.push({
+							id: getIdOfContainer(domNode),
+							text: domNode.textContent
+						});
+						domNode = domNode.nextElementSibling;
+					}					
+				}
+				chunks.push({
+					id: getIdOfContainer(focus.container),
+					text: focus.beforeText,
+					suffix: focus.afterText
+				});
+			}
+			// Get the title of the tiddler containing the actions to be executed
+			var actionsTiddler = anchor.container.parentNode.getAttribute("data-selection-actions-title");
+			// Assemble the variables to be passed to the action
+			var variables = {};
+			// Get the bounds of the container and the selection
+			var selectionRectangle = selection.getRangeAt(0).getBoundingClientRect(),
+				offsetParentRectangle = anchor.container.offsetParent.getBoundingClientRect();
+			variables["tv-selection-posx"] = (selectionRectangle.left - offsetParentRectangle.left).toString();
+			variables["tv-selection-posy"] = (selectionRectangle.top - offsetParentRectangle.top).toString();
+			variables["tv-selection-width"] = (selectionRectangle.width).toString();
+			variables["tv-selection-height"] = (selectionRectangle.height).toString();
+			variables["tv-selection-coords"] = "(" + variables["tv-selection-posx"] + "," + variables["tv-selection-posy"] + "," + variables["tv-selection-width"] + "," + variables["tv-selection-height"] + ")";
+			// Collect the attributes from the container
+			$tw.utils.each(anchor.container.parentNode.attributes,function(attribute) {
+				variables["dom-" + attribute.name] = attribute.value.toString();
+			});
+			// Action the selection
+			this.performSelectionActions(chunks,variables,actionsTiddler);
+		}
 	}
-	if(domNode && domNode.parentNode) {
-		return findSelectionContainer(domNode.parentNode);
+};
+
+SelectionTracker.prototype.performSelectionActions = function(chunks,variables,actionsTiddler) {
+	// Invoke the actions, passing the extract tiddler title as a variable
+	if(actionsTiddler) {
+		var actions = $tw.wiki.getTiddlerText(actionsTiddler)
+		if(actions) {
+			var selection = JSON.stringify({chunks: chunks,variables: variables});
+			$tw.rootWidget.invokeActionString(actions,undefined,undefined,$tw.utils.extend({},variables,{selection: selection}));
+		}
 	}
-	return null;
 };
 
+exports.SelectionTracker = SelectionTracker;
+
 })();

package/plugins/tiddlywiki/dynannotate/modules/startup.js

@@ -0,0 +1,40 @@
+/*\
+title: $:/plugins/tiddlywiki/dynannotate/startup.js
+type: application/javascript
+module-type: startup
+
+Startup the dyannotate background daemon to track the selection
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+// Export name and synchronous status
+exports.name = "dyannotate-startup";
+exports.platforms = ["browser"];
+exports.after = ["render"];
+exports.synchronous = true;
+
+var CONFIG_SELECTION_TRACKER_TITLE = "$:/config/Dynannotate/SelectionTracker/Enable",
+	CONFIG_LEGACY_SELECTION_TRACKER_TITLE = "$:/config/Dynannotate/LegacySelectionTracker/Enable";
+
+var SelectionTracker = require("$:/plugins/tiddlywiki/dynannotate/selection-tracker.js").SelectionTracker,
+	LegacySelectionTracker = require("$:/plugins/tiddlywiki/dynannotate/legacy-selection-tracker.js").LegacySelectionTracker;
+
+exports.startup = function() {
+	$tw.dynannotate = {};
+	if($tw.wiki.getTiddlerText(CONFIG_SELECTION_TRACKER_TITLE,"yes") === "yes") {
+		$tw.dynannotate.selectionTracker = new SelectionTracker($tw.wiki);
+	}
+	if($tw.wiki.getTiddlerText(CONFIG_LEGACY_SELECTION_TRACKER_TITLE,"yes") === "yes") {
+		$tw.dynannotate.legacySelectionTracker = new LegacySelectionTracker($tw.wiki,{
+			allowBlankSelectionPopup: true
+		});
+	}
+};
+
+})();
+	

package/plugins/tiddlywiki/help/tabs/Support.tid

@@ -4,9 +4,13 @@ caption: Support
 
 ~TiddlyWiki is an open source project with a vibrant community of users and developers. We're always happy to help new users get the most from ~TiddlyWiki.
 
-Join the ~TiddlyWiki mailing list:
+Join the ~TiddlyWiki forum:
 
-http://groups.google.com/group/TiddlyWiki
+https://talk.tiddlywiki.org/
+
+For the convenience of existing users, we also continue to operate the original TiddlyWiki group (hosted on Google Groups since 2005):
+
+https://groups.google.com/group/TiddlyWiki
 
 Post bug reports to the ~TiddlyWiki ~GitHub repository:
 

package/plugins/tiddlywiki/jasmine/command.js

@@ -0,0 +1,33 @@
+/*\
+title: $:/plugins/tiddlywiki/jasmine/command.js
+type: application/javascript
+module-type: command
+
+The command which executes jasmine on the command line for TiddlyWiki5
+
+\*/
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var jasmine = require("./jasmine-plugin.js");
+
+exports.info = {
+	name: "test",
+	synchronous: false,
+	namedParameterMode: true
+};
+
+var Command = function(params,commander,callback) {
+	this.params = params;
+	this.commander = commander;
+	this.callback = callback;
+};
+
+Command.prototype.execute = function() {
+	var specFilter = this.params.spec;
+	jasmine.runTests(this.callback,specFilter);
+};
+
+exports.Command = Command;

package/plugins/tiddlywiki/jasmine/help.tid

@@ -0,0 +1,24 @@
+title: $:/language/Help/test
+description: Run the jasmine test suite
+
+This runs all of the tests in tiddlers tagged with `$:/tags/test-spec`.
+
+```
+--test [spec=<regExp>]
+```
+
+''spec'' - optional regular expression to run only specific suites or tests. It will be matched against the full name of every test to see whether to run it. The full name of a test is its assigned name prepended with the names of all containing suites. For instance, to run only the following test:
+
+```
+describe("Framework") { it("handles edgecases") { ... } }
+```
+
+You might use a specFilter like `"^Framework handles edgecases$"` to match the full name exactly, or more simply `"edgecases"`, though this might run other tests with "edgecases" in their name. You could also run all tests in that suite with `"^Framework"`.
+
+If any tests fail or are skipped, all following commands are ignored. If you have any commands which must be executed regardless of test results, execute them first.
+
+A common usage is to run the tests on the console after creating a Tiddlywiki file which will run the tests on the browser.
+
+```
+tiddlywiki --rendertiddler $:/core/save/all test.html text/plain --test
+```

package/plugins/tiddlywiki/jasmine/jasmine-plugin.js

@@ -1,7 +1,7 @@
 /*\
 title: $:/plugins/tiddlywiki/jasmine/jasmine-plugin.js
 type: application/javascript
-module-type: startup
+module-type: library
 
 The main module of the Jasmine test plugin for TiddlyWiki5
 
@@ -12,20 +12,15 @@ The main module of the Jasmine test plugin for TiddlyWiki5
 /*global $tw: true */
 "use strict";
 
-var TEST_TIDDLER_FILTER = "[type[application/javascript]tag[$:/tags/test-spec]]";
+var TEST_TIDDLER_FILTER = "[all[tiddlers+shadows]type[application/javascript]tag[$:/tags/test-spec]]";
+var TESTS_DONE = false;
 
-exports.name = "jasmine";
-// Ensure this startup module is executed in the right order.
-// In Node.js, Jasmine calls `process.exit()` with a non-zero exit code if there's
-// any failed tests. Because of that, we want to make sure all critical
-// startup modules are run before this one.
-// * The "commands" module handles the --rendertiddler command-line flag,
-//   which is typically given in order to export an HTML file that can be opened with
-//   a browser to run tests.
-exports.after = $tw.node ? ["commands"] : [];
+exports.testsWereRun = function() {
+	return TESTS_DONE;
+};
 
 /*
-Startup function for running tests
+function for running tests
 
 Below, paths like jasmine-core/jasmine.js refer to files in the 'jasmine-core' npm
 package, whose repository is https://github.com/jasmine/jasmine.
@@ -34,7 +29,8 @@ repository is https://github.com/jasmine/jasmine-npm.
 
 They're all locally checked into the `./files` directory.
 */
-exports.startup = function() {
+
+exports.runTests = function(callback,specFilter) {
 	// Set up a shared context object.
 	var context = {
 		console: console,
@@ -63,6 +59,10 @@ exports.startup = function() {
 	//    is executed, so we use the `context` object instead.
 	context.global = $tw.browser ? window : context;
 
+	// We set this early rather than at the end for simplicity. The browser
+	// and node.js environments don't end the same way.
+	TESTS_DONE = true;
+
 	function evalInContext(title) {
 		var code = $tw.wiki.getTiddlerText(title,"");
 		var _exports = {};
@@ -123,7 +123,15 @@ exports.startup = function() {
 			path: "$:/plugins/tiddlywiki/jasmine/jasmine-core/jasmine-core"
 		};
 		// 'jasmine/jasmine.js' references `process.exit`, among other properties
-		context.process = process;
+		// It will call 'exit' after it's done, which gives us an
+		// opportunity to resynchronize and finish any following commands.
+		context.process = Object.create(process);
+		context.process.exit = function(code) {
+			// If jasmine's exit code is non-zero, tests failed. Abort any
+			// further commands. If they're important, they could have come
+			// before the testing suite.
+			callback(code ? "Tests failed with code " + code : undefined);
+		};
 
 		var NodeJasmine = evalInContext("$:/plugins/tiddlywiki/jasmine/jasmine/jasmine.js");
 		nodeJasmineWrapper = new NodeJasmine({jasmineCore: jasmineCore});
@@ -135,13 +143,11 @@ exports.startup = function() {
 	context = $tw.utils.extend({},jasmineInterface,context);
 	// Iterate through all the test modules
 	var tests = $tw.wiki.filterTiddlers(TEST_TIDDLER_FILTER);
-	$tw.utils.each(tests,function(title) {
-		evalInContext(title);
-	});
+	$tw.utils.each(tests,evalInContext);
 	// In a browser environment, jasmine-core/boot.js calls `execute()` for us.
 	// In Node.js, we call it manually.
 	if(!$tw.browser) {
-		nodeJasmineWrapper.execute();
+		nodeJasmineWrapper.execute(null,specFilter);
 	}
 };
 

package/plugins/tiddlywiki/jasmine/readme.tid

@@ -1,5 +1,35 @@
 title: $:/plugins/tiddlywiki/jasmine/readme
 
-This plugin provides a framework for running tests in the browser and under Node.js. It is based on [[Jasmine|https://jasmine.github.io/]] test framework.
+This plugin provides a framework for running tests in the browser and under Node.js. It is based on [[Jasmine|https://jasmine.github.io/]] test framework. On Tiddlywiki, it runs tests in all javascript tiddlers tagged with <<tag $:/tags/test-spec>>.
 
 [[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/jasmine]]
+
+!! Usage on Node.js
+
+On the command line, type `tiddlywiki --test`.
+
+Alternatively, you can set up a build task for jasmine by including the following in your tiddlywiki.info file:
+
+```
+{
+	...
+	"build": {
+		...
+		"test": ["--test"]
+	}
+}
+```
+
+You could then run tests by typing `tiddlywiki --build test` or just `tiddlywiki --build`. The advantage to this is it allows you to include other commands to run as well. See `tiddlywiki --help test` for more information.
+
+This will run the tests and produce a test file in your output directory.
+
+```
+		"test": [
+			"--test",
+			"--rendertiddler","$:/core/save/all","test.html","text/plain"]
+```
+
+!! Usage on a browser
+
+Once you've constructed a Tiddlywiki file using a command like the one above, you can run the tests simply by opening it. Tests run automatically, and the results will be at the bottom of the window.