update comments

2021-10-04 14:14:03 +02:00
parent 0cabe9b0a5
commit 1f427fd67e
11 changed files with 129 additions and 84 deletions
@@ -1,45 +1,46 @@
-<div mat-line>
-  <small>
-    <ng-container *ngIf="comment.metadata && !comment.metadata.unvote">
-      <a href="javascript:" (click)="voteUp(comment.id)" matTooltip="{{'vote.up' | i18n}}">
-        <mat-icon inline="true">thumb_up</mat-icon>
-      </a>
-      <span>&nbsp;</span>
-      <a href="javascript:" (click)="voteDown(comment.id)" matTooltip="{{'vote.down' | i18n}}">
-        <mat-icon inline="true">thumb_down</mat-icon>
-      </a>
-      <span>&nbsp;</span>
-    </ng-container>
-    <span class="voted" *ngIf="comment.metadata && comment.metadata.unvote">
-        <mat-icon *ngIf="comment.metadata && comment.metadata.upvoted" inline="true" >thumb_up</mat-icon>
-        <mat-icon *ngIf="comment.metadata && comment.metadata.downvoted"  inline="true">thumb_down</mat-icon>
-      <span>&nbsp;</span>
-    </span>
-    <a routerLink="/c/{{comment.id}}" matTooltip="{{comment.created | datef:'LLLL'}}">{{comment.created
-      | datef}}</a>
-    {{'comment.author' | i18n}}<a routerLink="/u/{{comment.author}}">{{comment.author}}</a>
-    <span *ngIf="comment.metadata && comment.metadata.unvote"> | </span>
-    <a *ngIf="comment.metadata.unvote" href="javascript:" (click)="unvote()">{{'comment.unvote' | i18n}}</a>
-  </small>
-</div>
-<div mat-line class="text"
-  [style.opacity]="comment.metadata && comment.metadata.points && comment.metadata.points < 0 ? 1 + (comment.metadata.points / 10) : '1.0'">
-  {{comment.text}}
+<div class="comment">
+  <div mat-line>
+    <small>
+      <ng-container *ngIf="comment.metadata && !comment.metadata.unvote">
+        <a href="javascript:" (click)="voteUp(comment.id)" matTooltip="{{'vote.up' | i18n}}">
+          <mat-icon inline="true">thumb_up</mat-icon>
+        </a>
+        <span>&nbsp;</span>
+        <a href="javascript:" (click)="voteDown(comment.id)" matTooltip="{{'vote.down' | i18n}}">
+          <mat-icon inline="true">thumb_down</mat-icon>
+        </a>
+        <span>&nbsp;</span>
+      </ng-container>
+      <span class="voted" *ngIf="comment.metadata && comment.metadata.unvote">
+        <mat-icon *ngIf="comment.metadata && comment.metadata.upvoted" inline="true">thumb_up</mat-icon>
+        <mat-icon *ngIf="comment.metadata && comment.metadata.downvoted" inline="true">thumb_down</mat-icon>
+        <span>&nbsp;</span>
+      </span>
+      <a routerLink="/c/{{comment.id}}" matTooltip="{{comment.created | datef:'LLLL'}}">{{comment.created
+        | datef}}</a>
+      {{'comment.author' | i18n}}<a routerLink="/u/{{comment.author}}">{{comment.author}}</a>
+      <span *ngIf="comment.metadata && comment.metadata.unvote"> | </span>
+      <a *ngIf="comment.metadata.unvote" href="javascript:" (click)="unvote()">{{'comment.unvote' | i18n}}</a>
+    </small>
+  </div>
+  <div mat-line class="text"
+    [style.opacity]="comment.metadata && comment.metadata.points && comment.metadata.points < 0 ? 1 + (comment.metadata.points / 10) : '1.0'">
+    {{comment.text}}
+  </div>
+
+  <div mat-line>
+    <small>
+      <a href="javascript:" (click)="comment.metadata.reply=!comment.metadata.reply">{{(comment.metadata.reply ?
+        'comment.replyHide' : 'comment.reply') | i18n}}</a>
+      <span *ngIf="moderator"> | </span>
+      <a *ngIf="moderator" href="javascript:" (click)="deleteComment(comment)">{{'comment.delete' | i18n}}</a>
+    </small>
+  </div>
+
+  <div mat-line>
+    <ui-commentform *ngIf="comment.metadata.reply" [target]="comment.target" [parent]="comment.id"
+      (replyCommentEvent)="replyCallback($event)"></ui-commentform>
+  </div>
 </div>

-<div mat-line>
-  <small>
-    <a href="javascript:" (click)="comment.metadata.reply=!comment.metadata.reply">{{(comment.metadata.reply ? 'comment.replyHide' : 'comment.reply') | i18n}}</a>
-    <span *ngIf="moderator"> | </span>
-    <a *ngIf="moderator" href="javascript:" (click)="deleteComment(comment)">{{'comment.delete' | i18n}}</a>
-  </small>
-</div>
-
-<div mat-line>
-  <ui-commentform *ngIf="comment.metadata.reply" [target]="comment.target" [parent]="comment.id"
-    [change]="boundReplyCallback"></ui-commentform>
-</div>
-
-<ng-container *ngIf="comment.metadata.comments">
-  <ui-comments [target]="comment.target" [parent]="comment.id"></ui-comments>
-</ng-container>
+<ui-comments #subcomments [target]="comment.target" [parent]="comment.id"></ui-comments>