diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index cd3b0f272179ce0984d9e810017fd01e3801f33d..0c56aa0ccfd73a9ced7a025b6e46cdce9f75e8d4 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -65,7 +65,8 @@
<!-- Moderator board / index -->
- <ng-container *ngIf="user && user.role > 0 && (router.url.endsWith('/moderator/comments') || router.url.includes('/comment/'))">
+ <ng-container
+ *ngIf="user && user.role > 0 && (router.url.endsWith('/moderator/comments') || router.url.includes('/comment/'))">
<button mat-menu-item
tabindex="0"
@@ -138,8 +139,6 @@
</button>
-
-
<button mat-menu-item
tabindex="0"
routerLink="participant/room/{{shortId}}/comments/tagcloud">
@@ -217,7 +216,8 @@
<!-- Room General Options - bot -->
- <ng-container *ngIf="user && user.role == 3 && !router.url.includes('/participant') && !router.url.includes('/comment/')">
+ <ng-container
+ *ngIf="user && user.role == 3 && !router.url.includes('/participant') && !router.url.includes('/comment/')">
<button mat-menu-item
*ngIf="user"
@@ -249,37 +249,39 @@
<button mat-menu-item
*ngIf="router.url.endsWith('/tagcloud')"
- tabindex="0">
+ tabindex="0"
+ (click)="navigateTopicCloudConfig()">
<mat-icon aria-label="Configuration Icon">cloud</mat-icon>
<span>{{'header.tag-cloud-config' | translate}}</span>
</button>
<button mat-menu-item
*ngIf="router.url.endsWith('/tagcloud')"
- tabindex="0">
+ tabindex="0"
+ (click)="navigateTopicCloudAdministration()">
<mat-icon aria-hidden="false" aria-label="Control Icon">edit</mat-icon>
<span>{{'header.tag-cloud-administration' | translate}}</span>
</button>
<button mat-menu-item
- *ngIf="router.url.endsWith('/tagcloud')"
- tabindex="0"
- (click)="navigateCreateQuestion();">
- <mat-icon>
- add
- </mat-icon>
- <span>{{'header.create-question' | translate}}</span>
- </button>
+ *ngIf="router.url.endsWith('/tagcloud')"
+ tabindex="0"
+ (click)="navigateCreateQuestion();">
+ <mat-icon>
+ add
+ </mat-icon>
+ <span>{{'header.create-question' | translate}}</span>
+ </button>
<button mat-menu-item
- tabindex="0"
- *ngIf="router.url.endsWith('/tagcloud')"
- routerLink="participant/room/{{shortId}}/comments">
- <mat-icon>
- forum
- </mat-icon>
- <span>{{'header.back-to-questionboard' | translate}}</span>
- </button>
+ tabindex="0"
+ *ngIf="router.url.endsWith('/tagcloud')"
+ routerLink="participant/room/{{shortId}}/comments">
+ <mat-icon>
+ forum
+ </mat-icon>
+ <span>{{'header.back-to-questionboard' | translate}}</span>
+ </button>
</ng-container>
diff --git a/src/app/components/shared/header/header.component.ts b/src/app/components/shared/header/header.component.ts
index f9ecf68ef429f9276e283647b58404c6b1e8cf99..7b8e4898d12893ef8d0672ecf39e490798c82434 100644
--- a/src/app/components/shared/header/header.component.ts
+++ b/src/app/components/shared/header/header.component.ts
@@ -282,4 +282,12 @@ export class HeaderComponent implements OnInit {
this.eventService.broadcast('navigate', 'createQuestion');
}
+ public navigateTopicCloudConfig() {
+ this.eventService.broadcast('navigate', 'topicCloudConfig');
+ }
+
+ public navigateTopicCloudAdministration() {
+ this.eventService.broadcast('navigate', 'topicCloudAdministration');
+ }
+
}
diff --git a/src/app/components/shared/tag-cloud/tag-cloud.component.html b/src/app/components/shared/tag-cloud/tag-cloud.component.html
index 323f62f71e65b5db7adb5d5a6152eda34caa61ed..ed922b41278ea285312a742603b95dab0a5cb4f3 100644
--- a/src/app/components/shared/tag-cloud/tag-cloud.component.html
+++ b/src/app/components/shared/tag-cloud/tag-cloud.component.html
@@ -15,7 +15,7 @@
[height]="options.height"
[overflow]="options.overflow"
[zoomOnHover]="zoomOnHoverOptions"
- [realignOnResize]="true">
+ [realignOnResize]="false">
</angular-tag-cloud>
</ars-fill>
</mat-drawer-content>
diff --git a/src/app/components/shared/tag-cloud/tag-cloud.component.ts b/src/app/components/shared/tag-cloud/tag-cloud.component.ts
index 727fa019d9b3b138e9253109c31e16afad08bb06..25e6b1f17856f1dbd708182af5d4fbad77964ece 100644
--- a/src/app/components/shared/tag-cloud/tag-cloud.component.ts
+++ b/src/app/components/shared/tag-cloud/tag-cloud.component.ts
@@ -1,4 +1,4 @@
-import {AfterViewInit, Component, OnInit, ViewChild, Input} from '@angular/core';
+import {Component, OnInit, ViewChild, Input} from '@angular/core';
import {
CloudData,
@@ -12,16 +12,16 @@ import {Result, SpacyService} from '../../../services/http/spacy.service';
import {Comment} from '../../../models/comment';
import {LanguageService} from '../../../services/util/language.service';
import {TranslateService} from '@ngx-translate/core';
-import { CreateCommentComponent } from '../_dialogs/create-comment/create-comment.component';
-import { MatDialog } from '@angular/material/dialog';
-import { User } from '../../../models/user';
-import { Room } from '../../../models/room';
-import { NotificationService } from '../../../services/util/notification.service';
-import { EventService } from '../../../services/util/event.service';
-import { AuthenticationService } from '../../../services/http/authentication.service';
-import { ActivatedRoute } from '@angular/router';
-import { UserRole } from '../../../models/user-roles.enum';
-import { RoomService } from '../../../services/http/room.service';
+import {CreateCommentComponent} from '../_dialogs/create-comment/create-comment.component';
+import {MatDialog} from '@angular/material/dialog';
+import {User} from '../../../models/user';
+import {Room} from '../../../models/room';
+import {NotificationService} from '../../../services/util/notification.service';
+import {EventService} from '../../../services/util/event.service';
+import {AuthenticationService} from '../../../services/http/authentication.service';
+import {ActivatedRoute} from '@angular/router';
+import {UserRole} from '../../../models/user-roles.enum';
+import {RoomService} from '../../../services/http/room.service';
import {ThemeService} from '../../../../theme/theme.service';
class CustomPosition implements Position {
@@ -33,11 +33,8 @@ class CustomPosition implements Position {
}
updatePosition(width: number, height: number, text: string, style: CSSStyleDeclaration) {
- const canvas = document.createElement('canvas');
- const context = canvas.getContext('2d');
- context.font = style.font;
- const offsetY = parseInt(style.fontSize, 10) / 2;
- const offsetX = context.measureText(text).width / 2;
+ const offsetY = parseFloat(style.height) / 2;
+ const offsetX = parseFloat(style.width) / 2;
this.left = width * this.relativeLeft - offsetX;
this.top = height * this.relativeTop - offsetY;
}
@@ -154,7 +151,8 @@ export class TagCloudComponent implements OnInit {
userRole: UserRole;
data: CloudData[] = [];
sorted = false;
-
+ debounceTimer = 0;
+ lastDebounceTime = 0;
constructor(private commentService: CommentService,
private spacyService: SpacyService,
@@ -177,6 +175,10 @@ export class TagCloudComponent implements OnInit {
this.headerInterface = this.eventService.on<string>('navigate').subscribe(e => {
if (e === 'createQuestion') {
this.openCreateDialog();
+ } else if (e === 'topicCloudConfig') {
+ // TODO Group 4: OPEN Topic Cloud Config
+ } else if (e === 'topicCloudAdministration') {
+ // TODO Group 5: OPEN Topic Cloud Administration
}
});
this.authenticationService.watchUser.subscribe(newUser => {
@@ -213,6 +215,7 @@ export class TagCloudComponent implements OnInit {
}
});
}
+
resetColorsToTheme() {
setGlobalStyles(getResolvedDefaultColors()
.map(e => 'color: ' + e + ' !important;') as TagCloudStyleData);
@@ -281,7 +284,19 @@ export class TagCloudComponent implements OnInit {
window.getComputedStyle(this.child.cloudDataHtmlElements[i]));
});
}
- this.child.reDraw();
+ const debounceTime = 1_000;
+ const current = new Date().getTime();
+ const diff = current - this.lastDebounceTime;
+ if (diff >= debounceTime) {
+ this.lastDebounceTime = current;
+ this.child.reDraw();
+ } else {
+ clearTimeout(this.debounceTimer);
+ this.debounceTimer = setTimeout(() => {
+ this.lastDebounceTime = new Date().getTime();
+ this.child.reDraw();
+ }, debounceTime - diff);
+ }
}
openCreateDialog(): void {