From 61b8180562b402102d65fc9a2fac91f9340d96e6 Mon Sep 17 00:00:00 2001 From: Astrid Elocson Date: Wed, 25 Feb 2015 12:53:57 +0000 Subject: [PATCH] Resolve merge conflict in LinkWidget.tid --- editions/tw5.com/tiddlers/widgets/LinkWidget.tid | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid index 97c787f1e..13f12c205 100644 --- a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid @@ -1,6 +1,6 @@ title: LinkWidget created: 201310241419 -modified: 20150225075728000 +modified: 201502231037 tags: Widgets caption: link @@ -12,6 +12,9 @@ The `link` widget generates links to tiddlers. (Use the HTML `` element to ge |to |The title of the target tiddler for the link (defaults to the [[current tiddler|Current Tiddler]]) | |aria-label |Optional [[Accessibility]] label | |tooltip |Optional tooltip WikiText | +|tabindex |Optional numeric [[tabindex|https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/tabIndex]] | +|draggable |"yes" to enable the link to be draggable (defaults to "yes") | +|tag |Optional tag to override the default "a" element | The content of the link widget is rendered within the `` tag.