diff --git a/shared/src/components/keymap/header/keymap-header.component.html b/shared/src/components/keymap/header/keymap-header.component.html index e6d684c0..f76baccb 100644 --- a/shared/src/components/keymap/header/keymap-header.component.html +++ b/shared/src/components/keymap/header/keymap-header.component.html @@ -27,6 +27,7 @@ [class.disabled]="!deletable" data-toggle="tooltip" data-placement="bottom" + html="true" (click)="removeKeymap()" > (); @@ -33,7 +36,7 @@ export class KeymapHeaderComponent implements OnChanges { @ViewChild('abbr') keymapAbbr: ElementRef; starTitle: string; - trashTitle: string = 'Delete keymap'; + trashTitle: string = DEFAULT_TRASH_TITLE; constructor(private store: Store, private renderer: Renderer2) { } @@ -92,7 +95,9 @@ export class KeymapHeaderComponent implements OnChanges { } setTrashTitle(): void { - this.trashTitle = this.deletable ? 'Delete keymap' : 'The last keymap cannot be deleted.'; + this.trashTitle = this.deletable + ? DEFAULT_TRASH_TITLE + : 'The last keymap cannot be deleted.'; } onDownloadIconClick(): void { diff --git a/shared/src/components/macro/header/macro-header.component.html b/shared/src/components/macro/header/macro-header.component.html index 2f89df39..cd8b4274 100644 --- a/shared/src/components/macro/header/macro-header.component.html +++ b/shared/src/components/macro/header/macro-header.component.html @@ -11,7 +11,8 @@ `; - constructor(private elementRef: ElementRef, private renderer: Renderer2) { } + constructor(private elementRef: ElementRef, private sanitizer: DomSanitizer) { } ngAfterContentInit() { this.init(); @@ -38,6 +39,13 @@ export class TooltipDirective implements AfterContentInit, OnChanges { } private fixTitle() { + jQuery(this.elementRef.nativeElement).tooltip({ + placement: this.placement, + html: this.html, + template: this.customTooltipTemplate, + title: this.title + }); + jQuery(this.elementRef.nativeElement) .attr('title', this.title) .tooltip('fixTitle');