From 9723d929e12ba0d9f1c52208053cd84848346435 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Thu, 5 Sep 2019 10:44:37 +0200
Subject: [PATCH] resolved issues after merge with master

---
 .../journal-issue/journal-issue-grid-element.component.html     | 2 +-
 .../journal-volume/journal-volume-grid-element.component.html   | 2 +-
 .../journal/journal-grid-element.component.html                 | 2 +-
 .../orgunit/orgunit-grid-element.component.html                 | 2 +-
 .../person/person-grid-element.component.html                   | 2 +-
 .../project/project-grid-element.component.html                 | 2 +-
 .../publication/publication-grid-element.component.html         | 2 +-
 .../search-result-grid-element.component.ts                     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html
index 4cb34a140b..3aa79fc70a 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html
@@ -1,5 +1,5 @@
 <ds-truncatable [id]="dso.id">
-  <div class="card" [@focusShadow]="(isCollapsed() | async)?'blur':'focus'">
+  <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
     <a [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
       <div>
         <ds-grid-thumbnail [thumbnail]="this.item.getThumbnail() | async">
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html
index d7c9b68a24..b2b251f550 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html
@@ -1,5 +1,5 @@
 <ds-truncatable [id]="dso.id">
-  <div class="card" [@focusShadow]="(isCollapsed() | async)?'blur':'focus'">
+  <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
     <a [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
       <div>
         <ds-grid-thumbnail [thumbnail]="this.item.getThumbnail() | async">
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html
index 467cdd1594..af0739004c 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html
@@ -1,5 +1,5 @@
 <ds-truncatable [id]="dso.id">
-  <div class="card" [@focusShadow]="(isCollapsed() | async)?'blur':'focus'">
+  <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
     <a [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
       <div>
         <ds-grid-thumbnail [thumbnail]="this.item.getThumbnail() | async">
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.html
index 104d3a0a57..a4765c4e8f 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.html
@@ -1,5 +1,5 @@
 <ds-truncatable [id]="dso.id">
-  <div class="card" [@focusShadow]="(isCollapsed() | async)?'blur':'focus'">
+  <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
     <a [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
       <div>
         <ds-grid-thumbnail [thumbnail]="this.item.getThumbnail() | async">
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html
index 86353377fa..331c2bd520 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html
@@ -1,5 +1,5 @@
 <ds-truncatable [id]="dso.id">
-  <div class="card" [@focusShadow]="(isCollapsed() | async)?'blur':'focus'">
+  <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
     <a [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
       <div>
         <ds-grid-thumbnail [thumbnail]="this.item.getThumbnail() | async">
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html
index a595791cc4..889276b29b 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html
@@ -1,5 +1,5 @@
 <ds-truncatable [id]="dso.id">
-  <div class="card" [@focusShadow]="(isCollapsed() | async)?'blur':'focus'">
+  <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
     <a [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
       <div>
         <ds-grid-thumbnail [thumbnail]="this.item.getThumbnail() | async">
diff --git a/src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.html b/src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.html
index e2477524ca..e735dbf107 100644
--- a/src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.html
+++ b/src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.html
@@ -1,5 +1,5 @@
 <ds-truncatable [id]="dso.id">
-  <div class="card" [@focusShadow]="(isCollapsed() | async)?'blur':'focus'">
+  <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
     <a [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
       <div>
         <ds-grid-thumbnail [thumbnail]="this.item.getThumbnail() | async">
diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
index af1768b0e5..63b2536043 100644
--- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
@@ -22,7 +22,7 @@ export class SearchResultGridElementComponent<T extends SearchResult<K>, K exten
     super(listableObject);
     if (hasValue(this.object)) {
       this.dso = this.object.indexableObject;
-    this.isCollapsed$ = this.isCollapsed();
+      this.isCollapsed$ = this.isCollapsed();
     }
   }