diff --git a/editions/fr-FR/tiddlers/saving/Saving on Beaker Browser.tid b/editions/fr-FR/tiddlers/saving/Saving on Beaker Browser.tid deleted file mode 100644 index a1541c9bf..000000000 --- a/editions/fr-FR/tiddlers/saving/Saving on Beaker Browser.tid +++ /dev/null @@ -1,35 +0,0 @@ -caption: Beaker Browser -color: #FF8A65 -created: 20161229121316912 -delivery: App -description: Nouveau navigateur puissant pour Mac, Windows et Linux -fr-title: Enregistrer avec Beaker Browser -method: save -modified: 20220402105820520 -tags: Saving Windows Linux Mac -title: Saving on Beaker Browser -type: text/vnd.tiddlywiki - -<<.from-version "5.1.14">> <> intègre un module qui lui permet d'enregistrer les modifications directement avec [[Beaker Browser]], un navigateur internet en peer-to-peer expérimental. - -! Instructions - -# Téléchargez et installez Beaker Browser depuis https://beakerbrowser.com/ -# Lancez Beaker et si nécessaire ouvrez un onglet vers l'adresse `beaker:start` -# Cliquez sur le bouton <> en haut à gauche de la page -# Saisissez les détails sur votre site -# Cliquez sur le lien <> et sélectionnez le fichier `index.html` de votre <> -# Naviguez sur votre site en cliquant sur le lien vers `index.html`<<;>> il devrait s'ouvrir dans un nouvel onglet -# Essayez de créer des tiddlers et d'enregistrer les modifications - -Jusque là, le wiki est entièrement privé et les autres utilisateurs ne peuvent pas en voir le contenu, même en connaissant l'URL. Pour le partager avec d'autres utilisateurs<<:>> - -# Publiez vos modifications -## Visitez la page <> à l'aide du menu <> de Beaker Browser -## Sélectionnez votre site dans la liste -## Recherchez un encart <>. S'il n'est pas présent, passez au point suivant -## Cliquez sur le bouton <> -## Cliquez sur le bouton <> -# Partagez l'URL `dat:` -## Copiez l'URL de votre site à partir de la barre d'adresse et partagez-la avec d'autres utilisateurs -## Les autres utilisateurs devraient pouvoir accéder à votre site mais ils ne pourront pas le modifier avant d'en avoir fait leur propre clone diff --git a/editions/tw5.com/tiddlers/filters/indexes.tid b/editions/tw5.com/tiddlers/filters/indexes.tid index 44b5fbf50..a65784118 100644 --- a/editions/tw5.com/tiddlers/filters/indexes.tid +++ b/editions/tw5.com/tiddlers/filters/indexes.tid @@ -11,7 +11,7 @@ op-output: all the property names or indices contained in the input data tiddler Each input title is processed in turn, and is ignored if it does not denote a [[data tiddler|DataTiddlers]]. The sorted list of property names is retrieved from the data tiddler and then [[dominantly appended|Dominant Append]] to the operator's output. -Note that behind the scenes, the name/value pairs in a dictionary tiddler are represented as a [[JSON object|JSONTiddlers]]. JSON objects do not maintain a guaranteed ordering and so we can’t reliably retain the ordering of the data in the file. +Note that behind the scenes, the name/value pairs in a dictionary tiddler are represented as a [[JSON object|JSONTiddlers]]. JSON objects do not maintain a guaranteed ordering and so we cannot reliably retain the ordering of the data in the file. Where the content of a tiddler is in JSON format with an array as its root, the <<.op indexes>> operator retrieves a selection of integer indices instead. diff --git a/editions/tw5.com/tiddlers/platforms/Beaker_Browser.tid b/editions/tw5.com/tiddlers/platforms/Beaker_Browser.tid deleted file mode 100644 index 1d43928aa..000000000 --- a/editions/tw5.com/tiddlers/platforms/Beaker_Browser.tid +++ /dev/null @@ -1,21 +0,0 @@ -created: 20161229113910984 -modified: 20171113110222980 -title: Beaker Browser -type: text/vnd.tiddlywiki - -From [[Beaker Browser website|https://beakerbrowser.com/]]: - -> Beaker is a Peer-to-Peer Web Browser, made for users to run applications independently of hosts. Using P2P Hypermedia, Beaker separates frontend apps from backend services, so that users are completely in control of their software and data. Read more. - -Beaker is a fork of the open source Chromium browser (which is the core engine powering Google's Chrome browser). - -Beaker adds the ability to host sites within the browser, and browse to those sites via the `dat://` protocol. The extraordinary thing is that if you are running Beaker then you can also browse to sites hosted by other users, without needing any server in between. - -Further, you can opt to host a site belonging to somebody else, forming part of a Bittorrent-like swarm of peers serving the content to other browsers. You can also //fork// a site, making your own copy that you can change as you need. - -The main disadvantage is that mainstream browsers cannot use `dat://` sites. - -Most of the magic is accomplished by the underlying [[Dat protocol|https://datproject.org/]]. - -<<.from-version "5.1.14">> TiddlyWiki incorporates a special saver module permitting changes to be saved directly from Beaker browser. See [[Saving on Beaker Browser]] for instructions. - diff --git a/editions/tw5.com/tiddlers/saving/Saving on Beaker Browser.tid b/editions/tw5.com/tiddlers/saving/Saving on Beaker Browser.tid deleted file mode 100644 index ea5777186..000000000 --- a/editions/tw5.com/tiddlers/saving/Saving on Beaker Browser.tid +++ /dev/null @@ -1,34 +0,0 @@ -caption: Beaker Browser -color: #FF8A65 -created: 20161229121316912 -delivery: App -description: Powerful new browser for Mac, Windows and Linux -method: save -modified: 20200507104016915 -tags: Saving Windows Linux Mac -title: Saving on Beaker Browser -type: text/vnd.tiddlywiki - -<<.from-version "5.1.14">> TiddlyWiki incorporates a saver module that allows it to save changes directly with the [[Beaker Browser]], an experimental peer-to-peer browser. - -! Instructions - -# Download and install the Beaker Browser from https://beakerbrowser.com/ -# Run Beaker, and if necessary open a tab to beaker:start -# Click the "New site" button at the top left of the page -# Enter the details of your site -# Click the link “Add files” and upload your TiddlyWiki index.html file -# View the site by clicking on the link to index.html; it should open in a new tab -# Try out creating tiddlers, and saving changes - -At this point, the wiki is entirely private, and other users cannot see the content even if they have the URL. To share the wiki with other users: - -# Publish your changes -## Visit the "Library" page in Beaker Browser via the system menu -## Select your site in the list -## Look for a box mentioning "n unpublished changes". If not present, skip to the next step -## Click the "Review changes" button -## Click the "Publish" button -# Share the dat: URL -## Copy the URL of your site from the address bar and share it with other users -## Other users should be able to access your site but they won't be able to make changes unless they fork their own copy diff --git a/editions/tw5.com/tiddlers/saving/Saving via WebDAV.tid b/editions/tw5.com/tiddlers/saving/Saving via WebDAV.tid index fe10ad98e..63959a1d6 100644 --- a/editions/tw5.com/tiddlers/saving/Saving via WebDAV.tid +++ b/editions/tw5.com/tiddlers/saving/Saving via WebDAV.tid @@ -34,7 +34,7 @@ Lightweight, portable and easy to use solutions * ~SharePoint / ~OneDrive for Windows ** Save your ~TiddlyWiki file with an `.aspx` extension ** Copy it to a ~SharePoint/~OneDrive for Business sync'd library -** As long as ~WebDAV hasn’t been disabled, renaming single-file wiki from .html to .aspx “just works” when stored in one of these folders +** As long as ~WebDAV has not been disabled, renaming single-file wiki from .html to .aspx “just works” when stored in one of these folders ** This //might// work with Mac also. !! OSX diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 1.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 1.tid index 713b6b156..57aee6673 100644 --- a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 1.tid +++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 1.tid @@ -1,6 +1,6 @@ created: 20200131142401129 modified: 20211113230406823 -tags: ActionCreateTiddlerWidget Widgets +tags: ActionCreateTiddlerWidget title: ActionCreateTiddlerWidget Example 1 type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 2.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 2.tid index bfb0d759f..336972a16 100644 --- a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 2.tid +++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 2.tid @@ -1,6 +1,6 @@ created: 20200131144828713 modified: 20211113011036840 -tags: ActionCreateTiddlerWidget Widgets +tags: ActionCreateTiddlerWidget title: ActionCreateTiddlerWidget Example 2 type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 3.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 3.tid index 296b32e74..2e137e330 100644 --- a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 3.tid +++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 3.tid @@ -1,6 +1,6 @@ created: 20200131145355658 modified: 20211113011111052 -tags: ActionCreateTiddlerWidget Widgets +tags: ActionCreateTiddlerWidget title: ActionCreateTiddlerWidget Example 3 type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 4.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 4.tid index 394bf61a9..1335893e5 100644 --- a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 4.tid +++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 4.tid @@ -1,6 +1,6 @@ created: 20200131150229551 modified: 20211113011129601 -tags: ActionCreateTiddlerWidget Widgets +tags: ActionCreateTiddlerWidget title: ActionCreateTiddlerWidget Example 4 type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 5.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 5.tid new file mode 100644 index 000000000..03f719b8b --- /dev/null +++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 5.tid @@ -0,0 +1,32 @@ +created: 20200131144828713 +modified: 20230111220933412 +tags: ActionCreateTiddlerWidget +title: ActionCreateTiddlerWidget Example 5 +type: text/vnd.tiddlywiki + +\define testCreate() +<$action-createtiddler $basetitle="base" $template="ActionCreateTiddlerWidget Template"> + <$action-sendmessage $message="tm-edit-tiddler" $param=<>/> + +\end + +This example will use the base title defined in [[ActionCreateTiddlerWidget Template]]. + +It will create: "base", "base 1", "base 2" and so on, and navigate to this tiddler in draft mode. + +``` +\define testCreate() +<$action-createtiddler $basetitle="base" $template="ActionCreateTiddlerWidget Template"> + <$action-sendmessage $message="tm-edit-tiddler" $param=<>/> + +\end + +<$button actions=<> > +Create Tiddler + +``` + +<$button actions=<> > +<$action-setfield $tiddler="$:/state/tab/sidebar--595412856" text="$:/core/ui/SideBar/Recent"/> +Create Tiddler + - Clicking this button, will also open the Right sidebar: Recent tab diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid index 56b3e0e27..632b71686 100644 --- a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid @@ -1,35 +1,39 @@ caption: action-createtiddler created: 20161020152745942 -modified: 20210601092956998 +modified: 20230115084716196 tags: Widgets ActionWidgets title: ActionCreateTiddlerWidget type: text/vnd.tiddlywiki ! Introduction -The ''action-createtiddler'' widget is an [[action widget|ActionWidgets]] that creates new tiddlers. ActionWidgets are used within triggering widgets such as the ButtonWidget. +The <<.wid "action-createtiddler">> widget is an [[action widget|ActionWidgets]] that creates new tiddlers. Action widgets are used within triggering widgets such as the ButtonWidget. -There are several differences from the [[tm-new-tiddler message|WidgetMessage: tm-new-tiddler]]: +There are several //differences// from the [[tm-new-tiddler message|WidgetMessage: tm-new-tiddler]]: -* The new tiddler is not automatically displayed in the [[story river|StoryRiver]] +* The new tiddler is not automatically displayed in the [[story river|Story River]] * The title of the new tiddler is made available for subsequent operations ! Content and Attributes The ''action-createtiddler'' widget is invisible. -<<.from-version "5.2.0">> The action widgets contained within the ''action-createtiddler'' widget are executed after the new tiddler has been created with the title of the tiddler in the variable `createTiddler-title` and `createTiddler-draftTitle`. - |!Attribute |!Description | |$basetitle |The initial title that will be attempted. If a tiddler with that title already exists, then a numerical counter is added to the title and incremented until it is unique| -|$savetitle |//(deprecated – see below)// A text reference identifying a field or index into which the title of the newly created tiddler will be stored after it is created | -|$savedrafttitle |//(deprecated – see below)// <<.from-version "5.1.20">> A text reference identifying a field or index into which the draft title associated with the newly created tiddler will be stored after it is created. This is useful when using a sequence of action widgets to create a new tiddler, put it into edit mode, and position it within the list of its parent tag | +|$savetitle |<<.deprecated-since "5.1.20" "ActionCreateTiddlerWidget Example 5">> A text reference identifying a field or index into which the title of the newly created tiddler will be stored after it is created | +|$savedrafttitle |<<.deprecated-since "5.1.20" "ActionCreateTiddlerWidget Example 5">> A text reference identifying a field or index into which the draft title associated with the newly created tiddler will be stored after it is created. This is useful when using a sequence of action widgets to create a new tiddler, put it into edit mode, and position it within the list of its parent tag | |$timestamp |Specifies whether the timestamp(s) of the target tiddler will be updated (''modified'' and ''modifier'', plus ''created'' and ''creator'' for newly created tiddlers). Can be "yes" (the default) or "no" | |$template |<<.from-version "5.1.22">> The title of a template tiddler, that will be used to create a new tiddler | |$overwrite |<<.from-version "5.1.22">> If set to "yes", it will overwrite existing tiddlers. ''Be careful!'' | |//{any attributes not starting with $}// |Each attribute name specifies a field to be created in the new tiddler | -<<.from-version "5.2.0">> Note that the attributes `$savetitle` and `$savedrafttitle` are no longer needed. Instead, any action widgets that need to use the title of the newly created tiddler should be contained within the ''action-createtiddler'' widget, and reference the variables `createTiddler-title` and `createTiddler-draftTitle` to obtain the title. +! Variables + +<<.from-version "5.2.0">> The content of the <<.wid "action-createtiddler">> widget is executed after the new tiddler has been created. The title of the newly created tiddler is stored in the variable <<.var "createTiddler-title">>. + +|!Variables |!Description | +|`createTiddler-title` |The tittle of the tiddler that has been created. See [[ActionCreateTiddlerWidget Example 5]] | +|`createTiddler-draftTitle` |This variable only exists to have feature parity with the deprecated parameters. It contains the title of a "draft tiddler" | ! Examples @@ -61,4 +65,9 @@ The ''action-createtiddler'' widget is invisible. {{ActionCreateTiddlerWidget Example 4}} <<< +--- + +<<< +{{ActionCreateTiddlerWidget Example 5}} +<<< diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid index e1184f00f..2a431ead9 100644 --- a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid +++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid @@ -1,6 +1,6 @@ created: 20161020153426686 modified: 20211113011019510 -tags: ActionCreateTiddlerWidget Widgets +tags: ActionCreateTiddlerWidget title: ActionCreateTiddlerWidget Example type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/widgets/GenesisWidget.tid b/editions/tw5.com/tiddlers/widgets/GenesisWidget.tid index 20f57ba1d..9292e39ba 100644 --- a/editions/tw5.com/tiddlers/widgets/GenesisWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/GenesisWidget.tid @@ -45,7 +45,6 @@ src="""\define my-banner(mode:"inline",caption) ! Important <$macrocall $name=".warning" _=""" -In the following example the widget attribute named `one` is absent from the HTML output, since HTML attributes with the prefix `on` are removed for security reasons. See [[HTML in WikiText]] "Security" for more details. +In the following example the widget attribute named `one` is not present in the HTML output. This is because HTML attributes starting with the prefix `on` are removed for security reasons. See [[HTML in WikiText]] "Security" for more details. This restriction only affects generated HTML elements, and does not prevent the use of attributes prefixed `on` with other widgets"""/> <Test Genesis Widget'>> -"""/> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid index ea926336d..d000cd975 100644 --- a/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid @@ -33,7 +33,7 @@ some text !! Security -<<.warning """Every HTML attribute prefixed with `on` is removed from rendered HTML content for security reasons. eg: `onclick="some evil code"` would be executed, if no sanitation is active. In ~TiddlyWiki It's important to remove every attribute prefixed with `on` so future extensions to the HTML spec will be secure by default. This can lead to some inconvenience since custom attributes like eg: `one` are removed too. """>> +<<.warning """Note that any HTML attributes prefixed with `on` are removed from the rendered HTML content. This is done to prevent event handlers (such as "onclick") being used as a clandestine way to execute untrusted JavaScript. A design goal of TiddlyWiki is to ensure that executable JavaScript can only enter the system through explicit JavaScript module tiddlers or raw markup tiddlers. This makes it possible to filter unsafe content in multiuser environments, and also makes it safer to copy untrusted wikitext examples.""">> !! Widgets @@ -54,7 +54,7 @@ The following tags are treated as 'void'. This means that `` is treated as * ``, ``, `
`, ``, ``, ``, `
`, ``, ``, ``, ``, ``, ``, ``, ``, `` -If you don’t close any other tag then it will behave as if the missing closing tag were at the end of the tiddler. +If you do not close any other tag then it will behave as if the missing closing tag were at the end of the tiddler. ! Attributes @@ -121,7 +121,7 @@ attr={{tiddler}} attr={{!!field}} attr={{tiddler!!field}} ``` -<<.warning "The attribute's value will be the exact text retrieved from the TextReference. Any wiki syntax in that text will be left as-is.">> +<<.warning "The value of the attribute value will be the exact text retrieved from the TextReference. Any wiki syntax in that text will be left as-is.">> !! Variable Attribute Values @@ -132,7 +132,7 @@ Variable attribute values are indicated with double angle brackets around a [[ma ... ``` -<<.warning "The text from the macro's definition will be retrieved and text substitution will be performed (i.e. <<.param $param$>> and <<.param $(...)$>> syntax). The attribute's value will be the resulting text. Any wiki syntax in that text (including further macro calls and variable references) will be left as-is.">> +<<.warning "The text from the definition of the macro will be retrieved and text substitution will be performed (i.e. <<.param $param$>> and <<.param $(...)$>> syntax). The value of the attribute value will be the resulting text. Any wiki syntax in that text (including further macro calls and variable references) will be left as-is.">> !! Filtered Attribute Values @@ -145,4 +145,4 @@ This example shows how to add a prefix to a value: ``` <$text text={{{ [addprefix[$:/myprefix/]] }}} /> ``` -<<.warning "The attribute's value will be the exact text from the first item in the resulting list. Any wiki syntax in that text will be left as-is.">> +<<.warning "The value of the attribute will be the exact text from the first item in the resulting list. Any wiki syntax in that text will be left as-is.">> diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 3ffb6e552..290fa85f5 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -517,3 +517,5 @@ Pippo Peppo, @pippep, 2023-01-03 Scott Sauye, @CrossEye, 2023-01-04 Marcus Winter, @yaisog, 2023-01-07 + +Ethan Weller, @gamedungeon, 2023-01-17