marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-11-18 11:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into text-labels

Browse Source 
Conflicts:
	dist/mermaid.full.js
	dist/mermaid.full.min.js
	dist/mermaid.slim.js
	dist/mermaid.slim.min.js
	src/diagrams/flowchart/flowRenderer.js
	src/utils.js
	test/web_style.html
This commit is contained in:
Björn Weström
2015-01-13 21:50:05 +01:00
parent cbd7393d36 58659c4d85
commit 9f970ed953
33 changed files with 3516 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/utils.js
View File

@@ -9,7 +9,6 @@
*/
module.exports.detectType = function(text,a){
if(text.match(/^\s*sequenceDiagram/)){
console.log('Detected sequenceDiagram syntax');
return "sequenceDiagram";
}
@@ -36,15 +35,17 @@ module.exports.cloneCssStyles = function(svg, classes){
var usedStyles = "";
var sheets = document.styleSheets;
for (var i = 0; i < sheets.length; i++) {
// Only clone css from stylesheets intended for mermaid
if (sheets[i].title == 'mermaid') {
// Avoid multiple inclusion on pages with multiple graphs
if (sheets[i].title !== 'mermaid-svg-internal-css') {
var rules = sheets[i].cssRules;
for (var j = 0; j < rules.length; j++) {
var rule = rules[j];
if (typeof(rule.style) != "undefined") {
var elems = svg.querySelectorAll(rule.selectorText);
if (elems.length > 0) {
usedStyles += rule.selectorText + " { " + rule.style.cssText + " }\n";
if(rules !== null) {
for (var j = 0; j < rules.length; j++) {
var rule = rules[j];
if (typeof(rule.style) !== 'undefined') {
var elems = svg.querySelectorAll(rule.selectorText);
if (elems.length > 0) {
usedStyles += rule.selectorText + " { " + rule.style.cssText + " }\n";
}
}
}
}
@@ -79,6 +80,8 @@ module.exports.cloneCssStyles = function(svg, classes){
s.setAttribute('type', 'text/css');
s.setAttribute('title', 'mermaid-svg-internal-css');
s.innerHTML = "/* <![CDATA[ */\n";
// Make this CSS local to this SVG
s.innerHTML += "#" + svg.id.trim() + " {\n";
if (defaultStyles !== "") {
s.innerHTML += defaultStyles;
}
@@ -88,6 +91,7 @@ module.exports.cloneCssStyles = function(svg, classes){
if (embeddedStyles !== "") {
s.innerHTML += embeddedStyles;
}
s.innerHTML += "}\n";
s.innerHTML += "/* ]]> */\n";
svg.insertBefore(s, svg.firstChild);
}