diff --git a/package.json b/package.json index 5caf35b241..a9a72c36da 100755 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "planet", "license": "AGPL-3.0", - "version": "0.14.44", + "version": "0.14.45", "myplanet": { - "latest": "v0.15.86", + "latest": "v0.15.94", "min": "v0.15.78" }, "scripts": { diff --git a/src/app/news/news-list-item.component.html b/src/app/news/news-list-item.component.html index 658e437cc1..9c3a423423 100644 --- a/src/app/news/news-list-item.component.html +++ b/src/app/news/news-list-item.component.html @@ -27,18 +27,18 @@
-
- {{ showLess ? 'Show More' : 'Show Less' }} - -
-
-

-

+ +
+
+

+

+
-
- - - + +
+ + {{ showLess ? 'Show More' : 'Show Less' }} +
diff --git a/src/app/news/news-list-item.component.ts b/src/app/news/news-list-item.component.ts index 7119697e86..15c81502e5 100644 --- a/src/app/news/news-list-item.component.ts +++ b/src/app/news/news-list-item.component.ts @@ -60,8 +60,9 @@ export class NewsListItemComponent implements OnInit, OnChanges, AfterViewChecke } ngAfterViewChecked() { - const offsetHeight = this.content && this.content.nativeElement.children[0].children[0].children[0].offsetHeight; - const showExpand = offsetHeight && (offsetHeight > this.content.nativeElement.clientHeight); + const contentHeight = this.content && this.content.nativeElement.scrollHeight; + const containerHeight = this.content && this.content.nativeElement.offsetHeight; + const showExpand = contentHeight > containerHeight; if (showExpand !== this.showExpand) { this.showExpand = showExpand; this.cdRef.detectChanges();