hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-15 05:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Giuseppe Digilio
2018-03-08 16:11:50 +01:00
parent 58cc17f1db
commit adf826690a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/shared/notifications/notification/notification.component.ts
View File

@@ -22,6 +22,7 @@ import { fromTopEnter, fromTopInState, fromTopLeave, fromTopOutState } from '../
import { fadeInEnter, fadeInState, fadeOutLeave, fadeOutState } from '../../animations/fade'; import { fadeInEnter, fadeInState, fadeOutLeave, fadeOutState } from '../../animations/fade';
import { NotificationAnimationsStatus } from '../models/notification-animations-type'; import { NotificationAnimationsStatus } from '../models/notification-animations-type';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { isNotEmpty } from '../../empty.util';
@Component({ @Component({
selector: 'ds-notification', selector: 'ds-notification',
@@ -126,8 +127,8 @@ export class NotificationComponent implements OnInit, OnDestroy {
private contentType(item: any, key: string) { private contentType(item: any, key: string) {
if (item instanceof TemplateRef) { if (item instanceof TemplateRef) {
this[key] = item; this[key] = item;
} else if (item instanceof Observable) { } else if (key === 'title' || key === 'content' ) {
this[key] = item; this[key] = isNotEmpty(item) ? item : Observable.of('');
} else { } else {
this[key] = this.domSanitizer.bypassSecurityTrustHtml(item); this[key] = this.domSanitizer.bypassSecurityTrustHtml(item);
} }