From b9d27e9fd5f5420dac375762670182275f33e0aa Mon Sep 17 00:00:00 2001
From: "jeremy@jermolene.com" <jeremy@jermolene.com>
Date: Sat, 22 Oct 2022 13:22:15 +0100
Subject: [PATCH] Revert "Fix popup position if popup is triggered from within
 an offsetParent element (#6887)"

This reverts commit 5b85786f737c94ee102490c68c22a563e418dd07.
---
 core/modules/utils/dom/dom.js                 | 17 +----
 core/modules/utils/dom/popup.js               | 69 ++----------------
 core/modules/widgets/action-popup.js          | 16 ++---
 core/modules/widgets/button.js                |  5 +-
 core/modules/widgets/reveal.js                | 19 ++---
 editions/test/tiddlers/tests/test-popup.js    | 71 -------------------
 .../tiddlers/concepts/CoordinateSystems.tid   | 42 -----------
 .../tiddlers/mechanisms/PopupMechanism.tid    |  1 -
 .../tiddlers/widgets/ActionPopupWidget.tid    |  7 +-
 .../tw5.com/tiddlers/widgets/ButtonWidget.tid |  3 +-
 .../tiddlers/widgets/DraggableWidget.tid      |  3 +-
 .../tiddlers/widgets/EventCatcherWidget.tid   |  7 +-
 .../dynannotate/modules/dynannotate.js        |  2 +-
 13 files changed, 34 insertions(+), 228 deletions(-)
 delete mode 100644 editions/test/tiddlers/tests/test-popup.js
 delete mode 100644 editions/tw5.com/tiddlers/concepts/CoordinateSystems.tid

diff --git a/core/modules/utils/dom/dom.js b/core/modules/utils/dom/dom.js
index 84bbb1068..330d184cc 100644
--- a/core/modules/utils/dom/dom.js
+++ b/core/modules/utils/dom/dom.js
@@ -294,21 +294,8 @@ exports.collectDOMVariables = function(selectedNode,domNode,event) {
 		});
 		
 		if(selectedNode.offsetLeft) {
-			// Add variables with a (relative and absolute) popup coordinate string for the selected node
-			var nodeRect = {
-				left: selectedNode.offsetLeft,
-				top: selectedNode.offsetTop,
-				width: selectedNode.offsetWidth,
-				height: selectedNode.offsetHeight
-			};
-			variables["tv-popup-coords"] = $tw.popup.buildCoordinates($tw.popup.coordinatePrefix.csOffsetParent,nodeRect);
-
-			var absRect = $tw.utils.extend({}, nodeRect);
-			for (var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) {
-				absRect.left += currentNode.offsetLeft;
-				absRect.top += currentNode.offsetTop;
-			}
-			variables["tv-popup-abs-coords"] = $tw.popup.buildCoordinates($tw.popup.coordinatePrefix.csAbsolute,absRect);
+			// Add a variable with a popup coordinate string for the selected node
+			variables["tv-popup-coords"] = "(" + selectedNode.offsetLeft + "," + selectedNode.offsetTop +"," + selectedNode.offsetWidth + "," + selectedNode.offsetHeight + ")";
 
 			// Add variables for offset of selected node
 			variables["tv-selectednode-posx"] = selectedNode.offsetLeft.toString();
diff --git a/core/modules/utils/dom/popup.js b/core/modules/utils/dom/popup.js
index 0a898156e..5eed80c88 100644
--- a/core/modules/utils/dom/popup.js
+++ b/core/modules/utils/dom/popup.js
@@ -22,19 +22,6 @@ var Popup = function(options) {
 	this.popups = []; // Array of {title:,wiki:,domNode:} objects
 };
 
-/*
-Global regular expression for parsing the location of a popup.
-This is also used by the Reveal widget.
-*/
-Popup.popupLocationRegExp = /^(@?)\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/
-
-/*
-Objekt containing the available prefixes for coordinates build with the `buildCoordinates` function:
- - csOffsetParent: Uses a coordinate system based on the offset parent (no prefix).
- - csAbsolute: Use an absolute coordinate system (prefix "@").
-*/
-Popup.prototype.coordinatePrefix = { csOffsetParent: "", csAbsolute: "@" }
-
 /*
 Trigger a popup open or closed. Parameters are in a hashmap:
 	title: title of the tiddler where the popup details are stored
@@ -149,17 +136,8 @@ Popup.prototype.show = function(options) {
 			height: options.domNode.offsetHeight
 		};
 	}
-	if(options.absolute && options.domNode) {
-		// Walk the offsetParent chain and add the position of the offsetParents to make
-		// the position absolute to the root node of the page.
-		var currentNode = options.domNode.offsetParent;
-		while(currentNode) {
-			rect.left += currentNode.offsetLeft;
-			rect.top += currentNode.offsetTop;
-			currentNode = currentNode.offsetParent;
-		}
-	}
-	var popupRect = $tw.popup.buildCoordinates(options.absolute?$tw.popup.coordinatePrefix.csAbsolute:$tw.popup.coordinatePrefix.csOffsetParent,rect);
+	var popupRect = "(" + rect.left + "," + rect.top + "," + 
+				rect.width + "," + rect.height + ")";
 	if(options.noStateReference) {
 		options.wiki.setText(options.title,"text",undefined,popupRect);
 	} else {
@@ -197,49 +175,10 @@ Popup.prototype.cancel = function(level) {
 Returns true if the specified title and text identifies an active popup
 */
 Popup.prototype.readPopupState = function(text) {
-	return Popup.popupLocationRegExp.test(text);
+	var popupLocationRegExp = /^\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/;
+	return popupLocationRegExp.test(text);
 };
 
-/*
-Parses a coordinate string in the format `(x,y,w,h)` or `@(x,y,z,h)` and returns
-an object containing the position, width and height. The absolute-Mark is boolean
-value that indicates the coordinate system of the coordinates. If they start with
-an `@`, `absolute` is set and the coordinates are relative to the root element. If
-the initial `@` is missing, they are relative to the offset parent element and
-`absoute` is false.
-*/
-Popup.prototype.parseCoordinates = function(coordinates) {
-	var match = Popup.popupLocationRegExp.exec(coordinates);
-	if(match) {
-		return {
-			absolute: (match[1] === "@"),
-			left: parseFloat(match[2]),
-			top: parseFloat(match[3]),
-			width: parseFloat(match[4]),
-			height: parseFloat(match[5])
-		};
-	} else {
-		return false;
-	}
-}
-
-/*
-Builds a coordinate string from a coordinate system identifier and an object
-containing the left, top, width and height values.
-Use constants defined in the coordinatePrefix property to specify a coordinate
-system.
-If one of the parameters is invalid for building a coordinate string `(0,0,0,0)`
-will be returned.
-*/
-Popup.prototype.buildCoordinates = function(prefix,position) {
-	var coord = prefix + "(" + position.left + "," + position.top + "," + position.width + "," + position.height + ")";
-	if (Popup.popupLocationRegExp.test(coord)) {
-		return coord;
-	} else {
-		return "(0,0,0,0)";
-	}
-}
-
 exports.Popup = Popup;
 
 })();
diff --git a/core/modules/widgets/action-popup.js b/core/modules/widgets/action-popup.js
index 2d47540d6..2903532b6 100644
--- a/core/modules/widgets/action-popup.js
+++ b/core/modules/widgets/action-popup.js
@@ -57,20 +57,20 @@ Invoke the action associated with this widget
 */
 ActionPopupWidget.prototype.invokeAction = function(triggeringWidget,event) {
 	// Trigger the popup
-	var coordinates = $tw.popup.parseCoordinates(this.actionCoords || "");
-	if(coordinates) {
+	var popupLocationRegExp = /^\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/,
+		match = popupLocationRegExp.exec(this.actionCoords || "");
+	if(match) {
 		$tw.popup.triggerPopup({
 			domNode: null,
 			domNodeRect: {
-				left: coordinates.left,
-				top: coordinates.top,
-				width: coordinates.width,
-				height: coordinates.height
+				left: parseFloat(match[1]),
+				top: parseFloat(match[2]),
+				width: parseFloat(match[3]),
+				height: parseFloat(match[4])
 			},
 			title: this.actionState,
 			wiki: this.wiki,
-			floating: this.floating,
-			absolute: coordinates.absolute
+			floating: this.floating
 		});
 	} else {
 		$tw.popup.cancel(0);
diff --git a/core/modules/widgets/button.js b/core/modules/widgets/button.js
index f266d47bf..a32820e8b 100644
--- a/core/modules/widgets/button.js
+++ b/core/modules/widgets/button.js
@@ -173,7 +173,6 @@ ButtonWidget.prototype.triggerPopup = function(event) {
 	if(this.popupTitle) {
 		$tw.popup.triggerPopup({
 			domNode: this.domNodes[0],
-			absolute: (this.popupAbsCoords === "yes"),
 			title: this.popupTitle,
 			wiki: this.wiki,
 			noStateReference: true
@@ -181,7 +180,6 @@ ButtonWidget.prototype.triggerPopup = function(event) {
 	} else {
 		$tw.popup.triggerPopup({
 			domNode: this.domNodes[0],
-			absolute: (this.popupAbsCoords === "yes"),
 			title: this.popup,
 			wiki: this.wiki
 		});
@@ -225,7 +223,6 @@ ButtonWidget.prototype.execute = function() {
 	this.setField = this.getAttribute("setField");
 	this.setIndex = this.getAttribute("setIndex");
 	this.popupTitle = this.getAttribute("popupTitle");
-	this.popupAbsCoords = this.getAttribute("popupAbsCoords", "no");
 	this.tabIndex = this.getAttribute("tabindex");
 	this.isDisabled = this.getAttribute("disabled","no");
 	// Make child widgets
@@ -255,7 +252,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 ButtonWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.popupAbsCoords || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) {
+	if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) {
 		this.refreshSelf();
 		return true;
 	} else if(changedAttributes["class"]) {
diff --git a/core/modules/widgets/reveal.js b/core/modules/widgets/reveal.js
index 0c82e8598..46e55e99e 100755
--- a/core/modules/widgets/reveal.js
+++ b/core/modules/widgets/reveal.js
@@ -94,13 +94,6 @@ RevealWidget.prototype.positionPopup = function(domNode) {
 		left = Math.max(0,left);
 		top = Math.max(0,top);
 	}
-	if (this.popup.absolute) {
-		// Traverse the offsetParent chain and correct the offset to make it relative to the parent node.
-		for (var offsetParentDomNode = domNode.offsetParent; offsetParentDomNode; offsetParentDomNode = offsetParentDomNode.offsetParent) {
-			left -= offsetParentDomNode.offsetLeft;
-			top -= offsetParentDomNode.offsetTop;
-		}
-	}
 	domNode.style.left = left + "px";
 	domNode.style.top = top + "px";
 };
@@ -190,11 +183,19 @@ RevealWidget.prototype.compareStateText = function(state) {
 };
 
 RevealWidget.prototype.readPopupState = function(state) {
-	this.popup = $tw.popup.parseCoordinates(state);
+	var popupLocationRegExp = /^\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/,
+		match = popupLocationRegExp.exec(state);
 	// Check if the state matches the location regexp
-	if(this.popup) {
+	if(match) {
 		// If so, we're open
 		this.isOpen = true;
+		// Get the location
+		this.popup = {
+			left: parseFloat(match[1]),
+			top: parseFloat(match[2]),
+			width: parseFloat(match[3]),
+			height: parseFloat(match[4])
+		};
 	} else {
 		// If not, we're closed
 		this.isOpen = false;
diff --git a/editions/test/tiddlers/tests/test-popup.js b/editions/test/tiddlers/tests/test-popup.js
deleted file mode 100644
index 360e7f17f..000000000
--- a/editions/test/tiddlers/tests/test-popup.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*\
-title: test-popup.js
-type: application/javascript
-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() {
-
-	it("parseCoordinates should parse valid coordinates", function() {
-		var popup = new $tw.utils.Popup({
-			rootElement: $tw.fakeDocument.createElement("div")
-		});
-
-		expect(popup.parseCoordinates("(1,2,3,4)")).toEqual({absolute: false, left: 1, top: 2, width: 3, height: 4});
-		expect(popup.parseCoordinates("(1.5,2.6,3.7,4.8)")).toEqual({absolute: false, left: 1.5, top: 2.6, width: 3.7, height: 4.8});
-		expect(popup.parseCoordinates("@(1,2,3,4)")).toEqual({absolute: true, left: 1, top: 2, width: 3, height: 4});
-		expect(popup.parseCoordinates("@(1.5,2.6,3.7,4.8)")).toEqual({absolute: true, left: 1.5, top: 2.6, width: 3.7, height: 4.8});
-	});
-
-	it("parseCoordinates should not parse invalid coordinates", function() {
-		var popup = new $tw.utils.Popup({
-			rootElement: $tw.fakeDocument.createElement("div")
-		});
-
-		expect(popup.parseCoordinates("#(1,2,3,4)")).toEqual(false);
-		expect(popup.parseCoordinates("(1,2,3,4")).toEqual(false);
-		expect(popup.parseCoordinates("(1,2,3)")).toEqual(false);
-	});
-
-	it("buildCoordinates should create valid coordinates", function() {
-		var popup = new $tw.utils.Popup({
-			rootElement: $tw.fakeDocument.createElement("div")
-		});
-
-		var coordinates = {
-			left: 1.5,
-			top: 2.6,
-			width: 3.7,
-			height: 4.8
-		};
-
-		expect(popup.buildCoordinates(popup.coordinatePrefix.csOffsetParent, coordinates)).toEqual("(1.5,2.6,3.7,4.8)");
-		expect(popup.buildCoordinates(popup.coordinatePrefix.csAbsolute, coordinates)).toEqual("@(1.5,2.6,3.7,4.8)");
-	});
-
-	it("buildCoordinates should detect invalid input", function() {
-		var popup = new $tw.utils.Popup({
-			rootElement: $tw.fakeDocument.createElement("div")
-		});
-
-		var coordinates = {
-			left: "invalid",
-			top: 2.6,
-			width: 3.7,
-			height: 4.8
-		};
-
-		expect(popup.buildCoordinates(popup.coordinatePrefix.csOffsetParent, coordinates)).toEqual("(0,0,0,0)");
-		expect(popup.buildCoordinates("dummy", coordinates)).toEqual("(0,0,0,0)");
-	});
-});
-
-})();
diff --git a/editions/tw5.com/tiddlers/concepts/CoordinateSystems.tid b/editions/tw5.com/tiddlers/concepts/CoordinateSystems.tid
deleted file mode 100644
index 9b66f941b..000000000
--- a/editions/tw5.com/tiddlers/concepts/CoordinateSystems.tid
+++ /dev/null
@@ -1,42 +0,0 @@
-created: 20220810201659784
-modified: 20220810201659784
-tags: Concepts
-title: Coordinate Systems
-type: text/vnd.tiddlywiki
-
-TiddlyWiki (primarily the RevealWidget) supports two coordinate systems for positioning popups (see PopupMechanism to learn more about popups).
-
-<<.from-version "5.2.4">> We introduced absolute coordinates that may not work with all extensions and plugins. For maximum backwards compatibility, use absolute coordinates only where necessary.
-
-!! Relative coordinate system
-
-The default coordinate system is relative to the nearest positioned ancestor element. This is either:
-
-* an element with a non-static position, or
-* a ''td'', ''th'', ''table'' in case the element itself is static positioned.
-
-For tiddlers the nearest positioned ancestor element mostly is the body of the tiddler. Read the next chapter to learn about the exceptions.
-
-Relative coordinates are expressed in the form ''(x,y,w,h)''. Where ''x'' and ''y'' represent the position and ''w'' and ''h'' the width and height of the element.
-
-!! Absolute coordinate system
-
-The relative coordinate system works flawless most of the time. Problems occure if the target element (for example, a popup) and the source element (the triggering button) do not share the same positioned ancherstor element. This is often the case if the popup is declared outside a table and the triggering button is declared within a table cell. In this case the coordiante systems have different origins and the popup will be displayed in the wrong location.
-
-Absolute coordinates can fix this problem by using the root element of the page (the upper-left corner of the page) as the origin of the coordinate system. Absolute coordinates are expressed in the form ''@(x,y,w,h)''. Where ''x'' and ''y'' represent the position and ''w'' and ''h'' the width and height of the element. The leading ''@''-symbol marks these coordinates as absolute.
-
-The ButtonWidget has an option (''popupAbsCoords'') to put absolute coordinates into the state tiddler. The DraggableWidget and the EventCatcherWidget provide the absolute coordinate of an event within the attribute `tv-popup-abs-coords`.
-
-
-!! Example
-
-The following example shows a popup that is triggerd from within a table cell. The table cell is the nearest positioned ancestor element. The popup was defined outside the table cell. The button using relative coordinates will open the popup in the wrong location because the button and the popup do not agree on the same coordinate system. Using absolute coordinates fixes this problem.
-
-<<wikitext-example-without-html '<$reveal type="popup" state="$:/state/CoordinateSampleReveal">
-<div class="tc-drop-down">
-Popup
-</div>
-</$reveal>
-
-| Table Row 1 |<$button popup="$:/state/CoordinateSampleReveal">Relative coordinates</$button>|
-| Table Row 2 |<$button popup="$:/state/CoordinateSampleReveal" popupAbsCoords="yes">Absolute coordinates</$button>|'>>
diff --git a/editions/tw5.com/tiddlers/mechanisms/PopupMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/PopupMechanism.tid
index 79f3de4c5..60566a329 100644
--- a/editions/tw5.com/tiddlers/mechanisms/PopupMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/PopupMechanism.tid
@@ -8,7 +8,6 @@ The popup mechanism allows blocks of content to be selectively displayed and pos
 
 * [[StateTiddlers|StateMechanism]] to record whether a popup is currently displayed or not
 * The RevealWidget to selectively display the popup content
-** <<.from-version "5.2.4">> For positioning the popups relative or absolute coordinates can be used. See [[Coordinate Systems]] for more information about usage and format.
 ** For "sticky" popups — those that don't close when clicking inside one — set the ''class'' attribute to `tc-popup-keep`
 * The ButtonWidget to trigger the display of the popup by setting the state tiddler appropriately
 
diff --git a/editions/tw5.com/tiddlers/widgets/ActionPopupWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionPopupWidget.tid
index 590e25a92..e423b6576 100644
--- a/editions/tw5.com/tiddlers/widgets/ActionPopupWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ActionPopupWidget.tid
@@ -1,6 +1,6 @@
 caption: action-popup
 created: 20200303114556528
-modified: 20220815205132124
+modified: 20210501203451387
 tags: Widgets ActionWidgets
 title: ActionPopupWidget
 type: text/vnd.tiddlywiki
@@ -15,11 +15,10 @@ The ''action-popup'' widget is invisible. Any content within it is ignored.
 
 |!Attribute |!Description |
 |$state |The title of the state tiddler for the popup |
-|$coords |Optional coordinates for the handle to which popup is positioned (see [[Coordinate Systems]] for the supported formats) |
+|$coords |Optional coordinates for the handle to which popup is positioned (in the format `(x,y,w,h)`) |
 |$floating |<<.from-version "5.2.0">> Optional. Defaults to `no`. Set to `yes` to create a popup that must be closed explicitly. |
 
-<<.from-version "5.1.23">> If the ''$coords'' attribute is missing or empty then all popups are cancelled.<br/>
-<<.from-version "5.2.4">> The ''$coords'' attribute supports absolute and relative coordinates. See [[Coordinate Systems]] for more information.
+<<.from-version "5.1.23">> If the ''$coords'' attribute is missing or empty then all popups are cancelled.
 
 <<.tip "Delete the state tiddler for a floating popup to close it.">>
 
diff --git a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid
index da61838af..e94504659 100644
--- a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid
@@ -1,6 +1,6 @@
 caption: button
 created: 20131024141900000
-modified: 20220810192251345
+modified: 20211009121239795
 tags: Widgets TriggeringWidgets
 title: ButtonWidget
 type: text/vnd.tiddlywiki
@@ -37,7 +37,6 @@ The content of the `<$button>` widget is displayed within the button.
 |default |Default value if <<.attr set>> tiddler is missing for testing against <<.attr setTo>> to determine <<.attr selectedClass>> |
 |popup |Title of a state tiddler for a popup that is toggled when the button is clicked. See PopupMechanism for details |
 |popupTitle |Title of a state tiddler for a popup that is toggled when the button is clicked. In difference to the <<.attr popup>> attribute, ''no'' TextReference is used. See PopupMechanism for details |
-|popupAbsCoords |<<.from-version "5.2.4">> If set to ''yes'' writes absolute coordinates to the tiddler referenced by the <<.attr popup>>. If set to ''no'' (the default) uses relative coordinates. See [[Coordinate Systems]] for details |
 |aria-label |Optional [[Accessibility]] label |
 |tooltip |Optional tooltip |
 |class |An optional CSS class name to be assigned to the HTML element|
diff --git a/editions/tw5.com/tiddlers/widgets/DraggableWidget.tid b/editions/tw5.com/tiddlers/widgets/DraggableWidget.tid
index c25b15791..fc65c4e74 100644
--- a/editions/tw5.com/tiddlers/widgets/DraggableWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/DraggableWidget.tid
@@ -41,8 +41,7 @@ The LinkWidget incorporates the functionality of the DraggableWidget via the ''d
 |!Variables |!Description |
 |`modifier` |The [[modifier Variable]] contains the Modifier Key held while dragging |
 |`dom-*` |All DOM attributes of the node being dragged are made available as variables, with the prefix `dom-` |
-|`tv-popup-coords` |A relative co-ordinate string that can be used with the ActionPopupWidget to trigger a popup at the DOM node matching the selector where the event originated (see [[Coordinate Systems]] for more information) |
-|`tv-popup-abs-coords` |<<.from-version "5.2.4">> An absolute co-ordinate string that can be used with the ActionPopupWidget to trigger a popup at the DOM node matching the selector where the event originated (see [[Coordinate Systems]] for more information) |
+|`tv-popup-coords` |A co-ordinate string that can be used with the ActionPopupWidget to trigger a popup at the DOM node that's being dragged where the event originated |
 |`tv-selectednode-posx` |`x` offset position of the dragged DOM node |
 |`tv-selectednode-posy` |`y` offset position of the dragged DOM node  |
 |`tv-selectednode-width` |`offsetWidth` of the dragged DOM node |
diff --git a/editions/tw5.com/tiddlers/widgets/EventCatcherWidget.tid b/editions/tw5.com/tiddlers/widgets/EventCatcherWidget.tid
index 5c2568a19..f0c8c257c 100644
--- a/editions/tw5.com/tiddlers/widgets/EventCatcherWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EventCatcherWidget.tid
@@ -1,5 +1,5 @@
 created: 20201123113532200
-modified: 20221012194222875
+modified: 20220507184043398
 tags: Widgets TriggeringWidgets
 title: EventCatcherWidget
 type: text/vnd.tiddlywiki
@@ -10,7 +10,7 @@ type: text/vnd.tiddlywiki
 
 //This is an advanced widget intended for use by those familiar with HTML, CSS and JavaScript handling of DOM events.//
 
-The event catcher widget traps DOM-initiated Javascript events dispatched within its child content, and allows invoking a series of ActionWidgets in response to those events.
+The event catcher widget traps DOM-initiated Javascript events dispatched within its child content, and allows invoking a series of ActionWidgets in response to those events. 
 
 In order for the events to be trapped:
 
@@ -47,8 +47,7 @@ The following variables are made available to the actions:
 |`event-mousebutton` |The mouse button (if any) used to trigger the event (can be "left", "right" or "middle"). Note that not all event types support the mousebutton property |
 |`event-type` |The type property of the JavaScript event |
 |`event-detail-*` |Any properties in the detail attribute of the event are made available with the prefix `event-detail-` |
-|`tv-popup-coords` |A relative co-ordinate string that can be used with the ActionPopupWidget to trigger a popup at the DOM node matching the selector where the event originated (see [[Coordinate Systems]] for more information) |
-|`tv-popup-abs-coords` |<<.from-version "5.2.4">> An absolute co-ordinate string that can be used with the ActionPopupWidget to trigger a popup at the DOM node matching the selector where the event originated (see [[Coordinate Systems]] for more information) |
+|`tv-popup-coords` |A co-ordinate string that can be used with the ActionPopupWidget to trigger a popup at the DOM node matching the selector where the event originated |
 |`tv-widgetnode-width` |<<.from-version "5.2.3">> `offsetWidth` of the DOM node created by the eventcatcher widget |
 |`tv-widgetnode-height` |<<.from-version "5.2.3">> `offsetHeight` of the DOM node created by the eventcatcher widget |
 |`tv-selectednode-posx` |`x` offset position of the selected DOM node |
diff --git a/plugins/tiddlywiki/dynannotate/modules/dynannotate.js b/plugins/tiddlywiki/dynannotate/modules/dynannotate.js
index bd898ebba..9a913384d 100644
--- a/plugins/tiddlywiki/dynannotate/modules/dynannotate.js
+++ b/plugins/tiddlywiki/dynannotate/modules/dynannotate.js
@@ -191,7 +191,7 @@ DynannotateWidget.prototype.applyAnnotations = function() {
 				"tv-selection-posy": (bounds.top).toString(),
 				"tv-selection-width": (bounds.width).toString(),
 				"tv-selection-height": (bounds.height).toString(),
-				"tv-selection-coords": $tw.popup.buildCoordinates($tw.popup.coordinatePrefix.csOffsetParent,bounds)
+				"tv-selection-coords": "(" + bounds.left + "," + bounds.top + "," + bounds.width + "," + bounds.height + ")"
 			});
 			if(self.hasAttribute("popup")) {
 				$tw.popup.triggerPopup({