From f6d1078e5440531a57fd8e187ccb6720b725a6f6 Mon Sep 17 00:00:00 2001 From: mmalerba Date: Tue, 12 Sep 2017 10:58:14 -0700 Subject: [PATCH] fix(tooltip): ensure tooltip never passes undefined message to (#7018) AriaDescriber --- src/lib/tooltip/tooltip.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts index d5a7c14169a..a941be0a341 100644 --- a/src/lib/tooltip/tooltip.ts +++ b/src/lib/tooltip/tooltip.ts @@ -142,17 +142,15 @@ export class MdTooltip implements OnDestroy { /** The default delay in ms before hiding the tooltip after hide is called */ @Input('mdTooltipHideDelay') hideDelay = 0; - private _message: string; + private _message = ''; /** The message to be displayed in the tooltip */ @Input('mdTooltip') get message() { return this._message; } set message(value: string) { - if (this._message) { - this._ariaDescriber.removeDescription(this._elementRef.nativeElement, this._message); - } + this._ariaDescriber.removeDescription(this._elementRef.nativeElement, this._message); // If the message is not a string (e.g. number), convert it to a string and trim it. - this._message = value ? `${value}`.trim() : ''; + this._message = value ? value.trim() : ''; this._updateTooltipMessage(); this._ariaDescriber.describe(this._elementRef.nativeElement, this.message); }