Merge branch 'sequence_config_file' of https://github.com/jjmr/mermaid into jjmr-sequence_config_file

Conflicts:
	dist/mermaid.full.js
	dist/mermaid.full.min.js
	dist/mermaid.slim.js
	dist/mermaid.slim.min.js
	src/main.js
This commit is contained in:
knsv
2015-01-14 18:10:21 +01:00
8 changed files with 230 additions and 1353 deletions

View File

@@ -18,10 +18,14 @@ var he = require('he');
* c-->|No |d(Transform);
* ```
*/
var init = function () {
var init = function (sequenceConfig) {
var arr = document.querySelectorAll('.mermaid');
var i;
if (sequenceConfig) {
seq.setConf(JSON.parse(sequenceConfig));
}
var cnt = 0;
for (i = 0; i < arr.length; i++) {
var element = arr[i];
@@ -51,18 +55,18 @@ var init = function () {
var classes = {};
switch(graphType){
case 'graph':
case 'graph':
classes = flowRenderer.getClasses(txt, false);
flowRenderer.draw(txt, id, false);
utils.cloneCssStyles(element.firstChild, classes);
graph.bindFunctions();
break;
case 'dotGraph':
case 'dotGraph':
classes = flowRenderer.getClasses(txt, true);
flowRenderer.draw(txt, id, true);
utils.cloneCssStyles(element.firstChild, classes);
break;
case 'sequenceDiagram':
case 'sequenceDiagram':
seq.draw(txt,id);
// TODO - Get styles for sequence diagram
utils.cloneCssStyles(element.firstChild, []);
@@ -95,8 +99,8 @@ var equals = function (val, variable){
global.mermaid = {
startOnLoad:true,
htmlLabels:true,
init:function(){
init();
init:function(sequenceConfig){
init(sequenceConfig);
},
version:function(){
return exports.version();