X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fcomment%2Fvideo-comments.component.html;h=6f3e571602ed7d860b392ba2660511f304a5cf9d;hb=244e76a552ef05a5067134b1065d26dd89246d8c;hp=5c6908150777069ae7c31f88e7fc354b0b23362f;hpb=7416fbf3359fc0b890cba3dae9661fe450604b21;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.html b/client/src/app/videos/+video-watch/comment/video-comments.component.html
index 5c6908150..6f3e57160 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.html
@@ -3,35 +3,60 @@
     Comments
   </div>
 
-  <my-video-comment-add
-    *ngIf="isUserLoggedIn()"
-    [video]="video"
-    (commentCreated)="onCommentThreadCreated($event)"
-  ></my-video-comment-add>
+  <ng-template [ngIf]="video.commentsEnabled === true">
+    <my-video-comment-add
+      *ngIf="isUserLoggedIn()"
+      [video]="video"
+      [user]="user"
+      (commentCreated)="onCommentThreadCreated($event)"
+    ></my-video-comment-add>
 
-  <div
-    class="comment-threads"
-    infiniteScroll
-    [infiniteScrollUpDistance]="1.5"
-    [infiniteScrollDistance]="0.5"
-    (scrolled)="onNearOfBottom()"
-  >
-    <div *ngFor="let comment of comments">
-      <my-video-comment
-        [comment]="comment"
-        [video]="video"
-        [inReplyToCommentId]="inReplyToCommentId"
-        [commentTree]="threadComments[comment.id]"
-        (wantedToReply)="onWantedToReply($event)"
-        (resetReply)="onResetReply()"
-      ></my-video-comment>
+    <div *ngIf="componentPagination.totalItems === 0 && comments.length === 0">No comments.</div>
 
-      <div *ngIf="comment.totalReplies !== 0 && !threadComments[comment.id]" (click)="viewReplies(comment)" class="view-replies">
-        View all {{ comment.totalReplies }} replies
+    <div
+      class="comment-threads"
+      myInfiniteScroller
+      [autoLoading]="true"
+      (nearOfBottom)="onNearOfBottom()"
+    >
+      <div *ngIf="highlightedThread" id="highlighted-comment">
+        <my-video-comment
+            [comment]="highlightedThread"
+            [video]="video"
+            [inReplyToCommentId]="inReplyToCommentId"
+            [commentTree]="threadComments[highlightedThread.id]"
+            [highlightedComment]="true"
+            (wantedToReply)="onWantedToReply($event)"
+            (wantedToDelete)="onWantedToDelete($event)"
+            (threadCreated)="onThreadCreated($event)"
+            (resetReply)="onResetReply()"
+        ></my-video-comment>
+      </div>
+
+      <div *ngFor="let comment of comments">
+        <my-video-comment
+          *ngIf="!highlightedThread || comment.id !== highlightedThread.id"
+          [comment]="comment"
+          [video]="video"
+          [inReplyToCommentId]="inReplyToCommentId"
+          [commentTree]="threadComments[comment.id]"
+          (wantedToReply)="onWantedToReply($event)"
+          (wantedToDelete)="onWantedToDelete($event)"
+          (threadCreated)="onThreadCreated($event)"
+          (resetReply)="onResetReply()"
+        ></my-video-comment>
 
-        <span *ngIf="!threadLoading[comment.id]" class="glyphicon glyphicon-menu-down"></span>
-        <my-loader class="comment-thread-loading" [loading]="threadLoading[comment.id]"></my-loader>
+        <div *ngIf="comment.totalReplies !== 0 && !threadComments[comment.id]" (click)="viewReplies(comment.id)" class="view-replies">
+          View all {{ comment.totalReplies }} replies
+
+          <span *ngIf="!threadLoading[comment.id]" class="glyphicon glyphicon-menu-down"></span>
+          <my-loader class="comment-thread-loading" [loading]="threadLoading[comment.id]"></my-loader>
+        </div>
       </div>
     </div>
+  </ng-template>
+
+  <div *ngIf="video.commentsEnabled === false">
+    Comments are disabled.
   </div>
 </div>