ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-20 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix relative paths in wysiwyg (#14743)

Browse Source 
* Convert relative paths to absolute paths based on the notebook uri before converting to markdown
This commit is contained in:
Barbara Valdez
2021-03-18 10:24:15 -07:00
committed by GitHub
parent 88b7960d01
commit 5da4690be8
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/workbench/contrib/notebook/browser/cellViews/markdownToolbar.component.ts
View File

@@ -19,6 +19,9 @@ import { AngularDisposable } from 'sql/base/browser/lifecycle';
import { ILinkCalloutDialogOptions, LinkCalloutDialog } from 'sql/workbench/contrib/notebook/browser/calloutDialog/linkCalloutDialog';
import { TextModel } from 'vs/editor/common/model/textModel';
import { IEditor } from 'vs/editor/common/editorCommon';
import * as path from 'vs/base/common/path';
import { URI } from 'vs/base/common/uri';
import { escape } from 'vs/base/common/strings';
export const MARKDOWN_TOOLBAR_SELECTOR: string = 'markdown-toolbar-component';
@@ -232,10 +235,16 @@ export class MarkdownToolbarComponent extends AngularDisposable {
if (this.cellModel.currentMode !== CellEditModes.WYSIWYG) {
needsTransform = false;
} else {
let linkUrl = linkCalloutResult.insertUnescapedLinkUrl;
const isFile = URI.parse(linkUrl).scheme === 'file';
if (isFile && !path.isAbsolute(linkUrl)) {
const notebookDirName = path.dirname(this.cellModel?.notebookModel?.notebookUri.fsPath);
const relativePath = (linkUrl).replace(/\\/g, path.posix.sep);
linkUrl = path.resolve(notebookDirName, relativePath);
}
// Otherwise, re-focus on the output element, and insert the link directly.
this.output?.nativeElement?.focus();
// Callout is responsible for returning escaped strings
document.execCommand('insertHTML', false, `<a href="${linkCalloutResult?.insertUnescapedLinkUrl}">${linkCalloutResult?.insertUnescapedLinkLabel}</a>`);
document.execCommand('insertHTML', false, `<a href="${escape(linkUrl)}">${escape(linkCalloutResult?.insertUnescapedLinkLabel)}</a>`);
return;
}
}