From 39bd45002ea051a6dc98fe8a2b4ff91826119e9a Mon Sep 17 00:00:00 2001 From: poc2go Date: Thu, 1 Aug 2024 06:47:37 -0400 Subject: [PATCH 01/11] Test to verify that reserved wikitext constructs are not parsed (#8384) --- .../reserved-wikitext/ReservedWikiText.tid | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 editions/test/tiddlers/tests/data/reserved-wikitext/ReservedWikiText.tid diff --git a/editions/test/tiddlers/tests/data/reserved-wikitext/ReservedWikiText.tid b/editions/test/tiddlers/tests/data/reserved-wikitext/ReservedWikiText.tid new file mode 100644 index 000000000..b9b77f160 --- /dev/null +++ b/editions/test/tiddlers/tests/data/reserved-wikitext/ReservedWikiText.tid @@ -0,0 +1,54 @@ +title: ReservedWikiText +description: Verify that reserved wikitext constructions are not parsed +type: text/vnd.tiddlywiki-multiple +tags: [[$:/tags/wiki-test-spec]] + +title: Narrative + +Verifies that certain wikitext constructions that are reserved for use by other tools are not parsed by TiddlyWiki. ++ +title: TestTiddler + +{%%} +(==) +{% %} +(= =) +{% something %} +(= something =) +Inline {% something %} substitution +Inline (= something =) substitution +Prefix-{% +Prefix-(= +%}-Postfix +=)-Postfix + {% + (= + %} + =) ++ +title: Output + +<$wikify name="parsetree" text={{TestTiddler}} output="parsetree"> +<$text text={{{ [jsonget[0],[children],[0],[text]] }}}/> + ++ +title: ExpectedResult + +

+{%%} +(==) +{% %} +(= =) +{% something %} +(= something =) +Inline {% something %} substitution +Inline (= something =) substitution +Prefix-{% +Prefix-(= +%}-Postfix +=)-Postfix + {% + (= + %} + =) +

\ No newline at end of file From 5c43512a56b9e08e680ad555439d8932ea2b9164 Mon Sep 17 00:00:00 2001 From: Mohammad Rahmani <830394+kookma@users.noreply.github.com> Date: Thu, 1 Aug 2024 19:13:10 +0330 Subject: [PATCH 02/11] Shorter Title of Compound Tiddler in Type Field Dropdown Menu (#8469) * Update text_vnd.tiddlywiki_multiple.tid This PR addresses the idea in #8465 * Update text_vnd.tiddlywiki_multiple.tid This addresses the idea in #8465 for de-DE language --- core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid | 2 +- languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid b/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid index 4fb3f2ec1..af15d7ac3 100644 --- a/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid +++ b/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid @@ -1,5 +1,5 @@ title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple -description: TiddlyWiki 5 compound tiddler +description: Compound tiddler name: text/vnd.tiddlywiki-multiple group: Developer group-sort: 2 diff --git a/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid b/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid index 2c192f96f..ab32b262c 100644 --- a/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid +++ b/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid @@ -1,5 +1,5 @@ title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple -description: TW5 - TiddlyWiki Wikitext Verbund Tiddler +description: Verbund Tiddler name: text/vnd.tiddlywiki-multiple group: Entwickler group-sort: 2 From 57d3e8e765cda7dadce9f021a5caab2dcfb9b4a8 Mon Sep 17 00:00:00 2001 From: lin onetwo Date: Fri, 2 Aug 2024 01:01:22 +0800 Subject: [PATCH 03/11] Feat: allow tags have its ViewTemplate tag and cascade (#8462) * feat: allow tags have its ViewTemplate tag and cascade * feat: quick addition of subtitle cascade * docs: tag subtitle cascade control panel * Update ControlPanel.multids --- core/language/en-GB/ControlPanel.multids | 4 ++++ .../ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid | 9 +++++++++ core/ui/ControlPanel/Cascades/ViewTemplateTags.tid | 9 +++++++++ core/ui/ViewTemplate/subtitle.tid | 8 +------- core/ui/ViewTemplate/subtitle/default.tid | 10 ++++++++++ core/ui/ViewTemplate/tags.tid | 4 +--- core/ui/ViewTemplate/tags/default.tid | 11 +++++++++++ languages/zh-Hans/ControlPanel.multids | 4 ++++ languages/zh-Hant/ControlPanel.multids | 6 +++++- 9 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 core/ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid create mode 100644 core/ui/ControlPanel/Cascades/ViewTemplateTags.tid create mode 100644 core/ui/ViewTemplate/subtitle/default.tid create mode 100644 core/ui/ViewTemplate/tags/default.tid diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids index 93cfc3c10..772949c0d 100644 --- a/core/language/en-GB/ControlPanel.multids +++ b/core/language/en-GB/ControlPanel.multids @@ -235,3 +235,7 @@ ViewTemplateBody/Caption: View Template Body ViewTemplateBody/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the body of a tiddler. ViewTemplateTitle/Caption: View Template Title ViewTemplateTitle/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the title of a tiddler. +ViewTemplateSubtitle/Caption: View Template Subtitle +ViewTemplateSubtitle/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the subtitle of a tiddler. +ViewTemplateTags/Caption: View Template Tags +ViewTemplateTags/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the tags area of a tiddler. diff --git a/core/ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid b/core/ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid new file mode 100644 index 000000000..5ba1234ae --- /dev/null +++ b/core/ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/ControlPanel/ViewTemplateSubtitle +tags: $:/tags/ControlPanel/Cascades +caption: {{$:/language/ControlPanel/ViewTemplateSubtitle/Caption}} + +\define lingo-base() $:/language/ControlPanel/ViewTemplateSubtitle/ + +<> + +{{$:/tags/ViewTemplateSubtitleFilter||$:/snippets/ListTaggedCascade}} diff --git a/core/ui/ControlPanel/Cascades/ViewTemplateTags.tid b/core/ui/ControlPanel/Cascades/ViewTemplateTags.tid new file mode 100644 index 000000000..3cea12307 --- /dev/null +++ b/core/ui/ControlPanel/Cascades/ViewTemplateTags.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/ControlPanel/ViewTemplateTags +tags: $:/tags/ControlPanel/Cascades +caption: {{$:/language/ControlPanel/ViewTemplateTags/Caption}} + +\define lingo-base() $:/language/ControlPanel/ViewTemplateTags/ + +<> + +{{$:/tags/ViewTemplateTagsFilter||$:/snippets/ListTaggedCascade}} diff --git a/core/ui/ViewTemplate/subtitle.tid b/core/ui/ViewTemplate/subtitle.tid index a7c010287..013f0266b 100644 --- a/core/ui/ViewTemplate/subtitle.tid +++ b/core/ui/ViewTemplate/subtitle.tid @@ -2,10 +2,4 @@ title: $:/core/ui/ViewTemplate/subtitle tags: $:/tags/ViewTemplate \whitespace trim -<$reveal type="nomatch" stateTitle=<> text="hide" tag="div" retain="yes" animate="yes"> -
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler"> -<$transclude tiddler=<> mode="inline"/><$list-join>  - -
- +<$transclude tiddler={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateSubtitleFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/subtitle/default]] }}} /> \ No newline at end of file diff --git a/core/ui/ViewTemplate/subtitle/default.tid b/core/ui/ViewTemplate/subtitle/default.tid new file mode 100644 index 000000000..3885dc779 --- /dev/null +++ b/core/ui/ViewTemplate/subtitle/default.tid @@ -0,0 +1,10 @@ +title: $:/core/ui/ViewTemplate/subtitle/default + +\whitespace trim +<$reveal type="nomatch" stateTitle=<> text="hide" tag="div" retain="yes" animate="yes"> +
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler"> +<$transclude tiddler=<> mode="inline"/><$list-join>  + +
+ diff --git a/core/ui/ViewTemplate/tags.tid b/core/ui/ViewTemplate/tags.tid index d1f4e55c9..fc09c571a 100644 --- a/core/ui/ViewTemplate/tags.tid +++ b/core/ui/ViewTemplate/tags.tid @@ -2,6 +2,4 @@ title: $:/core/ui/ViewTemplate/tags tags: $:/tags/ViewTemplate \whitespace trim -<$reveal type="nomatch" stateTitle=<> text="hide" tag="div" retain="yes" animate="yes"> -
<$list filter="[all[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop"/>
- +<$transclude tiddler={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateTagsFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/tags/default]] }}} /> \ No newline at end of file diff --git a/core/ui/ViewTemplate/tags/default.tid b/core/ui/ViewTemplate/tags/default.tid new file mode 100644 index 000000000..d524bfccd --- /dev/null +++ b/core/ui/ViewTemplate/tags/default.tid @@ -0,0 +1,11 @@ +title: $:/core/ui/ViewTemplate/tags/default + +\whitespace trim +<$reveal type="nomatch" stateTitle=<> text="hide" tag="div" retain="yes" animate="yes"> +
+ <$list filter="[all[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop"/> + <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Tags]!has[draft.of]]"> + <$transclude mode="inline"/> + +
+ diff --git a/languages/zh-Hans/ControlPanel.multids b/languages/zh-Hans/ControlPanel.multids index 258c051ad..33bc5e9ce 100644 --- a/languages/zh-Hans/ControlPanel.multids +++ b/languages/zh-Hans/ControlPanel.multids @@ -236,3 +236,7 @@ ViewTemplateBody/Caption: 查看模板主体 ViewTemplateBody/Hint: 默认的查看模板使用此规则级联，动态选择模板以显示条目的主体。 ViewTemplateTitle/Caption: 查看模板标题 ViewTemplateTitle/Hint: 默认的查看模板使用此规则级联，动态选择模板以显示条目的标题。 +ViewTemplateSubtitle/Caption: 查看模板副标题 +ViewTemplateSubtitle/Hint: 默认的查看模板使用此规则级联，动态选择模板以显示条目的副标题。 +ViewTemplateTags/Caption: 查看模板标签区 +ViewTemplateTags/Hint: 默认的查看模板使用此规则级联，动态选择模板以显示条目的标签区域。 diff --git a/languages/zh-Hant/ControlPanel.multids b/languages/zh-Hant/ControlPanel.multids index 497b72e49..853ca98d5 100644 --- a/languages/zh-Hant/ControlPanel.multids +++ b/languages/zh-Hant/ControlPanel.multids @@ -235,4 +235,8 @@ Tools/Download/Full/Caption: 下載完整副本 ViewTemplateBody/Caption: 檢視範本主體 ViewTemplateBody/Hint: 預設的檢視範本使用此規則級聯，動態選擇範本以顯示條目的主體。 ViewTemplateTitle/Caption: 檢視範本標題 -ViewTemplateTitle/Hint: 預設的檢視範本使用此規則級聯，動態選擇範本以顯示條目的標題。 \ No newline at end of file +ViewTemplateTitle/Hint: 預設的檢視範本使用此規則級聯，動態選擇範本以顯示條目的標題。 +ViewTemplateSubtitle/Caption: 檢視範本副標題 +ViewTemplateSubtitle/Hint: 預設的檢視範本使用此規則級聯，動態選擇範本以顯示條目的副標題。 +ViewTemplateTags/Caption: 檢視範本標籤 +ViewTemplateTags/Hint: 預設的檢視範本使用此規則級聯，動態選擇範本以顯示條目的標籤。 \ No newline at end of file From 77335a42b534613e3300f56d9bc24b1a029cad74 Mon Sep 17 00:00:00 2001 From: lin onetwo Date: Fri, 2 Aug 2024 16:45:52 +0800 Subject: [PATCH 04/11] Fix: add cascade configs (#8470) --- core/wiki/config/ViewTemplateSubtitleFilters.multids | 4 ++++ core/wiki/config/ViewTemplateTagsFilters.multids | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 core/wiki/config/ViewTemplateSubtitleFilters.multids create mode 100644 core/wiki/config/ViewTemplateTagsFilters.multids diff --git a/core/wiki/config/ViewTemplateSubtitleFilters.multids b/core/wiki/config/ViewTemplateSubtitleFilters.multids new file mode 100644 index 000000000..dd673b673 --- /dev/null +++ b/core/wiki/config/ViewTemplateSubtitleFilters.multids @@ -0,0 +1,4 @@ +title: $:/config/ViewTemplateSubtitleFilters/ +tags: $:/tags/ViewTemplateSubtitleFilter + +default: [[$:/core/ui/ViewTemplate/subtitle/default]] diff --git a/core/wiki/config/ViewTemplateTagsFilters.multids b/core/wiki/config/ViewTemplateTagsFilters.multids new file mode 100644 index 000000000..2f6c13051 --- /dev/null +++ b/core/wiki/config/ViewTemplateTagsFilters.multids @@ -0,0 +1,4 @@ +title: $:/config/ViewTemplateTagsFilters/ +tags: $:/tags/ViewTemplateTagsFilter + +default: [[$:/core/ui/ViewTemplate/tags/default]] From 2bc7ec4b946f6a1cd3db5146f02ff7717eef6355 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Sat, 3 Aug 2024 20:16:05 +0800 Subject: [PATCH 05/11] Do not import "$:/build" (#8476) --- core/modules/upgraders/system.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/modules/upgraders/system.js b/core/modules/upgraders/system.js index a93a57712..a653a75b1 100644 --- a/core/modules/upgraders/system.js +++ b/core/modules/upgraders/system.js @@ -12,7 +12,7 @@ Upgrader module that suppresses certain system tiddlers that shouldn't be import /*global $tw: false */ "use strict"; -var DONT_IMPORT_LIST = ["$:/Import"], +var DONT_IMPORT_LIST = ["$:/Import", "$:/build"], UNSELECT_PREFIX_LIST = ["$:/temp/","$:/state/","$:/StoryList","$:/HistoryList"], WARN_IMPORT_PREFIX_LIST = ["$:/core/modules/"]; From c5c72795548343ae36729e7f016897c573daf23f Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Sun, 4 Aug 2024 13:48:57 +0200 Subject: [PATCH 06/11] Eslint force double-quotes for strings -- avoidEscape:true (#8482) --- .eslintrc.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.eslintrc.yml b/.eslintrc.yml index 049af59e4..0316b8385 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -231,7 +231,10 @@ rules: prefer-spread: 'off' prefer-template: 'off' quote-props: 'off' - quotes: 'off' + quotes: + - error + - double + - avoidEscape: true radix: 'off' require-atomic-updates: error require-await: error From ac286dac822acad835d05a28cc0fbef6553c23dd Mon Sep 17 00:00:00 2001 From: Bram Chen Date: Mon, 5 Aug 2024 06:47:37 +0800 Subject: [PATCH 07/11] Update chinese language files (#8473) * update chinese descriptions for text/vnd.tiddlywiki-multiple --- languages/zh-Hans/Types/text_vnd.tiddlywiki_multiple.tid | 2 +- languages/zh-Hant/Types/text_vnd.tiddlywiki_multiple.tid | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/zh-Hans/Types/text_vnd.tiddlywiki_multiple.tid b/languages/zh-Hans/Types/text_vnd.tiddlywiki_multiple.tid index dd8e72be9..c38ddf015 100644 --- a/languages/zh-Hans/Types/text_vnd.tiddlywiki_multiple.tid +++ b/languages/zh-Hans/Types/text_vnd.tiddlywiki_multiple.tid @@ -1,5 +1,5 @@ title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple -description: TiddlyWiki 5 复合条目 +description: 复合条目 name: text/vnd.tiddlywiki-multiple group: 开发者 group-sort: 2 diff --git a/languages/zh-Hant/Types/text_vnd.tiddlywiki_multiple.tid b/languages/zh-Hant/Types/text_vnd.tiddlywiki_multiple.tid index 745734788..aee5a301e 100644 --- a/languages/zh-Hant/Types/text_vnd.tiddlywiki_multiple.tid +++ b/languages/zh-Hant/Types/text_vnd.tiddlywiki_multiple.tid @@ -1,5 +1,5 @@ title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple -description: TiddlyWiki 5 複合條目 +description: 複合條目 name: text/vnd.tiddlywiki-multiple group: 開發者 group-sort: 2 From d9ac4a823fe0f91c615ed33fa890069f88cc8ab9 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Mon, 5 Aug 2024 11:20:35 +0100 Subject: [PATCH 08/11] Fix crash with render command when filename filter returns empty result --- core/modules/commands/render.js | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/core/modules/commands/render.js b/core/modules/commands/render.js index b396deef9..bd8b23171 100644 --- a/core/modules/commands/render.js +++ b/core/modules/commands/render.js @@ -45,17 +45,22 @@ Render individual tiddlers and save the results to the specified files variableList = variableList.slice(2); } $tw.utils.each(tiddlers,function(title) { - var filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]); - if(self.commander.verbose) { - console.log("Rendering \"" + title + "\" to \"" + filepath + "\""); + var filenameResults = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title])); + if(filenameResults.length > 0) { + var filepath = path.resolve(self.commander.outputPath,filenameResults[0]); + if(self.commander.verbose) { + console.log("Rendering \"" + title + "\" to \"" + filepath + "\""); + } + var parser = wiki.parseTiddler(template || title), + widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}), + container = $tw.fakeDocument.createElement("div"); + widgetNode.render(container,null); + var text = type === "text/html" ? container.innerHTML : container.textContent; + $tw.utils.createFileDirectories(filepath); + fs.writeFileSync(filepath,text,"utf8"); + } else { + console.log("Not rendering \"" + title + "\" because the filename filter returned an empty result"); } - var parser = wiki.parseTiddler(template || title), - widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}), - container = $tw.fakeDocument.createElement("div"); - widgetNode.render(container,null); - var text = type === "text/html" ? container.innerHTML : container.textContent; - $tw.utils.createFileDirectories(filepath); - fs.writeFileSync(filepath,text,"utf8"); }); return null; }; From 885faf964b02cc1fb158dd8914ac56cf026a547e Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Mon, 5 Aug 2024 22:29:16 +0800 Subject: [PATCH 09/11] Fix strange links in $:/plugins/tiddlywiki/highlight/usage (#8487) * Normalize links in highlight usage * Revert to use define --- plugins/tiddlywiki/highlight/usage.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/tiddlywiki/highlight/usage.tid b/plugins/tiddlywiki/highlight/usage.tid index 5e5b51600..fc1d8f12c 100644 --- a/plugins/tiddlywiki/highlight/usage.tid +++ b/plugins/tiddlywiki/highlight/usage.tid @@ -31,8 +31,8 @@ You can import language definitions into <$text text="JavaScript"/> tiddlers, wi First, locate the language file(s) you need. You can fetch the files from the following CDNs: -* >>jsDelivr -* >>unpkg +* > class="tc-tiddlylink-external" target="_blank">jsDelivr +* > class="tc-tiddlylink-external" target="_blank">unpkg Then, click the button below to create a "highlight" module. Copy and paste the content of a language file into the the text area. Give your tiddler a meaningful title so you can keep track of the languages you've installed. You may choose to either create one tiddler per language or lump all language definitions into one tiddler. Save and reload your wiki. From a6ffcc13413e5ad98e45fc854877b99baa62f9ec Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Tue, 6 Aug 2024 16:45:14 +0200 Subject: [PATCH 10/11] Update bug_report.yml (#8468) Replace boilerplate text with "placeholder" text --- .github/ISSUE_TEMPLATE/bug_report.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 1e644e161..286a842bc 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -21,7 +21,7 @@ body: attributes: label: To Reproduce description: "Steps to reproduce the behavior:" - value: | + placeholder: | 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' @@ -41,7 +41,7 @@ body: attributes: label: TiddlyWiki Configuration description: please complete the following information - value: | + placeholder: | - Version [e.g. v5.1.24] - Saving mechanism [e.g. Node.js, TiddlyDesktop, TiddlyHost etc] - Plugins installed [e.g. Freelinks, TiddlyMap] From 9b6baba5d50c16417422a40b5111556710a753a9 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Tue, 6 Aug 2024 21:32:04 +0100 Subject: [PATCH 11/11] Fix geospatial plugin popup demo --- plugins/tiddlywiki/geospatial/docs/geomap.tid | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/plugins/tiddlywiki/geospatial/docs/geomap.tid b/plugins/tiddlywiki/geospatial/docs/geomap.tid index ba933ec8a..e72d3c156 100644 --- a/plugins/tiddlywiki/geospatial/docs/geomap.tid +++ b/plugins/tiddlywiki/geospatial/docs/geomap.tid @@ -53,13 +53,10 @@ If no base layers are defined by `<$geobaselayer>` widgets within the `<$geomap> lat="51.751944" long="-1.257778" alt="0" - text="""This is Oxford!"""/> + text="""{{$:/core/images/star-filled}} This is Oxford!"""/> <$data title="Output" text="""<$geomap state=<> > - <$list filter="[all[tiddlers+shadows]tag[$:/tags/GeoMarker]]"> - <$geolayer lat={{!!lat}} long={{!!long}} alt={{!!alt}} color={{!!color}}/> - """/> <$data $tiddler="$:/plugins/tiddlywiki/geospatial"/> @@ -80,7 +77,24 @@ If no base layers are defined by `<$geobaselayer>` widgets within the `<$geomap> """/> -<$data $tiddler="ui/PopupTemplate"/> +<$data + title="Oxford" + tags="$:/tags/GeoMarker" + caption="Oxford" + lat="51.751944" + long="-1.257778" + alt="0" + text="""{{$:/core/images/star-filled}} This is Oxford!"""/> + properties=""/> +<$data title="ui/PopupTemplate" text=""" +
+ <$let currentTiddler={{{ [jsonget[properties],[title]] }}}> + <$link><$text text=<>/> + + <$transclude $tiddler=<> $mode="block"/> + +
+"""/> <$data $tiddler="$:/plugins/tiddlywiki/geospatial"/>