diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index a29ac9986..000000000
--- a/.babelrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "presets": [
- "@babel/preset-env"
- ]
-}
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..e984af896
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+ "typescript.format.enable": false,
+ "typescript.reportStyleChecksAsWarnings": false,
+ "typescript.validate.enable": false,
+ "javascript.validate.enable": false,
+ "editor.formatOnSave": false
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bbf31366..5168c005d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@
**Merged pull requests:**
+- Adding weekend ignore do Gantt [\$314] (https://github.com/knsv/mermaid/issues/314)
+
- Adding init argument to the global API [\#137](https://github.com/knsv/mermaid/pull/137) ([bollwyvl](https://github.com/bollwyvl))
- Add description of manual calling of init [\#136](https://github.com/knsv/mermaid/pull/136) ([bollwyvl](https://github.com/bollwyvl))
diff --git a/README.md b/README.md
index 45464c0ea..f49363d9f 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,23 @@ Ever wanted to simplify documentation and avoid heavy tools like Visio when expl
This is why mermaid was born, a simple markdown-like script language for generating charts from text via javascript.
+**Mermaid was nomiated and won the JS Open Source Awards (2019) in the catory The most existing use of technology!!! Thanks to all involved, people committing pull requests, people answering questions and special thanks to Tyler Long who is helping me maintin the project.**
+
+### Are you someone who wants to take an active role in improving mermaid?
+
+Look at the list of areas we need help with:
+
+* Development - help solving issues
+* Development - work with the build environment, with JS we keep updating the tools we use
+* Development - new diagram types
+* Development - Handling Pull Requests
+* Test - testing in connection with realeases, regression testing
+* Test - verification of fixed issues
+* Test - test of pull requests and verification testing
+* Release management - more of a PL role, make roadmap for the project, coordinating the work
+* Release management - classification and monitoring of incoming issues
+
+If you think lending a hand to one or more of these areas would be fun, please send an email tp knsv@sveido.com!
### Flowchart
@@ -49,6 +66,7 @@ sequenceDiagram
gantt
dateFormat YYYY-MM-DD
title Adding GANTT diagram to mermaid
+excludes weekdays 2014-01-10
section A section
Completed task :done, des1, 2014-01-06,2014-01-08
@@ -147,7 +165,7 @@ As part of this team you would get write access to the repository and would
represent the project when answering questions and issues.
Together we could continue the work with things like:
-* adding more typers of diagrams like mindmaps, ert digrams etc
+* adding more types of diagrams like mindmaps, ert diagrams etc
* improving existing diagrams
Don't hesitate to contact me if you want to get involved.
diff --git a/__mocks__/MERMAID.js b/__mocks__/MERMAID.js
new file mode 100644
index 000000000..f844f1c55
--- /dev/null
+++ b/__mocks__/MERMAID.js
@@ -0,0 +1,3 @@
+export const curveBasis = 'basis'
+export const curveLinear = 'linear'
+export const curveCardinal = 'cardinal'
diff --git a/babel.config.js b/babel.config.js
new file mode 100644
index 000000000..c76a0d028
--- /dev/null
+++ b/babel.config.js
@@ -0,0 +1,12 @@
+module.exports = {
+ presets: [
+ [
+ '@babel/preset-env',
+ {
+ targets: {
+ node: 'current'
+ }
+ }
+ ]
+ ]
+}
diff --git a/dist/index.html b/dist/index.html
index 47bf945d5..5d223e4af 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -206,6 +206,35 @@ graph TB
a1-->a2
end
+
+ graph TB
+ A
+ B
+ subgraph foo[Foo SubGraph]
+ C
+ D
+ end
+ subgraph bar[Bar SubGraph]
+ E
+ F
+ end
+ G
+
+ A-->B
+ B-->C
+ C-->D
+ B-->D
+ D-->E
+ E-->A
+ E-->F
+ F-->D
+ F-->G
+ B-->G
+ G-->D
+
+ style foo fill:#F99,stroke-width:2px,stroke:#F0F
+ style bar fill:#999,stroke-width:10px,stroke:#0F0
+
graph LR
456ac9b0d15a8b7f1e71073221059886[1051 AAA fa:fa-check]
@@ -268,6 +297,7 @@ gantt
dateFormat YYYY-MM-DD
axisFormat %d/%m
title Adding GANTT diagram to mermaid
+excludes weekdays 2014-01-10
section A section
Completed task :done, des1, 2014-01-06,2014-01-08
@@ -288,6 +318,13 @@ Describe gantt syntax :active, a1, after des1, 3d
Add gantt diagram to demo page :after a1 , 20h
Add another diagram to demo page :doc1, after a1 , 48h
+section Clickable
+Visit mermaidjs :active, cl1, 2014-01-07,2014-01-10
+Calling a Callback (look at the console log) :cl2, after cl1, 3d
+
+click cl1 href "https://mermaidjs.github.io/"
+click cl2 call ganttTestClick("test", test, test)
+
section Last section
Describe gantt syntax :after doc1, 3d
Add gantt diagram to demo page : 20h
@@ -320,11 +357,11 @@ merge newbranch