diff --git a/src/app/components/moderator/moderator-comment-list/moderator-comment-list.component.html b/src/app/components/moderator/moderator-comment-list/moderator-comment-list.component.html index 4ffc43b05589df560ed373a4b197a5540a1aa3f5..e4996e8de4084a4494ff13b383b7d85c21e57d41 100644 --- a/src/app/components/moderator/moderator-comment-list/moderator-comment-list.component.html +++ b/src/app/components/moderator/moderator-comment-list/moderator-comment-list.component.html @@ -40,7 +40,7 @@ </div> <mat-menu #sortMenu="matMenu" xPosition="before"> - <button mat-icon-button matTooltip="{{ 'comment-list.vote-desc' | translate }}" + <button mat-icon-button *ngIf="isApple === 'false'" matTooltip="{{ 'comment-list.vote-desc' | translate }}" (click)="sortComments(votedesc)"> <mat-icon [ngClass]="{votedesc: 'up'}[currentSort]">keyboard_arrow_up</mat-icon> </button> diff --git a/src/app/components/moderator/moderator-comment-list/moderator-comment-list.component.ts b/src/app/components/moderator/moderator-comment-list/moderator-comment-list.component.ts index 021d45f264f7fcc8c35e5c9a12bccc32c0f4f58e..5a95e9ce1ec56e21534066ecac9d76ea1f3b36c2 100644 --- a/src/app/components/moderator/moderator-comment-list/moderator-comment-list.component.ts +++ b/src/app/components/moderator/moderator-comment-list/moderator-comment-list.component.ts @@ -11,7 +11,6 @@ import { Vote } from '../../../models/vote'; import { UserRole } from '../../../models/user-roles.enum'; import { Room } from '../../../models/room'; import { RoomService } from '../../../services/http/room.service'; -import { VoteService } from '../../../services/http/vote.service'; import { CorrectWrong } from '../../../models/correct-wrong.enum'; import { EventService } from '../../../services/util/event.service'; import { Router } from '@angular/router'; @@ -33,6 +32,7 @@ export class ModeratorCommentListComponent implements OnInit { filteredComments: Comment[]; userRole: UserRole; deviceType: string; + isApple: string; isLoading = true; voteasc = 'voteasc'; votedesc = 'votedesc'; @@ -79,6 +79,7 @@ export class ModeratorCommentListComponent implements OnInit { }); this.translateService.use(localStorage.getItem('currentLang')); this.deviceType = localStorage.getItem('deviceType'); + this.isApple = localStorage.getItem('isApple'); this.currentSort = this.votedesc; this.commentService.getRejectedComments(this.roomId) .subscribe(comments => { diff --git a/src/app/components/shared/comment-list/comment-list.component.html b/src/app/components/shared/comment-list/comment-list.component.html index bb79abf397877b69b092e396c2d5ec33acb354ba..79b6abad0ca8aceff04a994635ce1860b14117c6 100644 --- a/src/app/components/shared/comment-list/comment-list.component.html +++ b/src/app/components/shared/comment-list/comment-list.component.html @@ -69,7 +69,7 @@ <mat-menu #sortMenu="matMenu" xPosition="before"> - <button mat-menu-item matTooltip="{{ 'comment-list.time' | translate }}" + <button mat-menu-item *ngIf="isApple === 'false'" matTooltip="{{ 'comment-list.time' | translate }}" (click)="sortComments(time)" aria-labelledby="access_time"> <mat-icon [ngClass]="{time: 'unread-icon'}[currentSort]">access_time</mat-icon> <span>{{ 'comment-list.sort-list-time' | translate }}</span> diff --git a/src/app/components/shared/comment-list/comment-list.component.ts b/src/app/components/shared/comment-list/comment-list.component.ts index 0f8d3487edeaee287f889632785e63ff50171c3a..e6e8307cfb1d518a57f46da6f789749016ddfb7d 100644 --- a/src/app/components/shared/comment-list/comment-list.component.ts +++ b/src/app/components/shared/comment-list/comment-list.component.ts @@ -37,6 +37,7 @@ export class CommentListComponent implements OnInit, OnDestroy { filteredComments: Comment[]; userRole: UserRole; deviceType: string; + isApple: string; isLoading = true; voteasc = 'voteasc'; votedesc = 'votedesc'; @@ -107,6 +108,7 @@ export class CommentListComponent implements OnInit, OnDestroy { this.subscribeCommentStream(); this.translateService.use(localStorage.getItem('currentLang')); this.deviceType = localStorage.getItem('deviceType'); + this.isApple = localStorage.getItem('isApple'); if (this.userRole === 0) { this.voteService.getByRoomIdAndUserID(this.roomId, userId).subscribe(votes => { for (const v of votes) {