tiddlywiki 5.3.6 → 5.3.8

package/core/modules/widgets/testcase.js

@@ -6,10 +6,6 @@ module-type: widget
 Widget to display a test case
 
 \*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -33,6 +29,7 @@ TestCaseWidget.prototype.render = function(parent,nextSibling) {
 	this.execute();
 	// Create container DOM node
 	var domNode = this.document.createElement("div");
+	domNode.setAttribute("class", "tc-test-case " + this.testcaseClass);
 	this.domNodes.push(domNode);
 	parent.insertBefore(domNode,nextSibling);
 	// Render the children into a hidden DOM node
@@ -145,6 +142,7 @@ TestCaseWidget.prototype.execute = function() {
 	this.testcaseTestActions = this.getAttribute("testActions");
 	this.testcaseTestExpectedResult = this.getAttribute("testExpectedResult");
 	this.testcaseHideIfPass = this.getAttribute("testHideIfPass");
+	this.testcaseClass = this.getAttribute("class","");
 };
 
 /*
@@ -161,5 +159,3 @@ TestCaseWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports["testcase"] = TestCaseWidget;
-
-})();

package/core/modules/widgets/text.js

@@ -6,10 +6,7 @@ module-type: widget
 Text node widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -58,5 +55,3 @@ TextNodeWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.text = TextNodeWidget;
-
-})();

package/core/modules/widgets/tiddler.js

@@ -6,10 +6,7 @@ module-type: widget
 Tiddler widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -97,5 +94,3 @@ TiddlerWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.tiddler = TiddlerWidget;
-
-})();

package/core/modules/widgets/transclude.js

@@ -6,10 +6,7 @@ module-type: widget
 Transclude widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -101,6 +98,7 @@ TranscludeWidget.prototype.execute = function() {
 	}
 	this.sourceText = target.text;
 	this.parserType = target.type;
+	this._canonical_uri = target._canonical_uri;
 	// Set the legacy transclusion context variables only if we're not transcluding a variable
 	if(!this.transcludeVariable) {
 		var recursionMarker = this.makeRecursionMarker();
@@ -228,7 +226,8 @@ TranscludeWidget.prototype.getTransclusionTarget = function() {
 						});
 		return {
 			text: parserInfo.text,
-			type: parserInfo.type
+			type: parserInfo.type,
+			_canonical_uri: parserInfo._canonical_uri
 		};
 	}
 };
@@ -455,8 +454,11 @@ TranscludeWidget.prototype.makeRecursionMarker = function() {
 
 TranscludeWidget.prototype.parserNeedsRefresh = function() {
 	// Doesn't need to consider transcluded variables because a parent variable can't change once a widget has been created
-	var parserInfo = this.wiki.getTextReferenceParserInfo(this.transcludeTitle,this.transcludeField,this.transcludeIndex,{subTiddler:this.transcludeSubTiddler});
-	return (this.sourceText === undefined || parserInfo.sourceText !== this.sourceText || parserInfo.parserType !== this.parserType)
+	var parserInfo = this.wiki.getTextReferenceParserInfo(this.transcludeTitle,this.transcludeField,this.transcludeIndex,{
+		subTiddler: this.transcludeSubTiddler,
+		defaultType: this.transcludeType
+	});
+	return (this.sourceText === undefined || parserInfo.sourceText !== this.sourceText || parserInfo.parserType !== this.parserType || parserInfo._canonical_uri !== this._canonical_uri);
 };
 
 TranscludeWidget.prototype.functionNeedsRefresh = function() {
@@ -480,5 +482,3 @@ TranscludeWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.transclude = TranscludeWidget;
-
-})();

package/core/modules/widgets/vars.js

@@ -13,10 +13,7 @@ This widget allows multiple variables to be set in one go:
 ```
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -69,5 +66,3 @@ VarsWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports["vars"] = VarsWidget;
-
-})();

package/core/modules/widgets/view.js

@@ -6,10 +6,7 @@ module-type: widget
 View widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -224,5 +221,3 @@ ViewWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.view = ViewWidget;
-
-})();

package/core/modules/widgets/widget.js

@@ -6,10 +6,7 @@ module-type: widget
 Widget base class
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -628,31 +625,53 @@ Widget.prototype.addEventListeners = function(listeners) {
 };
 
 /*
-Add an event listener
+Add an event listener.
+
+Listener could return a boolean indicating whether to further propagation or not, default to `false`.
 */
 Widget.prototype.addEventListener = function(type,handler) {
-	var self = this;
-	if(typeof handler === "string") { // The handler is a method name on this widget
-		this.eventListeners[type] = function(event) {
-			return self[handler].call(self,event);
-		};
-	} else { // The handler is a function
-		this.eventListeners[type] = function(event) {
-			return handler.call(self,event);
-		};
+	this.eventListeners[type] = this.eventListeners[type] || [];
+	if(this.eventListeners[type].indexOf(handler) === -1) {
+		this.eventListeners[type].push(handler);
 	}
 };
 
 /*
-Dispatch an event to a widget. If the widget doesn't handle the event then it is also dispatched to the parent widget
+Remove an event listener
+*/
+Widget.prototype.removeEventListener = function(type,handler) {
+	if(!this.eventListeners[type]) return;
+	var index = this.eventListeners[type].indexOf(handler);
+	if(index !== -1) {
+		this.eventListeners[type].splice(index,1);
+	}
+};
+
+/*
+Dispatch an event to a widget.
+
+If the widget doesn't handle the event then it is also dispatched to the parent widget
 */
 Widget.prototype.dispatchEvent = function(event) {
 	event.widget = event.widget || this;
-	// Dispatch the event if this widget handles it
-	var listener = this.eventListeners[event.type];
-	if(listener) {
-		// Don't propagate the event if the listener returned false
-		if(!listener(event)) {
+	var listeners = this.eventListeners[event.type];
+	if(listeners) {
+		var self = this;
+		var shouldPropagate = true;
+		$tw.utils.each(listeners,function(handler) {
+			var propagate;
+			if(typeof handler === "string") {
+				 // If handler is a string, call it as a method on the widget
+				propagate = self[handler].call(self,event);
+			} else {
+				// Otherwise call the function handler directly
+				propagate = handler.call(self,event);
+			}
+			if(propagate === false) {
+				shouldPropagate = false;
+			}
+		});
+		if(!shouldPropagate) {
 			return false;
 		}
 	}
@@ -846,5 +865,3 @@ Widget.evaluateVariable  = function(widget,name,options) {
 };
 
 exports.widget = Widget;
-
-})();

package/core/modules/widgets/wikify.js

@@ -6,10 +6,7 @@ module-type: widget
 Widget to wikify text into a variable
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -153,5 +150,3 @@ WikifyWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.wikify = WikifyWidget;
-
-})();

package/core/modules/wiki-bulkops.js

@@ -6,10 +6,7 @@ module-type: wikimethod
 Bulk tiddler operations such as rename.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -84,5 +81,3 @@ function relinkTiddler(fromTitle,toTitle,options) {
 
 exports.renameTiddler = renameTiddler;
 exports.relinkTiddler = relinkTiddler;
-
-})();

package/core/modules/wiki.js

@@ -16,10 +16,7 @@ Adds the following properties to the wiki object:
 * `globalCache` is a hashmap by cache name of cache objects that are cleared whenever any tiddler change occurs
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var widget = require("$:/core/modules/widgets/widget.js");
@@ -141,12 +138,15 @@ This method should be called after the changes it describes have been made to th
 	title: Title of tiddler
 	isDeleted: defaults to false (meaning the tiddler has been created or modified),
 		true if the tiddler has been deleted
+	isShadow: defaults to false (meaning the change applies to the normal tiddler),
+		true if the tiddler being changed is a shadow tiddler
 */
-exports.enqueueTiddlerEvent = function(title,isDeleted) {
+exports.enqueueTiddlerEvent = function(title,isDeleted,isShadow) {
 	// Record the touch in the list of changed tiddlers
 	this.changedTiddlers = this.changedTiddlers || Object.create(null);
 	this.changedTiddlers[title] = this.changedTiddlers[title] || Object.create(null);
 	this.changedTiddlers[title][isDeleted ? "deleted" : "modified"] = true;
+	this.changedTiddlers[title][isShadow ? "shadow" : "normal"] = true;
 	// Increment the change count
 	this.changeCount = this.changeCount || Object.create(null);
 	if($tw.utils.hop(this.changeCount,title)) {
@@ -1132,6 +1132,7 @@ exports.getTextReferenceParserInfo = function(title,field,index,options) {
 			if(tiddler.fields.type) {
 				parserInfo.parserType = tiddler.fields.type;
 			}
+			parserInfo._canonical_uri = tiddler.fields._canonical_uri;
 		}
 	} else if(field) {
 		if(field === "title") {
@@ -1172,7 +1173,7 @@ exports.getSubstitutedText = function(text,widget,options) {
 		output = $tw.utils.replaceString(output,new RegExp("\\$" + $tw.utils.escapeRegExp(substitute.name) + "\\$","mg"),substitute.value);
 	});
 	// Substitute any variable references with their values
-	return output.replace(/\$\(([^\)\$]+)\)\$/g, function(match,varname) {
+	return output.replace(/\$\((.+?)\)\$/g, function(match,varname) {
 		return widget.getVariable(varname,{defaultValue: ""})
 	});
 };
@@ -1787,5 +1788,3 @@ exports.slugify = function(title,options) {
 	}
 	return slug;
 };
-
-})();

package/core/palettes/Blanca.tid

@@ -18,7 +18,7 @@ code-background: #f7f7f9
 code-border: #e1e1e8
 code-foreground: #dd1144
 dirty-indicator: #ff0000
-download-background: #66cccc
+download-background: #3aafaf
 download-foreground: <<colour background>>
 dragger-background: <<colour foreground>>
 dragger-foreground: <<colour background>>
@@ -26,7 +26,7 @@ dropdown-background: <<colour background>>
 dropdown-border: <<colour muted-foreground>>
 dropdown-tab-background-selected: #fff
 dropdown-tab-background: #ececec
-dropzone-background: rgba(0,200,0,0.7)
+dropzone-background: #00d900
 external-link-background-hover: inherit
 external-link-background-visited: inherit
 external-link-background: inherit
@@ -52,26 +52,30 @@ notification-border: #999999
 page-background: #ffffff
 pre-background: #f5f5f5
 pre-border: #cccccc
-primary: #7897f3
+primary: #6387f1
 select-tag-background:
 select-tag-foreground:
 sidebar-button-foreground: <<colour foreground>>
 sidebar-controls-foreground-hover: #000000
-sidebar-controls-foreground: #ccc
-sidebar-foreground-shadow: rgba(255,255,255, 0.8)
+sidebar-controls-foreground: #aaaaaa
+sidebar-foreground-shadow: #ffffff
 sidebar-foreground: #acacac
 sidebar-muted-foreground-hover: #444444
-sidebar-muted-foreground: #c0c0c0
+sidebar-muted-foreground: #aaaaaa
 sidebar-tab-background-selected: #ffffff
 sidebar-tab-background: <<colour tab-background>>
 sidebar-tab-border-selected: <<colour tab-border-selected>>
 sidebar-tab-border: <<colour tab-border>>
 sidebar-tab-divider: <<colour tab-divider>>
-sidebar-tab-foreground-selected: 
+sidebar-tab-foreground-selected: <<colour tab-foreground>>
 sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #444444
-sidebar-tiddler-link-foreground: #7897f3
+sidebar-tiddler-link-foreground: <<colour primary>>
 site-title-foreground: <<colour tiddler-title-foreground>>
+stability-stable: #008000
+stability-experimental: #c07c00
+stability-deprecated: #ff0000
+stability-legacy: #0000ff
 static-alert-foreground: #aaaaaa
 tab-background-selected: #ffffff
 tab-background: #eeeeee
@@ -83,10 +87,10 @@ tab-foreground: #666666
 table-border: #dddddd
 table-footer-background: #a8a8a8
 table-header-background: #f0f0f0
-tag-background: #ffeedd
-tag-foreground: #000
+tag-background: #ffd5aa
+tag-foreground: #000000
 tiddler-background: <<colour background>>
-tiddler-border: #eee
+tiddler-border: #eeeeee
 tiddler-controls-foreground-hover: #888888
 tiddler-controls-foreground-selected: #444444
 tiddler-controls-foreground: #cccccc
@@ -97,7 +101,7 @@ tiddler-editor-fields-even: #e0e8e0
 tiddler-editor-fields-odd: #f0f4f0
 tiddler-info-background: #f8f8f8
 tiddler-info-border: #dddddd
-tiddler-info-tab-background: #f8f8f8
+tiddler-info-tab-background: <<colour tiddler-info-background>>
 tiddler-link-background: <<colour background>>
 tiddler-link-foreground: <<colour primary>>
 tiddler-subtitle-foreground: #c0c0c0
@@ -111,5 +115,6 @@ toolbar-close-button:
 toolbar-delete-button:
 toolbar-cancel-button:
 toolbar-done-button:
-untagged-background: #999999
+untagged-background: #cccccc
 very-muted-foreground: #888888
+network-activity-foreground: <<colour primary>>

package/core/palettes/BrightMute.tid

@@ -85,6 +85,7 @@ table-footer-background: #a8a8a8
 table-header-background: #f0f0f0
 tag-background: #d5ad34
 tag-foreground: #ffffff
+testcase-accent-level-1: #b1b3e3
 tiddler-background: <<colour background>>
 tiddler-border: <<colour background>>
 tiddler-controls-foreground-hover: #888888

package/core/palettes/ContrastDark.tid

@@ -5,11 +5,11 @@ description: High contrast and unambiguous (dark version)
 tags: $:/tags/Palette
 type: application/x-tiddler-dictionary
 
-alert-background: #f00
+alert-background: #ff0000
 alert-border: <<colour background>>
 alert-highlight: <<colour foreground>>
-alert-muted-foreground: #800
-background: #000
+alert-muted-foreground: #880000
+background: #000000
 blockquote-bar: <<colour muted-foreground>>
 button-background: <<colour background>>
 button-foreground: <<colour foreground>>
@@ -17,24 +17,24 @@ button-border: <<colour foreground>>
 code-background: <<colour background>>
 code-border: <<colour foreground>>
 code-foreground: <<colour foreground>>
-dirty-indicator: #f00
-download-background: #080
+dirty-indicator: #ff0000
+download-background: #48ff48
 download-foreground: <<colour background>>
 dragger-background: <<colour foreground>>
 dragger-foreground: <<colour background>>
 dropdown-background: <<colour background>>
 dropdown-border: <<colour muted-foreground>>
-dropdown-tab-background-selected: <<colour foreground>>
-dropdown-tab-background: <<colour foreground>>
-dropzone-background: rgba(0,200,0,0.7)
+dropdown-tab-background-selected: #868686
+dropdown-tab-background: #515151
+dropzone-background: #1aff1a
 external-link-background-hover: inherit
 external-link-background-visited: inherit
 external-link-background: inherit
 external-link-foreground-hover: inherit
-external-link-foreground-visited: #00a
-external-link-foreground: #00e
+external-link-foreground-visited: #5353ff
+external-link-foreground: #9595ff
 footnote-target-background: #4c4c4c
-foreground: #fff
+foreground: #ffffff
 highlight-background: #ffff00
 highlight-foreground: #000000
 message-background: <<colour foreground>>
@@ -52,11 +52,11 @@ notification-border: <<colour foreground>>
 page-background: <<colour background>>
 pre-background: <<colour background>>
 pre-border: <<colour foreground>>
-primary: #00f
+primary: #8a8aff
 select-tag-background:
 select-tag-foreground:
 sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: <<colour background>>
+sidebar-controls-foreground-hover: #ffff00
 sidebar-controls-foreground: <<colour foreground>>
 sidebar-foreground-shadow: rgba(0,0,0, 0)
 sidebar-foreground: <<colour foreground>>
@@ -72,6 +72,10 @@ sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: <<colour foreground>>
 sidebar-tiddler-link-foreground: <<colour primary>>
 site-title-foreground: <<colour tiddler-title-foreground>>
+stability-stable: #00f400
+stability-experimental: #ffaf1c
+stability-deprecated: #ff2b2b
+stability-legacy: #ceceff
 static-alert-foreground: #aaaaaa
 tab-background-selected: <<colour background>>
 tab-background: <<colour foreground>>
@@ -81,14 +85,15 @@ tab-divider: <<colour foreground>>
 tab-foreground-selected: <<colour foreground>>
 tab-foreground: <<colour background>>
 table-border: #dddddd
-table-footer-background: #a8a8a8
-table-header-background: #f0f0f0
-tag-background: #fff
-tag-foreground: #000
+table-footer-background: #444444
+table-header-background: #444444
+tag-background: #ffffff
+tag-foreground: #000000
+testcase-accent-level-1: #144a8c
 tiddler-background: <<colour background>>
 tiddler-border: <<colour foreground>>
 tiddler-controls-foreground-hover: #ddd
-tiddler-controls-foreground-selected: #fdd
+tiddler-controls-foreground-selected: #ae0000
 tiddler-controls-foreground: <<colour foreground>>
 tiddler-editor-background: <<colour background>>
 tiddler-editor-border-image: <<colour foreground>>
@@ -102,14 +107,15 @@ tiddler-link-background: <<colour background>>
 tiddler-link-foreground: <<colour primary>>
 tiddler-subtitle-foreground: <<colour foreground>>
 tiddler-title-foreground: <<colour foreground>>
-toolbar-new-button: 
-toolbar-options-button: 
-toolbar-save-button: 
-toolbar-info-button: 
-toolbar-edit-button: 
-toolbar-close-button: 
-toolbar-delete-button: 
-toolbar-cancel-button: 
-toolbar-done-button: 
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button:
+toolbar-cancel-button:
+toolbar-done-button:
 untagged-background: <<colour foreground>>
 very-muted-foreground: #888888
+network-activity-foreground: <<colour primary>>

package/core/palettes/ContrastLight.tid

@@ -5,7 +5,7 @@ description: High contrast and unambiguous (light version)
 tags: $:/tags/Palette
 type: application/x-tiddler-dictionary
 
-alert-background: #f00
+alert-background: #ff4a4a
 alert-border: <<colour background>>
 alert-highlight: <<colour foreground>>
 alert-muted-foreground: #800
@@ -18,13 +18,13 @@ code-background: <<colour background>>
 code-border: <<colour foreground>>
 code-foreground: <<colour foreground>>
 dirty-indicator: #f00
-download-background: #080
+download-background: #008200
 download-foreground: <<colour background>>
 dragger-background: <<colour foreground>>
 dragger-foreground: <<colour background>>
 dropdown-background: <<colour background>>
 dropdown-border: <<colour muted-foreground>>
-dropdown-tab-background-selected: <<colour foreground>>
+dropdown-tab-background-selected: <<colour background>>
 dropdown-tab-background: <<colour foreground>>
 dropzone-background: rgba(0,200,0,0.7)
 external-link-background-hover: inherit
@@ -52,13 +52,13 @@ notification-border: <<colour foreground>>
 page-background: <<colour background>>
 pre-background: <<colour background>>
 pre-border: <<colour foreground>>
-primary: #00f
+primary: #0000ff
 select-tag-background:
 select-tag-foreground:
 sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: <<colour background>>
+sidebar-controls-foreground-hover: #606060
 sidebar-controls-foreground: <<colour foreground>>
-sidebar-foreground-shadow: rgba(0,0,0, 0)
+sidebar-foreground-shadow: #000000
 sidebar-foreground: <<colour foreground>>
 sidebar-muted-foreground-hover: #444444
 sidebar-muted-foreground: <<colour foreground>>
@@ -72,6 +72,10 @@ sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: <<colour foreground>>
 sidebar-tiddler-link-foreground: <<colour primary>>
 site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #ff0000
+stability-experimental: #b37400
+stability-legacy: #000075
+stability-stable: #008000
 static-alert-foreground: #aaaaaa
 tab-background-selected: <<colour background>>
 tab-background: <<colour foreground>>
@@ -88,7 +92,7 @@ tag-foreground: #fff
 tiddler-background: <<colour background>>
 tiddler-border: <<colour foreground>>
 tiddler-controls-foreground-hover: #ddd
-tiddler-controls-foreground-selected: #fdd
+tiddler-controls-foreground-selected: #c5abf3
 tiddler-controls-foreground: <<colour foreground>>
 tiddler-editor-background: <<colour background>>
 tiddler-editor-border-image: <<colour foreground>>
@@ -113,3 +117,4 @@ toolbar-cancel-button:
 toolbar-done-button: 
 untagged-background: <<colour foreground>>
 very-muted-foreground: #888888
+network-activity-foreground: <<colour primary>>