From 89fd5379dd78887fc21746d792072bf5a25f0c56 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Thu, 28 Aug 2014 22:28:02 +0100 Subject: [PATCH] Change "tw-*" variables to "tv-*" --- core/modules/widgets/link.js | 8 +++---- core/modules/widgets/navigator.js | 2 +- core/templates/alltiddlers.template.html.tid | 8 +++---- core/templates/static.template.html.tid | 8 +++---- core/templates/static.tiddler.html.tid | 8 +++---- .../Appearance/Toolbars/EditToolbar.tid | 4 ++-- .../Appearance/Toolbars/PageControls.tid | 4 ++-- .../Appearance/Toolbars/ViewToolbar.tid | 4 ++-- core/ui/EditToolbar/cancel.tid | 6 ++--- core/ui/EditToolbar/delete.tid | 6 ++--- core/ui/EditToolbar/save.tid | 6 ++--- core/ui/MoreSideBar/Tags.tid | 6 ++--- core/ui/PageControls/closeall.tid | 6 ++--- core/ui/PageControls/controlpanel.tid | 6 ++--- core/ui/PageControls/encryption.tid | 12 +++++----- core/ui/PageControls/full-screen.tid | 6 ++--- core/ui/PageControls/home.tid | 6 ++--- core/ui/PageControls/import.tid | 6 ++--- core/ui/PageControls/language.tid | 6 ++--- core/ui/PageControls/more-page-actions.tid | 12 +++++----- core/ui/PageControls/newtiddler.tid | 6 ++--- core/ui/PageControls/refresh.tid | 6 ++--- core/ui/PageControls/savewiki.tid | 6 ++--- core/ui/PageControls/storyview.tid | 6 ++--- core/ui/PageControls/tag-button.tid | 6 ++--- core/ui/PageControls/theme.tid | 6 ++--- core/ui/PageTemplate.tid | 6 ++--- core/ui/SideBar/Tools.tid | 6 ++--- core/ui/TiddlerInfo/Tools.tid | 6 ++--- core/ui/ViewToolbar/clone.tid | 6 ++--- core/ui/ViewToolbar/close-others.tid | 6 ++--- core/ui/ViewToolbar/close.tid | 6 ++--- core/ui/ViewToolbar/edit.tid | 6 ++--- core/ui/ViewToolbar/info.tid | 6 ++--- core/ui/ViewToolbar/more-tiddler-actions.tid | 10 ++++---- core/ui/ViewToolbar/permalink.tid | 6 ++--- core/ui/ViewToolbar/permaview.tid | 6 ++--- editions/test/tiddlers/tests/test-widget.js | 4 ++-- ...for GitHub Pages project documentation.tid | 4 ++-- .../WidgetMessage_ tw-import-tiddlers.tid | 2 +- .../tiddlers/readme/ContributingTemplate.tid | 2 +- editions/tw5.com/tiddlers/readme/ReadMe.tid | 2 +- .../tiddlers/readme/TiddlyWiki2ReadMe.tid | 2 +- .../tw5.com/tiddlers/widgets/LinkWidget.tid | 24 +++++++++---------- .../upgrade/set-auto-open-on-import.tid | 2 +- readme.md | 2 +- 46 files changed, 140 insertions(+), 140 deletions(-) diff --git a/core/modules/widgets/link.js b/core/modules/widgets/link.js index 572e253f4..0be1dbef0 100755 --- a/core/modules/widgets/link.js +++ b/core/modules/widgets/link.js @@ -33,8 +33,8 @@ LinkWidget.prototype.render = function(parent,nextSibling) { this.computeAttributes(); // Execute our logic this.execute(); - // Get the value of the tw-wikilinks configuration macro - var wikiLinksMacro = this.getVariable("tw-wikilinks"), + // Get the value of the tv-wikilinks configuration macro + var wikiLinksMacro = this.getVariable("tv-wikilinks"), useWikiLinks = wikiLinksMacro ? !(wikiLinksMacro.trim() === "no") : true; // Render the link if required if(useWikiLinks) { @@ -73,14 +73,14 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) { } domNode.setAttribute("class",classes.join(" ")); // Set an href - var wikiLinkTemplateMacro = this.getVariable("tw-wikilink-template"), + var wikiLinkTemplateMacro = this.getVariable("tv-wikilink-template"), wikiLinkTemplate = wikiLinkTemplateMacro ? wikiLinkTemplateMacro.trim() : "#$uri_encoded$", wikiLinkText = wikiLinkTemplate.replace("$uri_encoded$",encodeURIComponent(this.to)); wikiLinkText = wikiLinkText.replace("$uri_doubleencoded$",encodeURIComponent(encodeURIComponent(this.to))); domNode.setAttribute("href",wikiLinkText); // Set the tooltip // HACK: Performance issues with re-parsing the tooltip prevent us defaulting the tooltip to "<$transclude field='tooltip'><$transclude field='title'/>" - var tooltipWikiText = this.tooltip || this.getVariable("tw-wikilink-tooltip"); + var tooltipWikiText = this.tooltip || this.getVariable("tv-wikilink-tooltip"); if(tooltipWikiText) { var tooltipText = this.wiki.renderText("text/plain","text/vnd.tiddlywiki",tooltipWikiText,{ parseAsInline: true, diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js index 6257fabef..1ee5a42d3 100755 --- a/core/modules/widgets/navigator.js +++ b/core/modules/widgets/navigator.js @@ -439,7 +439,7 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) { newFields.text = JSON.stringify(importData,null,$tw.config.preferences.jsonSpaces); this.wiki.addTiddler(new $tw.Tiddler(importTiddler,newFields)); // Update the story and history details - if(this.getVariable("tw-auto-open-on-import") !== "no") { + if(this.getVariable("tv-auto-open-on-import") !== "no") { var storyList = this.getStoryList(), history = []; // Add it to the story diff --git a/core/templates/alltiddlers.template.html.tid b/core/templates/alltiddlers.template.html.tid index 64e6e51fb..62be5d3ef 100644 --- a/core/templates/alltiddlers.template.html.tid +++ b/core/templates/alltiddlers.template.html.tid @@ -1,10 +1,10 @@ title: $:/core/templates/alltiddlers.template.html type: text/vnd.tiddlywiki-html -\define tw-wikilink-template() #$uri_encoded$ -\define tw-config-toolbar-icons() no -\define tw-config-toolbar-text() no -\define tw-config-toolbar-class() tc-btn-invisible +\define tv-wikilink-template() #$uri_encoded$ +\define tv-config-toolbar-icons() no +\define tv-config-toolbar-text() no +\define tv-config-toolbar-class() tc-btn-invisible \rules only filteredtranscludeinline transcludeinline diff --git a/core/templates/static.template.html.tid b/core/templates/static.template.html.tid index 434ff1cd0..ab824ea62 100644 --- a/core/templates/static.template.html.tid +++ b/core/templates/static.template.html.tid @@ -1,10 +1,10 @@ title: $:/core/templates/static.template.html type: text/vnd.tiddlywiki-html -\define tw-wikilink-template() static/$uri_doubleencoded$.html -\define tw-config-toolbar-icons() no -\define tw-config-toolbar-text() no -\define tw-config-toolbar-class() tc-btn-invisible +\define tv-wikilink-template() static/$uri_doubleencoded$.html +\define tv-config-toolbar-icons() no +\define tv-config-toolbar-text() no +\define tv-config-toolbar-class() tc-btn-invisible \rules only filteredtranscludeinline transcludeinline diff --git a/core/templates/static.tiddler.html.tid b/core/templates/static.tiddler.html.tid index 7e6824f3a..f2fc623b2 100644 --- a/core/templates/static.tiddler.html.tid +++ b/core/templates/static.tiddler.html.tid @@ -1,9 +1,9 @@ title: $:/core/templates/static.tiddler.html -\define tw-wikilink-template() $uri_doubleencoded$.html -\define tw-config-toolbar-icons() no -\define tw-config-toolbar-text() no -\define tw-config-toolbar-class() tc-btn-invisible +\define tv-wikilink-template() $uri_doubleencoded$.html +\define tv-config-toolbar-icons() no +\define tv-config-toolbar-text() no +\define tv-config-toolbar-class() tc-btn-invisible ` diff --git a/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid b/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid index d07f27c77..b4e1999dd 100644 --- a/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid +++ b/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid @@ -9,9 +9,9 @@ $:/config/EditToolbarButtons/Visibility/$(listItem)$ {{$:/language/ControlPanel/Appearance/Toolbars/EditToolbar/Hint}} -<$set name="tw-config-toolbar-icons" value="yes"> +<$set name="tv-config-toolbar-icons" value="yes"> -<$set name="tw-config-toolbar-text" value="yes"> +<$set name="tv-config-toolbar-text" value="yes"> <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"> diff --git a/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid b/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid index 37d6a7414..e399c8e15 100644 --- a/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid +++ b/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid @@ -9,9 +9,9 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ {{$:/language/ControlPanel/Appearance/Toolbars/PageControls/Hint}} -<$set name="tw-config-toolbar-icons" value="yes"> +<$set name="tv-config-toolbar-icons" value="yes"> -<$set name="tw-config-toolbar-text" value="yes"> +<$set name="tv-config-toolbar-text" value="yes"> <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"> diff --git a/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid b/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid index b15374d0e..0fbbf171f 100644 --- a/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid +++ b/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid @@ -9,9 +9,9 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$ {{$:/language/ControlPanel/Appearance/Toolbars/ViewToolbar/Hint}} -<$set name="tw-config-toolbar-icons" value="yes"> +<$set name="tv-config-toolbar-icons" value="yes"> -<$set name="tw-config-toolbar-text" value="yes"> +<$set name="tv-config-toolbar-text" value="yes"> <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"> diff --git a/core/ui/EditToolbar/cancel.tid b/core/ui/EditToolbar/cancel.tid index a327a9fee..7d578022f 100644 --- a/core/ui/EditToolbar/cancel.tid +++ b/core/ui/EditToolbar/cancel.tid @@ -3,11 +3,11 @@ tags: $:/tags/EditToolbar caption: {{$:/core/images/cancel-button}} {{$:/language/Buttons/Cancel/Caption}} description: {{$:/language/Buttons/Cancel/Hint}} -<$button message="tm-cancel-tiddler" title={{$:/language/Buttons/Cancel/Hint}} aria-label={{$:/language/Buttons/Cancel/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-cancel-tiddler" title={{$:/language/Buttons/Cancel/Hint}} aria-label={{$:/language/Buttons/Cancel/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/cancel-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Cancel/Caption}}/> diff --git a/core/ui/EditToolbar/delete.tid b/core/ui/EditToolbar/delete.tid index 461f48528..8896304cc 100644 --- a/core/ui/EditToolbar/delete.tid +++ b/core/ui/EditToolbar/delete.tid @@ -3,11 +3,11 @@ tags: $:/tags/EditToolbar caption: {{$:/core/images/delete-button}} {{$:/language/Buttons/Delete/Caption}} description: {{$:/language/Buttons/Delete/Hint}} -<$button message="tm-delete-tiddler" title={{$:/language/Buttons/Delete/Hint}} aria-label={{$:/language/Buttons/Delete/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-delete-tiddler" title={{$:/language/Buttons/Delete/Hint}} aria-label={{$:/language/Buttons/Delete/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/delete-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Delete/Caption}}/> \ No newline at end of file diff --git a/core/ui/EditToolbar/save.tid b/core/ui/EditToolbar/save.tid index ca87bb8f4..9380444b1 100644 --- a/core/ui/EditToolbar/save.tid +++ b/core/ui/EditToolbar/save.tid @@ -3,11 +3,11 @@ tags: $:/tags/EditToolbar caption: {{$:/core/images/done-button}} {{$:/language/Buttons/Save/Caption}} description: {{$:/language/Buttons/Save/Hint}} -<$button message="tm-save-tiddler" title={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-save-tiddler" title={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/done-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Save/Caption}}/> \ No newline at end of file diff --git a/core/ui/MoreSideBar/Tags.tid b/core/ui/MoreSideBar/Tags.tid index 692b00afc..3ea7e54e6 100644 --- a/core/ui/MoreSideBar/Tags.tid +++ b/core/ui/MoreSideBar/Tags.tid @@ -2,11 +2,11 @@ title: $:/core/ui/MoreSideBar/Tags tags: $:/tags/MoreSideBar caption: {{$:/language/SideBar/Tags/Caption}} -<$set name="tw-config-toolbar-icons" value="yes"> +<$set name="tv-config-toolbar-icons" value="yes"> -<$set name="tw-config-toolbar-text" value="yes"> +<$set name="tv-config-toolbar-text" value="yes"> -<$set name="tw-config-toolbar-class" value=""> +<$set name="tv-config-toolbar-class" value=""> {{$:/core/ui/Buttons/tag-manager}} diff --git a/core/ui/PageControls/closeall.tid b/core/ui/PageControls/closeall.tid index 6d3fe5d5a..3a0520820 100644 --- a/core/ui/PageControls/closeall.tid +++ b/core/ui/PageControls/closeall.tid @@ -3,11 +3,11 @@ tags: $:/tags/PageControls caption: {{$:/core/images/close-all-button}} {{$:/language/Buttons/CloseAll/Caption}} description: {{$:/language/Buttons/CloseAll/Hint}} -<$button message="tm-close-all-tiddlers" title={{$:/language/Buttons/CloseAll/Hint}} aria-label={{$:/language/Buttons/CloseAll/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-close-all-tiddlers" title={{$:/language/Buttons/CloseAll/Hint}} aria-label={{$:/language/Buttons/CloseAll/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/close-all-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/CloseAll/Caption}}/> diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid index aac9af0e5..4c2a61108 100644 --- a/core/ui/PageControls/controlpanel.tid +++ b/core/ui/PageControls/controlpanel.tid @@ -3,11 +3,11 @@ tags: $:/tags/PageControls caption: {{$:/core/images/options-button}} {{$:/language/Buttons/ControlPanel/Caption}} description: {{$:/language/Buttons/ControlPanel/Hint}} -<$button to="$:/ControlPanel" title={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button to="$:/ControlPanel" title={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/options-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/ControlPanel/Caption}}/> diff --git a/core/ui/PageControls/encryption.tid b/core/ui/PageControls/encryption.tid index 33a44ec0a..0f9400fd2 100644 --- a/core/ui/PageControls/encryption.tid +++ b/core/ui/PageControls/encryption.tid @@ -4,21 +4,21 @@ caption: {{$:/core/images/locked-padlock}} {{$:/language/Buttons/Encryption/Capt description: {{$:/language/Buttons/Encryption/Hint}} <$reveal type="match" state="$:/isEncrypted" text="yes"> -<$button message="tm-clear-password" title={{$:/language/Buttons/Encryption/ClearPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/ClearPassword/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-clear-password" title={{$:/language/Buttons/Encryption/ClearPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/ClearPassword/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/locked-padlock}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Encryption/ClearPassword/Caption}}/> <$reveal type="nomatch" state="$:/isEncrypted" text="yes"> -<$button message="tm-set-password" title={{$:/language/Buttons/Encryption/SetPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/SetPassword/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-set-password" title={{$:/language/Buttons/Encryption/SetPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/SetPassword/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/unlocked-padlock}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Encryption/SetPassword/Caption}}/> diff --git a/core/ui/PageControls/full-screen.tid b/core/ui/PageControls/full-screen.tid index 5f65f2523..38a848f2f 100644 --- a/core/ui/PageControls/full-screen.tid +++ b/core/ui/PageControls/full-screen.tid @@ -3,11 +3,11 @@ tags: $:/tags/PageControls caption: {{$:/core/images/full-screen-button}} {{$:/language/Buttons/FullScreen/Caption}} description: {{$:/language/Buttons/FullScreen/Hint}} -<$button message="tm-full-screen" title={{$:/language/Buttons/FullScreen/Hint}} aria-label={{$:/language/Buttons/FullScreen/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-full-screen" title={{$:/language/Buttons/FullScreen/Hint}} aria-label={{$:/language/Buttons/FullScreen/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/full-screen-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/FullScreen/Caption}}/> diff --git a/core/ui/PageControls/home.tid b/core/ui/PageControls/home.tid index 748e73f69..dd4995c78 100644 --- a/core/ui/PageControls/home.tid +++ b/core/ui/PageControls/home.tid @@ -3,11 +3,11 @@ tags: $:/tags/PageControls caption: {{$:/core/images/home-button}} {{$:/language/Buttons/Home/Caption}} description: {{$:/language/Buttons/Home/Hint}} -<$button message="tm-home" title={{$:/language/Buttons/Home/Hint}} aria-label={{$:/language/Buttons/Home/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-home" title={{$:/language/Buttons/Home/Hint}} aria-label={{$:/language/Buttons/Home/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/home-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Home/Caption}}/> diff --git a/core/ui/PageControls/import.tid b/core/ui/PageControls/import.tid index a08643119..6dddec8bf 100644 --- a/core/ui/PageControls/import.tid +++ b/core/ui/PageControls/import.tid @@ -4,11 +4,11 @@ caption: {{$:/core/images/import-button}} {{$:/language/Buttons/Import/Caption}} description: {{$:/language/Buttons/Import/Hint}}
-<$button title={{$:/language/Buttons/Import/Hint}} aria-label={{$:/language/Buttons/Import/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button title={{$:/language/Buttons/Import/Hint}} aria-label={{$:/language/Buttons/Import/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/import-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Import/Caption}}/> diff --git a/core/ui/PageControls/language.tid b/core/ui/PageControls/language.tid index e6aac49cd..29254f4d6 100644 --- a/core/ui/PageControls/language.tid +++ b/core/ui/PageControls/language.tid @@ -6,15 +6,15 @@ description: {{$:/language/Buttons/Language/Hint}} \define flag-title() $(languagePluginTitle)$/icon \end -<$button popup=<> title={{$:/language/Buttons/Language/Hint}} aria-label={{$:/language/Buttons/Language/Caption}} class=<> selectedClass="tc-selected"> -<$list filter="[prefix[yes]]"> +<$button popup=<> title={{$:/language/Buttons/Language/Hint}} aria-label={{$:/language/Buttons/Language/Caption}} class=<> selectedClass="tc-selected"> +<$list filter="[prefix[yes]]"> <$set name="languagePluginTitle" value={{$:/language}}> <$image source=<>/> -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Language/Caption}}/> diff --git a/core/ui/PageControls/more-page-actions.tid b/core/ui/PageControls/more-page-actions.tid index 09b11d3a8..004123cd6 100644 --- a/core/ui/PageControls/more-page-actions.tid +++ b/core/ui/PageControls/more-page-actions.tid @@ -6,11 +6,11 @@ description: {{$:/language/Buttons/More/Hint}} \define config-title() $:/config/PageControlButtons/Visibility/$(listItem)$ \end -<$button popup=<> title={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<> selectedClass="tc-selected"> -<$list filter="[prefix[yes]]"> +<$button popup=<> title={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<> selectedClass="tc-selected"> +<$list filter="[prefix[yes]]"> {{$:/core/images/down-arrow}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/More/Caption}}/> @@ -18,11 +18,11 @@ $:/config/PageControlButtons/Visibility/$(listItem)$
-<$set name="tw-config-toolbar-icons" value="yes"> +<$set name="tv-config-toolbar-icons" value="yes"> -<$set name="tw-config-toolbar-text" value="yes"> +<$set name="tv-config-toolbar-text" value="yes"> -<$set name="tw-config-toolbar-class" value="tc-btn-invisible"> +<$set name="tv-config-toolbar-class" value="tc-btn-invisible"> <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]] -[[$:/core/ui/Buttons/more-page-actions]]" variable="listItem"> diff --git a/core/ui/PageControls/newtiddler.tid b/core/ui/PageControls/newtiddler.tid index f20c0454d..96afdc69e 100644 --- a/core/ui/PageControls/newtiddler.tid +++ b/core/ui/PageControls/newtiddler.tid @@ -3,11 +3,11 @@ tags: $:/tags/PageControls caption: {{$:/core/images/new-button}} {{$:/language/Buttons/NewTiddler/Caption}} description: {{$:/language/Buttons/NewTiddler/Hint}} -<$button message="tm-new-tiddler" title={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-new-tiddler" title={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/new-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/NewTiddler/Caption}}/> diff --git a/core/ui/PageControls/refresh.tid b/core/ui/PageControls/refresh.tid index 1197f3410..eea3205e2 100644 --- a/core/ui/PageControls/refresh.tid +++ b/core/ui/PageControls/refresh.tid @@ -3,11 +3,11 @@ tags: $:/tags/PageControls caption: {{$:/core/images/refresh-button}} {{$:/language/Buttons/Refresh/Caption}} description: {{$:/language/Buttons/Refresh/Hint}} -<$button message="tm-browser-refresh" title={{$:/language/Buttons/Refresh/Hint}} aria-label={{$:/language/Buttons/Refresh/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-browser-refresh" title={{$:/language/Buttons/Refresh/Hint}} aria-label={{$:/language/Buttons/Refresh/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/refresh-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Refresh/Caption}}/> diff --git a/core/ui/PageControls/savewiki.tid b/core/ui/PageControls/savewiki.tid index dc5be514f..adee6441d 100644 --- a/core/ui/PageControls/savewiki.tid +++ b/core/ui/PageControls/savewiki.tid @@ -3,12 +3,12 @@ tags: $:/tags/PageControls caption: {{$:/core/images/save-button}} {{$:/language/Buttons/SaveWiki/Caption}} description: {{$:/language/Buttons/SaveWiki/Hint}} -<$button message="tm-save-wiki" param={{$:/config/SaveWikiButton/Template}} title={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class=<>> +<$button message="tm-save-wiki" param={{$:/config/SaveWikiButton/Template}} title={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> {{$:/core/images/save-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/SaveWiki/Caption}}/> diff --git a/core/ui/PageControls/storyview.tid b/core/ui/PageControls/storyview.tid index 1cb0a75cf..fda1dea4e 100644 --- a/core/ui/PageControls/storyview.tid +++ b/core/ui/PageControls/storyview.tid @@ -6,13 +6,13 @@ description: {{$:/language/Buttons/StoryView/Hint}} \define icon() $:/core/images/storyview-$(storyview)$ \end -<$button popup=<> title={{$:/language/Buttons/StoryView/Hint}} aria-label={{$:/language/Buttons/StoryView/Caption}} class=<> selectedClass="tc-selected"> -<$list filter="[prefix[yes]]"> +<$button popup=<> title={{$:/language/Buttons/StoryView/Hint}} aria-label={{$:/language/Buttons/StoryView/Caption}} class=<> selectedClass="tc-selected"> +<$list filter="[prefix[yes]]"> <$set name="storyview" value={{$:/view}}> <$transclude tiddler=<>/> -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/StoryView/Caption}}/> diff --git a/core/ui/PageControls/tag-button.tid b/core/ui/PageControls/tag-button.tid index 2becac341..e30e7f4f5 100644 --- a/core/ui/PageControls/tag-button.tid +++ b/core/ui/PageControls/tag-button.tid @@ -3,11 +3,11 @@ tags: $:/tags/PageControls caption: {{$:/core/images/tag-button}} {{$:/language/Buttons/TagManager/Caption}} description: {{$:/language/Buttons/TagManager/Hint}} -<$button to="$:/TagManager" title={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button to="$:/TagManager" title={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/tag-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/TagManager/Caption}}/> diff --git a/core/ui/PageControls/theme.tid b/core/ui/PageControls/theme.tid index efb7f435f..60d4b4089 100644 --- a/core/ui/PageControls/theme.tid +++ b/core/ui/PageControls/theme.tid @@ -3,11 +3,11 @@ tags: $:/tags/PageControls caption: {{$:/core/images/theme-button}} {{$:/language/Buttons/Theme/Caption}} description: {{$:/language/Buttons/Theme/Hint}} -<$button popup=<> title={{$:/language/Buttons/Theme/Hint}} aria-label={{$:/language/Buttons/Theme/Caption}} class=<> selectedClass="tc-selected"> -<$list filter="[prefix[yes]]"> +<$button popup=<> title={{$:/language/Buttons/Theme/Hint}} aria-label={{$:/language/Buttons/Theme/Caption}} class=<> selectedClass="tc-selected"> +<$list filter="[prefix[yes]]"> {{$:/core/images/theme-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Theme/Caption}}/> diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid index a1f071419..eb800ddc5 100644 --- a/core/ui/PageTemplate.tid +++ b/core/ui/PageTemplate.tid @@ -6,11 +6,11 @@ tc-page-container tc-page-view-$(themeTitle)$ tc-language-$(languageTitle)$ <$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> -<$set name="tw-config-toolbar-icons" value={{$:/config/Toolbar/Icons}}> +<$set name="tv-config-toolbar-icons" value={{$:/config/Toolbar/Icons}}> -<$set name="tw-config-toolbar-text" value={{$:/config/Toolbar/Text}}> +<$set name="tv-config-toolbar-text" value={{$:/config/Toolbar/Text}}> -<$set name="tw-config-toolbar-class" value="tc-btn-invisible"> +<$set name="tv-config-toolbar-class" value="tc-btn-invisible"> <$set name="themeTitle" value={{$:/view}}> diff --git a/core/ui/SideBar/Tools.tid b/core/ui/SideBar/Tools.tid index d96e7d8de..908426911 100644 --- a/core/ui/SideBar/Tools.tid +++ b/core/ui/SideBar/Tools.tid @@ -9,11 +9,11 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ <> <> -<$set name="tw-config-toolbar-icons" value="yes"> +<$set name="tv-config-toolbar-icons" value="yes"> -<$set name="tw-config-toolbar-text" value="yes"> +<$set name="tv-config-toolbar-text" value="yes"> -<$set name="tw-config-toolbar-class" value=""> +<$set name="tv-config-toolbar-class" value=""> <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"> diff --git a/core/ui/TiddlerInfo/Tools.tid b/core/ui/TiddlerInfo/Tools.tid index 5c4f6a476..7c23a4d64 100644 --- a/core/ui/TiddlerInfo/Tools.tid +++ b/core/ui/TiddlerInfo/Tools.tid @@ -6,11 +6,11 @@ caption: {{$:/language/TiddlerInfo/Tools/Caption}} \define config-title() $:/config/ViewToolbarButtons/Visibility/$(listItem)$ \end -<$set name="tw-config-toolbar-icons" value="yes"> +<$set name="tv-config-toolbar-icons" value="yes"> -<$set name="tw-config-toolbar-text" value="yes"> +<$set name="tv-config-toolbar-text" value="yes"> -<$set name="tw-config-toolbar-class" value=""> +<$set name="tv-config-toolbar-class" value=""> <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"> diff --git a/core/ui/ViewToolbar/clone.tid b/core/ui/ViewToolbar/clone.tid index a09c731cd..7d9b4bb8b 100644 --- a/core/ui/ViewToolbar/clone.tid +++ b/core/ui/ViewToolbar/clone.tid @@ -3,11 +3,11 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/clone-button}} {{$:/language/Buttons/Clone/Caption}} description: {{$:/language/Buttons/Clone/Hint}} -<$button message="tm-new-tiddler" param=<> title={{$:/language/Buttons/Clone/Hint}} aria-label={{$:/language/Buttons/Clone/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-new-tiddler" param=<> title={{$:/language/Buttons/Clone/Hint}} aria-label={{$:/language/Buttons/Clone/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/clone-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Clone/Caption}}/> diff --git a/core/ui/ViewToolbar/close-others.tid b/core/ui/ViewToolbar/close-others.tid index b9fbb7428..b7b769253 100644 --- a/core/ui/ViewToolbar/close-others.tid +++ b/core/ui/ViewToolbar/close-others.tid @@ -3,11 +3,11 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/close-others-button}} {{$:/language/Buttons/CloseOthers/Caption}} description: {{$:/language/Buttons/CloseOthers/Hint}} -<$button message="tm-close-other-tiddlers" param=<> title={{$:/language/Buttons/CloseOthers/Hint}} aria-label={{$:/language/Buttons/CloseOthers/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-close-other-tiddlers" param=<> title={{$:/language/Buttons/CloseOthers/Hint}} aria-label={{$:/language/Buttons/CloseOthers/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/close-others-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/CloseOthers/Caption}}/> diff --git a/core/ui/ViewToolbar/close.tid b/core/ui/ViewToolbar/close.tid index 82ca663a1..021101201 100644 --- a/core/ui/ViewToolbar/close.tid +++ b/core/ui/ViewToolbar/close.tid @@ -3,11 +3,11 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/close-button}} {{$:/language/Buttons/Close/Caption}} description: {{$:/language/Buttons/Close/Hint}} -<$button message="tm-close-tiddler" title={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-close-tiddler" title={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/close-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Close/Caption}}/> \ No newline at end of file diff --git a/core/ui/ViewToolbar/edit.tid b/core/ui/ViewToolbar/edit.tid index 4b3024b9f..3622bd7d1 100644 --- a/core/ui/ViewToolbar/edit.tid +++ b/core/ui/ViewToolbar/edit.tid @@ -3,11 +3,11 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/edit-button}} {{$:/language/Buttons/Edit/Caption}} description: {{$:/language/Buttons/Edit/Hint}} -<$button message="tm-edit-tiddler" title={{$:/language/Buttons/Edit/Hint}} aria-label={{$:/language/Buttons/Edit/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-edit-tiddler" title={{$:/language/Buttons/Edit/Hint}} aria-label={{$:/language/Buttons/Edit/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/edit-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Edit/Caption}}/> diff --git a/core/ui/ViewToolbar/info.tid b/core/ui/ViewToolbar/info.tid index 73f63860e..2d6083cf5 100644 --- a/core/ui/ViewToolbar/info.tid +++ b/core/ui/ViewToolbar/info.tid @@ -3,11 +3,11 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/info-button}} {{$:/language/Buttons/Info/Caption}} description: {{$:/language/Buttons/Info/Hint}} -<$button popup=<> title={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class=<> selectedClass="tc-selected"> -<$list filter="[prefix[yes]]"> +<$button popup=<> title={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class=<> selectedClass="tc-selected"> +<$list filter="[prefix[yes]]"> {{$:/core/images/info-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Info/Caption}}/> diff --git a/core/ui/ViewToolbar/more-tiddler-actions.tid b/core/ui/ViewToolbar/more-tiddler-actions.tid index 50c538044..7d8ef1990 100644 --- a/core/ui/ViewToolbar/more-tiddler-actions.tid +++ b/core/ui/ViewToolbar/more-tiddler-actions.tid @@ -6,18 +6,18 @@ description: {{$:/language/Buttons/More/Hint}} \define config-title() $:/config/ViewToolbarButtons/Visibility/$(listItem)$ \end -<$button popup=<> title={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<> selectedClass="tc-selected"> -<$list filter="[prefix[yes]]"> +<$button popup=<> title={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<> selectedClass="tc-selected"> +<$list filter="[prefix[yes]]"> {{$:/core/images/down-arrow}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/More/Caption}}/> <$reveal state=<> type="popup" position="below" animate="yes">
-<$set name="tw-config-toolbar-icons" value="yes"> -<$set name="tw-config-toolbar-text" value="yes"> +<$set name="tv-config-toolbar-icons" value="yes"> +<$set name="tv-config-toolbar-text" value="yes"> <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] -[[$:/core/ui/Buttons/more-tiddler-actions]]" variable="listItem"> <$reveal type="match" state=<> text="hide"> <$transclude tiddler=<>/> diff --git a/core/ui/ViewToolbar/permalink.tid b/core/ui/ViewToolbar/permalink.tid index 8fc45f296..0a7a74b4f 100644 --- a/core/ui/ViewToolbar/permalink.tid +++ b/core/ui/ViewToolbar/permalink.tid @@ -3,11 +3,11 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/permalink-button}} {{$:/language/Buttons/Permalink/Caption}} description: {{$:/language/Buttons/Permalink/Hint}} -<$button message="tm-permalink" title={{$:/language/Buttons/Permalink/Hint}} aria-label={{$:/language/Buttons/Permalink/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-permalink" title={{$:/language/Buttons/Permalink/Hint}} aria-label={{$:/language/Buttons/Permalink/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/permalink-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Permalink/Caption}}/> diff --git a/core/ui/ViewToolbar/permaview.tid b/core/ui/ViewToolbar/permaview.tid index f05a7afc6..319a9151c 100644 --- a/core/ui/ViewToolbar/permaview.tid +++ b/core/ui/ViewToolbar/permaview.tid @@ -3,11 +3,11 @@ tags: $:/tags/ViewToolbar $:/tags/PageControls caption: {{$:/core/images/permaview-button}} {{$:/language/Buttons/Permaview/Caption}} description: {{$:/language/Buttons/Permaview/Hint}} -<$button message="tm-permaview" title={{$:/language/Buttons/Permaview/Hint}} aria-label={{$:/language/Buttons/Permaview/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$button message="tm-permaview" title={{$:/language/Buttons/Permaview/Hint}} aria-label={{$:/language/Buttons/Permaview/Caption}} class=<>> +<$list filter="[prefix[yes]]"> {{$:/core/images/permaview-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Permaview/Caption}}/> diff --git a/editions/test/tiddlers/tests/test-widget.js b/editions/test/tiddlers/tests/test-widget.js index 910fa80f5..3d847d8d9 100755 --- a/editions/test/tiddlers/tests/test-widget.js +++ b/editions/test/tiddlers/tests/test-widget.js @@ -171,12 +171,12 @@ describe("Widget module", function() { it("should deal with SVG elements", function() { var wiki = new $tw.Wiki(); // Construct the widget node - var text = "\n"; + var text = "\n"; var widgetNode = createWidgetNode(parseText(text,wiki,{parseAsInline:true}),wiki); // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("\n"); + expect(wrapper.innerHTML).toBe("\n"); expect(wrapper.firstChild.namespaceURI).toBe("http://www.w3.org/2000/svg"); }); diff --git a/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid b/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid index 86b12d74f..d285347d4 100644 --- a/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid +++ b/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid @@ -17,10 +17,10 @@ This is done in `bld.sh` by this command: It saves the tiddler ReadMe to the file `./readme.md` in the `text/html` format. -By default, tiddler links will be rendered as `` links to a relative URI consisting of the title of the tiddler. This behaviour can be overridden by defining the macro `tw-wikilink-template`, as is done at the top of the tiddler ReadMe: +By default, tiddler links will be rendered as `` links to a relative URI consisting of the title of the tiddler. This behaviour can be overridden by defining the macro `tv-wikilink-template`, as is done at the top of the tiddler ReadMe: ``` -\define tw-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html +\define tv-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html ``` See the LinkWidget for more details. diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tw-import-tiddlers.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tw-import-tiddlers.tid index 110834cbd..eef04b37a 100644 --- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tw-import-tiddlers.tid +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tw-import-tiddlers.tid @@ -13,7 +13,7 @@ The import tiddlers message is usually generated with the DropzoneWidget or the ! Configuration Variables -The variable `tw-auto-open-on-import` controls whether the `tm-import-tiddlers` message automatically triggers the display of the pending import tiddler [[$:/Import]]: +The variable `tv-auto-open-on-import` controls whether the `tm-import-tiddlers` message automatically triggers the display of the pending import tiddler [[$:/Import]]: * ''no'': The pending import tiddler is not opened in the story * ''yes'': The pending import tiddler is opened in th story. This is the default diff --git a/editions/tw5.com/tiddlers/readme/ContributingTemplate.tid b/editions/tw5.com/tiddlers/readme/ContributingTemplate.tid index f9b6516a6..b012a7d52 100644 --- a/editions/tw5.com/tiddlers/readme/ContributingTemplate.tid +++ b/editions/tw5.com/tiddlers/readme/ContributingTemplate.tid @@ -2,7 +2,7 @@ created: 201308251449 modified: 201308251449 title: ContributingTemplate -\define tw-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html +\define tv-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html ! Contributing to TiddlyWiki5 {{Contributing}} diff --git a/editions/tw5.com/tiddlers/readme/ReadMe.tid b/editions/tw5.com/tiddlers/readme/ReadMe.tid index ee1c81ee7..a0e6dc4ba 100644 --- a/editions/tw5.com/tiddlers/readme/ReadMe.tid +++ b/editions/tw5.com/tiddlers/readme/ReadMe.tid @@ -3,7 +3,7 @@ modified: 20131222161808390 title: ReadMe type: text/vnd.tiddlywiki -\define tw-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html +\define tv-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html ! Welcome to TiddlyWiki {{HelloThere}} diff --git a/editions/tw5.com/tiddlers/readme/TiddlyWiki2ReadMe.tid b/editions/tw5.com/tiddlers/readme/TiddlyWiki2ReadMe.tid index 15f274cbc..600af998c 100644 --- a/editions/tw5.com/tiddlers/readme/TiddlyWiki2ReadMe.tid +++ b/editions/tw5.com/tiddlers/readme/TiddlyWiki2ReadMe.tid @@ -1,5 +1,5 @@ title: TiddlyWiki2ReadMe -\define tw-wikilinks() no +\define tv-wikilinks() no ! Building TiddlyWikiClassic {{Building TiddlyWikiClassic}} diff --git a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid index 9c81ff1a9..e8f5b17f4 100644 --- a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid @@ -14,14 +14,14 @@ The `link` widget generates links to tiddlers. (Use the HTML `` element to ge The content of the link widget is rendered within the `` tag. -The default value of the tooltip attribute is `<>`. +The default value of the tooltip attribute is `<>`. This means that you can control the text of a link tooltip in several ways: ``` <$link to="HelloThere" tooltip="Custom tooltip">Link 1 -<$set name="tw-wikilink-tooltip" value="I'm a link to {{!!title}}"> +<$set name="tv-wikilink-tooltip" value="I'm a link to {{!!title}}"> <$link to="HelloThere">Link 2 @@ -31,7 +31,7 @@ Renders as: <$link to="HelloThere" tooltip="Custom tooltip">Link 1 -<$set name="tw-wikilink-tooltip" value="I'm a link to {{!!title}}"> +<$set name="tv-wikilink-tooltip" value="I'm a link to {{!!title}}"> <$link to="HelloThere">Link 2 @@ -40,7 +40,7 @@ Note that the tooltip is rendered with the current tiddler set to the target of A useful convention is to set the tooltip like this: ``` -\define tw-wikilink-tooltip() +\define tv-wikilink-tooltip() <$transclude field="tooltip"><$transclude field="title"/> \end ``` @@ -60,32 +60,32 @@ This causes the tooltip to be the ''tooltip'' field of the target tiddler. If th Configuration macros can be used to modify the behaviour of the link widget. -!! tw-wikilinks +!! tv-wikilinks -Links are suppressed if the macro `tw-wikilinks` evaluates to the string `no`. For example: +Links are suppressed if the macro `tv-wikilinks` evaluates to the string `no`. For example: ``` -\define tw-wikilinks() no +\define tv-wikilinks() no ``` -!! tw-wikilink-template +!! tv-wikilink-template -The target of the link widget defaults to the URL encoded title of the tiddler. The `href` can be templated by defining the configuration macro `tw-wikilink-template`, and including within it the token `$uri_encoded$`. For example: +The target of the link widget defaults to the URL encoded title of the tiddler. The `href` can be templated by defining the configuration macro `tv-wikilink-template`, and including within it the token `$uri_encoded$`. For example: ``` -\define tw-wikilink-template() http://tiddlywiki.com/#$uri_encoded$ +\define tv-wikilink-template() http://tiddlywiki.com/#$uri_encoded$ ``` The token `$uri_doubleencoded$` is replaced by the double encoded title of the tiddler. Note that in the browser the `` element generated by the link widget has a JavaScript event handler that navigates directly to the target tiddler, ignoring the `href` attribute. -!! tw-wikilink-tooltip +!! tv-wikilink-tooltip Provides default text for the link tooltip: ``` -\define tw-wikilink-tooltip() This is a link to {{!!title}} +\define tv-wikilink-tooltip() This is a link to {{!!title}} <$link to="HelloThere"/> ``` diff --git a/plugins/tiddlywiki/upgrade/set-auto-open-on-import.tid b/plugins/tiddlywiki/upgrade/set-auto-open-on-import.tid index 5c1e43543..7d2b86878 100644 --- a/plugins/tiddlywiki/upgrade/set-auto-open-on-import.tid +++ b/plugins/tiddlywiki/upgrade/set-auto-open-on-import.tid @@ -1,6 +1,6 @@ title: $:/plugins/tiddlywiki/upgrade/set-auto-open-on-import tags: $:/tags/Macro -\define tw-auto-open-on-import() +\define tv-auto-open-on-import() no \end diff --git a/readme.md b/readme.md index f5857e78a..7d04f5492 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -

Welcome to TiddlyWiki

Welcome to TiddlyWiki, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation.

TiddlyWiki is a complete interactive wiki in JavaScript. 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 WikiText.

This is version of TiddlyWiki, a major reboot designed for the next 25 years. It is currently in beta (see the detailed ReleaseHistory) with a RoadMap for moving to the full release. It is a great time to get involved and support the future development of TiddlyWiki.

TiddlyWiki is a free, open source project that depends on your love and support for its survival.

TiddlyWikiClassic

The original "Classic" version of TiddlyWiki is still available at http://classic.tiddlywiki.com. Note that it is not fully backwards compatible: existing content will need massaging, while plugins and themes will have to be completely rewritten. The upgrade path will get smoother as the new version matures. +

Welcome to TiddlyWiki

Welcome to TiddlyWiki, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation.

TiddlyWiki is a complete interactive wiki in JavaScript. 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 WikiText.

This is version of TiddlyWiki, a major reboot designed for the next 25 years. It is currently in beta (see the detailed ReleaseHistory) with a RoadMap for moving to the full release. It is a great time to get involved and support the future development of TiddlyWiki.

TiddlyWiki is a free, open source project that depends on your love and support for its survival.

TiddlyWikiClassic

The original "Classic" version of TiddlyWiki is still available at http://classic.tiddlywiki.com. Note that it is not fully backwards compatible: existing content will need massaging, while plugins and themes will have to be completely rewritten. The upgrade path will get smoother as the new version matures.

Getting started with TiddlyWiki under Node.js

Running TiddlyWiki on Node.js brings several important benefits over and above the single file version:

  • You can edit your content on any suitably compatible HTML5 browser, including smartphones and tablets
  • Individual tiddlers are stored in separate files, which you can organise as you wish
  • The ability to build multiple wikis that blend different combinations of shared and unique content

Installation

  1. Install Node.js from http://nodejs.org
  2. Open a command line terminal and type:

    npm install -g tiddlywiki

    If it fails with an error you may need to re-run the command as an administrator:

    npm install -g tiddlywiki (Windows)

    sudo npm install -g tiddlywiki (Mac/Linux)

  3. Check TiddlyWiki is installed by typing:

    tiddlywiki --version

  4. In response, you should see TiddlyWiki report its current version (eg 5.0.8-beta; you may also see other debugging information reported)
  5. Try it out:
    1. tiddlywiki mynewwiki --init server to create a folder for a new wiki that includes server-related components
    2. tiddlywiki mynewwiki --server to start TiddlyWiki
    3. Visit http://127.0.0.1:8080/ in your browser
    4. Try editing and creating tiddlers

The -g flag causes TiddlyWiki to be installed globally. Without it, TiddlyWiki will only be available in the directory where you installed it.

A slightly different method for installation is recommended if you plan on forking the source code in order to study it or contribute to it. See Working with the TiddlyWiki5 repository.

Usage

TiddlyWiki5 can be used on the command line to perform an extensive set of operations based on TiddlyWikiFolders, TiddlerFiles and TiddlyWikiFiles.

For example, the following command loads the tiddlers from a TiddlyWiki HTML file and then saves one of them in static HTML:

tiddlywiki --verbose --load mywiki.html --rendertiddler ReadMe ./readme.html

Running tiddlywiki from the command line boots the TiddlyWiki kernel, loads the core plugins and establishes an empty wiki store. It then sequentially processes the command line arguments from left to right. The arguments are separated with spaces.

The first argument is the optional path to the TiddlyWikiFolder to be loaded. If not present, then the current directory is used.

The commands and their individual arguments follow, each command being identified by the prefix --.

tiddlywiki [<wikipath>] [--<command> [<arg>[,<arg>]]]

The available commands are:

See also:

Upgrading

If you've installed TiddlyWiki on Node.js on the usual way, when a new version is released you can upgrade it with this command:

npm update -g tiddlywiki

On Mac or Linux you'll need to add sudo like this:

sudo npm update -g tiddlywiki

Working with the TiddlyWiki5 repository

Setting Up

If you plan on working with the TiddlyWiki5 source code then follow these steps:

  1. Fork the TiddlyWiki5 GitHub repository from https://github.com/Jermolene/TiddlyWiki5
  2. Clone a local copy of your fork
  3. Open a command line terminal and change the current working directory to the root of the repo
  4. Type npm link (Windows) or sudo npm link (Mac/Linux) to tell npm to use this copy of the repo as the globally installed one

After this procedure you can work with TiddlyWiki5 via npm as though it were installed in the usual way with npm install -g tiddlywiki.

See also Scripts for TiddlyWiki on Node.js.

This readme file was automatically generated by TiddlyWiki

\ No newline at end of file