diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 556b93919..dca23b783 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: Discuss feature request - url: https://github.com/Jermolene/TiddlyWiki5/discussions + url: https://github.com/TiddlyWiki/TiddlyWiki5/discussions about: Open new discussion about new feature - name: Talk.Tiddlywiki Forum url: https://talk.tiddlywiki.org diff --git a/.github/workflows/cla-check.yml b/.github/workflows/cla-check.yml index c6927fad9..72bba1c54 100644 --- a/.github/workflows/cla-check.yml +++ b/.github/workflows/cla-check.yml @@ -18,10 +18,10 @@ jobs: echo "CLA not signed" gh pr comment "$NUMBER" -b "@$USER It appears that this is your first contribution to the project, welcome. - With apologies for the bureaucracy, please could you prepare a separate PR to the 'tiddlywiki-com' branch with your signature for the Contributor License Agreement (see [contributing.md](https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md))." + With apologies for the bureaucracy, please could you prepare a separate PR to the 'tiddlywiki-com' branch with your signature for the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))." else echo "CLA already signed" - gh pr comment "$NUMBER" -b "**$USER** has signed the Contributor License Agreement (see [contributing.md](https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md))" + gh pr comment "$NUMBER" -b "Confirmed: **$USER** has already signed the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))" fi env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/cla-signed.yml b/.github/workflows/cla-signed.yml index fc3b205b8..6783219d1 100644 --- a/.github/workflows/cla-signed.yml +++ b/.github/workflows/cla-signed.yml @@ -66,5 +66,5 @@ jobs: for number in "${prs[@]}" do - gh pr comment "$number" -b "**$AUTHOR** has signed the Contributor License Agreement (see [contributing.md](https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md))" + gh pr comment "$number" -b "**$AUTHOR** has signed the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))" done diff --git a/bin/ci-pre-build.sh b/bin/ci-pre-build.sh index 6f4b0ca78..a11b8e0c4 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 dff297c80..fe8373785 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/boot/bootprefix.js b/boot/bootprefix.js index 0ae236c21..4dae1b28f 100644 --- a/boot/bootprefix.js +++ b/boot/bootprefix.js @@ -21,7 +21,7 @@ $tw.boot = $tw.boot || Object.create(null); // Detect platforms if(!("browser" in $tw)) { - $tw.browser = typeof(window) !== "undefined" ? {} : null; + $tw.browser = typeof(window) !== "undefined" && typeof(document) !== "undefined" ? {} : null; } if(!("node" in $tw)) { $tw.node = typeof(process) === "object" ? {} : null; diff --git a/contributing.md b/contributing.md index 549e862a6..707c34110 100644 --- a/contributing.md +++ b/contributing.md @@ -1,3 +1,3 @@ -
Here we focus on contributions via GitHub Pull Requests but there are many other ways that anyone can help the TiddlyWiki project, such as reporting bugs or helping to improve our documentation.
PRs must meet these minimum requirements before they can be considered for merging:
The "imperative mood" means written as if giving a command or instruction. See this post for more details, but the gist is that the title of the PR should make sense when used to complete the sentence "If applied, this commit will...". So for example, these are good PR titles:
These a poorly worded PR titles:
PR titles may also include a short prefix to indicate the subsystem to which they apply. For example:
One of the principles of open source is that many pairs of eyes on the code can improve quality. So, we welcome comments and critiques of pending PRs. Conventional Comments has some techniques to help make comments as constructive and actionable as possible. Notably, they recommend prefixing a comment with a label to clarify the intention:
praise | Praises highlight something positive. Try to leave at least one of these comments per review. Do not leave false praise (which can actually be damaging). Do look for something to sincerely praise |
nitpick | Nitpicks are small, trivial, but necessary changes. Distinguishing nitpick comments significantly helps direct the reader's attention to comments requiring more involvement |
suggestion | Suggestions are specific requests to improve the subject under review. It is assumed that we all want to do what's best, so these comments are never dismissed as “mere suggestions”, but are taken seriously |
issue | Issues represent user-facing problems. If possible, it's great to follow this kind of comment with a suggestion |
question | Questions are appropriate if you have a potential concern but are not quite sure if it's relevant or not. Asking the author for clarification or investigation can lead to a quick resolution |
thought | Thoughts represent an idea that popped up from reviewing. These comments are non-blocking by nature, but they are extremely valuable and can lead to more focused initiatives and mentoring opportunities |
chore | Chores are simple tasks that must be done before the subject can be “officially” accepted. Usually, these comments reference some common process. Try to leave a link to the process description so that the reader knows how to resolve the chore |
Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the UnaMesa Association (the legal entity that owns TiddlyWiki on behalf of the community).
Create a GitHub pull request to add your name to cla-individual.md
or cla-entity.md
, with the date in the format (YYYY/MM/DD).
step by step
tiddlywiki-com
Jeremy Ruston, @Jermolene, 2011/11/22
The CLA documents used for this project were created using Harmony Project Templates. "HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "HA-CLA-E-LIST Version 1.0" for "CLA-entity". +
Here we focus on contributions via GitHub Pull Requests but there are many other ways that anyone can help the TiddlyWiki project, such as reporting bugs or helping to improve our documentation.
PRs must meet these minimum requirements before they can be considered for merging:
The "imperative mood" means written as if giving a command or instruction. See this post for more details, but the gist is that the title of the PR should make sense when used to complete the sentence "If applied, this commit will...". So for example, these are good PR titles:
These a poorly worded PR titles:
PR titles may also include a short prefix to indicate the subsystem to which they apply. For example:
One of the principles of open source is that many pairs of eyes on the code can improve quality. So, we welcome comments and critiques of pending PRs. Conventional Comments has some techniques to help make comments as constructive and actionable as possible. Notably, they recommend prefixing a comment with a label to clarify the intention:
praise | Praises highlight something positive. Try to leave at least one of these comments per review. Do not leave false praise (which can actually be damaging). Do look for something to sincerely praise |
nitpick | Nitpicks are small, trivial, but necessary changes. Distinguishing nitpick comments significantly helps direct the reader's attention to comments requiring more involvement |
suggestion | Suggestions are specific requests to improve the subject under review. It is assumed that we all want to do what's best, so these comments are never dismissed as “mere suggestions”, but are taken seriously |
issue | Issues represent user-facing problems. If possible, it's great to follow this kind of comment with a suggestion |
question | Questions are appropriate if you have a potential concern but are not quite sure if it's relevant or not. Asking the author for clarification or investigation can lead to a quick resolution |
thought | Thoughts represent an idea that popped up from reviewing. These comments are non-blocking by nature, but they are extremely valuable and can lead to more focused initiatives and mentoring opportunities |
chore | Chores are simple tasks that must be done before the subject can be “officially” accepted. Usually, these comments reference some common process. Try to leave a link to the process description so that the reader knows how to resolve the chore |
Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the UnaMesa Association (the legal entity that owns TiddlyWiki on behalf of the community).
Create a GitHub pull request to add your name to cla-individual.md
or cla-entity.md
, with the date in the format (YYYY/MM/DD).
step by step
tiddlywiki-com
Jeremy Ruston, @Jermolene, 2011/11/22
The CLA documents used for this project were created using Harmony Project Templates. "HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "HA-CLA-E-LIST Version 1.0" for "CLA-entity".
This file was automatically generated by TiddlyWiki5
\ No newline at end of file diff --git a/core/modules/savers/put.js b/core/modules/savers/put.js index de9ba9465..a1ebef4bb 100644 --- a/core/modules/savers/put.js +++ b/core/modules/savers/put.js @@ -48,7 +48,7 @@ var PutSaver = function(wiki) { var self = this; var uri = this.uri(); // Async server probe. Until probe finishes, save will fail fast - // See also https://github.com/Jermolene/TiddlyWiki5/issues/2276 + // See also https://github.com/TiddlyWiki/TiddlyWiki5/issues/2276 $tw.utils.httpRequest({ url: uri, type: "OPTIONS", diff --git a/core/modules/storyviews/classic.js b/core/modules/storyviews/classic.js index c2848c435..044cd97f0 100644 --- a/core/modules/storyviews/classic.js +++ b/core/modules/storyviews/classic.js @@ -82,6 +82,10 @@ ClassicStoryView.prototype.remove = function(widget) { removeElement = function() { widget.removeChildDomNodes(); }; + // Blur the focus if it is within the descendents of the node we are removing + if($tw.utils.domContains(targetElement,targetElement.ownerDocument.activeElement)) { + targetElement.ownerDocument.activeElement.blur(); + } // Abandon if the list entry isn't a DOM element (it might be a text node) if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) { removeElement(); diff --git a/core/modules/utils/dom/dom.js b/core/modules/utils/dom/dom.js index 4ba037ed5..0b71e128c 100644 --- a/core/modules/utils/dom/dom.js +++ b/core/modules/utils/dom/dom.js @@ -270,6 +270,7 @@ Copy plain text to the clipboard on browsers that support it */ exports.copyToClipboard = function(text,options) { options = options || {}; + text = text || ""; var textArea = document.createElement("textarea"); textArea.style.position = "fixed"; textArea.style.top = 0; @@ -289,7 +290,7 @@ exports.copyToClipboard = function(text,options) { var succeeded = false; try { succeeded = document.execCommand("copy"); - } catch (err) { + } catch(err) { } if(!options.doNotNotify) { var successNotification = options.successNotification || "$:/language/Notifications/CopiedToClipboard/Succeeded", @@ -326,7 +327,7 @@ exports.collectDOMVariables = function(selectedNode,domNode,event) { variables["tv-popup-coords"] = Popup.buildCoordinates(Popup.coordinatePrefix.csOffsetParent,nodeRect); var absRect = $tw.utils.extend({}, nodeRect); - for (var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) { + for(var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) { absRect.left += currentNode.offsetLeft; absRect.top += currentNode.offsetTop; } diff --git a/core/modules/utils/filesystem.js b/core/modules/utils/filesystem.js index 5319e0481..86001c291 100644 --- a/core/modules/utils/filesystem.js +++ b/core/modules/utils/filesystem.js @@ -238,7 +238,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) { } else { // Save as a .tid or a text/binary file plus a .meta file var tiddlerType = tiddler.fields.type || "text/vnd.tiddlywiki"; - if(tiddlerType === "text/vnd.tiddlywiki" || tiddler.hasField("_canonical_uri")) { + if(tiddlerType === "text/vnd.tiddlywiki" || tiddlerType === "text/vnd.tiddlywiki-multiple" || tiddler.hasField("_canonical_uri")) { // Save as a .tid file fileInfo.type = "application/x-tiddler"; fileInfo.hasMetaFile = false; diff --git a/core/ui/TestCases/DefaultTemplate.tid b/core/ui/TestCases/DefaultTemplate.tid index fb6e9edf1..04623cbc6 100644 --- a/core/ui/TestCases/DefaultTemplate.tid +++ b/core/ui/TestCases/DefaultTemplate.tid @@ -1,4 +1,5 @@ title: $:/core/ui/testcases/DefaultTemplate +code-body: yes \whitespace trim \procedure linkcatcherActions() @@ -46,7 +47,7 @@ title: $:/core/ui/testcases/DefaultTemplate <$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]" variable="listItem" > - <$transclude tiddler=<` inutiles) +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/commit/987bfcfd5b49b992e5fd45f3428497f6f55cae53]] une d'interface utilisateur pour [[régler l'image d'arrière plan|Setting a page background image]] +* [[Corrige|https://github.com/TiddlyWiki/TiddlyWiki5/commit/3df341621d30b205775288e324cef137c48e9f6e]] un problème avec un défilement inutile au démarrage +* [[Actualise|https://github.com/TiddlyWiki/TiddlyWiki5/commit/ae001a19e5b3e43cf5388fd4e8d99788085649fe]] le [[Plugin KaTeX|KaTeX Plugin]] vers le [[KaTeX v0.2.0|https://github.com/Khan/KaTeX/releases/tag/v0.2.0]], pour un meilleur support des symboles +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/commit/70e419824fab107aab58f87780dbb5a1de70c248]] l'affichage d'un panneau d'aide flottant au [[Plugin Help|$:/plugins/tiddlywiki/help]] +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/commit/8643278a452d1a300cec8d3425c1b18699a17dca]] le support d'une bibliothèque de plugins en ligne +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/commit/ea6e60e66983ee1184f09c5796ef6c8bceae703a]] la sélection automatique de la zone de recherche au démarrage +* [[Intègre|https://github.com/TiddlyWiki/TiddlyWiki5/commit/4f3cb8b9aebfc4f65f40c96ef99730887d746b41]] le [[Plugin Railroad|Railroad Plugin]] par Astrid Elocson (le voir en action dans la nouvelle documentation de la [[Syntaxe des filtres|Filter Syntax]]) +* [[Migre|https://github.com/TiddlyWiki/TiddlyWiki5/commit/230066eeae9ace8336612e02c78f8cdaa3f717e4]] la fonctionnalité "Titres Stickés", par un réglage optionnel, des thèmes "Vanilla"/"Snow White". Ainsi les titres des tiddlers collent au haut de la fenêtre pendant le défilement pour les navigateurs qui l'acceptent `position: sticky` (comme Safari et Firefox) +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/commit/8cb7090c40489c81e8c5dfb8cbbdee2c60998c3e]] des icones à [[RechercheAvancée|$:/AdvancedSearch]], [[PanneauDeContrôle|$:/ControlPanel]] et [[GestionDesÉtiquettes|$:/TagManager]] +* [[Change|https://github.com/TiddlyWiki/TiddlyWiki5/commit/21b6ce71ffc617f61d4da0065a3ee695be535e2a]] le libellé du bouton du tiddler "save" pour "confirm" +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/issues/1103]] la liaison automatique à des tiddlers système tels que $:/ControlPanel +* [[Améliore|https://github.com/TiddlyWiki/TiddlyWiki5/commit/9c7936413a8c50817044eb409661a575f7f97563]] le déroulé des listes de titres correspondant à l'étiquette +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/commit/aae56f20af35e7be6f3839a8c727e3f43174efe9]] une bannière avertissant l'utilisateur quand la modification de plugins demande la réactualisation de la page +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/commit/0bd2ec50e1514ef247182816f9f9e421f52f67bb]] une première passe à la vue du déroulé "empilé" +* [[Change|https://github.com/TiddlyWiki/TiddlyWiki5/commit/421ac16389cf07e8c00611ef5a858da0b89f7584]] les entêtes et pieds de page modaux afin d'être analysés par défaut dans le mode enligne (en évitant les balises `
` inutiles) !! Améliorations Technologiques -* [[Ajoute|https://github.com/Jermolene/TiddlyWiki5/commit/d340277cb219ffebd212fbf409e8ea804121d105]] la [[Macro ResolvePath|resolvepath Macro]] -* [[Ajoute|https://github.com/Jermolene/TiddlyWiki5/commit/718ce3e4aa04f7af5e9310f90d3415c0d82bee6f]] l'attribut ''class'' au CheckboxWidget -* [[Ajoute|https://github.com/Jermolene/TiddlyWiki5/commit/bb10e2b02900ece4701c44c3a7e7c03304e813b7]] le support d'affichage de message spécial si le déroulé principal est vide -* [[Améliore|https://github.com/Jermolene/TiddlyWiki5/commit/6e0c7d90221771ae384d620984f08a2090c500dc]] le rendu des polices sous Mac OS X -* [[Ajoute|https://github.com/Jermolene/TiddlyWiki5/commit/a2493f80a973b24ad3d3affda945c437b98c2d2e]] le support d'inclusion des fichiers ZIP -* [[Ajoute|https://github.com/Jermolene/TiddlyWiki5/commit/1808b1597e5a61379e4e5381d6d78bb73fa3a523]] le support d'éléments personnalisés par le RevealWidget -* [[Ajoute|https://github.com/Jermolene/TiddlyWiki5/commit/bd6472c1d10bc86eaf1b317c35b86f84086ee3c8]] l'attribut ''style'' au RevealWidget -* [[Corrige|https://github.com/Jermolene/TiddlyWiki5/commit/0b4ed3c72de16148ffe62abf1c5c06f2d2ce47f1]] l'utilisation de palette de couleurs dans les entrées de texte +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/commit/d340277cb219ffebd212fbf409e8ea804121d105]] la [[Macro ResolvePath|resolvepath Macro]] +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/commit/718ce3e4aa04f7af5e9310f90d3415c0d82bee6f]] l'attribut ''class'' au CheckboxWidget +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/commit/bb10e2b02900ece4701c44c3a7e7c03304e813b7]] le support d'affichage de message spécial si le déroulé principal est vide +* [[Améliore|https://github.com/TiddlyWiki/TiddlyWiki5/commit/6e0c7d90221771ae384d620984f08a2090c500dc]] le rendu des polices sous Mac OS X +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/commit/a2493f80a973b24ad3d3affda945c437b98c2d2e]] le support d'inclusion des fichiers ZIP +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/commit/1808b1597e5a61379e4e5381d6d78bb73fa3a523]] le support d'éléments personnalisés par le RevealWidget +* [[Ajoute|https://github.com/TiddlyWiki/TiddlyWiki5/commit/bd6472c1d10bc86eaf1b317c35b86f84086ee3c8]] l'attribut ''style'' au RevealWidget +* [[Corrige|https://github.com/TiddlyWiki/TiddlyWiki5/commit/0b4ed3c72de16148ffe62abf1c5c06f2d2ce47f1]] l'utilisation de palette de couleurs dans les entrées de texte * Plusieurs nouveaux [[icones au noyau|ImageGallery Example]]: {{$:/core/images/github}} {{$:/core/images/help}} {{$:/core/images/mail}} {{$:/core/images/tip}} {{$:/core/images/warning}} {{$:/core/images/twitter}} {{$:/core/images/video}} {{$:/core/images/up-arrow}} {{$:/core/images/left-arrow}} !! Corrections de Bogues -* [[Corrige|https://github.com/Jermolene/TiddlyWiki5/pull/1520]] les opérateurs [[sameday|sameday Operator]] et [[eachday|eachday Operator]] pour accepter les chaines de date TW5 -* [[Corrige|https://github.com/Jermolene/TiddlyWiki5/pull/1249]] les tests de compatibilité des numéros de version pour lesplugins -* [[Corrige|https://github.com/Jermolene/TiddlyWiki5/commit/1adfe20508116da0ee4b5c9e72ea9742f24b60c9]] un problème avec l'annulation répétée d'une ébauche -* [[Améliore|https://github.com/Jermolene/TiddlyWiki5/commit/050b643948e24d1d93a83766a23a0d693616d01e]] la mise au bacasable des éléments `