mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(https): use https in SVGs

This commit is contained in:
Daniel Thompson-Yvetot 2019-09-19 20:53:42 +02:00
parent e40e1da292
commit f30f607b0c
No known key found for this signature in database
GPG Key ID: A88F800A19E176E6
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/diagrams/flowchart/flowRenderer.js
View File

@ -83,13 +83,13 @@ export const addVertices = function(vert, g, svgId) {
vertexNode = addHtmlLabel(svg, node).node();
vertexNode.parentNode.removeChild(vertexNode);
} else {
const svgLabel = document.createElementNS('http://www.w3.org/2000/svg', 'text');
const svgLabel = document.createElementNS('https://www.w3.org/2000/svg', 'text');
const rows = vertexText.split(/<br[/]{0,1}>/);
for (let j = 0; j < rows.length; j++) {
const tspan = document.createElementNS('http://www.w3.org/2000/svg', 'tspan');
tspan.setAttributeNS('http://www.w3.org/XML/1998/namespace', 'xml:space', 'preserve');
const tspan = document.createElementNS('https://www.w3.org/2000/svg', 'tspan');
tspan.setAttributeNS('https://www.w3.org/XML/1998/namespace', 'xml:space', 'preserve');
tspan.setAttribute('dy', '1em');
tspan.setAttribute('x', '1');
tspan.textContent = rows[j];
@ -100,9 +100,9 @@ export const addVertices = function(vert, g, svgId) {
// If the node has a link, we wrap it in a SVG link
if (vertex.link) {
const link = document.createElementNS('http://www.w3.org/2000/svg', 'a');
link.setAttributeNS('http://www.w3.org/2000/svg', 'href', vertex.link);
link.setAttributeNS('http://www.w3.org/2000/svg', 'rel', 'noopener');
const link = document.createElementNS('https://www.w3.org/2000/svg', 'a');
link.setAttributeNS('https://www.w3.org/2000/svg', 'href', vertex.link);
link.setAttributeNS('https://www.w3.org/2000/svg', 'rel', 'noopener');
link.appendChild(vertexNode);
vertexNode = link;
}
@ -609,7 +609,7 @@ export const draw = function(text, id) {
// Get dimensions of label
const dim = label.getBBox();
const rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
const rect = document.createElementNS('https://www.w3.org/2000/svg', 'rect');
rect.setAttribute('rx', 0);
rect.setAttribute('ry', 0);
rect.setAttribute('width', dim.width);

2
src/diagrams/git/gitGraphRenderer.js
View File

@ -48,7 +48,7 @@ function svgCreateDefs(svg) {
.attr('x', config.nodeLabel.x)
.attr('y', config.nodeLabel.y)
.attr('class', 'node-label')
.attr('requiredFeatures', 'http://www.w3.org/TR/SVG11/feature#Extensibility')
.attr('requiredFeatures', 'https://www.w3.org/TR/SVG11/feature#Extensibility')
.append('p')
.html('');
}

4
src/diagrams/info/parser/info.jison
View File

@ -1,5 +1,5 @@
/** mermaid
* http://knsv.github.io/mermaid/
* https://knsv.github.io/mermaid
* (c) 2015 Knut Sveidqvist
* MIT license.
*/
@ -45,4 +45,4 @@ statement
: showInfo { yy.setInfo(true); }
;
%%
%%

8
src/diagrams/pie/parser/pie.jison
View File

@ -1,5 +1,5 @@
/** mermaid
* http://knsv.github.io/mermaid/
* https://knsv.github.io/mermaid
* (c) 2015 Knut Sveidqvist
* MIT license.
*/
@ -48,10 +48,10 @@ line
;
statement
: STR VALUE {
: STR VALUE {
console.log('str:'+$1+' value: '+$2)
yy.addSection($1,yy.cleanupValue($2)); }
| title {yy.setTitle($1.substr(6));$$=$1.substr(6);}
| title {yy.setTitle($1.substr(6));$$=$1.substr(6);}
;
%%
%%

6
src/mermaidAPI.js
View File

@ -426,7 +426,7 @@ const render = function(id, txt, cb, container) {
.append('svg')
.attr('id', id)
.attr('width', '100%')
.attr('xmlns', 'http://www.w3.org/2000/svg')
.attr('xmlns', 'https://www.w3.org/2000/svg')
.append('g');
} else {
const element = document.querySelector('#' + 'd' + id);
@ -440,7 +440,7 @@ const render = function(id, txt, cb, container) {
.append('svg')
.attr('id', id)
.attr('width', '100%')
.attr('xmlns', 'http://www.w3.org/2000/svg')
.attr('xmlns', 'https://www.w3.org/2000/svg')
.append('g');
}
@ -535,7 +535,7 @@ const render = function(id, txt, cb, container) {
d3.select(`[id="${id}"]`)
.selectAll('foreignobject > *')
.attr('xmlns', 'http://www.w3.org/1999/xhtml');
.attr('xmlns', 'https://www.w3.org/1999/xhtml');
let url = '';
if (config.arrowMarkerAbsolute) {