tiddlywiki 5.3.6 → 5.3.7

package/editions/test/tiddlers/tests/test-checkbox-widget.js

@@ -6,7 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests the checkbox widget thoroughly.
 
 \*/
-(function(){
+
 
     /*jslint node: true, browser: true */
     /*global $tw: false */
@@ -78,6 +78,13 @@ Tests the checkbox widget thoroughly.
                 startsOutChecked: false,
                 expectedChange: { "TiddlerOne": { expand: "yes" } }
             },
+            {
+                testName: "field mode default when missing -> true",
+                tiddlers: [],
+                widgetText: "<$checkbox tiddler='TiddlerOne' field='expand' default='yes' checked='yes' unchecked='no' />",
+                startsOutChecked: true,
+                expectedChange: { "TiddlerOne": { expand: "no" } }
+            },
             {
                 testName: "field mode indeterminate -> true",
                 tiddlers: [{title: "TiddlerOne", text: "Jolly Old World", expand: "some other value"}],
@@ -98,19 +105,28 @@ Tests the checkbox widget thoroughly.
         var indexModeTests = fieldModeTests.map(data => {
             var newData = {...data};
             var newName = data.testName.replace('field mode', 'index mode');
+            var tiddlerOneAlreadyExists = false;
             var newTiddlers = data.tiddlers.map(tiddler => {
+                if(tiddler.title === "TiddlerOne") {
+                    tiddlerOneAlreadyExists = true;
+                }
                 return {title: tiddler.title, type: "application/x-tiddler-dictionary", text: `one: a\nexpand: ${tiddler.expand}\ntwo: b`}
             });
             var newWidgetText = data.widgetText.replace("field='expand'", "index='expand'");
             var newChange = {};
             for (var key of Object.keys(data.expectedChange)) {
                 var oldChange = data.expectedChange[key];
-                if (oldChange.expand) {
-                    newChange[key] = { text: `one: a\nexpand: ${oldChange.expand}\ntwo: b` }
+                var text;
+                if (!tiddlerOneAlreadyExists) {
+                    // If it wasn't there, the created one will be JSON
+                    text = `{\n    "expand": "${oldChange.expand}"\n}`;
+                } else if (oldChange.expand) {
+                    text = `one: a\nexpand: ${oldChange.expand}\ntwo: b`;
                 } else {
                     // In index tiddlers, the "expand" field gets completely removed, not turned into "expand: (undefined)"
-                    newChange[key] = { text: `one: a\ntwo: b` }
+                    text = `one: a\ntwo: b`;
                 }
+                newChange[key] = { text: text };
             }
             newData.testName = newName;
             newData.tiddlers = newTiddlers;
@@ -514,7 +530,9 @@ Tests the checkbox widget thoroughly.
         /*
          * Checkbox widget tests using the test data above
          */
-        for (var data of checkboxTestData) {
+        // MAKE SURE TO USE $tw.utils.each HERE!!!
+        // If you use a forloop, the closure of the tests will all use the last value "data" was assigned to, and thus all run the same test.
+        $tw.utils.each(checkboxTestData, function(data) {
             it('checkbox widget test: ' + data.testName, function() {
                 // Setup
     
@@ -553,9 +571,8 @@ Tests the checkbox widget thoroughly.
                     }
                 }
             })
-        }
+        });
     
     });
     
-})();
     

package/editions/test/tiddlers/tests/test-compare-filter.js

@@ -6,7 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests the compare filter.
 
 \*/
-(function(){
+
 
 /* jslint node: true, browser: true */
 /* eslint-env node, browser, jasmine */
@@ -81,4 +81,3 @@ describe("'compare' filter tests", function() {
 
 });
 
-})();

package/editions/test/tiddlers/tests/test-deserialize-operator.js

@@ -6,7 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests deserialize[] filter operator with various core deserializers
 
 \*/
-(function(){
+
 
 	/* jslint node: true, browser: true */
 	/* eslint-env node, browser, jasmine */
@@ -37,8 +37,4 @@ Tests deserialize[] filter operator with various core deserializers
 		});
 	});
 	
-})();
-
-
 
- 

package/editions/test/tiddlers/tests/test-deserializers.js

@@ -6,7 +6,6 @@ tags: [[$:/tags/test-spec]]
 Tests various core deserializers
 
 \*/
-(function(){
 
 	/* jslint node: true, browser: true */
 	/* eslint-env node, browser, jasmine */
@@ -34,6 +33,3 @@ Tests various core deserializers
 		executeTestCase("dezerializer test data case 5",[ { title: 'Hello "There"', text: 'Abacus', type: 'text/vnd.tiddlywiki' }, { title: 'Hello "There"', text: 'Calculator'} , { title: 'Hello "There"', text: 'Protractor'}  ]);
 		
 	});
-	
-	})();
-	

package/editions/test/tiddlers/tests/test-fakedom.js

@@ -6,10 +6,6 @@ tags: [[$:/tags/test-spec]]
 Tests the fakedom that Tiddlywiki occasionally uses.
 
 \*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 describe("fakedom tests", function() {
@@ -23,5 +19,3 @@ describe("fakedom tests", function() {
 		expect($tw.fakeDocument.createTextNode("text").TEXT_NODE).toBe(3);
 	});
 });
-
-})();

package/editions/test/tiddlers/tests/test-filters.js

@@ -6,12 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests the filtering mechanism.
 
 \*/
-(function(){
 
-	/* jslint node: true, browser: true */
-	/* eslint-env node, browser, jasmine */
-	/* eslint no-mixed-spaces-and-tabs: ["error", "smart-tabs"]*/
-	/* global $tw, require */
 	"use strict";
 	
 	describe("Filter tests", function() {
@@ -1134,9 +1129,26 @@ Tests the filtering mechanism.
 			expect(wiki.filterTiddlers("[[<>:\"/\\|?*]encodeuricomponent[]]").join(",")).toBe("%3C%3E%3A%22%2F%5C%7C%3F%2A");
 		});
 	
+		it("should handle the moduleproperty operator", function() {
+			// We don't need to confirm them all, only it it finds at least one module name that we're sure is there.
+			expect(wiki.filterTiddlers("[[macro]modules[]moduleproperty[name]]")).toContain("qualify");
+			// No such property. Nothing to return.
+			expect(wiki.filterTiddlers("[[macro]modules[]moduleproperty[nonexistent]]").length).toBe(0);
+			// No such tiddlers. Nothing to return.
+			expect(wiki.filterTiddlers("[[nonexistent]moduleproperty[name]]").length).toBe(0);
+			// Non string properties should get toStringed.
+			expect(wiki.filterTiddlers("[[$:/core/modules/commands/init.js]moduleproperty[info]]").join(" ")).toBe('{"name":"init","synchronous":true}');
+		});
+
+		it("should minimize unnecessary variable lookup", function() {
+			var widget = wiki.makeWidget();
+			var getVar = spyOn(widget, "getVariableInfo").and.callThrough();
+			expect(wiki.filterTiddlers("[all[]prefix[anything]]", widget).length).toBe(0);
+			// We didn't use any indirect operands or variables.
+			// No variable lookup should have occurred.
+			expect(getVar).not.toHaveBeenCalled();
+		});
 	}
 	
 	});
 	
-	})();
-	

package/editions/test/tiddlers/tests/test-html-parser.js

@@ -6,10 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests for the internal components of the HTML tag parser
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 function FakeParser() {
@@ -231,5 +228,3 @@ describe("HTML tag new parser tests", function() {
 	});
 
 });
-
-})();

package/editions/test/tiddlers/tests/test-json-filters.js

@@ -6,7 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests the JSON filters and the format:json operator
 
 \*/
-(function(){
+
 
 /* jslint node: true, browser: true */
 /* eslint-env node, browser, jasmine */
@@ -151,4 +151,3 @@ describe("json filter tests", function() {
 
 });
 
-})();

package/editions/test/tiddlers/tests/test-linked-list.js

@@ -21,10 +21,7 @@ NOTE TO FURTHER LINKED LIST DEVELOPERS:
 	the end. I think you'll probably be better off preventing 'prev' from ever
 	adding undefined.
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 describe("LinkedList class tests", function() {
@@ -307,4 +304,3 @@ describe("LinkedList class tests", function() {
 	});
 });
 
-})();

package/editions/test/tiddlers/tests/test-parsetextreference.js

@@ -6,10 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests for source attribute in parser returned from wiki.parseTextReference
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 describe("Wiki.parseTextReference tests", function() {
@@ -129,4 +126,3 @@ describe("Wiki.parseTextReference tests", function() {
 
 });
 
-})();

package/editions/test/tiddlers/tests/test-plugins.js

@@ -6,10 +6,6 @@ tags: [[$:/tags/test-spec]]
 Tests for integrity of the core plugins, languages, themes and editions
 
 \*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 if($tw.node) {
@@ -50,6 +46,3 @@ if($tw.node) {
 		});
 	});
 }
-
-
-})();

package/editions/test/tiddlers/tests/test-popup.js

@@ -6,10 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests some utility function of the Popup prototype.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 describe("Popup tests", function() {
@@ -60,4 +57,3 @@ describe("Popup tests", function() {
 	});
 });
 
-})();

package/editions/test/tiddlers/tests/test-prefixes-filter.js

@@ -4,7 +4,7 @@ type: application/javascript
 tags: [[$:/tags/test-spec]]
 Tests the reduce prefix and filter.
 \*/
-(function(){
+
 
 /* jslint node: true, browser: true */
 /* eslint-env node, browser, jasmine */
@@ -459,5 +459,3 @@ describe("'reduce' and 'intersection' filter prefix tests", function() {
 		expect(wiki.filterTiddlers('[tag[shopping]] :reduce[<echo "$(accumulator)$ $(index)$ $(currentTiddler)$,">]',anchorWidget).join(",")).toBe(" 0 Brownies, 1 Chick Peas, 2 Milk, 3 Rice Pudding,");
 	});
 });
-
-})();

package/editions/test/tiddlers/tests/test-tags-operator.js

@@ -6,8 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests the tagging mechanism.
 
 \*/
-/*jslint node: true, browser: true */
-/*global $tw: false */
+
 "use strict";
 
 describe("Tags Operator tests", function() {

package/editions/test/tiddlers/tests/test-tags.js

@@ -6,10 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests the tagging mechanism.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 describe("Tag tests", function() {
@@ -179,4 +176,3 @@ function runTests(wiki,wikiOptions) {
 
 });
 
-})();

package/editions/test/tiddlers/tests/test-tiddler.js

@@ -6,10 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests the tiddler object
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 describe("Tiddler tests", function() {
@@ -134,4 +131,3 @@ describe("Tiddler tests", function() {
 
 });
 
-})();

package/editions/test/tiddlers/tests/test-utils.js

@@ -6,10 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests various utility functions.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 describe("Utility tests", function() {
@@ -210,5 +207,3 @@ describe("Utility tests", function() {
 	});
 
 });
-
-})();

package/editions/test/tiddlers/tests/test-widget-event.js

@@ -0,0 +1,219 @@
+/*\
+title: test-widget-event.js
+type: application/javascript
+tags: [[$:/tags/test-spec]]
+\*/
+
+"use strict";
+
+describe("Widget Event Listeners", function() {
+	var widget = require("$:/core/modules/widgets/widget.js");
+
+	function createWidgetNode(parseTreeNode,wiki,parentWidget) {
+		return new widget.widget(parseTreeNode,{
+			wiki: wiki,
+			document: $tw.fakeDocument,
+			parentWidget: parentWidget
+		});
+	}
+
+	it("should call all added event listeners on dispatchEvent", function() {
+		var calls = [];
+		var wiki = new $tw.Wiki();
+		var widget = createWidgetNode({type:"widget", text:"text"}, wiki);
+
+		// Add a function listener.
+		widget.addEventListener("testEvent", function(e) {
+			calls.push("funcListener");
+			return true;
+		});
+		// Setup a method on widget for string listener.
+		widget.testHandler = function(e) {
+			calls.push("methodListener");
+			return true;
+		};
+		widget.addEventListener("testEvent", "testHandler");
+
+		var event = {type:"testEvent"};
+		var result = widget.dispatchEvent(event);
+		expect(result).toBe(true);
+		expect(calls.length).toBe(2);
+		expect(calls).toContain("funcListener");
+		expect(calls).toContain("methodListener");
+	});
+
+	it("should remove an event listener correctly", function() {
+		var calls = [];
+		var wiki = new $tw.Wiki();
+		var widget = createWidgetNode({type:"widget", text:"text"}, wiki);
+
+		function listener(e) {
+			calls.push("listener");
+			return true;
+		}
+		// Add listener twice: once as function and then add another distinct listener.
+		widget.addEventListener("removeTest", listener);
+		widget.addEventListener("removeTest", function(e) {
+			calls.push("secondListener");
+			return true;
+		});
+		// Remove the function listener.
+		widget.removeEventListener("removeTest", listener);
+
+		var event = {type:"removeTest"};
+		var result = widget.dispatchEvent(event);
+		expect(result).toBe(true);
+		expect(calls.length).toBe(1);
+		expect(calls).toContain("secondListener");
+		expect(calls).not.toContain("listener");
+	});
+
+	it("stop further propagation by returns false won't block other listeners on the same level.", function() {
+		var calls = [];
+		var wiki = new $tw.Wiki();
+		var widget = createWidgetNode({type:"widget", text:"text"}, wiki);
+
+		widget.addEventListener("stopEvent", function(e) {
+			calls.push("first");
+			// stops further propagation, but still dispatch event for second listener.
+			return false;
+		});
+		widget.addEventListener("stopEvent", function(e) {
+			calls.push("second");
+			return true;
+		});
+		var event = {type:"stopEvent"};
+		var result = widget.dispatchEvent(event);
+		expect(result).toBe(false);
+		expect(calls.length).toBe(2);
+		expect(calls).toContain("first");
+		expect(calls).toContain("second");
+	});
+
+	it("should dispatch event to parent widget if not handled on child", function() {
+		var parentCalls = [];
+		var wiki = new $tw.Wiki();
+		var parentWidget = createWidgetNode({type:"widget", text:"text"}, wiki);
+		parentWidget.addEventListener("parentEvent", function(e) {
+			parentCalls.push("parentListener");
+			return true;
+		});
+		// Create a child with parentWidget assigned.
+		var childWidget = createWidgetNode({type:"widget", text:"text"}, wiki, parentWidget);
+		// No listener on child; so dispatch should bubble up.
+		var event = {type:"parentEvent"};
+		var result = childWidget.dispatchEvent(event);
+		expect(result).toBe(true);
+		expect(parentCalls.length).toBe(1);
+		expect(parentCalls).toContain("parentListener");
+	});
+
+	it("should not dispatch event to parent if child's listener stops propagation", function() {
+		var parentCalls = [];
+		var wiki = new $tw.Wiki();
+		var parentWidget = createWidgetNode({type:"widget", text:"text"}, wiki);
+		parentWidget.addEventListener("bubbleTest", function(e) {
+			parentCalls.push("parentListener");
+			return true;
+		});
+		var childWidget = createWidgetNode({type:"widget", text:"text"}, wiki, parentWidget);
+		childWidget.addEventListener("bubbleTest", function(e) {
+			return false; // Stop event propagation
+		});
+		var event = {type:"bubbleTest"};
+		var result = childWidget.dispatchEvent(event);
+		expect(result).toBe(false);
+		expect(parentCalls.length).toBe(0);
+	});
+
+	it("should call multiple listeners in proper order across child and parent", function() {
+		var calls = [];
+		var wiki = new $tw.Wiki();
+		var parentWidget = createWidgetNode({type:"widget", text:"text"}, wiki);
+		parentWidget.addEventListener("chainEvent", function(e) {
+			calls.push("parentListener");
+			return true;
+		});
+		var childWidget = createWidgetNode({type:"widget", text:"text"}, wiki, parentWidget);
+		childWidget.addEventListener("chainEvent", function(e) {
+			calls.push("childListener");
+			return true;
+		});
+		var event = {type:"chainEvent"};
+		var result = childWidget.dispatchEvent(event);
+		expect(result).toBe(true);
+		expect(calls.length).toBe(2);
+		// First call from child widget and then parent's listener.
+		expect(calls[0]).toBe("childListener");
+		expect(calls[1]).toBe("parentListener");
+	});
+
+	// Additional tests for multiple event types
+	it("should handle events of different types separately", function() {
+		var callsA = [];
+		var callsB = [];
+		var wiki = new $tw.Wiki();
+		var widget = createWidgetNode({type:"widget", text:"text"}, wiki);
+		widget.addEventListener("eventA", function(e) {
+			callsA.push("A1");
+			return true;
+		});
+		widget.addEventListener("eventB", function(e) {
+			callsB.push("B1");
+			return true;
+		});
+		widget.dispatchEvent({type:"eventA"});
+		widget.dispatchEvent({type:"eventB"});
+		expect(callsA).toContain("A1");
+		expect(callsB).toContain("B1");
+	});
+
+	// Test using $tw.utils.each in removeEventListener internally (behavior verified via dispatch)
+	it("should remove listeners using $tw.utils.each without affecting other listeners", function() {
+		var calls = [];
+		var wiki = new $tw.Wiki();
+		var widget = createWidgetNode({type:"widget", text:"text"}, wiki);
+		function listener1(e) {
+			calls.push("listener1");
+			return true;
+		}
+		function listener2(e) {
+			calls.push("listener2");
+			return true;
+		}
+		widget.addEventListener("testRemove", listener1);
+		widget.addEventListener("testRemove", listener2);
+		widget.removeEventListener("testRemove", listener1);
+		widget.dispatchEvent({type:"testRemove"});
+		expect(calls.length).toBe(1);
+		expect(calls).toContain("listener2");
+		expect(calls).not.toContain("listener1");
+	});
+
+	it("should prevent adding the same event listener multiple times", function() {
+		var calls = 0;
+		var wiki = new $tw.Wiki();
+		var widget = createWidgetNode({type:"widget", text:"text"}, wiki);
+		
+		function listener(e) {
+			calls++;
+			return true;
+		}
+		
+		// Add the same listener multiple times
+		widget.addEventListener("testEvent", listener);
+		widget.addEventListener("testEvent", listener);
+		widget.addEventListener("testEvent", listener);
+		
+		// Dispatch the event
+		var event = {type:"testEvent"};
+		widget.dispatchEvent(event);
+		
+		// The listener should only be called once
+		expect(calls).toBe(1);
+		
+		// Check the internal structure of eventListeners array
+		expect(widget.eventListeners["testEvent"].length).toBe(1);
+	});
+
+});

package/editions/test/tiddlers/tests/test-widget-getVariableInfo.js

@@ -6,10 +6,6 @@ tags: [[$:/tags/test-spec]]
 Tests the wikitext rendering pipeline end-to-end. We also need tests that individually test parsers, rendertreenodes etc., but this gets us started.
 
 \*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 describe("Widget module", function() {
@@ -92,4 +88,3 @@ describe("Widget module", function() {
 
 });
 
-})();

package/editions/test/tiddlers/tests/test-widget.js

@@ -6,10 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests the wikitext rendering pipeline end-to-end. We also need tests that individually test parsers, rendertreenodes etc., but this gets us started.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 describe("Widget module", function() {
@@ -945,4 +942,3 @@ describe("Widget module", function() {
 	});
 });
 
-})();