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

Bumped up version and removed logging

This commit is contained in:
knsv 2015-06-07 16:51:56 +02:00
parent c0ca932ccf
commit 0703292fb9
16 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -1,6 +1,6 @@
{
"name": "mermaid",
"version": "0.4.0",
"version": "0.5.0",
"authors": [
"knsv <knut@sveido.com>"
],

11
dist/mermaid-legacy.full.js vendored
View File

@ -15768,7 +15768,7 @@ process.chdir = function (dir) {
},{}],85:[function(require,module,exports){
module.exports={
"name": "mermaid",
"version": "0.5.0",
"version": "0.4.0",
"description": "Markdownish syntax for generating flowcharts, sequence diagrams and gantt charts.",
"main": "src/mermaid.js",
"keywords": [
@ -15859,7 +15859,7 @@ module.exports={
},{}],86:[function(require,module,exports){
/* global window */
console.log('Setting up d3');
//console.log('Setting up d3');
var d3;
if (require) {
@ -21886,7 +21886,6 @@ module.exports.mermaidAPI = mermaidAPI;
* @* param nodes- a css selector or an array of nodes
*/
var init = function () {
console.log('In mermaid.init');
var nodes;
if(arguments.length === 2){
// sequence config was passed as #1
@ -22014,6 +22013,12 @@ exports.contentLoaded = function(){
global.mermaid.init();
}
}
}else{
var config = mermaidAPI.getConfig();
if(config.startOnLoad){
global.mermaid.init();
}
}
};

4
dist/mermaid-legacy.slim.js vendored
View File

@ -24950,7 +24950,7 @@ process.chdir = function (dir) {
},{}],86:[function(require,module,exports){
module.exports={
"name": "mermaid",
"version": "0.5.0",
"version": "0.4.0",
"description": "Markdownish syntax for generating flowcharts, sequence diagrams and gantt charts.",
"main": "src/mermaid.js",
"keywords": [
@ -25041,7 +25041,7 @@ module.exports={
},{}],87:[function(require,module,exports){
/* global window */
console.log('Setting up d3');
//console.log('Setting up d3');
var d3;
if (require) {

2
dist/mermaid-legacy.slim.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/mermaid.js vendored
View File

@ -25041,7 +25041,7 @@ module.exports={
},{}],87:[function(require,module,exports){
/* global window */
console.log('Setting up d3');
//console.log('Setting up d3');
var d3;
if (require) {
@ -31068,7 +31068,6 @@ module.exports.mermaidAPI = mermaidAPI;
* @* param nodes- a css selector or an array of nodes
*/
var init = function () {
console.log('In mermaid.init');
var nodes;
if(arguments.length === 2){
// sequence config was passed as #1
@ -31135,7 +31134,7 @@ exports.version = function(){
exports.initialize = function(config){
mermaidAPI.initialize(config);
}
};
var equals = function (val, variable){
if(typeof variable === 'undefined'){
@ -31172,7 +31171,7 @@ global.mermaid = {
};
exports.contentLoaded = function(){
console.log('Content loaded');
var config;
// Check state of start config mermaid namespace
if (typeof mermaid_config !== 'undefined') {
if (equals(false, mermaid_config.htmlLabels)) {
@ -31191,13 +31190,13 @@ exports.contentLoaded = function(){
}
else {
// No config found, do check API config
var config = mermaidAPI.getConfig();
config = mermaidAPI.getConfig();
if(config.startOnLoad){
global.mermaid.init();
}
}
}else{
var config = mermaidAPI.getConfig();
config = mermaidAPI.getConfig();
if(config.startOnLoad){
global.mermaid.init();
}

4
dist/mermaid.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/mermaid.slim.js vendored
View File

@ -15825,7 +15825,7 @@ module.exports={
},{}],86:[function(require,module,exports){
/* global window */
console.log('Setting up d3');
//console.log('Setting up d3');
var d3;
if (require) {
@ -21852,7 +21852,6 @@ module.exports.mermaidAPI = mermaidAPI;
* @* param nodes- a css selector or an array of nodes
*/
var init = function () {
console.log('In mermaid.init');
var nodes;
if(arguments.length === 2){
// sequence config was passed as #1
@ -21919,7 +21918,7 @@ exports.version = function(){
exports.initialize = function(config){
mermaidAPI.initialize(config);
}
};
var equals = function (val, variable){
if(typeof variable === 'undefined'){
@ -21956,7 +21955,7 @@ global.mermaid = {
};
exports.contentLoaded = function(){
console.log('Content loaded');
var config;
// Check state of start config mermaid namespace
if (typeof mermaid_config !== 'undefined') {
if (equals(false, mermaid_config.htmlLabels)) {
@ -21975,13 +21974,13 @@ exports.contentLoaded = function(){
}
else {
// No config found, do check API config
var config = mermaidAPI.getConfig();
config = mermaidAPI.getConfig();
if(config.startOnLoad){
global.mermaid.init();
}
}
}else{
var config = mermaidAPI.getConfig();
config = mermaidAPI.getConfig();
if(config.startOnLoad){
global.mermaid.init();
}

4
dist/mermaid.slim.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/mermaidAPI.js vendored
View File

@ -24708,7 +24708,7 @@ module.exports={
},{}],86:[function(require,module,exports){
/* global window */
console.log('Setting up d3');
//console.log('Setting up d3');
var d3;
if (require) {

4
dist/mermaidAPI.slim.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/mermaidAPI.slim.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
gulp/tasks/dist.js
View File

@ -61,7 +61,7 @@ gulp.task('fullDist', ['slimDist'], function() {
//]));
// Basic usage
gulp.task('mermaid',['mermaidAPI','mermaidAPI.slim'],function() {
gulp.task('mermaid',function() {
// Single entry point to browserify
var EXTERNALS = ['d3'];
@ -135,4 +135,4 @@ gulp.task('editor', function() {
//gulp.task('dist', ['slimDist', 'fullDist','jasmine']);
gulp.task('legacy', ['slimDist', 'fullDist']);
gulp.task('dist', ['mermaidAPI', 'mermaidAPI.slim','legacy','mermaid']);
gulp.task('dist', ['mermaidAPI', 'mermaidAPI.slim','mermaid']);

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "mermaid",
"version": "0.4.0",
"version": "0.5.0",
"description": "Markdownish syntax for generating flowcharts, sequence diagrams and gantt charts.",
"main": "src/mermaid.js",
"keywords": [

2
src/d3.js vendored
View File

@ -1,5 +1,5 @@
/* global window */
console.log('Setting up d3');
//console.log('Setting up d3');
var d3;
if (require) {

9
src/mermaid.js
View File

@ -26,7 +26,6 @@ module.exports.mermaidAPI = mermaidAPI;
* @* param nodes- a css selector or an array of nodes
*/
var init = function () {
console.log('In mermaid.init');
var nodes;
if(arguments.length === 2){
// sequence config was passed as #1
@ -93,7 +92,7 @@ exports.version = function(){
exports.initialize = function(config){
mermaidAPI.initialize(config);
}
};
var equals = function (val, variable){
if(typeof variable === 'undefined'){
@ -130,7 +129,7 @@ global.mermaid = {
};
exports.contentLoaded = function(){
console.log('Content loaded');
var config;
// Check state of start config mermaid namespace
if (typeof mermaid_config !== 'undefined') {
if (equals(false, mermaid_config.htmlLabels)) {
@ -149,13 +148,13 @@ exports.contentLoaded = function(){
}
else {
// No config found, do check API config
var config = mermaidAPI.getConfig();
config = mermaidAPI.getConfig();
if(config.startOnLoad){
global.mermaid.init();
}
}
}else{
var config = mermaidAPI.getConfig();
config = mermaidAPI.getConfig();
if(config.startOnLoad){
global.mermaid.init();
}

3
test/web.html
View File

@ -3,8 +3,7 @@
<head>
<meta charset="UTF-8">
<scrpt src="../dist/mermaid.full.js"></scrpt>
<script src="../dist/js3/mermaid.js"></script>
<script src="../dist/mermaid.js"></script>
<script>
var mermaid_config = {
startOnLoad:true,