diff options
Diffstat (limited to 'client/src/app/shared/shared-custom-markup')
2 files changed, 8 insertions, 4 deletions
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts index 8c1357d7a..35b413b60 100644 --- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts +++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts | |||
@@ -39,9 +39,13 @@ export class ChannelMiniatureMarkupComponent implements CustomMarkupComponent, O | |||
39 | ngOnInit () { | 39 | ngOnInit () { |
40 | this.findInBulk.getChannel(this.name) | 40 | this.findInBulk.getChannel(this.name) |
41 | .pipe( | 41 | .pipe( |
42 | tap(channel => this.channel = channel), | 42 | tap(channel => { |
43 | this.channel = channel | ||
44 | }), | ||
43 | switchMap(() => from(this.markdown.textMarkdownToHTML(this.channel.description))), | 45 | switchMap(() => from(this.markdown.textMarkdownToHTML(this.channel.description))), |
44 | tap(html => this.descriptionHTML = html), | 46 | tap(html => { |
47 | this.descriptionHTML = html | ||
48 | }), | ||
45 | switchMap(() => this.loadVideosObservable()), | 49 | switchMap(() => this.loadVideosObservable()), |
46 | finalize(() => this.loaded.emit(true)) | 50 | finalize(() => this.loaded.emit(true)) |
47 | ).subscribe({ | 51 | ).subscribe({ |
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.ts index 56b43d85e..7315126e0 100644 --- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.ts +++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.ts | |||
@@ -1,10 +1,10 @@ | |||
1 | import { finalize } from 'rxjs/operators' | 1 | import { finalize } from 'rxjs/operators' |
2 | import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' | 2 | import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' |
3 | import { AuthService, Notifier } from '@app/core' | 3 | import { AuthService, Notifier } from '@app/core' |
4 | import { Video, VideoService } from '../../shared-main' | 4 | import { FindInBulkService } from '@app/shared/shared-search' |
5 | import { Video } from '../../shared-main' | ||
5 | import { MiniatureDisplayOptions } from '../../shared-video-miniature' | 6 | import { MiniatureDisplayOptions } from '../../shared-video-miniature' |
6 | import { CustomMarkupComponent } from './shared' | 7 | import { CustomMarkupComponent } from './shared' |
7 | import { FindInBulkService } from '@app/shared/shared-search' | ||
8 | 8 | ||
9 | /* | 9 | /* |
10 | * Markup component that creates a video miniature only | 10 | * Markup component that creates a video miniature only |