Skip to content
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

Jump to bottom

Put embed param into short url instead of behind it #58846

Merged
merged 2 commits into from
Mar 2, 2020
Merged

Put embed param into short url instead of behind it #58846

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bca30e
put params into short url instead of behind it
flash1293 Feb 28, 2020
2a41fad
Merge branch 'master' into fix-embed-short-url
elasticmachine Mar 2, 2020
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
9 changes: 6 additions & 3 deletions src/plugins/share/public/components/url_panel_content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,11 @@ export class UrlPanelContent extends Component<Props, State> {
};

private getSnapshotUrl = () => {
return this.props.shareableUrl || window.location.href;
let url = this.props.shareableUrl || window.location.href;
if (this.props.isEmbedded) {
url = this.makeUrlEmbeddable(url);
}
return url;
};

private makeUrlEmbeddable = (url: string) => {
Expand All @@ -200,8 +204,7 @@ export class UrlPanelContent extends Component<Props, State> {
return;
}

const embeddableUrl = this.makeUrlEmbeddable(url);
return `<iframe src="${embeddableUrl}" height="600" width="800"></iframe>`;
return `<iframe src="${url}" height="600" width="800"></iframe>`;
};

private setUrl = () => {
Expand Down