From 61f9adb710858f93bfe954ed7e1852bc2448bdba Mon Sep 17 00:00:00 2001 From: Tobias Beer Date: Tue, 24 Apr 2018 23:02:04 +0200 Subject: [PATCH] allows to add link via ENTER in input (#2703) simplified / refactored actions --- core/ui/EditorToolbar/link-dropdown.tid | 45 ++++++------------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/core/ui/EditorToolbar/link-dropdown.tid b/core/ui/EditorToolbar/link-dropdown.tid index 782bc6d6f..c9c1989b6 100644 --- a/core/ui/EditorToolbar/link-dropdown.tid +++ b/core/ui/EditorToolbar/link-dropdown.tid @@ -2,51 +2,26 @@ title: $:/core/ui/EditorToolbar/link-dropdown \define lingo-base() $:/language/Buttons/Link/ -\define link-actions() -<$action-sendmessage - $message="tm-edit-text-operation" - $param="make-link" - text={{$(linkTiddler)$}} -/> - -<$action-deletetiddler - $tiddler=<> -/> - -<$action-deletetiddler - $tiddler=<> -/> - -<$action-deletetiddler - $tiddler=<> -/> +\define add-link-actions() +<$action-sendmessage $message="tm-edit-text-operation" $param="make-link" text={{$(linkTiddler)$}} /> +<$action-deletetiddler $tiddler=<> /> +<$action-deletetiddler $tiddler=<> /> +<$action-deletetiddler $tiddler=<> /> \end \define external-link() -<$button class="tc-btn-invisible" style="width: auto; display: inline-block; background-colour: inherit;"> -<$action-sendmessage $message="tm-edit-text-operation" $param="make-link" text={{$(searchTiddler)$}} -/> +<$button class="tc-btn-invisible" style="width: auto; display: inline-block; background-colour: inherit;" actions=<>> {{$:/core/images/chevron-right}} -<$action-deletetiddler - $tiddler=<> -/> - -<$action-deletetiddler - $tiddler=<> -/> - -<$action-deletetiddler - $tiddler=<> -/> \end - \define body(config-title) ''<>'' <$vars searchTiddler="""$config-title$/search""" linkTiddler="""$config-title$/link""" linktext="" > +<$vars linkTiddler=<>> +<$keyboard key="ENTER" actions=<>> <$edit-text tiddler=<> type="search" tag="input" focus="true" placeholder={{$:/language/Search/Search}} default=""/> <$reveal tag="span" state=<> type="nomatch" text=""> <> @@ -55,10 +30,12 @@ title: $:/core/ui/EditorToolbar/link-dropdown {{$:/core/images/close-button}} + + <$reveal tag="div" state=<> type="nomatch" text=""> -<$linkcatcher actions=<> to=<>> +<$linkcatcher actions=<> to=<>> {{$:/core/ui/SearchResults}}