Skip to content

Do not add <base> href to SVG clip paths during toImage #3272

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 8 commits into from
Nov 26, 2018
Merged

Do not add <base> href to SVG clip paths during toImage #3272

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fbae9e7
pass 'gd' to Drawing.setClipUrl
etpinard Nov 19, 2018
6e444d8
don't add baseUrl on clipPath URls when staticPlot:true
etpinard Nov 19, 2018
d12b097
stash <base> href on gd._context
etpinard Nov 20, 2018
2cddc84
use 'exportedPlot' to determine if baseUrl is needed or not
etpinard Nov 20, 2018
e362bc9
mv toSVG with <base> test to toImage suite
etpinard Nov 21, 2018
29fdf45
rename exportedPlot -> _exportedPlot
etpinard Nov 21, 2018
fab9b2d
use context._baseUrl / add jsDoc to Drawing.setClipUrl
etpinard Nov 21, 2018
76f5ad0
fixup: baseUrl -> _baseUrl in drawing tests
etpinard Nov 21, 2018
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
2 changes: 1 addition & 1 deletion src/components/drawing/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ drawing.setClipUrl = function(s, localId, gd) {
}

var context = gd._context;
var baseUrl = context.staticPlot ? '' : (context.baseUrl || '');
var baseUrl = context.exportedPlot ? '' : (context.baseUrl || '');

s.attr('clip-path', 'url(' + baseUrl + '#' + localId + ')');
};
Expand Down
1 change: 1 addition & 0 deletions src/plot_api/to_image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ function toImage(gd, opts) {
// extend config for static plot
var configImage = Lib.extendFlat({}, config, {
staticPlot: true,
exportedPlot: true,
setBackground: setBackground
});

Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/tests/snapshot_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ describe('Plotly.Snapshot', function() {
.append('base')
.attr('href', 'https://plot.ly');

Plotly.plot(gd, [{ y: [1, 2, 1] }], {}, {staticPlot: true})
Plotly.plot(gd, [{ y: [1, 2, 1] }], {}, {exportedPlot: true})
.then(function() { return Plotly.Snapshot.toSVG(gd); })
.then(function(svg) {
var svgDOM = parser.parseFromString(svg, 'image/svg+xml');
Expand Down