Commit 6f286102 authored by Brian Hatchet's avatar Brian Hatchet :speech_balloon:

relinted

1 merge request!469Fix/comments media gallery 1601
Pipeline #80330168 running with stages
......@@ -199,9 +199,29 @@
</li>
</ng-container>
<!-- ALLOW COMMENTS -->
<ng-container *ngIf="featuresService.has('allow-comments-toggle') && options.indexOf('allow-comments') !== -1 && entity.ownerObj.guid == session.getLoggedInUser().guid ">
<li class="mdl-menu__item" *ngIf="!entity.allow_comments" (click)="allowComments(true)" i18n="@@COMMON__POST_MENU__ALLOW_COMMENTS">Allow Comments</li>
<li class="mdl-menu__item" *ngIf="entity.allow_comments" (click)="allowComments(false)" i18n="@@COMMON__POST_MENU__DISABLE_COMMENTS">Disable Comments</li>
<ng-container
*ngIf="
featuresService.has('allow-comments-toggle') &&
options.indexOf('allow-comments') !== -1 &&
entity.ownerObj.guid == session.getLoggedInUser().guid
"
>
<li
class="mdl-menu__item"
*ngIf="!entity.allow_comments"
(click)="allowComments(true)"
i18n="@@COMMON__POST_MENU__ALLOW_COMMENTS"
>
Allow Comments
</li>
<li
class="mdl-menu__item"
*ngIf="entity.allow_comments"
(click)="allowComments(false)"
i18n="@@COMMON__POST_MENU__DISABLE_COMMENTS"
>
Disable Comments
</li>
</ng-container>
<!-- ADMIN EDIT FLAGS -->
<ng-container
......
......@@ -145,7 +145,7 @@ export class BlogView implements OnInit, OnDestroy {
ngOnDestroy() {
if (this.scroll_listener) {
this.scroll.unListen(this.scroll_listener);
this.scroll.unListen(this.scroll_listener);
}
}
......
......@@ -384,9 +384,24 @@
(click)="toggleReplies()"
*ngIf="comment.can_reply"
>
<i *ngIf="comment.replies_count > 0 || (activityService.allowComment$ | async)" class="material-icons">reply</i>
<span *ngIf="comment.replies_count > 0">{{ comment.replies_count }} Replies</span>
<span *ngIf="comment.replies_count <= 0 && (activityService.allowComment$ | async)">Reply</span>
<i
*ngIf="
comment.replies_count > 0 ||
(activityService.allowComment$ | async)
"
class="material-icons"
>reply</i
>
<span *ngIf="comment.replies_count > 0"
>{{ comment.replies_count }} Replies</span
>
<span
*ngIf="
comment.replies_count <= 0 &&
(activityService.allowComment$ | async)
"
>Reply</span
>
</span>
</div>
......
......@@ -44,12 +44,14 @@
<p
class="m-comments--start-conversation-label"
*ngIf="!descendingInProgress
&& !ascendingInProgress
&& !error
&& comments?.length === 0
&& parent.type == 'activity'
&& activityService.allowComment$"
*ngIf="
!descendingInProgress &&
!ascendingInProgress &&
!error &&
comments?.length === 0 &&
parent.type == 'activity' &&
activityService.allowComment$
"
i18n="@@MINDS__COMMENTS__START_CONVERSATION"
>
Start the conversation!
......
......@@ -111,9 +111,9 @@ export class CommentsListComponent implements OnInit, OnDestroy {
set _reversed(value: boolean) {
if (value) {
this.reversed = true;
this.reversed = true;
} else {
this.reversed = false;
this.reversed = false;
}
}
......
......@@ -112,7 +112,7 @@
</div>
<m-comment__poster
*ngIf="(activityService.allowComment$ | async)"
*ngIf="activityService.allowComment$ | async"
[guid]="guid"
[parent]="parent"
[entity]="entity"
......
......@@ -273,11 +273,11 @@
</div>
<!-- Don't show comments for albums -->
<div class="mdl-grid m-media-content--comments mdl-color--white" *ngIf="canShowComments() || (activityService.allowComment$ | async)">
<m-comments__tree
[entity]="entity"
>
</m-comments__tree>
<div
class="mdl-grid m-media-content--comments mdl-color--white"
*ngIf="canShowComments() || (activityService.allowComment$ | async)"
>
<m-comments__tree [entity]="entity"> </m-comments__tree>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment