Merge branch 'master' into confetti-plugin

editions/tw5.com/tiddlers/community/editions/TiddlyMemo by oflg.tid

@@ -1,16 +0,0 @@
-created: 20220417010615742
-modified: 20220417011547812
-tags: [[Community Plugins]] [[Community Editions]] Resources
-title: TiddlyMemo by oflg
-type: text/vnd.tiddlywiki
-url: https://tiddlymemo.org/
-
-Lifelong knowledge, deep in the Sea of Mind.
-
-{{!!url}}
-
-~TiddlyMemo uses advanced [[Incremental Learning|https://help.supermemo.org/wiki/Incremental_learning]] concepts to make it your powerful second brain for acquiring lifelong knowledge.
-
-* [[Read Articles|https://tiddlymemo.org/#Read%20Articles]] like ~SuperMemo
-* [[Learn languages|https://tiddlymemo.org/#Learn%20languages]] like ~LingQ
-* [[Memory Notes|https://tiddlymemo.org/#Memory%20Notes]] like Anki

editions/tw5.com/tiddlers/community/editions/Tidme by oflg.tid

@@ -0,0 +1,16 @@
+created: 20220417010615742
+modified: 20231005060241771
+tags: [[Community Editions]]
+title: Tidme by oflg
+type: text/vnd.tiddlywiki
+url: https://github.com/oflg/Tidme
+
+Lifelong knowledge, deep in Mind.
+
+{{!!url}}
+
+Tidme uses advanced [[Incremental Learning|https://help.supermemo.org/wiki/Incremental_learning]] concepts to make it your powerful second brain for acquiring lifelong knowledge.
+
+* Read Articles like SuperMemo
+* Learn languages like LingQ
+* Memory Notes like Anki

editions/tw5.com/tiddlers/community/plugins/FSRS4TW by oflg.tid

@@ -0,0 +1,10 @@
+created: 20220417010615742
+modified: 20231005060241771
+tags: [[Community Plugins]]
+title: Free Spaced Repetition Scheduler for TiddlyWiki by oflg
+type: text/vnd.tiddlywiki
+url: https://github.com/open-spaced-repetition/fsrs4tw
+
+TiddlyWiki-based memory programme using advanced FSRS algorithm
+
+{{!!url}}

package.json

@@ -32,6 +32,9 @@
     "node": ">=0.8.2"
   },
   "scripts": {
+    "dev": "node ./tiddlywiki.js ./editions/tw5.com-server --listen",
+    "test": "node ./tiddlywiki.js ./editions/test --verbose --version --build index",
+    "lint:fix": "eslint . --fix",
     "lint": "eslint ."
   }
 }

plugins/tiddlywiki/dynannotate/docs/readme.tid

@@ -24,6 +24,7 @@ The `<$dynannotate>` widget uses the selection tracker to support a popup that d
 |filter |Filter identifying the annotation tiddlers applying to this content (see below) |
 |actions |Action string to be executed when an annotation is clicked. The variable `annotationTiddler` contains the title of the tiddler corresponding to the annotation that was clicked, and the variable `modifierKey` contains "ctrl", "shift", "ctrl-shift", "normal" according to which modifier keys were pressed |
 |popup |Popup state tiddler to be used to trigger a popup when an annotation is clicked |
+|floating |Setting to `yes` makes the popup need to be closed explicitly. |
 |search |Search text to be highlighted within the widget |
 |searchDisplay |"overlay" or "snippet" (see below) |
 |searchMode |"literal" (default), "regexp", "whitespace", "words" or "some" (see below) |

plugins/tiddlywiki/dynannotate/modules/dynannotate.js

@@ -65,7 +65,7 @@ DynannotateWidget.prototype.render = function(parent,nextSibling) {
 	this.domNodes.push(this.domWrapper);
 	// Apply the selection tracker data to the DOM
 	if(!isSnippetMode) {
-		this.applySelectionTrackerData();		
+		this.applySelectionTrackerData();
 	}
 	// Render our child widgets
 	this.renderChildren(this.domContent,null);
@@ -79,7 +79,7 @@ DynannotateWidget.prototype.render = function(parent,nextSibling) {
 			// Apply annotations
 			this.applyAnnotations();
 			// Apply search overlays
-			this.applySearch();		
+			this.applySearch();
 		}
 	}
 	// Save the width of the wrapper so that we can tell when it changes
@@ -205,10 +205,11 @@ DynannotateWidget.prototype.applyAnnotations = function() {
 			if(self.hasAttribute("popup")) {
 				$tw.popup.triggerPopup({
 					domNode: domOverlay,
-					title: self.getAttribute("popup"),
+                    title: self.getAttribute("popup"),
+                    floating: self.getAttribute("floating"),
 					wiki: self.wiki
 				});
-			}			
+			}
 		};
 	};
 	// Draw the overlay for the "target" attribute
@@ -224,7 +225,7 @@ DynannotateWidget.prototype.applyAnnotations = function() {
 				className: "tc-dynannotation-annotation-overlay",
 				onclick: clickHandlerFn(null)
 			});
-		}		
+		}
 	}
 	// Draw the overlays for each annotation tiddler
 	$tw.utils.each(this.annotationTiddlers,function(title) {
@@ -361,7 +362,7 @@ DynannotateWidget.prototype.applySnippets = function() {
 			if(!merged) {
 				container = null;
 			}
-		});		
+		});
 	}
 };
 
@@ -382,7 +383,7 @@ DynannotateWidget.prototype.refresh = function(changedTiddlers) {
 	var childrenDidRefresh = this.refreshChildren(changedTiddlers);
 	// Reapply the selection tracker data to the DOM
 	if(changedAttributes.selection || changedAttributes.selectionPrefix || changedAttributes.selectionSuffix || changedAttributes.selectionPopup) {
-		this.applySelectionTrackerData();		
+		this.applySelectionTrackerData();
 	}
 	// Reapply the annotations if the children refreshed or the main wrapper resized
 	var wrapperWidth = this.domWrapper.offsetWidth,
@@ -390,14 +391,14 @@ DynannotateWidget.prototype.refresh = function(changedTiddlers) {
 		oldAnnotationTiddlers = this.annotationTiddlers;
 	this.getAnnotationTiddlers();
 	if(!isSnippetMode && (
-		childrenDidRefresh || 
-		hasResized || 
-		changedAttributes.target || 
-		changedAttributes.targetPrefix || 
-		changedAttributes.targetSuffix || 
-		changedAttributes.filter || 
-		changedAttributes.actions || 
-		changedAttributes.popup || 
+		childrenDidRefresh ||
+		hasResized ||
+		changedAttributes.target ||
+		changedAttributes.targetPrefix ||
+		changedAttributes.targetSuffix ||
+		changedAttributes.filter ||
+		changedAttributes.actions ||
+		changedAttributes.popup ||
 		!$tw.utils.isArrayEqual(oldAnnotationTiddlers,this.annotationTiddlers) ||
 		this.annotationTiddlers.find(function(title) {
 			return changedTiddlers[title];
@@ -406,23 +407,23 @@ DynannotateWidget.prototype.refresh = function(changedTiddlers) {
 		this.applyAnnotations();
 	}
 	if(!isSnippetMode && (
-		childrenDidRefresh || 
-		hasResized || 
-		changedAttributes.search || 
-		changedAttributes.searchMinLength || 
-		changedAttributes.searchClass || 
-		changedAttributes.searchMode || 
+		childrenDidRefresh ||
+		hasResized ||
+		changedAttributes.search ||
+		changedAttributes.searchMinLength ||
+		changedAttributes.searchClass ||
+		changedAttributes.searchMode ||
 		changedAttributes.searchCaseSensitive
 	)) {
 		this.applySearch();
 	}
 	if(isSnippetMode && (
-		childrenDidRefresh || 
-		hasResized || 
-		changedAttributes.search || 
-		changedAttributes.searchMinLength || 
-		changedAttributes.searchClass || 
-		changedAttributes.searchMode || 
+		childrenDidRefresh ||
+		hasResized ||
+		changedAttributes.search ||
+		changedAttributes.searchMinLength ||
+		changedAttributes.searchClass ||
+		changedAttributes.searchMode ||
 		changedAttributes.searchCaseSensitive
 	)) {
 		this.applySnippets();