List widget should search recursively for list-template and list-empty

core/modules/widgets/list.js

@@ -69,15 +69,7 @@ ListWidget.prototype.execute = function() {
 	this.storyViewName = this.getAttribute("storyview");
 	this.historyTitle = this.getAttribute("history");
 	// Look for <$list-template> and <$list-empty> widgets as immediate child widgets
-	this.explicitListTemplate = null;
-	this.explicitEmptyTemplate = null;
-	$tw.utils.each(this.parseTreeNode.children,function(node) {
-		if(node.type === "list-template") {
-			self.explicitListTemplate = node.children;
-		} else if(node.type === "list-empty") {
-			self.explicitEmptyTemplate = node.children;
-		}
-	});
+	this.findExplicitTemplates();
 	// Compose the list elements
 	this.list = this.getTiddlerList();
 	var members = [],
@@ -96,6 +88,24 @@ ListWidget.prototype.execute = function() {
 	this.history = [];
 };
 
+ListWidget.prototype.findExplicitTemplates = function() {
+	var self = this;
+	this.explicitListTemplate = null;
+	this.explicitEmptyTemplate = null;
+	var searchChildren = function(childNodes) {
+		$tw.utils.each(childNodes,function(node) {
+			if(node.type === "list-template") {
+				self.explicitListTemplate = node.children;
+			} else if(node.type === "list-empty") {
+				self.explicitEmptyTemplate = node.children;
+			} else if(node.type === "element" && node.tag === "p") {
+				searchChildren(node.children);
+			}
+		});
+	};
+	searchChildren(this.parseTreeNode.children);
+}
+
 ListWidget.prototype.getTiddlerList = function() {
 	var limit = $tw.utils.getInt(this.getAttribute("limit",""),undefined);
 	var defaultFilter = "[!is[system]sort[title]]";

editions/test/tiddlers/tests/data/list-widget/WithExplicitTemplatesInBlockMode.tid

@@ -0,0 +1,32 @@
+title: ListWidget/WithExplicitTemplatesInBlockMode
+description: List widget with explicit templates in block mode
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
++
+title: Output
+
+\whitespace trim
+
+\procedure test(filter)
+<$list filter=<<filter>>>
+
+	<$list-template>
+		<$text text=<<currentTiddler>>/>
+	</$list-template>
+
+	<$list-empty>
+		None!
+	</$list-empty>
+
+</$list>
+\end
+
+<<test "1 2 3">>
+
+<<test "">>
+
++
+title: ExpectedResult
+
+123None!