From 660d11e91e1643927028d2d6870a911f569b34d8 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Tue, 25 Sep 2018 15:42:58 +0200 Subject: refactor subscribe button and comment-add for visitor-interact UX (#1100) * refactor subscribe button for visitor-subscribe UX * refactor comment-add for visitor-interact UX --- .../comment/video-comment-add.component.ts | 57 ++++++++++++++++++---- 1 file changed, 47 insertions(+), 10 deletions(-) (limited to 'client/src/app/videos/+video-watch/comment/video-comment-add.component.ts') diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts index 9998685e8..91af113d2 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts +++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts @@ -1,4 +1,5 @@ import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core' +import { Router } from '@angular/router' import { NotificationsService } from 'angular2-notifications' import { Observable } from 'rxjs' import { VideoCommentCreate } from '../../../../../../shared/models/videos/video-comment.model' @@ -10,6 +11,8 @@ import { VideoCommentService } from './video-comment.service' import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { VideoCommentValidatorsService } from '@app/shared/forms/form-validators/video-comment-validators.service' +import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { AuthService } from '@app/core/auth' @Component({ selector: 'my-video-comment-add', @@ -25,15 +28,20 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit { @Output() commentCreated = new EventEmitter() + @ViewChild('visitorModal') visitorModal: NgbModal @ViewChild('textarea') private textareaElement: ElementRef private addingComment = false + private uri: string constructor ( protected formValidatorService: FormValidatorService, private videoCommentValidatorsService: VideoCommentValidatorsService, private notificationsService: NotificationsService, private videoCommentService: VideoCommentService, + private authService: AuthService, + private modalService: NgbModal, + private router: Router, private i18n: I18n ) { super() @@ -44,19 +52,23 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit { text: this.videoCommentValidatorsService.VIDEO_COMMENT_TEXT }) - if (this.focusOnInit === true) { - this.textareaElement.nativeElement.focus() - } + this.uri = this.router.url - if (this.parentComment) { - const mentions = this.parentComments - .filter(c => c.account.id !== this.user.account.id) // Don't add mention of ourselves - .map(c => '@' + c.by) + if (this.user) { + if (this.focusOnInit === true) { + this.textareaElement.nativeElement.focus() + } + + if (this.parentComment) { + const mentions = this.parentComments + .filter(c => c.account.id !== this.user.account.id) // Don't add mention of ourselves + .map(c => '@' + c.by) - const mentionsSet = new Set(mentions) - const mentionsText = Array.from(mentionsSet).join(' ') + ' ' + const mentionsSet = new Set(mentions) + const mentionsText = Array.from(mentionsSet).join(' ') + ' ' - this.form.patchValue({ text: mentionsText }) + this.form.patchValue({ text: mentionsText }) + } } } @@ -67,6 +79,20 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit { this.formValidated() } + openVisitorModal (event) { + if (this.user === null) { // we only open it for visitors + // fixing ng-bootstrap ModalService and the "Expression Changed After It Has Been Checked" Error + event.srcElement.blur() + event.preventDefault() + + this.modalService.open(this.visitorModal) + } + } + + hideVisitorModal () { + this.modalService.dismissAll() + } + formValidated () { // If we validate very quickly the comment form, we might comment twice if (this.addingComment) return @@ -101,6 +127,17 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit { return this.form.value['text'] } + getAvatarUrl () { + if (this.user) return this.user.accountAvatarUrl + return window.location.origin + '/client/assets/images/default-avatar.png' + } + + gotoLogin () { + this.hideVisitorModal() + this.authService.redirectUrl = this.router.url + this.router.navigate([ '/login' ]) + } + private addCommentReply (commentCreate: VideoCommentCreate) { return this.videoCommentService .addCommentReply(this.video.id, this.parentComment.id, commentCreate) -- cgit v1.2.3