From adfb69a68ce30d82d3d67cc4035c258919fba243 Mon Sep 17 00:00:00 2001 From: btheado Date: Mon, 22 Jul 2024 04:05:40 -0400 Subject: [PATCH 1/5] Use the testcase widget for the $reveal widget examples (#8406) * Use the testcase widget for the $reveal widget examples * Convert $reveal testcase widget examples into testcase tiddlers * Add expected results to $reveal test case tiddlers These examples are intended to be interactive and the expect results only test the initial rendering. Still that seems like useful verification --- .../RevealWidget/AccordionSlider.tid | 30 ++++++++++ .../tiddlers/testcases/RevealWidget/Popup.tid | 27 +++++++++ .../testcases/RevealWidget/SimpleReveal.tid | 27 +++++++++ .../testcases/RevealWidget/TextReference.tid | 23 ++++++++ .../tw5.com/tiddlers/widgets/RevealWidget.tid | 57 ++----------------- 5 files changed, 112 insertions(+), 52 deletions(-) create mode 100644 editions/tw5.com/tiddlers/testcases/RevealWidget/AccordionSlider.tid create mode 100644 editions/tw5.com/tiddlers/testcases/RevealWidget/Popup.tid create mode 100644 editions/tw5.com/tiddlers/testcases/RevealWidget/SimpleReveal.tid create mode 100644 editions/tw5.com/tiddlers/testcases/RevealWidget/TextReference.tid diff --git a/editions/tw5.com/tiddlers/testcases/RevealWidget/AccordionSlider.tid b/editions/tw5.com/tiddlers/testcases/RevealWidget/AccordionSlider.tid new file mode 100644 index 00000000000..27361b335db --- /dev/null +++ b/editions/tw5.com/tiddlers/testcases/RevealWidget/AccordionSlider.tid @@ -0,0 +1,30 @@ +created: 20240721163229297 +description: Reveal widget for accordion or slider functionality +modified: 20240721172211283 +tags: $:/tags/wiki-test-spec +title: TestCases/RevealWidget/AccordionSlider +type: text/vnd.tiddlywiki-multiple + +title: Narrative + +Two distinct buttons toggle the state of the tiddler value. Two reveal widgets. The first displays the button to show the content. The second displays both the content and the button to hide the content. ++ +title: Output + +<$reveal type="nomatch" state="$:/state/SampleReveal2" text="show"> + +<$button set="$:/state/SampleReveal2" setTo="show">Show me + + +<$reveal type="match" state="$:/state/SampleReveal2" text="show"> + +<$button set="$:/state/SampleReveal2" setTo="hide">Hide me + +! This is the revealed content +And this is some text + + ++ +title: ExpectedResult + +

\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/testcases/RevealWidget/Popup.tid b/editions/tw5.com/tiddlers/testcases/RevealWidget/Popup.tid new file mode 100644 index 00000000000..3defafd48a8 --- /dev/null +++ b/editions/tw5.com/tiddlers/testcases/RevealWidget/Popup.tid @@ -0,0 +1,27 @@ +created: 20240721163229297 +description: Reveal widget for popup content +modified: 20240721172211283 +tags: $:/tags/wiki-test-spec +title: TestCases/RevealWidget/Popup +type: text/vnd.tiddlywiki-multiple + +title: Narrative + +When the button is clicked, the tiddler specified by the popup attribute is filled with the click coordinates. The reveal widget uses these coordinates to position the popup content. ++ +title: Output + +<$button popup="$:/SamplePopupState">Pop me up! + +<$reveal type="popup" state="$:/SamplePopupState"> +
+ +! This is the popup +And this is some text + +
+ ++ +title: ExpectedResult + +

\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/testcases/RevealWidget/SimpleReveal.tid b/editions/tw5.com/tiddlers/testcases/RevealWidget/SimpleReveal.tid new file mode 100644 index 00000000000..b73eaa83f93 --- /dev/null +++ b/editions/tw5.com/tiddlers/testcases/RevealWidget/SimpleReveal.tid @@ -0,0 +1,27 @@ +created: 20240721163229297 +description: Simple content reveal +modified: 20240721172211283 +tags: $:/tags/wiki-test-spec +title: TestCases/RevealWidget/SimpleReveal +type: text/vnd.tiddlywiki-multiple + +title: Narrative + +Two distinct buttons toggle the state of the tiddler value. The reveal widget displays its content for one of the two states. ++ +title: Output + +<$button set="$:/state/SampleReveal1" setTo="show">Show me +<$button set="$:/state/SampleReveal1" setTo="hide">Hide me + +<$reveal type="match" state="$:/state/SampleReveal1" text="show"> + +! This is the revealed content +And this is some text + + ++ +title: ExpectedResult + +

+

\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/testcases/RevealWidget/TextReference.tid b/editions/tw5.com/tiddlers/testcases/RevealWidget/TextReference.tid new file mode 100644 index 00000000000..e2123003349 --- /dev/null +++ b/editions/tw5.com/tiddlers/testcases/RevealWidget/TextReference.tid @@ -0,0 +1,23 @@ +created: 20240721163229297 +description: Reveal widget text references +modified: 20240721174826529 +tags: $:/tags/wiki-test-spec +title: TestCases/RevealWidget/TextReference +type: text/vnd.tiddlywiki-multiple + +title: Narrative + +The state attribute of the reveal widget can use the text reference syntax to refer to a specific field. In this example if the field ``jeremy`` contains the text ``tiddlywiki``, then the reveal widget's content will be displayed. ++ +title: Output +jeremy: tiddlywiki + +<$reveal type="match" state="!!jeremy" text="tiddlywiki"> +~TiddlyWiki! + ++ +title: ExpectedResult + +

+TiddlyWiki! +

\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid index de445e08d10..37df94c1e7d 100644 --- a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid @@ -1,7 +1,7 @@ caption: reveal created: 20131024141900000 jeremy: tiddlywiki -modified: 20230803052644851 +modified: 20240721175716320 tags: Widgets title: RevealWidget type: text/vnd.tiddlywiki @@ -47,57 +47,10 @@ This is useful for edge-cases where titles may contain characters that are used ! Examples -!! Simple content reveal +<> -Here's a simple example of showing and hiding content with buttons: +<> -<Show me -<$button set="$:/state/SampleReveal1" setTo="hide">Hide me +<> -<$reveal type="match" state="$:/state/SampleReveal1" text="show"> - -! This is the revealed content -And this is some text - -'>> - -!! Accordion or Slider - -An "accordion" or "slider" is a button that can be used to toggle the display of associated content. - -< - -<$button set="$:/state/SampleReveal2" setTo="show">Show me - - -<$reveal type="match" state="$:/state/SampleReveal2" text="show"> - -<$button set="$:/state/SampleReveal2" setTo="hide">Hide me - -! This is the revealed content -And this is some text - -'>> - -!! Popup - -Here is a simple example of a popup built with the RevealWidget: - -<Pop me up! - -<$reveal type="popup" state="$:/SamplePopupState"> -
- -! This is the popup -And this is some text - -
-'>> - -!! How to use text references with field content - -Here is a simple example how to use text references with field content to control the RevealWidget. If the field ``jeremy`` is populated with text ``tiddlywiki``, a message will be displayed. - -< -~TiddlyWiki! -'>> +<> \ No newline at end of file From 98df1c58e35bb29a09b398e9f21e8a1adccac71f Mon Sep 17 00:00:00 2001 From: webplusai Date: Tue, 23 Jul 2024 15:02:59 +0200 Subject: [PATCH 2/5] Signing the CLA (#8411) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index e7a7136f1ff..8e7c22a91de 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -581,3 +581,5 @@ Andrei Rybak, @rybak, 2024/06/09 @andrewgoz, 2024/07/10 Michael McDermott, @michaeljmcd, 2024-07-09 + +@webplusai, 2024/07/23 From a27824af7e5d7da844fad963bb5d0a691b773674 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Tue, 23 Jul 2024 23:12:47 +0200 Subject: [PATCH 3/5] Update Release Info for v5.3.5 (#8412) --- editions/tw5.com/tiddlers/about/Archive.tid | 4 ++-- editions/tw5.com/tiddlers/releasenotes/Release 5.3.5.tid | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/editions/tw5.com/tiddlers/about/Archive.tid b/editions/tw5.com/tiddlers/about/Archive.tid index bf7667e9ae8..5290ed1b6e6 100644 --- a/editions/tw5.com/tiddlers/about/Archive.tid +++ b/editions/tw5.com/tiddlers/about/Archive.tid @@ -1,5 +1,5 @@ created: 20231005205623086 -modified: 20240628132622052 +modified: 20240723172222378 tags: About title: TiddlyWiki Archive @@ -8,7 +8,7 @@ title: TiddlyWiki Archive 5.1.10 5.1.11 5.1.12 5.1.13 5.1.14 5.1.15 5.1.16 5.1.17 5.1.18 5.1.19 5.1.20 5.1.21 5.1.22 5.1.23 5.2.0 5.2.1 5.2.2 5.2.3 5.2.4 5.2.5 5.2.6 5.2.7 -5.3.0 5.3.1 5.3.2 5.3.3 5.3.4 +5.3.0 5.3.1 5.3.2 5.3.3 5.3.4 5.3.5 \end Older versions of TiddlyWiki are available in the [[archive|https://github.com/Jermolene/jermolene.github.io/tree/master/archive]]: diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.3.5.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.3.5.tid index 09d23ab1244..faf91de96ac 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.3.5.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.3.5.tid @@ -1,10 +1,11 @@ caption: 5.3.5 created: 20240710115948992 -modified: 20240710115948992 +description: Bugfix release for v5.3.4 +modified: 20240723172616735 +released: 20240710153600000 tags: ReleaseNotes title: Release 5.3.5 type: text/vnd.tiddlywiki -description: Under development //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.4...v5.3.5]]// From 995f3babce4fafc6617a3ba82b4c027152e898af Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Wed, 24 Jul 2024 11:21:59 +0100 Subject: [PATCH 4/5] Update github URL for TW5 repo --- editions/tw5.com/tiddlers/definitions/GitHub.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/definitions/GitHub.tid b/editions/tw5.com/tiddlers/definitions/GitHub.tid index 06b24c7104e..55a019a9935 100644 --- a/editions/tw5.com/tiddlers/definitions/GitHub.tid +++ b/editions/tw5.com/tiddlers/definitions/GitHub.tid @@ -8,7 +8,7 @@ GitHub is a hosting service for distributed projects that use git as their versi The code and documentation of TiddlyWiki is hosted on ~GitHub at: -https://github.com/Jermolene/TiddlyWiki5 +https://github.com/TiddlyWiki/TiddlyWiki5 ~GitHub also offer a free web hosting service called [[GitHub Pages|https://pages.github.com/]] that can be used directly from the single file configuration. See [[Saving to a Git service]]. From 2aec57213d840569ffc202237f7c0cf4d913abc2 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Wed, 24 Jul 2024 11:38:00 +0100 Subject: [PATCH 5/5] Update URL of GitHub pages repo for tiddlywiki.com --- bin/ci-pre-build.sh | 2 +- bin/ci-push.sh | 2 +- .../tiddlers/build/Scripts for building tiddlywiki.com.tid | 4 ++-- editions/tw5.com/tiddlers/about/Archive.tid | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/ci-pre-build.sh b/bin/ci-pre-build.sh index 6f4b0ca7819..a11b8e0c4f2 100755 --- a/bin/ci-pre-build.sh +++ b/bin/ci-pre-build.sh @@ -7,4 +7,4 @@ npm --force install tiddlywiki || exit 1 # Pull existing GitHub pages content -git clone --depth=1 --branch=master "https://github.com/Jermolene/jermolene.github.io.git" output +git clone --depth=1 --branch=master "https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages.git" output diff --git a/bin/ci-push.sh b/bin/ci-push.sh index dff297c8013..fe8373785e4 100755 --- a/bin/ci-push.sh +++ b/bin/ci-push.sh @@ -10,6 +10,6 @@ git config --global user.email "actions@github.com" git config --global user.name "GitHub Actions" git add -A . git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))" -git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" &>/dev/null +git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.com-gh-pages.git" &>/dev/null git push deploy master &>/dev/null cd .. diff --git a/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid b/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid index 0bbc3419401..c371fc47ba2 100644 --- a/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid +++ b/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid @@ -6,7 +6,7 @@ Nonetheless, you may find techniques that are useful for your own scripts. ! Hosting -https://tiddlywiki.com is served by [[GitHub Pages|https://pages.github.com]] from the repository https://github.com/Jermolene/jermolene.github.io +https://tiddlywiki.com is served by [[GitHub Pages|https://pages.github.com]] from the repository https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages The scripts live in the repository https://github.com/Jermolene/build.jermolene.github.io @@ -15,7 +15,7 @@ The scripts live in the repository https://github.com/Jermolene/build.jermolene. These scripts require the following directories to be siblings: * `build.jermolene.github.io` - a local copy of https://github.com/Jermolene/build.jermolene.github.io -* `jermolene.github.io` - a local copy of the repo https://github.com/Jermolene/jermolene.github.io +* `jermolene.github.io` - a local copy of the repo https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages * `TiddlyWiki5` - a local copy of the repo https://github.com/Jermolene/TiddlyWiki5 The scripts are designed to be executed with the current directory being the `TiddlyWiki5` directory. diff --git a/editions/tw5.com/tiddlers/about/Archive.tid b/editions/tw5.com/tiddlers/about/Archive.tid index 5290ed1b6e6..c3bbf8671c2 100644 --- a/editions/tw5.com/tiddlers/about/Archive.tid +++ b/editions/tw5.com/tiddlers/about/Archive.tid @@ -11,7 +11,7 @@ title: TiddlyWiki Archive 5.3.0 5.3.1 5.3.2 5.3.3 5.3.4 5.3.5 \end -Older versions of TiddlyWiki are available in the [[archive|https://github.com/Jermolene/jermolene.github.io/tree/master/archive]]: +Older versions of TiddlyWiki are available in the [[archive|https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages/tree/master/archive]]: