1b64af143e
#1295 Drawing edges between nodes
2020-03-11 17:36:30 +01:00
bab4649a1e
Use markers with rounded crows feet
2020-03-10 13:48:53 +00:00
29b6e00071
clean up for eslint
2020-03-09 12:36:43 +00:00
9aacc85a16
Working experimental version using markers
2020-03-08 22:22:33 +00:00
aa32d454c9
#1295 First draft of generic renderer applied to flowcharts.
2020-03-08 09:49:41 +01:00
061045016f
Minor tidy up of prototype code
2020-03-07 11:05:56 +00:00
25e2d78311
#1295 Start renderer
2020-03-04 20:35:59 +01:00
1e2d014ac9
Basic rendering for ER diagrams
2020-03-03 21:44:18 +00:00
6985391437
Minor clean up for eslint
2020-03-02 11:46:07 +00:00
e90f58a0a7
Merge branch 'develop' into feature/117_er_diagram
2020-03-02 10:48:32 +00:00
0555fca5d8
Initial parsing logic for ER diagrams
2020-03-02 10:03:55 +00:00
94ace2348f
Revert "Multiline comments"
2020-02-29 21:32:20 +01:00
de11dc43ab
Merge pull request #1285 from mermaid-js/bug/1269_fix_label_background_on_safari
...
Bug/1269 fix label background on safari
2020-02-29 15:49:23 +01:00
756927b6f8
#1269 Fix for build issue - lint
2020-02-29 15:39:21 +01:00
e62027b73c
Multiline comments
2020-02-27 00:02:25 +01:00
0ee9c69ddf
#1269 Work around for inaccurate bounding box results in Safari. Fix for multiple lines
2020-02-26 20:53:08 +01:00
dd5e6c18d5
#1269 Work around for inaccurate bounding box results in Safari.
2020-02-26 20:01:53 +01:00
8758bd57ca
Merge pull request #1274 from GDFaber/bug/apply_default_class_to_flowchart_nodes
...
Fix applying default class to flowchart nodes
2020-02-25 19:20:52 +01:00
d67e49400f
#684 Fix applying default class to flowchart nodes
2020-02-24 01:31:39 +01:00
6d74c5663f
1169- break out getRows
...
Moved getRows function from `state/stateRenderer.js` and `state/shapes.js` into `common/common.js`. Broke out section into small one line functions for replacing line breaks, then moved the `sanitize` function from `utils.js` to this new module as there is shared functionality
2020-02-21 13:49:05 -08:00
89c1853977
#1261 Removed calls to console.log
2020-02-21 09:50:04 +01:00
f8137ea7c1
#1257 Adding the autonumber keyword + tests and docs
2020-02-16 15:26:08 +01:00
00d2a1fe9f
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2020-02-05 19:42:13 +01:00
18d0d435c6
Merge pull request #1241 from jgreywolf/1240-ClassDiagramRefactor
...
1240 class diagram refactor
2020-02-05 19:42:01 +01:00
f298c154e2
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2020-02-05 19:40:18 +01:00
822df37f8c
#1224 Possibility to style text color of nodes and subgraphs as well as apply classes to subgraphs
2020-02-05 19:39:50 +01:00
a0e7789d50
#962 added color setting for default link style
2020-02-04 22:07:10 +01:00
c825b37cc6
1240-refactor for class renderer
...
prep for future functionality work
2020-02-03 16:04:59 -08:00
2dd4aa31e5
#962 moved "style from array" function to utils.js, added unit test
2020-02-04 00:24:50 +01:00
c95adfaf74
#962 Set text color for flowchart link labels according to linkStyle definitions
2020-02-02 22:59:59 +01:00
963a0fcd77
Merge branch 'develop' into 1179-SupportGenericTypesForMembers
2020-01-29 21:08:31 +01:00
c43f791b29
#1223 Removing/updating some logging, adding current.html to .gitignore
2020-01-29 20:44:15 +01:00
4709195a1d
#1223 Adding support for multiple transitions to a node from another node
2020-01-29 19:57:59 +01:00
0082c23a90
#1217 Better matchingof words beginning with as as matching token AS in stateDiagram's state definition.
2020-01-29 19:05:51 +01:00
d571c7e08e
Merge pull request #1225 from jgreywolf/1058-ClassDiagramScaling
...
1058 class diagram scaling
2020-01-27 20:14:39 +01:00
ea29b67c5c
Merge pull request #1221 from mermaid-js/bug/1216_dodging_huge_diagrams
...
#1216 Fix for issue when mermaid freezes the browser tab due to large…
2020-01-27 20:01:54 +01:00
0921007d92
1058-Set diagram dimensions appropriately
...
Make sure height and width are set so that all of the diagram is displayed
2020-01-27 10:27:05 -08:00
4ad354a561
#1216 Fix for issue when mermaid freezes the browser tab due to large diagrams
2020-01-25 13:35:11 +01:00
587592449a
1179 Add ability to use generics for members
...
Created new class to handle parsing of members with regex to handle determining type of member and the different elements within. Also moved addTSpan in drawClass method to this new file. Finally, I added a "catch all" section in case something fails in the regex to make sure everything gets formatted correctly.
Added more tests and documentation
updating gitignore
Tired of constantly having to ignore files and stash/pop when switching between branches
2020-01-24 16:01:04 -08:00
d2d4a24229
#487 Set text color for flowchart nodes according to style definitions
2020-01-24 01:24:47 +01:00
c38f053294
#1212 Class definition is not applied to flowchart nodes with links
2020-01-19 18:10:14 +01:00
921d274579
Merge pull request #1208 from mermaid-js/feature/Issue-1206_Parsing_Crashing_Browser_In_Class_Diagram
...
Feature/issue 1206 parsing crashing browser in class diagram
2020-01-15 20:55:21 +01:00
99469f8404
#1206 Added test case to verify parsing fails to allow EOF until first '{' is closed
2020-01-15 20:34:41 +01:00
417d2c0336
#1206 Added test case to verify parsing fails to allow another '{' until first one is closed
2020-01-15 20:33:23 +01:00
2a3de1a090
#1206 Updated the classDiagram JISON to not allow EOF or another '{' until first one is closed
2020-01-15 20:29:13 +01:00
d9318c5af3
#1205 Adding parsing exception for then an inactive participant is inactivated
2020-01-15 20:27:31 +01:00
0e02cf5c86
Merge pull request #1195 from fgrandel/bug/1193_allow_multiple_relations
...
fix(#1193 ): render multiple relations
2020-01-15 09:29:02 -08:00
45277affe8
Merge pull request #1204 from GDFaber/bug/1196_keep_flowchart_label_text_when_style_is_applied
...
Keep flowchart node label text (if already defined) when a style is applied
2020-01-15 18:27:48 +01:00
c564a843fa
Merge pull request #1202 from GDFaber/bug/1200_unify_regex_for_br_tags
...
Unify regex for finding <br> tags throughout mermaid
2020-01-15 16:53:06 +01:00
b1bfdec473
#1196 Keep flowchart node label text (if already defined) when a style is applied
2020-01-14 23:37:30 +01:00
244f423baf
Merge pull request #1194 from fgrandel/bug/1192_relation_cut_off
...
fix(#1192 ): relation got cut off
2020-01-14 09:35:00 -08:00
5493fadc9e
#1200 Unify regex for finding <br> tags throughout mermaid
2020-01-13 22:04:47 +01:00
fa1331ffd5
Fix after removing other code
2020-01-10 10:24:04 -08:00
57b5b9a7a6
Added conditional to fallback to old style
2020-01-10 09:50:21 -08:00
58fbfc3c38
1119 Support method return types
...
Small refactor to split out logic for determining method display text and style. Updated documentation
Used regex to parse method statements in class diagrams to extract discrete elements to set display appropriately. Added tests and updated docs
2020-01-10 09:50:21 -08:00
0af5e0b795
Address code style issues
2020-01-10 09:50:21 -08:00
d7771eb4b6
1119 Add ability to define return type for methods
...
Updated ClassRenderer to check for `[]` to indicate return type for method. Small refactor to split out logic for determining method display text and style. Updated documentation
2020-01-10 09:50:21 -08:00
75890f88fa
fix( #1193 ): render multiple relations
2020-01-09 17:00:34 +01:00
9a6b07e1e1
fix( #1192 ): relation got cut off
2020-01-09 16:24:47 +01:00
ce02d1dc98
Merge pull request #1190 from mermaid-js/Issue-1092_Mangled_Multiple_Class_Diagrams
...
#1092 Fix for mangling of multiple classDiagrams
2020-01-08 21:05:42 +01:00
48c345a403
#1092 Fix for mangling of multiple classDiagrams
2020-01-08 20:48:57 +01:00
ffbf9f265f
#1182 : remove "newDagreD3" switch from the flowchart renderer
2020-01-08 20:27:33 +01:00
144f65c459
Merge pull request #1176 from GDFaber/feature/1152_flowchart_node_spacing
...
Feature/Add node spacing to flowchart configuration
2020-01-08 18:16:03 +01:00
1cfd93640c
#743 handle multiline section titles in gantt diagrams
2020-01-08 13:50:58 +01:00
b3934c9788
#1152 add node spacing to flowchart configuration
2020-01-05 22:03:53 +01:00
37ae863443
Merge pull request #1170 from jgreywolf/1064-ClickEventInClassDiagram
...
1064 click event in class diagram
2020-01-05 12:07:34 +01:00
f57356006d
Merge pull request #1171 from mermaid-js/feature/Issue-1146_Dashed_Line_For_Class_Diagram
...
Feature/issue 1146 dashed line for class diagram
2020-01-05 12:02:36 +01:00
38097c9095
code style
2020-01-02 11:27:56 -08:00
7f31e624ca
Addressing code style issues
2020-01-02 11:24:06 -08:00
e6fbfcb1e8
1064 Adding tooltip and function calls to click evens in class diagrams
2020-01-02 11:06:29 -08:00
190353785e
#1146 Added jest test for dash line (dependecy) parsing
2020-01-02 19:51:25 +01:00
b14c768fa2
#1146 Fix for dashed line (Dependency) support for classDiagram
2020-01-02 19:25:31 +01:00
4e6aad5115
#834 Using & as a separator for the multiple nodes
2020-01-02 18:52:50 +01:00
7bd1408de0
Merge pull request #1165 from jgreywolf/1064-ClickEventInClassDiagram
...
1064 click event in class diagram
2020-01-02 08:10:48 -08:00
d63eb396e1
Fix code style issues
2020-01-02 07:59:36 -08:00
a1626927cc
Merge pull request #1136 from keenanjt33/feature/921_callback_params
...
Gantt: Add support for callback with parameters
2020-01-01 00:29:00 -08:00
75e2abe242
Merge pull request #1166 from GDFaber/feature/flowchart_add_cylindric_shape
...
#1154 Flow diagram DB shape request
2020-01-01 00:24:56 -08:00
2db8075e3f
Merge pull request #1163 from GDFaber/bug/891_make_link_clickable_on_the_entire_node
...
Bug/Clicking on a link only works directly on the node text
2019-12-31 07:58:47 -08:00
413876644c
Merge pull request #1162 from sdankel/bug/1060_date_infinite_loop
...
Fix infinite loop caused by date iteration
2019-12-31 07:57:16 -08:00
d5e9f2e23e
Merge pull request #1156 from gene1wood/extend_br_tag_regex
...
Extend the `br` tag regex
2019-12-31 07:56:21 -08:00
bc59d015e6
#1154 Flow diagram DB shape request
2019-12-31 16:30:03 +01:00
2decf94ad0
1064- Add click functionality to class diagrams
...
modified interaction functionality from flowcharts to work with class diagrams
2019-12-30 17:27:20 -08:00
5d7ef149aa
Merge pull request #1161 from wfnuser/fix/typos-in-flowDb
...
Error typos in flowDb
2019-12-26 16:26:02 +01:00
7ce0974767
#891 Clicking on a link only works directly on the node text
2019-12-26 15:38:53 +01:00
7b12c7a07d
Fix infinite loop caused by date iteration
2019-12-24 19:01:29 -08:00
4eedeebd46
other/typos in flowDb
2019-12-24 16:14:42 +08:00
b4f9dd46a9
Add tests for <br \t> case
...
This adds tests for the case where
* multiple pieces of whitespace are used
* one of those whitespace characters is a tab
2019-12-23 08:52:15 -08:00
3abd77a1e6
Extend the `br` tag regex
...
This extends the `br` tag regex to accommodate an arbitrary amount of
any type of whitespace instead of a single space character, which holds
more closely to the HTML spec[1]
This extends the fix to #702 added in #1153
[1]: http://www.w3.org/TR/REC-xml/#sec-starttags
2019-12-23 08:02:11 -08:00
d96b79a9ba
Merge pull request #1153 from GDFaber/bug/702_br_tags_in_sequence_diagrams
...
Bug/702 br tags in sequence diagrams
2019-12-23 10:04:30 +01:00
233520b797
#702 improve handling of different "br" tag notations for multiline texts in sequence diagrams
2019-12-21 20:39:32 +01:00
ec742d3180
fix git graph not clearing
2019-12-20 14:48:36 -05:00
a4e7305d52
#834 Adding unit tests and rendering tests
2019-12-18 19:13:56 +01:00
5716d163ec
Merge branch 'develop' into other/1143_utilze_browser_console_object_better
2019-12-18 18:41:14 +01:00
42ef035241
#834 Using space as separator, simplfifying the grammar some more, reomving some logging
2019-12-18 18:36:34 +01:00
6598b1b10d
#1143 Adding support in grammar for multiple nodes in dependency declarations
2019-12-15 18:10:52 +01:00
4ff4058244
#1142 Simplified arrows/edges in the grammar
2019-12-15 13:34:35 +01:00
aa2f9622f8
Merge branch 'issue-552' of https://github.com/itprdev/mermaid into itprdev-issue-552
2019-12-11 21:10:11 +01:00
5eb50cb2b6
Merge pull request #1132 from GDFaber/develop_Bugfixes_linkStyle_910_1088
...
Flow: Bugfixes for link style
2019-12-11 20:04:32 +01:00
f6ef6ff7db
Merge pull request #1130 from GDFaber/develop
...
Flow: Add stadium shape for nodes
2019-12-11 19:48:47 +01:00
de8c6d5572
Merge branch 'develop' into 1104(b)-SupportForAbstractMethodInClassDiagram
2019-12-11 10:31:27 -08:00
5b4e95484e
Merge pull request #1120 from jgreywolf/1063-GenericTypeSupportInClassDiagrams
...
Class: Generic type support
2019-12-11 19:09:19 +01:00
d504e00e18
Adds simple tests for parsing callbacks wrt args
2019-12-10 18:27:06 -05:00
74c8e7fad9
another style fix
2019-12-10 15:21:25 -08:00
4b781d3827
remove extra space
2019-12-10 15:18:26 -08:00
9fbcc5c32d
Code style fix
2019-12-10 15:12:37 -08:00
c7ec8190fb
Gantt callback: default to node id as callback arg
2019-12-10 15:25:28 -05:00
2eaa7f1ab6
Generic Type support for classes
...
Fixed typos after refactor
2019-12-10 11:39:25 -08:00
608445e64f
#910 set correct position and style for edge labels when using linkStyle, #1088 handle multiline texts in edge labels when using linkStyle
2019-12-10 03:51:37 +01:00
1f4be77662
Revert "#910 set correct position and style for edge labels when using linkStyle, #1088 handle multiline texts in edge labels when using linkStyle" - Sorry, forgot to push to a new branch.
...
This reverts commit 0deae4abf9
2019-12-10 03:48:12 +01:00
0deae4abf9
#910 set correct position and style for edge labels when using linkStyle, #1088 handle multiline texts in edge labels when using linkStyle
2019-12-10 03:34:40 +01:00
5b2f9351c7
Add support for abstract methods
...
Added logic to allow rendering of a method name with italics or underline based on modifier at beginning of name to set css style
2019-12-09 18:13:06 -08:00
6fdf30357c
1104-Add support to designate a method as abstract
...
Added logic to allow rendering of a method name with italics or underline based on modifier at beginning of name to set css style
2019-12-09 17:41:26 -08:00
9a0df5afb0
#723 Add stadium shape for flowchart nodes
2019-12-08 16:51:47 +01:00
d23ce9fb63
#935 Fix for stylink of links. Default theme colors are picked up and styling via themeCSS works
2019-12-08 10:10:03 +01:00
ab191abd5a
#903 Fix for broken build
2019-12-07 15:06:44 +01:00
c2e5e94b37
#903 Allowing >,< and = characters in svg. Updating xss tests to handle both htmlLabels and non htmlLabels
2019-12-07 12:19:45 +01:00
6a9b251be1
Fix code style errors
2019-12-06 20:35:22 -08:00
2a41280076
Add support for Generic class definitions
...
Added support in parser to translate characters surrounded by `~` into generic type definition ie: `Class01~T~` would turn into `Class01<T>`
2019-12-05 12:59:22 -08:00
9fe0aa0604
Merge pull request #1116 from mermaid-js/bug/1110_state_diagram_rendering_composit_state
...
Bug/1110 state diagram rendering composit state
2019-12-04 19:15:06 +01:00
5c71a3c85b
#1110 Fix for transparent rect under edge title, was misaligned
2019-12-04 18:20:28 +01:00
94e768dd01
#1110 Cleanup and removal of loggings
2019-12-04 18:04:56 +01:00
0fb91d6bcc
#1110 Fixing height issue
2019-12-03 23:38:51 +01:00
02854881b4
#1110 Zoom in a bit
2019-12-03 22:48:55 +01:00
4254781391
Adjusted imports
2019-12-03 22:09:43 +01:00
5a38562bfc
#1110 Handling case with concurrency lines
2019-12-03 20:59:17 +01:00
fcd1e106a5
#1110 Handling case when title is less wide then subgraph
2019-12-02 21:22:22 +01:00
346328156a
#1110 Adding tests for this case and some calcuations for width
2019-12-02 21:10:37 +01:00
de8f8b02dc
Merge branch 'master' into develop
2019-12-01 07:54:02 +01:00
78e4fead49
Feature request 552. Gnatt chart task with multiple dependencies
2019-11-28 16:53:33 +02:00
bea2e73b82
#1065 Updated dependency of dagre-d3 to unofficial release
2019-11-27 19:09:14 +01:00
753bd7e1d9
Update class diagrams to handle comments
...
updated regex in parser to correctly handle comments in class diagrams. Also updated flowchart parser to remove unused elements for comments, as well as modifying the regex to match
2019-11-26 11:23:07 -08:00
b57492c1c6
Initial checkin
2019-11-26 11:22:21 -08:00
5736d523dd
Merge pull request #1081 from jgreywolf/Bug1061-CannotMarkMembersAsProtectedInClassDiagram
...
Bug/1061 Cannot mark members as protected in class diagram
2019-11-21 20:54:15 +01:00
9a87ff684d
Removed logging
2019-11-20 19:33:42 +01:00
087e5eaa32
#1055 Fix for tests
2019-11-20 19:21:19 +01:00
a60e01db97
Corrected typo in test
2019-11-19 13:02:08 -08:00
68c2ea38c9
Bug1061-CannotMarkMembersAsProtectedInClassDiagram
...
Using # to indicate protected status of a member or method causing parser error when not used inside class declaration brackets {}. Removed '#' from `LABEL` regex
2019-11-19 12:49:59 -08:00
3f8f9f6711
#1055 Better selectors
2019-11-08 20:15:48 +01:00
d01f494277
Merge branch 'master' into develop
2019-11-08 19:32:54 +01:00
48ce7a9b78
#1023 Fix for tests
2019-11-07 19:19:44 +01:00
09bf54f9af
#1038 Updated prefix for the internal dom id
2019-11-07 19:14:06 +01:00
a3017b8456
Merge branch 'release/8.4.1'
2019-11-06 10:52:10 -08:00
aac915b285
#1044 fix: Multiple class diagrams are not rendered correctly
2019-11-05 18:00:52 +09:00
427aea73e7
test pass with underscore in a class name
2019-10-29 17:39:15 +01:00
c4436b7a1e
ALPHA pattern now include underscore
2019-10-29 17:20:25 +01:00
034a7c424d
#1033 Better handling of multiline notes
2019-10-27 17:16:29 +01:00
b113436055
#1033 Fix for diagram bounds and viewbox
2019-10-27 16:58:32 +01:00
e550d974da
Merge pull request #1032 from knsv/bug/1031_stricter_code_checks
...
Fix for Bug/1031 stricter code checks
2019-10-27 15:33:48 +01:00
bc34ef4b66
Merge pull request #1028 from knsv/Issue-1027_Pie-Chart-Legends
...
#1027 Updated Pie chart to render percentages and labels separately …
2019-10-27 15:26:54 +01:00
a5cc1e804b
#1031 Adding stricter code checks
2019-10-27 15:24:56 +01:00
8f8638fb7c
#1029 Linting fixes
2019-10-24 19:46:42 +02:00
d1c74070ab
#1029 Fix for issues after switching to master branch of dagre-d3
2019-10-24 19:33:13 +02:00
66152b42ae
#1023 New line in transition labels, basic support
2019-10-23 21:16:59 +02:00
76c8737485
#1027 Updated Pie chart to render percentages and labels separately as legends
2019-10-23 21:00:33 +02:00
4a1eb55127
#1022 Fix for long names for state diagrams
2019-10-23 19:22:36 +02:00
c87637c6f4
#1024 Removal of leftover loggings
2019-10-23 18:47:41 +02:00
ca5e60b38b
Use dagre-d3 master branch (for d3v5)
2019-10-21 22:46:20 +05:30
2a2fd7a8b1
Small gramatical mistake
2019-10-21 22:46:18 +05:30
0157f665a3
Merge branch 'release/8.4.0'
2019-10-19 07:59:04 -07:00
dc88e7a2c2
Fixes after verification, documentation of stateDiagram
2019-10-19 14:42:34 +02:00
1b813d371d
Small gramatical mistake
2019-10-16 10:08:24 +03:00
e65f916ba5
Merge pull request #992 from edekadigital/enhancement-958
...
#958 Cannot center-justify text in nodes
2019-10-15 18:54:28 +02:00
f9c8ce1ac7
Merge branch 'master' into develop
2019-10-15 18:50:11 +02:00
b881e5c69c
Merge pull request #991 from christopherkade/feature/divided-flow-tests
...
#906 Divided flow unit tests
2019-10-15 18:43:39 +02:00
51a89c80aa
Merge pull request #985 from knsv/bug/984_bracket_syntax_properties_reversed_order
...
bug/984 Class diagram: properties with bracket syntax are reversed in order
2019-10-15 18:39:20 +02:00
f089c45115
#958 Cannot center-justify text in nodes
...
- changed fit() to it() to reactivate test
2019-10-15 16:02:11 +02:00
90fe015d68
#958 Cannot center-justify text in nodes
...
- assign text-align style to text node to allow aligning of node text
2019-10-15 16:02:11 +02:00
89b6ccf47d
#906 Divided flow unit tests
2019-10-14 16:17:43 +02:00
047ce2949a
#989 Added font styling classes to diagrams lacking then
2019-10-13 19:16:35 +02:00
53bdfee057
#989 Font configuration
2019-10-12 16:53:21 +02:00
2da55993e0
Test of font-settings for correct image snapshots
2019-10-12 09:16:33 +02:00
a258eda035
#945 Setting up stylesheet, classes and colors
2019-10-11 18:12:24 +02:00
7c125cf9d6
#945 Moving hardcoded sizes etc to config
2019-10-11 15:39:50 +02:00
031c0b7b21
#945 Increasing size, handling forks and joins in multiple directions
2019-10-10 20:55:27 +02:00
ce017ecd40
Merge branch 'master' of github.com:knsv/mermaid
2019-10-10 17:57:39 +02:00
85e58faa78
#945 White background and forks in composite mode
2019-10-10 17:57:29 +02:00
f8f52c4587
Fix for viewport in classDiagram and stateDiagram renndering
2019-10-09 21:15:17 +02:00
54e6e2f66e
#945 Some bug fixes and draft docs
2019-10-09 20:05:24 +02:00
fe1e09f06b
Merge branch 'feature/945_state_diagrams'
2019-10-09 18:16:32 +02:00
f180510fbb
Merge pull request #983 from knsv/feature/Issue-949_Add_cardinality_support
...
Feature/issue 949 add cardinality support
2019-10-08 23:06:17 +02:00
687e74de9b
fixed members order
2019-10-08 22:59:59 +02:00
35ddf9235f
#949 Added rendering of cardinality for class diagrams
2019-10-08 21:43:58 +02:00
554189908d
Merge pull request #970 from mearns/issue-530-hexagon
...
Add hex shape for flow charts
2019-10-08 21:43:10 +02:00
a9224015e0
Merge pull request #964 from volkanunsal/master
...
Add useMaxWidth to flowRenderer
2019-10-08 21:33:50 +02:00
1cba50266e
#755 Linting fixes + merge
2019-10-08 14:25:29 +02:00
ae7852d9b9
Merge branch 'master' into feature/755_handling_br_in_sequence_diagram
2019-10-08 14:18:55 +02:00
6b4a8325ae
Merge branch 'feature/963_class_annotations' of https://github.com/chris579/mermaid into develop
2019-10-08 12:49:52 +02:00
ebede9b910
#945 Log removal
2019-10-06 16:06:15 +02:00
b12791d3e0
#945 Divider lines for concurrency, full width when in a composit state
2019-10-06 15:53:34 +02:00
ce0b0fa0c8
#945 Divider lines for concurrency
2019-10-06 15:44:31 +02:00
dce09586cd
#945 Support for forks and joins
2019-10-06 14:11:17 +02:00
4f1186a610
#945 Support for notes, better width and handling of +/-
2019-10-06 11:35:46 +02:00
1cb52a602a
#945 Support for notes
2019-10-06 10:52:37 +02:00
c9fe948b90
#530 Finished basic unit tests for flow shapes
2019-10-05 13:48:20 -04:00
cc731fe3c4
#530 Pull shape functions out to shorten functions
2019-10-05 09:38:03 -04:00
9da61ad562
added some documentation
2019-10-05 12:38:29 +02:00
3b731282e3
#945Renabling support for descriptions
2019-10-05 12:15:14 +02:00
cfc14ade2a
#945 Some more cleanup focusing on stateDb
2019-10-05 10:02:58 +02:00
d4306e61c2
#945 Some cleanup
2019-10-05 09:02:20 +02:00
dcbcbf40a0
#530 Started adding some tests around how flowchart shapes are rendered in SVG
2019-10-04 22:38:27 -04:00
9a0a5ca804
#530 Add some unit tests for flowRenderer.addVertices
2019-10-04 22:03:20 -04:00
20b2866631
#530 Further encapsulation of common code
2019-10-04 21:21:00 -04:00
612df99c34
added tests + alt syntax
2019-10-04 23:49:58 +02:00
912e850db4
added grammar
2019-10-04 21:49:02 +02:00
96735dd543
Added rendering for annotations
2019-10-04 21:09:49 +02:00
65cbfbdb40
#945 Tweaking
2019-10-03 19:54:07 +02:00
7865fd4f02
#945 Rendering of composite state in a box
2019-10-03 19:08:15 +02:00
c9f84ccae5
#530 Testing Coverage
2019-10-03 06:41:36 -04:00
01fd54dd6f
#530 Encapsulate some redudant flow shape code
2019-10-02 22:51:12 -04:00
e1446ce38a
#530 Add unit test for hex nodes
2019-10-02 22:44:56 -04:00
550f91aa68
#530 Better shaping of hexagon
...
The "corner" triangles are a fixed ratio to the height,
so the triangles will always be mathemtically similar.
2019-10-02 22:36:02 -04:00
b300a4decb
#530 Fit hexagon to width and height
...
The hexagon shape in flow chart now fits
the width and height independently, so it can better fit
large content without taking up too much space.
2019-10-02 22:23:30 -04:00
51e902cd36
Added the hex shape to the renderer, and support for it in the flow parser.
...
Need to work on properly sizing it.
2019-10-02 22:11:02 -04:00
f9f8785aef
#945 Recursive object from parsing and stateDb
2019-10-02 19:32:13 +02:00
0abeaa4dc2
Merge branch 'feature/945_state_diagrams' into develop
2019-10-02 19:17:38 +02:00
9ca077b3dc
Add some test coverage for getBranchesAsObjArray
2019-10-01 22:29:07 -04:00
351dd3728e
#848 - Add Unit Test
2019-10-01 22:03:43 -04:00
054901cb79
Fixes #848 - Use more secure PRNG
...
Math.random() is not cryptogaphically secure, but the crypto-random-string
package provides what is needed with a cryptographically secure pseudo-random
number generator.
2019-10-01 21:29:42 -04:00
94afcfb6f9
#945 Rendering of state descriptions
2019-09-29 15:50:43 +02:00
682faa4f9d
Add useMaxWidth to flowRenderer
2019-09-29 09:31:41 -04:00
3cffd1e3ed
#945 Rendering of labels and new label positioning algorithm
2019-09-28 13:31:10 +02:00
095233e6cf
Flowchart parsing issue with CRLF #894
2019-09-27 01:05:25 +02:00
13baa43081
#945 Rendering from diagram data
2019-09-25 21:29:32 +02:00
fad76ad534
#945 Rendering of start & end node
2019-09-25 21:01:21 +02:00
6110640fc2
Merge pull request #940
...
Use https in githu urls
2019-09-23 09:44:20 -04:00
4f218435e3
revert to http
2019-09-23 12:05:13 +02:00
7ca13fd163
revert to http
2019-09-23 12:04:39 +02:00
2306534248
#945 Handling of dimples state definitions
2019-09-22 03:30:36 -07:00
2f0248e6d5
#945 Handling of note statements
2019-09-22 02:38:04 -07:00
3a8564de92
#945 Handling of fork statements
2019-09-21 23:19:03 -07:00
1aa8b9b804
#945 Handling recursive logn descriptions for states with quotes
2019-09-21 11:31:09 -07:00
921d5464a1
#945 Handling recursive logn descriptions for states with quotes
2019-09-21 09:12:02 -07:00
9993b90a20
#945 Handling recursive state statements
2019-09-21 08:54:18 -07:00
6f054519e7
#945 Handling simple state statements
2019-09-21 08:50:32 -07:00
51bf4a4c5c
#945 Parsing happy case and scale/hide statements
2019-09-21 08:19:55 -07:00
f39e120952
#941 Fix for issue with directions iin flowchart
2019-09-19 13:56:41 -07:00
f30f607b0c
feat(https): use https in SVGs
2019-09-19 20:53:42 +02:00
d8397f146b
#937 Handling direction keywords in node ids
2019-09-18 12:56:24 -07:00
f9b30bdb43
#931 Reformatting for compliacne with code standard
2019-09-12 12:58:32 -07:00
34de31195f
#931 Aligning with code standard
2019-09-12 12:58:04 -07:00
cf05a8d8fa
#931 Updating code to align witn new code standard
2019-09-12 12:57:36 -07:00
a2e3f3d900
#931 Reformatting code for gitGraph
2019-09-12 12:56:54 -07:00
e67b8c86d6
#931 Aligning code standard
2019-09-12 12:55:31 -07:00
e14922f15c
#931 Aligning code standard
2019-09-12 12:55:20 -07:00
ad5669b523
#931 Aligning code standard
2019-09-12 12:55:10 -07:00
f2a6ba80b5
#931 Aligning code standard
2019-09-12 12:54:59 -07:00
398d66bda9
#22 Update SCSS for pie chart specific title class
2019-09-11 21:39:39 +02:00
42fc23cff2
#22 Basic Pie Chart
2019-09-11 21:20:28 +02:00
e37f5a6eb2
#926 Applying the color styling on the label instead of the node
2019-09-08 02:56:06 -07:00
21aa8c5f15
#922 Fix for click binding on nodes with ids starting with a number
2019-09-03 11:31:47 -07:00
2cb54293f8
Lint fixes
2019-09-01 02:18:00 -07:00
5610185050
#918 Removed som logging
2019-09-01 00:45:24 -07:00
699bd61045
#918 Fix for issue with nodes starting with a number in a subgraph
2019-09-01 00:44:48 -07:00
c43d58d3c9
#916 Allow chaining of vertice in flowcharts
2019-08-28 20:25:54 +02:00
c6efddee87
#755 lint fixes
2019-08-28 20:13:37 +02:00
f6377e6125
#755
2019-08-28 20:09:45 +02:00
4ae48f4284
#915 Reviving the possibility to use underscore in text in vertices
2019-08-28 17:34:57 +02:00
a48a306fe8
#914 Fix for issue identifying node wehen the id of the node starts with a digit
2019-08-27 12:16:11 -07:00
06a91d8564
#835 Backwords compatible syntax for associating classes with nodes/vertices
2019-08-26 20:10:44 +02:00
ef51f543a3
Fix for test
2019-08-16 12:42:42 +02:00
4eda2aa36d
#900 Handling ids starting with a number and styling for other nodes as well
2019-08-16 12:38:34 +02:00
a35892da4f
Fix for issue #895
2019-08-15 08:57:49 +02:00
23b567e11b
#900 Fix for subgraph ids starting with a number
2019-08-14 20:00:06 +02:00
7b335fb62e
#901 Fixed the issue with multiple calls to bind the click functions. Also sanitized the tooltips so that no tags are allowed in them for ( #847 ).
2019-08-11 03:26:44 -07:00
a6f21c2b91
Re-enabling all tests
2019-08-08 01:19:14 -07:00
78dd0e6ddc
remove dev code
2019-08-03 15:10:53 -07:00
cfea52f570
chore: integrate jison into webpack build
2019-08-03 15:05:43 -07:00
533b55bb68
Merge of feat: sequence diagram background rect #889
2019-07-25 12:04:01 -07:00
8f6d148481
chore: added test for background rect dimensions
2019-07-23 21:28:48 -07:00
671a892b52
fix: removed it.only
2019-07-23 21:08:33 -07:00
5c25c5563a
chore: Added e2e snapshot tests
2019-07-23 21:07:01 -07:00
8b05eeaa59
chore: Added unit tests around drawBackgroundRect and drawRect
2019-07-23 19:15:54 -07:00
1b001cf1e8
chore: Added unit tests around drawBackgroundRect and drawRect
2019-07-23 19:11:31 -07:00
855bad2f40
Added sequenceDiagram.js
2019-07-23 06:54:45 -07:00
b6d9407246
Added Jest test case for handling underscore in vertex name
2019-07-23 06:51:18 -07:00
957687ed39
Added Jest test for use-case A[text]-->B[test2].class
2019-07-23 06:49:44 -07:00
db86cfa7d9
Added Jest test case for use-case A[text].class-->B[test2]
2019-07-23 06:47:03 -07:00
afa95172b6
Added new Jest test case for usecase A[text].class
2019-07-23 06:45:35 -07:00
2e0843c226
Added Jest test case for 'should be possible to apply a class to a vertex directly' use-case
2019-07-23 06:41:45 -07:00
b312901705
Updated JISON for flow diagram to allow . class in vertex declaration
2019-07-23 06:37:28 -07:00
c8091c61c0
feat: sequence diagram background rect
2019-07-22 22:47:49 -07:00
cf686c445c
Standard fixes
2019-07-22 05:23:03 -07:00
f11d1a6fa1
#847 Better sanitizing of urls
2019-07-22 02:18:09 -07:00
c33533082c
#847 Handling of embedded javascript in links
2019-07-21 07:39:36 -07:00
9c150eec4e
Linting fixes
2019-07-21 02:14:49 -07:00
c25a3cf1c1
#731 Issue with clicks in flowcharts. Replacing d3 with document.querySelect and addEventListener
2019-07-21 02:12:54 -07:00
8e27318eda
#847 fix for case texts with multiple br tags, explanation in usage doc on how to avoid labels out of bounds.
2019-07-16 16:05:22 -07:00
484b24d097
Merge pull request #882 from IOrlandoni/fix/whitespace-in-participant
...
Trimming whitespace after participant id
2019-07-14 10:36:10 -07:00
e93cc85e9b
Trimming whitespace after participant id
2019-07-14 11:51:20 -04:00
c818dbb5a0
Setting default securityLevel to strict, updated docs in mermaidAPI
2019-07-14 06:07:27 -07:00
31576f8f55
#847 Removing </> in text
2019-07-13 22:50:53 -07:00
c6511ed829
test(ganttDb.spec): add simple tests for the durationToDate fn
2019-07-07 17:17:22 -03:00
047760ad4b
chore(ganttDb): export durationToDate so it can be tested
2019-07-07 17:17:05 -03:00
b7c4b66b61
test(ganttDb.spec): fix missing initialization for clear test
2019-07-07 17:04:40 -03:00
67bb5ffa73
refactor(ganttDb.js): extract durationToDate function
...
codeclimate was complaining about the getEndDate function so I split it up
2019-07-07 17:01:45 -03:00
1ee4b964e2
test(gantt.spec): add assertions to check that the parser didn't error
2019-07-07 16:41:07 -03:00
cb7d05bd53
chore(gantt.js): generate parser from jison
2019-07-07 16:28:53 -03:00
16f3338b3d
feat(gantt.jison): update parser to accept a inclusive end date arg
...
if a line contains inclusiveEndDates then it will toggle the chart to use inclusive end dates
2019-07-07 16:28:31 -03:00
0a567a3ef9
test(ganttDb): update inclusive end date tests
2019-07-07 16:27:41 -03:00
660e0f3d8b
refactor(ganttDb): separate out the inclusive end date toggle
2019-07-07 16:27:28 -03:00
ee766ec88e
fix(ganttDb): change manual end time determination
...
now it just checks if a valid end time was provided and instead of the comparison that went on before.
This needed to be done in order to support manual end dates with inclusive set to true since they don't match anymore as the 'manually' supplied end date is increased by one
2019-07-06 12:28:56 -03:00
63096a5c26
feat(ganttDb.js): add 1 day to end dates if inclusive is set to true
...
This will essentially keep all old behavior the same while still allowing users to specify if they want inclusive end dates
2019-07-06 12:27:28 -03:00
b5b714861d
test(ganttDb.spec): flip function design to specify inclusive instead
2019-07-06 12:26:32 -03:00
5c2d416a34
test(ganttDB.spec): fix typo
2019-07-06 12:25:57 -03:00
0515375cfa
test(ganttDb.spec): clear function
2019-07-06 11:54:45 -03:00
6d20ccccd0
feat(ganttDb.js): add getters for excludes,sections and date format
2019-07-06 11:54:18 -03:00
6dce255393
fix(ganttDb.js): clear formats and excludes on clear
2019-07-06 11:30:13 -03:00
402d4bdee1
test(gantt.spec): add parser test for inclusive end dates
2019-07-06 11:29:50 -03:00
123fba5b07
test(ganttDb.spec): add test case for inclusive end dates
2019-07-06 11:29:10 -03:00
5fd803d479
Fix merge changes for pr 722 and issue #782
2019-06-30 16:14:59 +02:00
4bb0da0ce6
Merge of pull request #741
2019-06-29 10:41:44 +02:00
3e9e5acdab
Fix of merge conflicts
2019-06-29 10:33:44 +02:00
40d10ea741
#457 Added grammar for double directional arrows
2019-06-28 12:10:16 +02:00
231aaedec8
Update for double arrows - regular
2019-06-28 11:26:20 +02:00
03abeacea4
Added parallelograms.
2019-06-25 23:15:43 -05:00
99169398b7
Simpler syntax for trapezoid nodes
2019-06-25 23:06:53 -05:00
24600355c8
Merge remote-tracking branch 'origin/master' into flow/trapezoid
2019-06-25 22:36:13 -05:00
db2a21cea1
updated flow parser
2019-06-25 22:30:28 -05:00
bba6bb6255
Remove console.log in classDB.
2019-06-23 19:56:50 -07:00
7d7bc9782b
Merge pull request #795 from DanShai/fix-class-diagram
...
fix class diagram mermaid
2019-06-16 08:24:03 +02:00
5667694652
info diagram to show version of mermaid, bugfixes for gantt chart
2019-06-15 14:29:26 +02:00
e64d2dcada
fixed class diagram hopefuly no conflict
2019-06-14 17:29:40 +03:00
f057bd1e89
fixed class diagram 2nd pr
2019-06-14 08:01:51 +03:00
1e7e719dbf
fixed class diagram 2nd pr
2019-06-14 07:37:16 +03:00
5b6e9747b7
fixed class diagram 2nd pr
2019-06-14 01:22:46 +03:00
db5be3c28a
Resolving som conflicts from merge
2019-06-11 08:35:46 -07:00
434a033411
Resolved an name change issue fom a merge
2019-06-11 08:22:55 -07:00
0816591cf9
Resolved some merge conflicts
2019-06-11 08:20:12 -07:00
836d02d0b9
Merge pull request #828 from stanhu/sh-fix-dotted-lines-flowchart
...
Fix dotted lines not appearing in flowcharts when HTML labels disabled
2019-06-11 17:13:51 +02:00
b951d506d9
Merge pull request #832 from vaniship/master
...
fix draw function can only call once
2019-06-11 17:13:00 +02:00
e0a70bd352
Merge of latest changesin to pr #804
2019-06-09 12:40:37 -07:00
fe913ec10f
Merge pull request #705 from Vrixyz/602-cardinality-not-showing
...
wip: class diagram cardinality display
2019-06-09 11:22:03 -07:00
3e6396cc4b
Merged in recent updates
2019-06-09 10:53:46 -07:00
a8d9b269ff
Fixed reference in test file
2019-06-09 07:07:57 -07:00
df7dc21893
Merge branch 'no-bloat'
2019-06-09 07:00:29 -07:00
ed3d15501a
Aligned “lodash” version with other dependencies, so that it gets deduplicated
2019-06-04 03:52:01 +02:00
fef85cf259
Importing only specific modules from "lodash"
2019-06-04 03:32:56 +02:00
9290aa2b61
Replaced “moment” with “moment-mini"
2019-06-04 03:14:35 +02:00
ee0cb8793f
Merge pull request #791 from flying-sheep/svg-links
...
SVG link rendering
2019-05-28 23:18:39 +02:00
0cfd3c7e02
Merge pull request #749 from monsterkrampe/issue-748-make-mermaid-class-diagrams-usable-in-stackedit
...
Make Class Diagrams usable in Stackedit and Live Editor
2019-05-28 22:32:36 +02:00
23693bd57e
Merge pull request #845 from Qix-/style-subgraph
...
Support styling of subgraphs
2019-05-28 22:22:45 +02:00
d742211797
Merge pull request #837 from jnnnnn/master
...
fix dark theme loop labels not visible
2019-05-28 22:16:22 +02:00
f51596eb61
Support styling of subgraphs
2019-05-24 17:08:45 +02:00
c1d252afe0
fix dark theme loop labels not visible
...
* fix loop label text forced to black, ignoring styles
* fix styles that were being ignored
2019-05-14 11:23:37 +10:00
c3f03e4497
fix: fix draw function can only call once
2019-05-07 15:06:58 +08:00
9e67de8a9f
Fix dotted lines not appearing in flowcharts when HTML labels disabled
...
For some reason, `edgeData.style` was being overwritten when it
was already set earlier in the method.
2019-05-01 22:48:16 -07:00
6f09b14f44
Fix group labels
2019-04-26 11:01:21 +02:00
fa9cf2b345
Fix line styling (dashed / thick) when not using HTML labels option
2019-04-24 16:31:09 +01:00
b2c833b879
Remove escape inside regex for StandardJS
2019-04-18 18:38:33 +01:00
96516d6dd5
Fix issue with XML line breaks inside vertex labels
...
The regex needed to match the `<br>` or `<br/>` wasn't completely correct since some browsers (e.g. Chrome) attempt to turn `<br>` elements into their XHTML counter-parts: `<br/>`. This fixes the regex so both will match.
2019-04-18 10:46:52 +01:00
Knut Sveidqvist