Skip to content

Commit 7db1a47

Browse files
authored
Merge branch 'master' into tooltip-icon
2 parents 0e6a753 + 40f72e8 commit 7db1a47

File tree

3 files changed

+6
-21
lines changed

3 files changed

+6
-21
lines changed

src/notification/notification-content.interface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export interface NotificationContent {
55
duration?: number;
66
smart?: boolean;
77
closeLabel?: any;
8-
message: string;
8+
message?: string;
99
}
1010

1111
export interface ToastContent extends NotificationContent {

src/notification/notification.component.ts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ import { of } from "rxjs";
1515

1616
/**
1717
* Notification messages are displayed toward the top of the UI and do not interrupt user’s work.
18-
*
19-
* @export
20-
* @class Notification
2118
*/
2219
@Component({
2320
selector: "ibm-notification",
@@ -65,10 +62,9 @@ export class Notification {
6562
/**
6663
* Can have `type`, `title`, and `message` members.
6764
*
68-
* `type` can be one of `"info"`, `"warning"`, `"danger"`, `"success"`
69-
*
70-
* `message` is message for notification to display
65+
* `type` can be one of `"info"`, `"warning"`, `"error"`, `"success"`
7166
*
67+
* `message` is the message to display
7268
*/
7369
@Input() get notificationObj(): NotificationContent {
7470
return this._notificationObj;
@@ -82,9 +78,6 @@ export class Notification {
8278

8379
/**
8480
* Emits on close.
85-
*
86-
* @type {EventEmitter<any>}
87-
* @memberof Notification
8881
*/
8982
@Output() close: EventEmitter<any> = new EventEmitter();
9083

@@ -113,8 +106,6 @@ export class Notification {
113106

114107
/**
115108
* Emits close event.
116-
*
117-
* @memberof Notification
118109
*/
119110
onClose() {
120111
this.close.emit();

src/notification/toast.component.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@ import {
55
HostBinding
66
} from "@angular/core";
77

8-
import { NotificationContent, ToastContent } from "./notification-content.interface";
8+
import { ToastContent } from "./notification-content.interface";
99
import { Notification } from "./notification.component";
1010
import { ExperimentalService } from "./../experimental.module";
1111
import { NotificationDisplayService } from "./notification-display.service";
1212
import { I18n } from "./../i18n/i18n.module";
1313

1414
/**
15-
* Notification messages are displayed toward the top of the UI and do not interrupt user’s work.
16-
*
17-
* @export
18-
* @class Notification
15+
* Toast messages are displayed toward the top of the UI and do not interrupt user’s work.
1916
*/
2017
@Component({
2118
selector: "ibm-toast",
@@ -61,10 +58,7 @@ export class Toast extends Notification implements OnInit {
6158
/**
6259
* Can have `type`, `title`, `subtitle`, and `caption` members.
6360
*
64-
* `type` can be one of `"info"`, `"warning"`, `"danger"`, `"success"`
65-
*
66-
* `message` is message for notification to display
67-
*
61+
* `type` can be one of `"error"`, `"info"`, `"warning"`, or `"success"`
6862
*/
6963
@Input() notificationObj: ToastContent;
7064

0 commit comments

Comments
 (0)