Skip to content

fix plot asset loading in bundle #2200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2021
Merged

fix plot asset loading in bundle #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 src/interactive/plots/main_plot_webview.js → scripts/plots/main_plot_webview.js
View file
Open in desktop
File renamed without changes.
0 src/interactive/plots/panel_webview.js → scripts/plots/panel_webview.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/interactive/plots.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class PlotNavigatorProvider implements vscode.WebviewViewProvider {
getWebviewHTML(innerHTML: string) {
const extensionPath = this.context.extensionPath
const plotterStylesheet = this.view.webview.asWebviewUri(vscode.Uri.file(path.join(extensionPath, 'libs', 'plotter', 'plotter.css')))
const plotterJavaScript = this.view.webview.asWebviewUri(vscode.Uri.file(path.join(extensionPath, 'src', 'interactive', 'plots', 'panel_webview.js')))
const plotterJavaScript = this.view.webview.asWebviewUri(vscode.Uri.file(path.join(extensionPath, 'scripts', 'plots', 'panel_webview.js')))

return `<html lang="en" class='theme--plotter'>
<head>
Expand Down Expand Up @@ -304,7 +304,7 @@ export function displayPlot(params: { kind: string, data: string }) {
showPlotPane()
// We need to show the pane before accessing the webview to avoid "undefined" issue in webview.
g_screenShotScript = `<script src="${g_plotPanel.webview.asWebviewUri(vscode.Uri.file(path.join(g_context.extensionPath, 'libs', 'html2canvas', 'html2canvas.min.js')))}"></script>
<script src="${g_plotPanel.webview.asWebviewUri(vscode.Uri.file(path.join(g_context.extensionPath, 'src', 'interactive', 'plots', 'main_plot_webview.js')))}"></script>`
<script src="${g_plotPanel.webview.asWebviewUri(vscode.Uri.file(path.join(g_context.extensionPath, 'scripts', 'plots', 'main_plot_webview.js')))}"></script>`

// We display a text thumbnail first just in case that JavaScript errors in the webview or did not successfully send out message and corrupt thumbnail indices.
g_plotNavigatorProvider.setPlotsInfo(plotsInfo => {
Expand Down