GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-21 06:53:17 +08:00
Code Issues Projects Releases Wiki Activity
4,936 Commits 185 Branches 159 Tags
Commit Graph

1917 Commits

Author SHA1 Message Date
knsv
9face45357 Merge remote-tracking branch 'origin/master' 
Conflicts:
	dist/mermaid.full.js
	dist/mermaid.full.min.js
	dist/mermaid.slim.js
	dist/mermaid.slim.min.js
	src/diagrams/gantt/ganttRenderer.js
	test/gantt.html
 2015-05-09 19:18:12 +02:00
knsv
ae6bb57cf5 Added support for nested subgraphs in grammar, part 1 of issue #161 2015-05-09 19:05:47 +02:00
knsv
c65f6aaed3 Merge remote-tracking branch 'origin/master' 2015-04-20 21:21:37 +02:00
knsv
2204d46ce1 Fix for defect #158 2015-04-20 21:21:17 +02:00
Tyler Long
e0d90def93 IE, local html, cssRules access is denied 
IE, open html file directly from hard disk(insead of from a http server), cssRules access is denied.

Thus an expection is thrown. But in the catch statement, another one is thrown again thus caused the whole mermaid code break. 

In this line `console.warn('Invalid CSS selector "' + rule.selectorText + '"', err);`  rule is undefined, so exception will be thrown if we don't check.
 2015-04-19 15:58:09 +08:00
knsv
f310eb0574 Fix for default arguments to init method 2015-04-11 16:47:14 +02:00
knsv
2bd7dee3c7 Fix for init not running by default 2015-04-11 16:36:04 +02:00
knsv
1fd94f9cf1 Remoed a console.log 2015-03-29 12:08:07 +02:00
knsv
78d8ee01ac #Adjustments of init - **could break some integrations!!** 
* Configuration are picked up from the mermaid object and is not passed as arguments. Same handling for all diagram types, sequenceDiagrams were handled in a different way before this commit.

When init is called with:

* 0 arguments - all mermaid divs are processed
* 1 argument - this is interpreted as a definition of what nodes to process
* 2 arguments - for (some) backwards compatability the second argument is interpreted as the definition of nodes to process. The first argument (prrobably a sequence config is ignored)

A definition of nodes to process can be

* a css selector for what elements to be processed
* a list of nodes as in the result of a command like the one below

```
document.querySelectorAll('.tbProcessed');
```
 2015-03-29 11:54:54 +02:00
knsv
c966aad496 Fix for subgraphs 2015-03-22 18:36:17 +01:00
knsv
0ed5a01756 Fix fir defect #141 regarding comment characters 2015-03-22 18:02:45 +01:00
knsv
22b9ee4919 Comment handling 2015-03-22 17:51:13 +01:00
knsv
3781dea498 Removed duplicate code 2015-03-15 14:55:16 +01:00
bollwyvl
f591fedb77 Adding init argument to the global API 
Will also handle future arguments :)
 2015-03-10 15:38:53 -04:00
Knut Sveidqvist
b0cf9836af Merge pull request #135 from bollwyvl/patch-2 
Allow other forms of node selection for init()
 2015-03-10 20:07:58 +01:00
bollwyvl
d61aac362c Allow other forms of node selection for init() 
The existing behavior of init will always re-render the whole page, and requires that a chart be classed `mermaid`.

This change allows the user to specify:
- a DOM Node (as from getQuerySelector)
- a DOM NodeList  (as from getQuerySelectorAll)
- an array of nodes (as from jQuery.find)
- a string (to be handed to getQuerySelectorAll)
 2015-03-10 13:25:16 -04:00
bollwyvl
6aff481e9b Use a library-level variable for assigning ids 
The current behavior is unexpected when re-running `init()`, as every run through will start with the first `.mermaid` it finds, and start re-indexing at 0, irrespective if the original `id=mermaidChart0` is still around.

This change ensures that successive runs will not clobber old ones.
 2015-03-10 13:06:39 -04:00
knsv
3ae1b5f1a3 Fix for issue #129 - Possibility to set the width of the generated flowchart 2015-03-07 14:52:18 +01:00
knsv
cbebf126ce Fix for issue #128 - flowchart - styling of edges via css overrides specific styles set in the graph definition 2015-03-07 13:51:47 +01:00
knsv
3fedc1263c Fix for issue #126 2015-03-07 13:37:24 +01:00
knsv
85cdfbaaf8 Modified the number of week for which the x-axis stays in week mode as discussed in issue #125 2015-03-05 08:11:29 +01:00
knsv
cc1a4be15a Added default stylesheet and less structure to create new themes as described in issue #122 2015-03-01 16:48:16 +01:00
knsv
ead74558ea Added default stylesheet and less structure to create new themes 2015-03-01 16:29:41 +01:00
knsv
3c5a19e5a7 Gantt: Configurable format for dates on x-axis 
Flowchart: Default styles for links as discussed in issue #31
 2015-02-28 23:50:23 +01:00
knsv
8598a7d712 More forgiving flowcharts, space at the end of the line allowed 2015-02-25 07:57:26 +01:00
knsv
0955c4c428 Today line for gantt chart 2015-02-25 00:07:13 +01:00
knsv
182729e015 Small fixes for linting 2015-02-24 23:03:09 +01:00
Knut Sveidqvist
a7dd6a6614 Better width calculations for task texts 2015-02-24 15:48:41 +01:00
knsv
e5657d028d Better styling for gantt diagrams and addition of critical path, active and completed tasks 2015-02-22 20:18:44 +01:00
knsv
a7339eaf1c Experimental support for gantt diagrams 2015-02-20 19:34:18 +01:00
knsv
2877501ff5 Experimental support for gantt diagrams 2015-02-20 19:06:15 +01:00
knsv
1b016bd412 First rendering draft 2015-02-20 16:22:37 +01:00
knsv
2512666f49 New release 2015-02-15 19:34:18 +01:00
knsv
074a819ca8 New release 2015-02-15 18:11:46 +01:00
knsv
c211434c38 Draft parser for gantt diagrams. 2015-02-08 20:07:15 +01:00
knsv
4562a811fc Better margin calculation when there are several diagrams on one page. 2015-01-25 16:40:12 +01:00
knsv
a38a156d3b Mirror actors below sequence diagram possible as described in issue #106 2015-01-25 14:24:58 +01:00
knsv
d3d44ec806 Api for validating the syntax without rendering 2015-01-25 13:06:25 +01:00
knsv
6612b3e01e Fix relatwed to issue number #54 - % in text 2015-01-24 19:33:10 +01:00
knsv
d0428d492b Fix for issue number #108 - v in text 2015-01-20 20:23:02 +01:00
knsv
ee6ad01209 Merge branch 'master' of https://github.com/knsv/mermaid 
Conflicts:
	dist/mermaid.full.js
	dist/mermaid.full.min.js
	dist/mermaid.slim.js
	dist/mermaid.slim.min.js
 2015-01-20 20:04:16 +01:00
knsv
2af4a1f9f8 * Removed logging 2015-01-20 19:52:13 +01:00
knsv
44a2e0472a * Draft implementation of info diagram 
* Fix for issue #109
 2015-01-20 19:48:33 +01:00
Mark Dalgleish
50d285bc49 Require d3 directly to better support Node usage 2015-01-20 16:59:58 +11:00
knsv
48500652b3 Allow overriding sequence diagram configuration (SVG properties) - handling of non existent configuration 2015-01-14 19:10:39 +01:00
knsv
73f567f3e2 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
 2015-01-14 18:10:21 +01:00
Björn Weström
84124c9427 Improved CSS cloning 
Better separation of styles between multiple mermaid SVGs on the same
page
Added support for text label styling
 2015-01-14 00:04:38 +01:00
Björn Weström
3fe38237e6 New config attribute, htmlLabels 2015-01-14 00:03:41 +01:00
Björn Weström
9c8e36ea95 Syntax suggestion for reverse asymmetric shape 2015-01-14 00:03:19 +01:00
Björn Weström
8e9890d6e1 New shape, text labels 
Added support to configure mermaid to use plain text labels for better
SVG compatibility
Added a reverse asymmetric shape, not in the graph syntax yet
 2015-01-14 00:02:58 +01:00