tiddlywiki 5.3.2 → 5.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. package/bin/build-site.sh +1 -1
  2. package/core/modules/parsers/wikiparser/wikiparser.js +2 -0
  3. package/core/modules/widgets/list.js +5 -2
  4. package/core/modules/widgets/select.js +2 -2
  5. package/core/templates/html-json-skinny-tiddler.tid +1 -1
  6. package/core/templates/store.area.template.html.tid +3 -5
  7. package/core/ui/EditTemplate/body/default.tid +3 -6
  8. package/core/ui/EditorToolbar/preview.tid +5 -14
  9. package/core/wiki/config/OfficialPluginLibrary.tid +1 -1
  10. package/editions/prerelease/tiddlers/{Release 5.3.3.tid → Release 5.3.4.tid } +8 -5
  11. package/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid +1 -1
  12. package/editions/test/tiddlers/tests/data/list-widget/WithEmptyParagraphTemplate.tid +13 -0
  13. package/editions/test/tiddlers/tests/data/pragmas/WhitespaceAfterPragma.tid +64 -0
  14. package/editions/test/tiddlers/tests/data/pragmas/WhitespaceNoPragma.tid +32 -0
  15. package/editions/test/tiddlers/tests/data/widgets/DataAttributes/SelectWidget-DataAttributes.tid +2 -2
  16. package/editions/tw5.com/tiddlers/hellothere/HelloThere.tid +1 -1
  17. package/editions/tw5.com/tiddlers/images/New Release Banner.png +0 -0
  18. package/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-delete-tiddler.tid +3 -1
  19. package/editions/tw5.com/tiddlers/pragmas/Pragma_ _define.tid +3 -1
  20. package/editions/tw5.com/tiddlers/releasenotes/BetaReleases.tid +2 -2
  21. package/editions/tw5.com/tiddlers/releasenotes/Release 5.3.3.tid +30 -0
  22. package/editions/tw5.com/tiddlers/releasenotes/alpha/AlphaReleases.tid +2 -2
  23. package/editions/tw5.com/tiddlers/widgets/GenesisWidget.tid +2 -1
  24. package/licenses/cla-individual.md +2 -0
  25. package/package.json +1 -1
  26. package/plugins/tiddlywiki/tiddlyweb/html-json-skinny-tiddler.tid +1 -1
  27. package/readme.md +1 -1
package/bin/build-site.sh CHANGED
@@ -5,7 +5,7 @@
5
5
  # Default to the current version number for building the plugin library
6
6
 
7
7
  if [ -z "$TW5_BUILD_VERSION" ]; then
8
- TW5_BUILD_VERSION=v5.3.2
8
+ TW5_BUILD_VERSION=v5.3.3
9
9
  fi
10
10
 
11
11
  echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -216,6 +216,8 @@ WikiParser.prototype.parsePragmas = function() {
216
216
  subTree[0].children = [];
217
217
  currentTreeBranch = subTree[0].children;
218
218
  }
219
+ // Skip whitespace after the pragma
220
+ this.skipWhitespace();
219
221
  }
220
222
  return currentTreeBranch;
221
223
  };
@@ -109,6 +109,7 @@ ListWidget.prototype.findExplicitTemplates = function() {
109
109
  this.explicitJoinTemplate = null;
110
110
  this.hasTemplateInBody = false;
111
111
  var searchChildren = function(childNodes) {
112
+ var foundInlineTemplate = false;
112
113
  $tw.utils.each(childNodes,function(node) {
113
114
  if(node.type === "list-template") {
114
115
  self.explicitListTemplate = node.children;
@@ -118,12 +119,14 @@ ListWidget.prototype.findExplicitTemplates = function() {
118
119
  self.explicitJoinTemplate = node.children;
119
120
  } else if(node.type === "element" && node.tag === "p") {
120
121
  searchChildren(node.children);
122
+ foundInlineTemplate = true;
121
123
  } else {
122
- self.hasTemplateInBody = true;
124
+ foundInlineTemplate = true;
123
125
  }
124
126
  });
127
+ return foundInlineTemplate;
125
128
  };
126
- searchChildren(this.parseTreeNode.children);
129
+ this.hasTemplateInBody = searchChildren(this.parseTreeNode.children);
127
130
  }
128
131
 
129
132
  ListWidget.prototype.getTiddlerList = function() {
@@ -43,7 +43,7 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
43
43
  //Create element
44
44
  var domNode = this.document.createElement("select");
45
45
  if(this.selectClass) {
46
- domNode.classname = this.selectClass;
46
+ domNode.className = this.selectClass;
47
47
  }
48
48
  // Assign data- attributes
49
49
  this.assignAttributes(domNode,{
@@ -62,8 +62,8 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
62
62
  if(this.selectTooltip) {
63
63
  domNode.setAttribute("title",this.selectTooltip);
64
64
  }
65
- this.renderChildren(domNode,nextSibling);
66
65
  this.parentDomNode.insertBefore(domNode,nextSibling);
66
+ this.renderChildren(domNode,null);
67
67
  this.domNodes.push(domNode);
68
68
  this.setSelectValue();
69
69
  if(this.selectFocus == "yes") {
@@ -1,3 +1,3 @@
1
1
  title: $:/core/templates/html-json-skinny-tiddler
2
2
 
3
- <$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes"/>
3
+ <$text text=<<join>>/><$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes"/>
@@ -9,9 +9,7 @@ title: $:/core/templates/store.area.template.html
9
9
  <$let newline={{{ [charcode[10]] }}} join=`,$(newline)$`>
10
10
  <$text text=<<newline>>/>
11
11
  <$list filter=<<saveTiddlerFilter>> join=<<join>> template="$:/core/templates/html-json-tiddler"/>
12
- <$vars numTiddlers={{{ [subfilter<saveTiddlerFilter>count[]] }}}>
13
- <$list filter={{{ [<skinnySaveTiddlerFilter>] }}} join=<<join>> template="$:/core/templates/html-json-skinny-tiddler"/>
14
- </$vars>
12
+ <$list filter="[subfilter<skinnySaveTiddlerFilter>]" template="$:/core/templates/html-json-skinny-tiddler"/>
15
13
  <$text text=<<newline>>/>
16
14
  </$let>
17
15
  `]</script>`
@@ -22,8 +20,8 @@ title: $:/core/templates/store.area.template.html
22
20
  <!-- Old-style DIV/PRE-based store area -->
23
21
  <$reveal type="nomatch" state="$:/isEncrypted" text="yes">
24
22
  `<div id="storeArea" style="display:none;">`
25
- <$list filter=<<saveTiddlerFilter>> template="$:/core/templates/html-div-tiddler"/>
26
- <$list filter={{{ [<skinnySaveTiddlerFilter>] }}} template="$:/core/templates/html-div-skinny-tiddler"/>
23
+ <$list filter={{{ [<saveTiddlerFilter>] }}} template="$:/core/templates/html-div-tiddler"/>
24
+ <$list filter="[subfilter<skinnySaveTiddlerFilter>]" template="$:/core/templates/html-div-skinny-tiddler"/>
27
25
  `</div>`
28
26
  </$reveal>
29
27
  </$list>
@@ -1,9 +1,5 @@
1
1
  title: $:/core/ui/EditTemplate/body/default
2
2
 
3
- \function edit-preview-state()
4
- [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] +[get[text]] :else[[no]]
5
- \end
6
-
7
3
  \define config-visibility-title()
8
4
  $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
9
5
  \end
@@ -14,15 +10,16 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
14
10
 
15
11
  \whitespace trim
16
12
  <$let
13
+ editPreviewStateTiddler={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
17
14
  importTitle=<<qualify $:/ImportImage>>
18
15
  importState=<<qualify $:/state/ImportImage>> >
19
16
  <$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> >
20
17
  <div>
21
- <div class={{{ [function[edit-preview-state]match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}}>
18
+ <div class={{{ [<editPreviewStateTiddler>get[text]match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}}>
22
19
 
23
20
  <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
24
21
 
25
- <$list filter="[function[edit-preview-state]match[yes]]" variable="ignore">
22
+ <$list filter="[<editPreviewStateTiddler>get[text]match[yes]]" variable="ignore">
26
23
 
27
24
  <div class="tc-tiddler-preview-preview" data-tiddler-title={{!!draft.title}} data-tags={{!!tags}}>
28
25
 
@@ -9,17 +9,8 @@ button-classes: tc-text-editor-toolbar-item-start-group
9
9
  shortcuts: ((preview))
10
10
 
11
11
  \whitespace trim
12
- <$let
13
- edit-preview-state={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
14
- >
15
- <$reveal state=<<edit-preview-state>> type="match" text="yes" tag="span">
16
- {{$:/core/images/preview-open}}
17
- <$action-setfield $tiddler=<<edit-preview-state>> $value="no"/>
18
- <$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
19
- </$reveal>
20
- <$reveal state=<<edit-preview-state>> type="nomatch" text="yes" tag="span">
21
- {{$:/core/images/preview-closed}}
22
- <$action-setfield $tiddler=<<edit-preview-state>> $value="yes"/>
23
- <$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
24
- </$reveal>
25
- </$let>
12
+ <span>
13
+ <$transclude $tiddler={{{ [<editPreviewStateTiddler>get[text]match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} />
14
+ </span>
15
+ <$action-setfield $tiddler=<<editPreviewStateTiddler>> $value={{{ [<editPreviewStateTiddler>get[text]toggle[yes],[no]] }}} />
16
+ <$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
@@ -1,6 +1,6 @@
1
1
  title: $:/config/OfficialPluginLibrary
2
2
  tags: $:/tags/PluginLibrary
3
- url: https://tiddlywiki.com/library/v5.3.2/index.html
3
+ url: https://tiddlywiki.com/library/v5.3.3/index.html
4
4
  caption: {{$:/language/OfficialPluginLibrary}}
5
5
 
6
6
  {{$:/language/OfficialPluginLibrary/Hint}}
@@ -1,12 +1,15 @@
1
- caption: 5.3.3
2
- created: 20231213080754563
3
- modified: 20231213080754563
1
+ caption: 5.3.4
2
+ created: 20231223102229103
3
+ modified: 20231223102229103
4
4
  tags: ReleaseNotes
5
- title: Release 5.3.3
5
+ title: Release 5.3.4
6
6
  type: text/vnd.tiddlywiki
7
7
  description: Under development
8
8
 
9
- //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.2...master]]//
9
+ //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.3...master]]//
10
+
11
+ ! Major Improvements
12
+
10
13
 
11
14
  ! Translation improvements
12
15
 
@@ -1,6 +1,6 @@
1
1
  title: $:/config/OfficialPluginLibrary
2
2
  tags: $:/tags/PluginLibrary
3
- url: https://tiddlywiki.com/prerelease/library/v5.3.2/index.html
3
+ url: https://tiddlywiki.com/prerelease/library/v5.3.3/index.html
4
4
  caption: {{$:/language/OfficialPluginLibrary}} (Prerelease)
5
5
 
6
6
  The prerelease version of the official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
@@ -0,0 +1,13 @@
1
+ title: ListWidget/WithEmptyParagraphTemplate
2
+ description: List widget with an empty paragraph as inline template
3
+ type: text/vnd.tiddlywiki-multiple
4
+ tags: [[$:/tags/wiki-test-spec]]
5
+
6
+ +
7
+ title: Output
8
+
9
+ <$list filter="1"><p/></$list>
10
+ +
11
+ title: ExpectedResult
12
+
13
+ <p><p></p></p>
@@ -0,0 +1,64 @@
1
+ title: Pragmas/WhitespaceAfterPragma
2
+ description: parsermode pragma
3
+ type: text/vnd.tiddlywiki-multiple
4
+ tags: [[$:/tags/wiki-test-spec]]
5
+
6
+ title: Output
7
+
8
+ <$wikify name="parsetree" text={{Text}} mode="inline" output="parsetree">
9
+ <$text text=<<parsetree>>/>
10
+ </$wikify>
11
+ +
12
+ title: Text
13
+
14
+ \procedure this-is-a-definition() Something
15
+
16
+
17
+
18
+
19
+ Now!
20
+
21
+ +
22
+ title: ExpectedResult
23
+
24
+ <p>
25
+ [
26
+ {
27
+ "type": "set",
28
+ "attributes": {
29
+ "name": {
30
+ "name": "name",
31
+ "type": "string",
32
+ "value": "this-is-a-definition"
33
+ },
34
+ "value": {
35
+ "name": "value",
36
+ "type": "string",
37
+ "value": "Something"
38
+ }
39
+ },
40
+ "children": [
41
+ {
42
+ "type": "text",
43
+ "text": "Now!\n",
44
+ "start": 48,
45
+ "end": 53
46
+ }
47
+ ],
48
+ "params": [],
49
+ "orderedAttributes": [
50
+ {
51
+ "name": "name",
52
+ "type": "string",
53
+ "value": "this-is-a-definition"
54
+ },
55
+ {
56
+ "name": "value",
57
+ "type": "string",
58
+ "value": "Something"
59
+ }
60
+ ],
61
+ "isProcedureDefinition": true
62
+ }
63
+ ]
64
+ </p>
@@ -0,0 +1,32 @@
1
+ title: Pragmas/WhitespaceNoPragma
2
+ description: parsermode pragma
3
+ type: text/vnd.tiddlywiki-multiple
4
+ tags: [[$:/tags/wiki-test-spec]]
5
+
6
+ title: Output
7
+
8
+ <$wikify name="parsetree" text={{Text}} mode="inline" output="parsetree">
9
+ <$text text=<<parsetree>>/>
10
+ </$wikify>
11
+ +
12
+ title: Text
13
+
14
+
15
+
16
+
17
+
18
+ Now!
19
+
20
+ +
21
+ title: ExpectedResult
22
+
23
+ <p>
24
+ [
25
+ {
26
+ "type": "text",
27
+ "text": "\n\n\n\nNow!\n",
28
+ "start": 0,
29
+ "end": 9
30
+ }
31
+ ]
32
+ </p>
@@ -6,7 +6,7 @@ tags: [[$:/tags/wiki-test-spec]]
6
6
  title: Output
7
7
 
8
8
  \whitespace trim
9
- <$select tiddler='New Tiddler' field='text' default='Choose a new text' data-title={{Temp}} style.color={{{ [[Temp]get[color]] }}} onclick="clicked">
9
+ <$select tiddler='New Tiddler' class="myclass" field='text' default='Choose a new text' data-title={{Temp}} style.color={{{ [[Temp]get[color]] }}} onclick="clicked">
10
10
  <option disabled>Choose a new text</option>
11
11
  <option>A Tale of Two Cities</option>
12
12
  <option>A New Kind of Science</option>
@@ -24,4 +24,4 @@ Title1
24
24
  +
25
25
  title: ExpectedResult
26
26
 
27
- <p><select data-title="Title2" value="Choose a new text" style="color:red;"><option disabled="true">Choose a new text</option><option>A Tale of Two Cities</option><option>A New Kind of Science</option><option>The Dice Man</option></select></p>
27
+ <p><select class="myclass" data-title="Title2" value="Choose a new text" style="color:red;"><option disabled="true">Choose a new text</option><option>A Tale of Two Cities</option><option>A New Kind of Science</option><option>The Dice Man</option></select></p>
@@ -1,6 +1,6 @@
1
1
  created: 20130822170200000
2
2
  list: [[A Gentle Guide to TiddlyWiki]] [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] Examples [[What happened to the original TiddlyWiki?]]
3
- modified: 20231213080637781
3
+ modified: 20231223102201587
4
4
  tags: TableOfContents
5
5
  title: HelloThere
6
6
  type: text/vnd.tiddlywiki
@@ -11,4 +11,6 @@ The `tm-delete-tiddler` message deletes the specified tiddler and removes it fro
11
11
  |param |Title of the tiddler that is to be deleted |
12
12
  |tiddlerTitle |Fallback title that is used if ''param'' isn't specified (automatically set by the ButtonWidget) |
13
13
 
14
- The delete tiddler message is usually generated with the ButtonWidget and is handled by the NavigatorWidget.
14
+ The delete tiddler message is usually generated with the ButtonWidget and is handled by the NavigatorWidget.
15
+
16
+ Use the [[ActionDeleteTiddlerWidget]] to delete a named tiddler without getting the "Do you wish to delete the tiddler" prompt.
@@ -1,5 +1,5 @@
1
1
  created: 20220917112233317
2
- modified: 20230419103154328
2
+ modified: 20231217185535715
3
3
  tags: Pragmas
4
4
  title: Pragma: \define
5
5
  type: text/vnd.tiddlywiki
@@ -48,4 +48,6 @@ $caption$
48
48
  <<special-button>>
49
49
  """>>
50
50
 
51
+ <<.warning """If macros are nested, textual substitution will only occur for the outermost macro. Thi is because by the time the inner macros are processed all the substitutions will have already occurred""">>
52
+
51
53
  A more formal [[presentation|Macro Definition Syntax]] of this syntax is also available.
@@ -1,9 +1,9 @@
1
1
  created: 20131109105400007
2
- modified: 20211117230125737
2
+ modified: 20231220113054682
3
3
  tags: Releases BetaReleaseNotes
4
4
  title: BetaReleases
5
5
  type: text/vnd.tiddlywiki
6
6
 
7
7
  Here are the details of the beta releases of TiddlyWiki5. See [[TiddlyWiki5 Versioning]] for details of how releases are named.
8
8
 
9
- <<tabs "[tag[BetaReleaseNotes]!sort[created]]" "Release 5.0.18-beta" "$:/state/tab2" "tc-vertical" "ReleaseTemplate">>
9
+ <<tabs "[tag[BetaReleaseNotes]!sort[created]] -[<currentTiddler>]" "Release 5.0.18-beta" "$:/state/tab2" "tc-vertical" "ReleaseTemplate">>
@@ -0,0 +1,30 @@
1
+ caption: 5.3.3
2
+ created: 20231223102201587
3
+ modified: 20231223102201587
4
+ released: 20231223102201587
5
+ tags: ReleaseNotes
6
+ title: Release 5.3.3
7
+ type: text/vnd.tiddlywiki
8
+ description: Under development
9
+
10
+ //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.2...v5.3.3]]//
11
+
12
+ <<.banner-credits
13
+ credit:"""Congratulations to [[catter-fly|https://talk.tiddlywiki.org/u/catter-fly]] for their winning design for the banner for this release (here is the [[competition thread|https://talk.tiddlywiki.org/t/banner-image-competition-for-v5-3-2/8569]]).
14
+ """
15
+ url:"https://raw.githubusercontent.com/Jermolene/TiddlyWiki5/5cb31b7adb0a6b226c0c215ddbed62e297ce89e1/editions/tw5.com/tiddlers/images/New%20Release%20Banner.png"
16
+ >>
17
+
18
+ This is a bug fix release to address a number of bugs that were introduced with [[Release 5.3.2]].
19
+
20
+ * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7903">> handling of a list widget with an empty paragraph as inline template
21
+ * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7900">> broken per-tiddler previews
22
+ * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7897">> missing comma before skinny tiddlers in JSON store area
23
+ * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7895">> handling of whitespace immediately after pragmas
24
+ * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7905">> SelectWidget handling of classes and rendering typo
25
+
26
+ Since v5.3.3 replaces v5.3.2 after only a couple of weeks, here is the release note for v5.3.2.
27
+
28
+ ! Release Note for v5.3.2
29
+
30
+ {{Release 5.3.2}}
@@ -1,9 +1,9 @@
1
1
  created: 20131109105400007
2
- modified: 20211117225858830
2
+ modified: 20231220113044942
3
3
  tags: Releases AlphaReleaseNotes
4
4
  title: AlphaReleases
5
5
  type: text/vnd.tiddlywiki
6
6
 
7
7
  Here are the details of the alpha releases of TiddlyWiki5. See [[TiddlyWiki5 Versioning]] for details of how releases are named.
8
8
 
9
- <<tabs "[tag[AlphaReleaseNotes]!sort[created]]" "Release 5.0.1-alpha" "$:/state/tab2" "tc-vertical" "ReleaseTemplate">>
9
+ <<tabs "[tag[AlphaReleaseNotes]!sort[created]] -[<currentTiddler>]" "Release 5.0.1-alpha" "$:/state/tab2" "tc-vertical" "ReleaseTemplate">>
@@ -1,6 +1,6 @@
1
1
  caption: genesis
2
2
  created: 20221101100729587
3
- modified: 20230115101800345
3
+ modified: 20231214093716044
4
4
  tags: Widgets
5
5
  title: GenesisWidget
6
6
  type: text/vnd.tiddlywiki
@@ -15,6 +15,7 @@ The content of the <<.wid genesis>> widget is used as the content of the dynamic
15
15
 
16
16
  |!Attribute |!Description |
17
17
  |$type |The type of widget or element to create (an initial `$` indicates a widget, otherwise an HTML element will be created) |
18
+ |$remappable |Set to "no" to prevent the generated widget from being affected by any custom widget overrides. Needed when invoking the original widget within a custom widget definition |
18
19
  |$names |An optional filter evaluating to the names of a list of attributes to be applied to the widget |
19
20
  |$values |An optional filter evaluating to the values corresponding to the list of names specified in <<.attr $names>> |
20
21
  |$mode |An optional override of the parsing mode. May be "inline" or "block" |
@@ -557,3 +557,5 @@ Wang Ke, @Gk0Wk, 2023/10/17
557
557
  @frittro, 2023/10/27
558
558
 
559
559
  @etardiff, 2023/12/10
560
+
561
+ John Long, @drevarr, 2023/12/12
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "tiddlywiki",
3
3
  "preferGlobal": "true",
4
- "version": "5.3.2",
4
+ "version": "5.3.3",
5
5
  "author": "Jeremy Ruston <jeremy@jermolene.com>",
6
6
  "description": "a non-linear personal web notebook",
7
7
  "contributors": [
@@ -1,3 +1,3 @@
1
1
  title: $:/core/templates/html-json-skinny-tiddler
2
2
 
3
- <$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes" $revision=<<changecount>> $bag="default" $_is_skinny=""/>
3
+ <$text text=<<join>>/><$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes" $revision=<<changecount>> $bag="default" $_is_skinny=""/>
package/readme.md CHANGED
@@ -1,7 +1,7 @@
1
1
  <p>Welcome to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a>, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation.</p><p><a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> is a complete interactive wiki in <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/JavaScript.html">JavaScript</a>. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/WikiText.html">WikiText</a>.</p><p>Learn more and see it in action at <a class="tc-tiddlylink-external" href="https://tiddlywiki.com/" rel="noopener noreferrer" target="_blank">https://tiddlywiki.com/</a></p><p>Developer documentation is in progress at <a class="tc-tiddlylink-external" href="https://tiddlywiki.com/dev/" rel="noopener noreferrer" target="_blank">https://tiddlywiki.com/dev/</a></p><h1 class="">Join the Community</h1><p>
2
2
  <h2 class="">Official Forums</h2><p>The new official forum for talking about TiddlyWiki: requests for help, announcements of new releases and plugins, debating new features, or just sharing experiences. You can participate via the associated website, or subscribe via email.</p><p><a class="tc-tiddlylink-external" href="https://talk.tiddlywiki.org/" rel="noopener noreferrer" target="_blank">https://talk.tiddlywiki.org/</a></p><p>Note that talk.tiddlywiki.org is a community run service that we host and maintain ourselves. The modest running costs are covered by community contributions.</p><p>For the convenience of existing users, we also continue to operate the original TiddlyWiki group (hosted on Google Groups since 2005):</p><p><a class="tc-tiddlylink-external" href="https://groups.google.com/group/TiddlyWiki" rel="noopener noreferrer" target="_blank">https://groups.google.com/group/TiddlyWiki</a></p><h2 class="">Developer Forums</h2><p>There are several resources for developers to learn more about <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> and to discuss and contribute to its development.</p><ul><li><a class="tc-tiddlylink-external" href="https://tiddlywiki.com/dev" rel="noopener noreferrer" target="_blank">tiddlywiki.com/dev</a> is the official developer documentation</li><li>Get involved in the <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5" rel="noopener noreferrer" target="_blank">development on GitHub</a><ul><li><a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/discussions" rel="noopener noreferrer" target="_blank">Discussions</a> are for Q&amp;A and open-ended discussion</li><li><a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/issues" rel="noopener noreferrer" target="_blank">Issues</a> are for raising bug reports and proposing specific, actionable new ideas</li></ul></li><li>The older TiddlyWikiDev Google Group is now closed in favour of <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/discussions" rel="noopener noreferrer" target="_blank">GitHub Discussions</a> but remains a useful archive: <a class="tc-tiddlylink-external" href="https://groups.google.com/group/TiddlyWikiDev" rel="noopener noreferrer" target="_blank">https://groups.google.com/group/TiddlyWikiDev</a><ul><li>An enhanced group search facility is available on <a class="tc-tiddlylink-external" href="https://www.mail-archive.com/tiddlywikidev@googlegroups.com/" rel="noopener noreferrer" target="_blank">mail-archive.com</a></li></ul></li><li>Follow <a class="tc-tiddlylink-external" href="http://twitter.com/#!/TiddlyWiki" rel="noopener noreferrer" target="_blank">@TiddlyWiki on Twitter</a> for the latest news</li><li>Chat at <a class="tc-tiddlylink-external" href="https://gitter.im/TiddlyWiki/public" rel="noopener noreferrer" target="_blank">https://gitter.im/TiddlyWiki/public</a> (development room coming soon)</li></ul><h2 class="">Other Forums</h2><ul><li><a class="tc-tiddlylink-external" href="https://www.reddit.com/r/TiddlyWiki5/" rel="noopener noreferrer" target="_blank">TiddlyWiki Subreddit</a></li><li>Chat with Gitter at <a class="tc-tiddlylink-external" href="https://gitter.im/TiddlyWiki/public" rel="noopener noreferrer" target="_blank">https://gitter.im/TiddlyWiki/public</a> !</li><li>Chat on Discord at <a class="tc-tiddlylink-external" href="https://discord.gg/HFFZVQ8" rel="noopener noreferrer" target="_blank">https://discord.gg/HFFZVQ8</a></li></ul><h3 class="">Documentation</h3><p>There is also a discussion group specifically for discussing <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> documentation improvement initiatives: <a class="tc-tiddlylink-external" href="https://groups.google.com/group/tiddlywikidocs" rel="noopener noreferrer" target="_blank">https://groups.google.com/group/tiddlywikidocs</a>
3
3
  </p>
4
- </p><h1 class="">Installing <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on Node.js</h1><ol><li>Install <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/Node.js.html">Node.js</a><ul><li>Linux: <blockquote><div><em>Debian/Ubuntu</em>:<br><code>apt install nodejs</code><br>May need to be followed up by:<br><code>apt install npm</code></div><div><em>Arch Linux</em><br><code>yay -S tiddlywiki</code> <br>(installs node and tiddlywiki)</div></blockquote></li><li>Mac<blockquote><div><code>brew install node</code></div></blockquote></li><li>Android<blockquote><div><a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/Serving%2520TW5%2520from%2520Android.html">Termux for Android</a></div></blockquote></li><li>Other <blockquote><div>See <a class="tc-tiddlylink-external" href="http://nodejs.org" rel="noopener noreferrer" target="_blank">http://nodejs.org</a></div></blockquote></li></ul></li><li>Open a command line terminal and type:<blockquote><div><code>npm install -g tiddlywiki</code></div><div>If it fails with an error you may need to re-run the command as an administrator:</div><div><code>sudo npm install -g tiddlywiki</code> (Mac/Linux)</div></blockquote></li><li>Ensure TiddlyWiki is installed by typing:<blockquote><div><code>tiddlywiki --version</code></div></blockquote><ul><li>In response, you should see <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> report its current version (eg "5.3.2". You may also see other debugging information reported.)</li></ul></li><li>Try it out:<ol><li><code>tiddlywiki mynewwiki --init server</code> to create a folder for a new wiki that includes server-related components</li><li><code>tiddlywiki mynewwiki --listen</code> to start <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a></li><li>Visit <a class="tc-tiddlylink-external" href="http://127.0.0.1:8080/" rel="noopener noreferrer" target="_blank">http://127.0.0.1:8080/</a> in your browser</li><li>Try editing and creating tiddlers</li></ol></li><li>Optionally, make an offline copy:<ul><li>click the <span class="doc-icon"><svg class="tc-image-save-button-dynamic tc-image-button" height="22pt" viewBox="0 0 128 128" width="22pt">
4
+ </p><h1 class="">Installing <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on Node.js</h1><ol><li>Install <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/Node.js.html">Node.js</a><ul><li>Linux: <blockquote><div><em>Debian/Ubuntu</em>:<br><code>apt install nodejs</code><br>May need to be followed up by:<br><code>apt install npm</code></div><div><em>Arch Linux</em><br><code>yay -S tiddlywiki</code> <br>(installs node and tiddlywiki)</div></blockquote></li><li>Mac<blockquote><div><code>brew install node</code></div></blockquote></li><li>Android<blockquote><div><a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/Serving%2520TW5%2520from%2520Android.html">Termux for Android</a></div></blockquote></li><li>Other <blockquote><div>See <a class="tc-tiddlylink-external" href="http://nodejs.org" rel="noopener noreferrer" target="_blank">http://nodejs.org</a></div></blockquote></li></ul></li><li>Open a command line terminal and type:<blockquote><div><code>npm install -g tiddlywiki</code></div><div>If it fails with an error you may need to re-run the command as an administrator:</div><div><code>sudo npm install -g tiddlywiki</code> (Mac/Linux)</div></blockquote></li><li>Ensure TiddlyWiki is installed by typing:<blockquote><div><code>tiddlywiki --version</code></div></blockquote><ul><li>In response, you should see <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> report its current version (eg "5.3.3". You may also see other debugging information reported.)</li></ul></li><li>Try it out:<ol><li><code>tiddlywiki mynewwiki --init server</code> to create a folder for a new wiki that includes server-related components</li><li><code>tiddlywiki mynewwiki --listen</code> to start <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a></li><li>Visit <a class="tc-tiddlylink-external" href="http://127.0.0.1:8080/" rel="noopener noreferrer" target="_blank">http://127.0.0.1:8080/</a> in your browser</li><li>Try editing and creating tiddlers</li></ol></li><li>Optionally, make an offline copy:<ul><li>click the <span class="doc-icon"><svg class="tc-image-save-button-dynamic tc-image-button" height="22pt" viewBox="0 0 128 128" width="22pt">
5
5
  <g class="tc-image-save-button-dynamic-clean">
6
6
  <path d="M120.783 34.33c4.641 8.862 7.266 18.948 7.266 29.646 0 35.347-28.653 64-64 64-35.346 0-64-28.653-64-64 0-35.346 28.654-64 64-64 18.808 0 35.72 8.113 47.43 21.03l2.68-2.68c3.13-3.13 8.197-3.132 11.321-.008 3.118 3.118 3.121 8.193-.007 11.32l-4.69 4.691zm-12.058 12.058a47.876 47.876 0 013.324 17.588c0 26.51-21.49 48-48 48s-48-21.49-48-48 21.49-48 48-48c14.39 0 27.3 6.332 36.098 16.362L58.941 73.544 41.976 56.578c-3.127-3.127-8.201-3.123-11.32-.005-3.123 3.124-3.119 8.194.006 11.319l22.617 22.617a7.992 7.992 0 005.659 2.347c2.05 0 4.101-.783 5.667-2.349l44.12-44.12z" fill-rule="evenodd"></path>
7
7
  </g>