aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorkimsible <kimsible@users.noreply.github.com>2020-08-12 13:33:43 +0200
committerChocobozzz <chocobozzz@cpy.re>2020-08-14 15:03:38 +0200
commitc537763a2352a8b41611d784e31d7c36fef53019 (patch)
treec78fe7d51a129d0badda12c267a1ce5150887fa2
parentfdd1296521354401e9927e5faeb0aa17ba810c41 (diff)
downloadPeerTube-c537763a2352a8b41611d784e31d7c36fef53019.tar.gz
PeerTube-c537763a2352a8b41611d784e31d7c36fef53019.tar.zst
PeerTube-c537763a2352a8b41611d784e31d7c36fef53019.zip
Fix autoclose md popover when click on emoji list link inside
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment-add.component.html2
-rw-r--r--client/src/app/shared/shared-main/misc/help.component.html2
-rw-r--r--client/src/app/shared/shared-main/misc/help.component.ts1
3 files changed, 3 insertions, 2 deletions
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html
index 6b3d39730..22bcd65db 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html
+++ b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html
@@ -10,7 +10,7 @@
10 (keyup.control.enter)="onValidKey()" (keyup.meta.enter)="onValidKey()" #textarea> 10 (keyup.control.enter)="onValidKey()" (keyup.meta.enter)="onValidKey()" #textarea>
11 11
12 </textarea> 12 </textarea>
13 <my-help class="markdown-guide" helpType="custom" iconName="markdown" tooltipPlacement="left auto" i18n-title title="Markdown compatible"> 13 <my-help class="markdown-guide" helpType="custom" iconName="markdown" tooltipPlacement="left auto" autoClose="true" i18n-title title="Markdown compatible">
14 <ng-template ptTemplate="customHtml"> 14 <ng-template ptTemplate="customHtml">
15 <span i18n>Markdown compatible that supports:</span> 15 <span i18n>Markdown compatible that supports:</span>
16 16
diff --git a/client/src/app/shared/shared-main/misc/help.component.html b/client/src/app/shared/shared-main/misc/help.component.html
index b2d58a828..af8cb3b17 100644
--- a/client/src/app/shared/shared-main/misc/help.component.html
+++ b/client/src/app/shared/shared-main/misc/help.component.html
@@ -32,7 +32,7 @@
32 [attr.aria-pressed]="isPopoverOpened" 32 [attr.aria-pressed]="isPopoverOpened"
33 [ngbPopover]="tooltipTemplate" 33 [ngbPopover]="tooltipTemplate"
34 [placement]="tooltipPlacement" 34 [placement]="tooltipPlacement"
35 autoClose="outside" 35 [autoClose]="autoClose"
36 (onHidden)="onPopoverHidden()" 36 (onHidden)="onPopoverHidden()"
37 (onShown)="onPopoverShown()" 37 (onShown)="onPopoverShown()"
38> 38>
diff --git a/client/src/app/shared/shared-main/misc/help.component.ts b/client/src/app/shared/shared-main/misc/help.component.ts
index bcbb464f3..9647e05bd 100644
--- a/client/src/app/shared/shared-main/misc/help.component.ts
+++ b/client/src/app/shared/shared-main/misc/help.component.ts
@@ -14,6 +14,7 @@ export class HelpComponent implements OnInit, OnChanges, AfterContentInit {
14 @Input() tooltipPlacement = 'right auto' 14 @Input() tooltipPlacement = 'right auto'
15 @Input() iconName: GlobalIconName = 'help' 15 @Input() iconName: GlobalIconName = 'help'
16 @Input() title = $localize`Get help` 16 @Input() title = $localize`Get help`
17 @Input() autoClose = 'outside'
17 18
18 @ContentChildren(PeerTubeTemplateDirective) templates: QueryList<PeerTubeTemplateDirective<'preHtml' | 'customHtml' | 'postHtml'>> 19 @ContentChildren(PeerTubeTemplateDirective) templates: QueryList<PeerTubeTemplateDirective<'preHtml' | 'customHtml' | 'postHtml'>>
19 20