diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-06 03:07:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-06 03:07:56 +0300 |
| commit | f38bcf2e443dd89acc774a2fa1efa2e881a67a90 (patch) | |
| tree | ac135b383df45c9536206dc41650b95b8dc7aa51 /app/assets/javascripts/content_editor | |
| parent | a29707687893beecb0e333a12e6f9e093a77eeb9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/content_editor')
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/content_editor/components/bubble_menus/link.vue b/app/assets/javascripts/content_editor/components/bubble_menus/link.vue index abd225c0b1a..dae0bc63b5a 100644 --- a/app/assets/javascripts/content_editor/components/bubble_menus/link.vue +++ b/app/assets/javascripts/content_editor/components/bubble_menus/link.vue @@ -60,7 +60,7 @@ export default { async endEditingLink() { this.isEditing = false; - this.linkHref = await this.contentEditor.resolveLink(this.linkCanonicalSrc); + this.linkHref = await this.contentEditor.resolveUrl(this.linkCanonicalSrc); if (!this.linkCanonicalSrc && !this.linkHref) { this.removeLink(); diff --git a/app/assets/javascripts/content_editor/components/bubble_menus/media.vue b/app/assets/javascripts/content_editor/components/bubble_menus/media.vue index d1bc5c83948..a36a860c440 100644 --- a/app/assets/javascripts/content_editor/components/bubble_menus/media.vue +++ b/app/assets/javascripts/content_editor/components/bubble_menus/media.vue @@ -114,7 +114,7 @@ export default { async saveEditedMedia() { this.isUpdating = true; - this.mediaSrc = await this.contentEditor.resolveLink(this.mediaCanonicalSrc); + this.mediaSrc = await this.contentEditor.resolveUrl(this.mediaCanonicalSrc); const position = this.tiptapEditor.state.selection.from; @@ -151,7 +151,7 @@ export default { this.mediaAlt = alt; this.mediaCanonicalSrc = canonicalSrc || src; this.isUploading = uploading; - this.mediaSrc = await this.contentEditor.resolveLink(this.mediaCanonicalSrc); + this.mediaSrc = await this.contentEditor.resolveUrl(this.mediaCanonicalSrc); this.isUpdating = false; }, diff --git a/app/assets/javascripts/content_editor/services/content_editor.js b/app/assets/javascripts/content_editor/services/content_editor.js index 5078668c620..6eac5a63439 100644 --- a/app/assets/javascripts/content_editor/services/content_editor.js +++ b/app/assets/javascripts/content_editor/services/content_editor.js @@ -43,7 +43,7 @@ export class ContentEditor { }); } - resolveAssetUrl(canonicalSrc) { + resolveUrl(canonicalSrc) { return this._assetResolver.resolveUrl(canonicalSrc); } |