diff --git a/src/Squidex/app/framework/angular/forms/autocomplete.component.html b/src/Squidex/app/framework/angular/forms/autocomplete.component.html index 5b62c0310..5f6ee92fa 100644 --- a/src/Squidex/app/framework/angular/forms/autocomplete.component.html +++ b/src/Squidex/app/framework/angular/forms/autocomplete.component.html @@ -6,7 +6,7 @@ autocapitalize="off"> -
+
0) { @@ -252,7 +254,7 @@ export class MarkdownEditorComponent extends StatefulControlComponent { if (Types.is(asset, AssetDto)) { - replaceText(`![${asset.fileName}](${asset.contentUrl} '${asset.fileName}')`); + replaceText(`![${asset.fileName}](${asset.fullUrl(this.apiUrl)} '${asset.fileName}')`); } }, error => { if (!Types.is(error, UploadCanceled)) { diff --git a/src/Squidex/app/shared/components/pipes.ts b/src/Squidex/app/shared/components/pipes.ts index 11abdf943..7c59cd5b0 100644 --- a/src/Squidex/app/shared/components/pipes.ts +++ b/src/Squidex/app/shared/components/pipes.ts @@ -216,8 +216,13 @@ export class UserPictureRefPipe extends UserAsyncPipe implements PipeTransform { pure: true }) export class AssetUrlPipe implements PipeTransform { + constructor( + private readonly apiUrl: ApiUrlConfig + ) { + } + public transform(asset: AssetDto): string { - return `${asset.contentUrl}&sq=${MathHelper.guid()}`; + return `${asset.fullUrl(this.apiUrl)}&sq=${MathHelper.guid()}`; } } @@ -226,8 +231,13 @@ export class AssetUrlPipe implements PipeTransform { pure: true }) export class AssetPreviewUrlPipe implements PipeTransform { + constructor( + private readonly apiUrl: ApiUrlConfig + ) { + } + public transform(asset: AssetDto): string { - return asset.contentUrl; + return asset.fullUrl(this.apiUrl); } } diff --git a/src/Squidex/app/shared/components/rich-editor.component.ts b/src/Squidex/app/shared/components/rich-editor.component.ts index 807b8ae0a..4e73c1c65 100644 --- a/src/Squidex/app/shared/components/rich-editor.component.ts +++ b/src/Squidex/app/shared/components/rich-editor.component.ts @@ -11,6 +11,7 @@ import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, E import { NG_VALUE_ACCESSOR } from '@angular/forms'; import { + ApiUrlConfig, AssetDto, AssetUploaderState, DialogModel, @@ -55,6 +56,7 @@ export class RichEditorComponent extends StatefulControlComponent { if (Types.is(asset, AssetDto)) { - success(asset.contentUrl); + success(asset.fullUrl(this.apiUrl)); } }, error => { if (!Types.is(error, UploadCanceled)) { @@ -190,7 +192,7 @@ export class RichEditorComponent extends StatefulControlComponent`; + content += `${asset.fileName}`; } if (content.length > 0) { @@ -220,7 +222,7 @@ export class RichEditorComponent extends StatefulControlComponent { if (Types.is(asset, AssetDto)) { - replaceText(`${asset.fileName}`); + replaceText(`${asset.fileName}`); } }, error => { if (!Types.is(error, UploadCanceled)) { diff --git a/src/Squidex/app/shared/services/assets.service.ts b/src/Squidex/app/shared/services/assets.service.ts index b058e8a2d..b7bcc8ded 100644 --- a/src/Squidex/app/shared/services/assets.service.ts +++ b/src/Squidex/app/shared/services/assets.service.ts @@ -80,6 +80,10 @@ export class AssetDto { this._meta = meta; } + + public fullUrl(apiUrl: ApiUrlConfig) { + return apiUrl.buildUrl(this.contentUrl); + } } export interface AnnotateAssetDto {