Merge branch 'master' into colour-improvements

core/modules/filters/function.js

@@ -17,19 +17,24 @@ Export our filter function
 */
 exports.function = function(source,operator,options) {
 	var functionName = operator.operands[0],
-		params = [];
+		params = [],
+		results;
 	$tw.utils.each(operator.operands.slice(1),function(param) {
 		params.push({value: param});
 	});
+	// console.log(`Calling ${functionName} with params ${JSON.stringify(params)}`);
 	var variableInfo = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(functionName,{params: params, source: source});
 	if(variableInfo && variableInfo.srcVariable && variableInfo.srcVariable.isFunctionDefinition) {
-		return variableInfo.resultList ? variableInfo.resultList : [variableInfo.text];
+		results = variableInfo.resultList ? variableInfo.resultList : [variableInfo.text];
 	}
 	// Return the input list if the function wasn't found
-	var results = [];
-	source(function(tiddler,title) {
-		results.push(title);
-	});
+	if(!results) {
+		results = [];
+		source(function(tiddler,title) {
+			results.push(title);
+		});	
+	}
+	// console.log(`function ${functionName} with params ${JSON.stringify(params)} results: ${JSON.stringify(results)}`);
 	return results;
 };
 

core/modules/startup/rootwidget.js

@@ -79,7 +79,7 @@ exports.startup = function() {
 			successNotification: event.paramObject && event.paramObject.successNotification,
 			failureNotification: event.paramObject && event.paramObject.failureNotification,
 			plainText: event.paramObject && event.paramObject.plainText
-		},event.paramObject.type);
+		},event.paramObject && event.paramObject.type);
 	});
 	// Install the tm-focus-selector message
 	$tw.rootWidget.addEventListener("tm-focus-selector",function(event) {

core/modules/utils/dom/http.js

@@ -216,11 +216,11 @@ HttpClientRequest.prototype.send = function(callback) {
 				if(lengthComputable) {
 					setBinding(self.bindProgress,"" + Math.floor((loaded/total) * 100))
 				}
-				self.wiki.invokeActionString(self.progressActions,undefined,{
+				self.wiki.invokeActionString(self.progressActions,undefined,$tw.utils.extend({},self.variables,{
 					lengthComputable: lengthComputable ? "yes" : "no",
 					loaded: loaded,
 					total: total
-				},{parentWidget: $tw.rootWidget});
+				}),{parentWidget: $tw.rootWidget});
 			}
 		});
 	}

core/palettes/FlexokiDark.tid

@@ -78,13 +78,13 @@ code-background: <<colour background>>
 code-border: <<colour flexoki-tx>>
 code-foreground: <<colour flexoki-tx>>
 diff-delete-background: <<colour flexoki-re>>
-diff-delete-foreground: <<colour flexoki-paper>>
+diff-delete-foreground: <<colour flexoki-bg-2>>
 diff-equal-background: 
 diff-equal-foreground: inherit
 diff-insert-background: <<colour flexoki-gr>>
-diff-insert-foreground: <<colour flexoki-paper>>
+diff-insert-foreground: <<colour flexoki-bg-2>>
 diff-invisible-background: <<colour flexoki-ye>>
-diff-invisible-foreground: <<colour flexoki-paper>>
+diff-invisible-foreground: <<colour flexoki-bg-2>>
 dirty-indicator: <<colour flexoki-re>>
 download-background: <<colour flexoki-cy-2>>
 download-foreground: <<colour background>>
@@ -103,8 +103,8 @@ external-link-foreground-visited: <<colour flexoki-bl>>
 external-link-foreground: <<colour flexoki-bl>>
 footnote-target-background: <<colour flexoki-bg-2>>
 foreground: #CECDC3
-highlight-background: <<colour flexoki-cyan-950>>
-highlight-foreground: <<colour flexoki-cyan-400>>
+highlight-background: <<colour flexoki-yellow-900>>
+highlight-foreground: inherit
 menubar-background: <<colour primary>>
 menubar-foreground: <<colour flexoki-paper>>
 message-background: <<colour background>>

core/palettes/FlexokiLight.tid

@@ -105,7 +105,7 @@ external-link-foreground-visited: <<colour flexoki-bl>>
 external-link-foreground: <<colour flexoki-bl>>
 footnote-target-background: <<colour flexoki-bg-2>>
 foreground: #100F0F
-highlight-background: <<colour flexoki-cyan-050>>
+highlight-background: <<colour flexoki-yellow-100>>
 highlight-foreground: inherit
 menubar-background: <<colour primary>>
 menubar-foreground: <<colour flexoki-paper>>

plugins/tiddlywiki/consent-banner/banner.tid

@@ -3,6 +3,8 @@ tags: $:/tags/PageTemplate
 
 \whitespace trim
 
+<%if [<tv-config-static>!match[yes]] %>
+
 <$reveal state="$:/state/consent-banner/accepted" type="match" text="" tag="div">
 
 <div class="tc-consent-backdrop">
@@ -26,3 +28,5 @@ tags: $:/tags/PageTemplate
 </div>
 
 </$reveal>
+
+<%endif%>