Commit Graph

361 Commits

Author SHA1 Message Date
Knut Sveidqvist 6042ca9c56 Merge pull request #172 from kkirsche/patch-1
Remove moot `version` property from bower.json
2015-06-14 09:32:44 +02:00
knsv e5c16fd960 Added subgraphs in new grammar 2015-06-13 18:34:45 +02:00
knsv 6eb018489e Fix issue with new line in the lexer 2015-06-13 08:19:31 +02:00
knsv 5447a88c34 Cleanup of bundles 2015-06-11 08:22:01 +02:00
Kevin Kirsche 4fbebcfab4 Remove moot `version` property from bower.json
Per bower/bower.json-spec@a325da3
2015-06-10 18:51:14 -04:00
Knut Sveidqvist 35e4cd7c18 Update README.md 2015-06-07 21:09:09 +02:00
knsv 999430f9e0 New release 2015-06-07 17:05:57 +02:00
knsv be535604ab Cleanup of bundles 2015-06-07 16:56:09 +02:00
knsv 0703292fb9 Bumped up version and removed logging 2015-06-07 16:51:56 +02:00
Knut Sveidqvist c0ca932ccf Merge pull request #168 from knsv/dev-0.5.0
Merge of changes in dev-0.5.0 branch into master before release
2015-06-07 09:32:51 +02:00
knsv 08fa19bc83 Updated conf handling
Added initialize function
Moved genric configuration as clonseCssStyles till conf root
Added parse funtion to the mermaidAPI api
2015-06-07 09:21:19 +02:00
knsv 55fa62d9c0 Chineese example 2015-06-06 12:13:55 +02:00
knsv 94e5177bb1 Fixed build issue 2015-05-31 08:19:26 +02:00
knsv 45f34d871b Added option for whether or not to cloneCssStyles as mentioned in issue #157. 2015-05-30 17:20:24 +02:00
knsv 173a2b12aa Fix for issue #150. 2015-05-30 13:00:04 +02:00
knsv 3f0ead3e0a Fix for issue #150 this change makes gant diagram autoscale. 2015-05-30 12:59:20 +02:00
knsv 6864652b80 Initial fix for defect #162. 2015-05-29 08:23:13 +02:00
knsv ca99a30b71 Example page for using the slim bundle and with some nested subgraphs. 2015-05-28 23:05:49 +02:00
knsv b2e489b689 Fix for issue #161 concering nested subgraphs and correct labels for each subgraph. 2015-05-28 23:02:41 +02:00
knsv cf67307711 Fix for build scripts, mermaid full was not including d3. 2015-05-26 21:10:33 +02:00
knsv 2d1f5aa6cb Adding missing files 2015-05-26 20:59:23 +02:00
Knut Sveidqvist 56375faa65 Update README.md 2015-05-26 20:45:30 +02:00
Knut Sveidqvist 1236c0c272 Update README.md 2015-05-26 20:44:44 +02:00
knsv b4a96c9b21 Render function as mentioned in issue #146, only works in browser context
Updated build scripts
New way for bundling content in dist, tobe tested, currently to be considered beta
2015-05-26 20:41:53 +02:00
knsv 05f3982632 Fix for defect #161, nested subgraphs. 2015-05-15 12:11:36 +02:00
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 824a43f537 Added support for nested subgraphs in grammar, part 1 of issue #161 2015-05-09 19:08:04 +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 82dffe0a1d Fix for defect #158 2015-04-20 21:22:37 +02:00
knsv 22cee7e4b0 Fix for defect #158 2015-04-20 21:22:05 +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
Knut Sveidqvist 11a30dd505 Merge pull request #155 from tylerlong/master
IE, local html, cssRules access is denied
2015-04-19 10:14:59 +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 594e69dd93 Adjusted cli tool for new init functionality 2015-03-29 12:26:47 +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
Knut Sveidqvist 60392424dc Merge pull request #139 from skywinder/add-change-log-file
Add automatically generated change log file.
2015-03-14 09:20:35 +01:00
Petr Korolev 23bd06c2d3 Added automatically generated change log file 2015-03-13 11:36:49 +02:00
Knut Sveidqvist 1644f06ec8 Merge pull request #137 from bollwyvl/patch-4
Adding init argument to the global API
2015-03-10 20:44:01 +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
Knut Sveidqvist 34ee8a0e21 Merge pull request #134 from bollwyvl/patch-1
Use a library-level variable for assigning ids
2015-03-10 20:06:43 +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