From cbbe90313b6696188c083ad0e2bba56bc23b3cf0 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Wed, 5 Aug 2015 15:08:03 +0100 Subject: [PATCH] Add in-place editing for text-slicer plugin @pmario \o/ --- .../text-slicer/tag-TextSlicerToolbar.tid | 2 +- .../text-slicer/template-display-tiddler.tid | 4 +++- .../text-slicer/template-edit-tiddler.tid | 11 +++++++++++ plugins/tiddlywiki/text-slicer/toolbar-cancel.tid | 13 +++++++++++++ plugins/tiddlywiki/text-slicer/toolbar-done.tid | 13 +++++++++++++ plugins/tiddlywiki/text-slicer/toolbar-edit.tid | 12 ++++++++++++ plugins/tiddlywiki/text-slicer/toolbar-rename.tid | 3 ++- 7 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 plugins/tiddlywiki/text-slicer/template-edit-tiddler.tid create mode 100644 plugins/tiddlywiki/text-slicer/toolbar-cancel.tid create mode 100644 plugins/tiddlywiki/text-slicer/toolbar-done.tid create mode 100644 plugins/tiddlywiki/text-slicer/toolbar-edit.tid diff --git a/plugins/tiddlywiki/text-slicer/tag-TextSlicerToolbar.tid b/plugins/tiddlywiki/text-slicer/tag-TextSlicerToolbar.tid index ef2f27cd4..d00060b74 100644 --- a/plugins/tiddlywiki/text-slicer/tag-TextSlicerToolbar.tid +++ b/plugins/tiddlywiki/text-slicer/tag-TextSlicerToolbar.tid @@ -1,3 +1,3 @@ title: $:/tags/TextSlicerToolbar -list: $:/plugins/tiddlywiki/text-slicer/toolbar/title $:/plugins/tiddlywiki/text-slicer/toolbar/rename +list: $:/plugins/tiddlywiki/text-slicer/toolbar/title $:/plugins/tiddlywiki/text-slicer/toolbar/rename $:/plugins/tiddlywiki/text-slicer/toolbar/edit $:/plugins/tiddlywiki/text-slicer/toolbar/cancel $:/plugins/tiddlywiki/text-slicer/toolbar/done diff --git a/plugins/tiddlywiki/text-slicer/template-display-tiddler.tid b/plugins/tiddlywiki/text-slicer/template-display-tiddler.tid index 0a4023560..1bf427c5a 100644 --- a/plugins/tiddlywiki/text-slicer/template-display-tiddler.tid +++ b/plugins/tiddlywiki/text-slicer/template-display-tiddler.tid @@ -3,4 +3,6 @@ title: $:/plugins/tiddlywiki/text-slicer/templates/display-tiddler <$list filter="[prefix[yes]]" variable="hasToolbar"> {{||$:/plugins/tiddlywiki/text-slicer/templates/tiddler-toolbar}} -<$list filter="[draft.oflimit[1]]" editTemplate="$:/core/ui/EditTemplate" emptyMessage="""<$transclude mode='block'/>"""/> +<$list filter="[draft.oflimit[1]]" emptyMessage="""<$transclude mode='block'/>"""> +<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/edit-tiddler" mode="block"/> + diff --git a/plugins/tiddlywiki/text-slicer/template-edit-tiddler.tid b/plugins/tiddlywiki/text-slicer/template-edit-tiddler.tid new file mode 100644 index 000000000..1b4080a84 --- /dev/null +++ b/plugins/tiddlywiki/text-slicer/template-edit-tiddler.tid @@ -0,0 +1,11 @@ +title: $:/plugins/tiddlywiki/text-slicer/templates/edit-tiddler + +<$set name="storyTiddler" value=<>> +<$keyboard key="escape" message="tm-cancel-tiddler"> +<$keyboard key="ctrl+enter" message="tm-save-tiddler"> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditTemplate]!has[draft.of]] -[[$:/core/ui/EditTemplate/controls]] -[[$:/core/ui/EditTemplate/title]]" variable="listItem"> +<$transclude tiddler=<>/> + + + + diff --git a/plugins/tiddlywiki/text-slicer/toolbar-cancel.tid b/plugins/tiddlywiki/text-slicer/toolbar-cancel.tid new file mode 100644 index 000000000..935cd77bf --- /dev/null +++ b/plugins/tiddlywiki/text-slicer/toolbar-cancel.tid @@ -0,0 +1,13 @@ +title: $:/plugins/tiddlywiki/text-slicer/toolbar/cancel +tags: $:/tags/TextSlicerToolbar + +\define body() +<$button> +<$action-sendmessage $message="tm-cancel-tiddler" $param=<> suppressNavigation="yes"/> +cancel + +\end + +<$list filter="[draft.oflimit[1]]"> +<> + diff --git a/plugins/tiddlywiki/text-slicer/toolbar-done.tid b/plugins/tiddlywiki/text-slicer/toolbar-done.tid new file mode 100644 index 000000000..cbffcba69 --- /dev/null +++ b/plugins/tiddlywiki/text-slicer/toolbar-done.tid @@ -0,0 +1,13 @@ +title: $:/plugins/tiddlywiki/text-slicer/toolbar/done +tags: $:/tags/TextSlicerToolbar + +\define body() +<$button> +<$action-sendmessage $message="tm-save-tiddler" $param=<> suppressNavigation="yes"/> +done + +\end + +<$list filter="[draft.oflimit[1]]"> +<> + diff --git a/plugins/tiddlywiki/text-slicer/toolbar-edit.tid b/plugins/tiddlywiki/text-slicer/toolbar-edit.tid new file mode 100644 index 000000000..be074aab2 --- /dev/null +++ b/plugins/tiddlywiki/text-slicer/toolbar-edit.tid @@ -0,0 +1,12 @@ +title: $:/plugins/tiddlywiki/text-slicer/toolbar/edit +tags: $:/tags/TextSlicerToolbar + +\define body() +<$button> +<$action-sendmessage $message="tm-edit-tiddler" $param=<> suppressNavigation="yes"/> +edit + +\end + +<$list filter="[draft.oflimit[1]]" emptyMessage="""<>"""> + diff --git a/plugins/tiddlywiki/text-slicer/toolbar-rename.tid b/plugins/tiddlywiki/text-slicer/toolbar-rename.tid index a11f10bbd..12538744e 100644 --- a/plugins/tiddlywiki/text-slicer/toolbar-rename.tid +++ b/plugins/tiddlywiki/text-slicer/toolbar-rename.tid @@ -13,4 +13,5 @@ rename \end -<> \ No newline at end of file +<$list filter="[draft.oflimit[1]]" emptyMessage="""<>"""> +