Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Dspace7 Angular
Manage
Activity
Members
Labels
Plan
Issues
42
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vtechworks
Dspace7 Angular
Commits
5045b810
Commit
5045b810
authored
7 years ago
by
Giuseppe Digilio
Browse files
Options
Downloads
Patches
Plain Diff
Fixed notifications
parent
d3949c17
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/app/shared/notifications/notification/notification.component.ts
+11
-9
11 additions, 9 deletions
...ared/notifications/notification/notification.component.ts
with
11 additions
and
9 deletions
src/app/shared/notifications/notification/notification.component.ts
+
11
−
9
View file @
5045b810
...
...
@@ -129,15 +129,17 @@ export class NotificationComponent implements OnInit, OnDestroy {
this
[
key
]
=
item
;
}
else
if
(
key
===
'
title
'
||
key
===
'
content
'
)
{
let
value
=
null
;
if
(
typeof
item
===
'
string
'
)
{
value
=
Observable
.
of
(
item
);
}
else
if
(
item
instanceof
Observable
)
{
value
=
item
;
}
else
if
(
typeof
item
===
'
object
'
&&
isNotEmpty
(
item
.
value
))
{
// when notifications state is transferred from SSR to CSR,
// Observables Object loses the instance type and become simply object,
// so converts it again to Observable
value
=
Observable
.
of
(
item
.
value
);
if
(
isNotEmpty
(
item
))
{
if
(
typeof
item
===
'
string
'
)
{
value
=
Observable
.
of
(
item
);
}
else
if
(
item
instanceof
Observable
)
{
value
=
item
;
}
else
if
(
typeof
item
===
'
object
'
&&
isNotEmpty
(
item
.
value
))
{
// when notifications state is transferred from SSR to CSR,
// Observables Object loses the instance type and become simply object,
// so converts it again to Observable
value
=
Observable
.
of
(
item
.
value
);
}
}
this
[
key
]
=
value
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment