594ae20a6e
#1547 Remove usage of crypto libraries
2020-07-16 10:48:37 +02:00
2bdc229a9a
Merge pull request #1496 from polarsquad/fix-git-commit-id
...
Make gitGraph commit IDs out of hexadecimal chars
2020-07-12 11:22:19 +02:00
e93a0556e7
Merge pull request #1471 from vantoan8x/securityLevel_antiscript_option
...
add security level antiscript option, use rich html format but dont permit script element.
2020-07-12 10:58:08 +02:00
12668b78b9
Merge pull request #1535 from 72636c/feature/er_classes
...
Add classes to ERD elements
2020-07-12 10:52:30 +02:00
8255088508
Merge pull request #1534 from 72636c/feature/er_use_max_width
...
Add `er.useMaxWidth` config option
2020-07-12 10:51:00 +02:00
20e56d7dfa
Add classes to ERD elements
...
It's a little hard to style the current ERDs. This aims to make things
easier by associating a distinct class with each type of element within
the diagram.
I've added a common `er` class across the elements so that those that
bring their own `themeCSS` can target styles at this diagram type. This
hasn't really been done elsewhere so I'm open to suggestions; an
alternative may be to add classes to a top-level element so that we can
do e.g. `svg.mermaid.er .entityBox`.
2020-07-11 20:34:57 +10:00
99cb752c71
Add `er.useMaxWidth` config option
...
This restores the option of rendering an ERD with an absolute width,
which is consistent with the approach taken with the other diagram
types.
This logic was lost in #1324 , which was probably just a small oversight:
9199546dca (diff-7c38d27acbe0676d923bf19283671616L397-L409)
2020-07-11 18:54:26 +10:00
5da4ced8c1
Add `flowchart.diagramPadding` config option
...
This option lets you customise the padding around the whole flowchart.
It is equivalent to `er.diagramPadding` and defaults to 8px for
backwards compatibility with the current hardcoded value.
2020-07-11 16:54:00 +10:00
fce2a16e42
add security level antiscript option, to let use rich html format but remove all script element.
2020-07-05 23:04:22 +07:00
19ed03c44c
#1524 Updated tests
2020-07-04 12:35:34 +02:00
32b2ee8cab
2020-07-04 11:13:54 +02:00
7e9ab546eb
Fix for broken build, issue with config use in flowcahart and gantt diagram
2020-07-02 22:34:13 +02:00
2af1f9a9d3
Fix for broken build, issue with config use in flowcahart and gantt diagram
2020-07-02 22:27:03 +02:00
ca86ab71f2
added hasBreaks and splitBreaks to common.js
...
updated parseMessage to set wrap: true when breaks are detected
2020-07-01 07:41:44 -04:00
2ffb2988bf
One small refactor to fix activation starty
...
Ensure a minimum amount of space between wrapped / non-wrapped title text and the next element
2020-07-01 05:34:53 -04:00
cbb69bd3cb
() => is not the same as function() {} smh
...
Fixed a few of the text rendering issues
2020-07-01 04:34:29 -04:00
174b098724
loop/opt/alt/etc titles should always wrap
2020-06-30 07:54:51 -04:00
6c6f6838ee
conf.messageFont() would have a different cacheKey based on the cacheKey calculations done in this particular branch. This will be normalized with the memoize PR about to be created.
2020-06-30 07:18:28 -04:00
5b37536ce5
math is hard sometimes?
2020-06-30 06:42:29 -04:00
d42b95bab9
messageFont, noteFont, and actorFont getConfig() calls were not specifying the sequence object
...
take into account width of message over single actor for actors' max message width
2020-06-30 06:20:45 -04:00
fed142dad2
Merge branch 'mermaid-js-develop' into develop
2020-06-30 03:34:55 -04:00
fcd2126330
Getting closer
2020-06-28 08:37:26 -04:00
6915634729
Missed `activationWidth` new configuration option for sequence diagrams
2020-06-26 10:17:13 -04:00
217bd1f4bf
Fixed test cases for sequence diagrams
...
Updated config to match a conversation knut and i had about the relationship between global, site, and integrator configuration
(Will update docs)
Renamed wrapEnabled to wrap
Poor man's caching for calculateTextDimensions, wrapLabel, and breakString (actually makes a huge difference)
2020-06-26 09:26:56 -04:00
1e400624e0
Adjusting classDiagram marker styling
2020-06-24 21:46:59 +02:00
b9931da241
1465 Marking edges witrh new schema for arrow heads
2020-06-24 19:47:12 +02:00
eaf0d5e0a0
Merge branch 'feature/Issue-1465_Class_migration' of github.com:mermaid-js/mermaid into feature/Issue-1465_Class_migration
2020-06-24 19:43:00 +02:00
832206ef80
Adjust flowchart-v2 to use new arrot type handling
2020-06-24 19:42:56 +02:00
85d4f2843e
Initial commit for classDiagram v2
2020-06-24 19:34:12 +02:00
0849aa3f03
Merge pull request #1488 from abhijeet-pathak/1005_gantt_sequnce_creation_order_change
...
Fix for the issue 1005
2020-06-24 18:33:01 +02:00
3c727bc46f
Corrected the test case description
2020-06-24 14:51:08 +05:30
955ccfae88
Make gitGraph commit IDs out of hexadecimal chars
2020-06-24 09:28:58 +03:00
2840c98bb0
Added test case for preserving creation order
...
of tasks
2020-06-23 22:32:49 +05:30
7d9bf83f66
addition: added bounds models for bounds checking in unit tests.
...
addition: bounds.init will clear models
addition: added loop model widths id instead of using title as the id
removed parseMessage debug message
addition: added configuration labelBoxWidth and labelBoxHeight for loop label box width/height
change: adjusted svgDraw drawText to support anchor and valign and whether to output a tspan
change: drawText returns an array regardless of array size
change: hardcoded label width/height uses conf.labelBoxWidth and conf.labelBoxHeight
change: Math.round() on many of the calculations to clean up bounds values
change: getTextObj anchor, width, height start as undefined
2020-06-22 16:59:07 -04:00
ee109c2279
noteModel generated during calculation of loop bounds
...
msgModel generated during calculation of loop bounds
simplifies draw messages loop
2020-06-20 18:15:24 -04:00
e515c7beb1
Fxed liniting issues.
2020-06-20 18:39:19 +05:30
5f56db6f6e
Fix for the issue 1005
...
(https://github.com/mermaid-js/mermaid/issues/1005 )
A new attribute 'order' has been introduced in the task which records
the serial number of task in the script.
In ganttRenderer.js, the tasks are sorted by stratTime attribute.
The function which calculates 'y' for task rectangles, lables etc.
has been modified to correctly position it.
2020-06-20 18:03:48 +05:30
c00b204259
gitGraph: 🔨 dot and minus should be valid branch name
2020-06-20 11:58:38 +08:00
809ba2b392
Fixed: width of notes left of and right of
2020-06-19 13:50:53 -04:00
18254392ab
Merge branch 'mermaid-js-develop' into develop
2020-06-19 13:32:23 -04:00
5646518352
Tweaked the PR for long messages
2020-06-19 12:45:04 -04:00
710b88efae
Merge branch 'feature/1483_long_messages' of https://github.com/mermaid-js/mermaid into develop
2020-06-19 09:17:04 -04:00
1118c3399c
Fixed incorrect positioning and bounds for actors and notes with wrapping enabled and disabled
2020-06-19 09:13:37 -04:00
44d5009538
Revert of PR #1482
2020-06-19 10:52:20 +02:00
dbbfbb2855
Updates after review
2020-06-19 08:40:54 +02:00
24ed979faf
Fixed an incorrect reference to an outer variable (actor) when processing actor widths
2020-06-18 08:51:16 -04:00
e64a65c41e
Refactored rendering sequence diagrams
...
Fixed default config clobbering issues
Updated/corrected sequenceDiagram.spec to set the config using mermaidAPI
Enabled freeze on mermaidAPI to protect defaultConfig
2020-06-18 08:10:50 -04:00
67c2fe8005
Refactored rendering sequence diagrams
...
Fixed default config clobbering issues
2020-06-17 18:13:37 -04:00
5f257119d6
Merge branch 'develop' into refactor-sequences
...
# Conflicts:
# dist/mermaid.core.js
# dist/mermaid.core.js.map
# dist/mermaid.js
# dist/mermaid.js.map
# dist/mermaid.min.js
# dist/mermaid.min.js.map
# src/config.js
# src/mermaidAPI.js
2020-06-17 06:12:02 -04:00
3c72d28511
Refactored rendering sequence diagrams
2020-06-17 05:54:24 -04:00
bd0210cdce
1473 Updated config handling
2020-06-15 01:11:56 +02:00
6309dd1350
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into mermaid-js-develop
2020-06-14 11:40:15 -04:00
0ae001ed6d
Fixed issue with idea-multimarkdown.
...
- JavaFX does not support lookbehind
- (?) It also appears that named regex groups are also unsupported for both mermaid and javafx
Update:
- Fixed an issue where setLogLevel did not properly handle 'named' log levels
- Backwards compatibility should be preserved, any/all %%{...}%% directives will be correctly processed by the grammar and properly ignored for any/all graph types that do not support them.
- Multiline directives will render an error (as they should) if they are not accounted for in the .jison grammar
2020-06-14 11:34:39 -04:00
bb8efadb98
Merge pull request #1470 from vantoan8x/click_event_support_keypath_function
...
Chart Node click event support key-path value for function callback
2020-06-14 14:25:46 +02:00
620c894929
Fixed issue causing idea-multimarkdown headaches: util changes. Reworking them.
2020-06-14 06:53:22 -04:00
cc9c69c931
#1466 Fixing notes for state diagrams (beta)
2020-06-13 13:44:45 +02:00
6559cfd0e1
#1466 Handling line styles using the new rendering engine
2020-06-13 13:12:33 +02:00
28dcc781b4
Chart Node click event support key-path value for function callback
2020-06-13 17:41:52 +07:00
04b4da0c75
## Work in progress.
...
Implemented directives per PR review comment:
%%{directive: json-encoded-arg-string}%%
example:
%%{init: { 'logLevel': 0, 'theme': 'dark' }}%%
Also changed wrap and config to directives:
%%{wrap}%%
%%{config: { 'fontSize': 18 }}%%
2020-06-11 15:35:00 -04:00
44675739a1
when window scroll, the tooltip show incorrect position coz its missing offset of window.scrollXY
2020-06-11 16:01:36 +07:00
6e13718cbd
naming the link/connector edgeLabel and edgePath to let easy query and custom.
2020-06-11 11:42:14 +07:00
67e167427c
1378-Added additional test
2020-06-09 14:54:08 -07:00
969a4e7ba5
1378-refine legacy member parsing to cover additional cases
2020-06-09 14:25:03 -07:00
0495103635
Fix regex and Fix incorrect test
2020-06-08 19:21:33 -07:00
9091d686ed
1378-Update regex to match multiple parameters
...
removing node version changes
2020-06-08 18:42:29 -07:00
47b5d7a2df
1378-accept multiple parameters with methods
...
sec
2020-06-08 18:42:29 -07:00
4a253a7760
Merged with mainline develop
2020-06-08 14:58:42 -04:00
bd11663e0a
Added auto wrap option (and grammar) for sequenceDiagrams
...
Added inline config and init(ialization) grammar
Added reinitialize functionality to mermaidAPI (not to be confused with initialize)
Added actorFontWeight, noteFontWeight, messageFontWeight, wrapEnabled, wrapPadding
Added wrapLabel and breakWord functions to intelligently wrap text based on a pixel-based width instead of column-based
- The implementation is largely from Carys Mills: https://medium.com/@CarysMills/wrapping-svg-text-without-svg-2-ecbfb58f7ba4
- Made slight modifications for mermaid-js
Fixed dark theme color inconsistencies for sequence diagrams
Removed !important from sequence scss as this prevents any client overrides
Fixed various invalid css values in sequence scss which prevented proper rendering of various elements
Added detectInit to utils for initialization json detection
Updated detectType to support the existence or absence of the intialization configuration
Updated calculateTextWidth to include fontWeight
2020-06-08 14:48:03 -04:00
db3377e170
Lint fixes
2020-06-06 12:53:19 +02:00
85a8feec9d
Also fix for error handling when setting mermaid.parseError
2020-06-06 12:42:35 +02:00
8958b2aa1b
Merge pull request #1432 from mermaid-js/1418_html_labels_rendering_engine
...
1418 html labels rendering engine
2020-05-27 22:34:26 +02:00
8603cf89b0
#1418 Fix for descriptions in states
2020-05-27 22:18:59 +02:00
7a7e8fe741
Merge pull request #1425 from spopida/bug/1415_erd_empty_label_not_working
...
Ensure empty quoted relationship labels are accepted in ER diagrams
2020-05-27 19:30:21 +02:00
f1c05bc909
Ensure empty quoted relationship labels are accepted in ER diagrams
2020-05-23 13:33:44 +01:00
ef24020b14
Merge pull request #1411 from ivan-danilov/sequence-over-notes-position-fix
...
Fixed SequenceDiagram over note horizontal position
2020-05-22 09:33:54 +02:00
61249b0887
Fixed SequenceDiagram over note horizontal position
...
Previous expression with noteWidth does not make sense as noteWidth is
not used in case of note over two participants - forceWidth is used
instead. It tried to be symmetrical over cases A,B and B,A but failed.
Can be seen with messages over conf.width size (cannot reproduce in the
live editor as it seems to use not the last version where the code
does not use noteWidth).
The changed code explicitly calculates which of the actors is the
"left" one and starts rendering half margin to the left of its cetral
line.
2020-05-13 21:50:25 -07:00
6d076284e8
#1408 Removing crypto-random-string and he
2020-05-13 19:14:18 +02:00
d7d248fd04
Merge pull request #1388 from mermaid-js/1386_finetuning_rendering_engine
...
1386 finetuning rendering engine
2020-05-13 17:36:12 +02:00
1fc6603f41
Merge branch 'develop' into feature/remove-lodash
2020-05-13 17:34:26 +02:00
053a86c0d4
Do explicit imports for d3 instead of wildcards
2020-05-11 07:10:04 +01:00
28ea68fe7f
Replace lodash with specific implementations, #1389
2020-05-07 21:35:34 +08:00
9a3ec31191
#1386 Adding support for click events and links
2020-05-06 18:51:12 +02:00
a8f9e3f0b0
#1386 Adding some docs and adjusted sizing for state diagrams
2020-05-03 13:31:09 +02:00
d068a460bd
Change ERD fontSize config to an integer to prevent NaN errors
2020-04-30 15:55:14 +01:00
0933268e61
Merge pull request #1371 from jgreywolf/1234-RefactorClassDiagramScaling
...
1234 refactor class diagram scaling
2020-04-26 17:23:14 +02:00
3aa5fc0cc2
Merge pull request #1365 from dany74q/feature/sequence-diagrams-improvements
...
Feature/sequence diagrams improvements
2020-04-26 17:21:55 +02:00
397f57accb
Merge pull request #1334 from russellgeraghty/feature/user-journey
...
Feature/user journey
2020-04-26 17:17:33 +02:00
e3b1944e31
Merge pull request #1370 from mermaid-js/feature/1295_generic_rendering_engine
...
Feature/1295 generic rendering engine
2020-04-26 16:55:11 +02:00
08e015a951
1234-RefactorDiagramScaling
...
Changed implementation to ensure that viewport is aligned correctly, rather than increasing size
2020-04-26 06:10:18 -07:00
ef17f4eacb
1274-adjust diagram viewbox
2020-04-26 05:51:03 -07:00
fd37edc53f
#1295 Adding support for forks and joins
2020-04-26 10:07:25 +02:00
5662c06a33
#1295 Adding support for multiline descriptions for states
2020-04-26 09:47:47 +02:00
0aede618ec
#1295 Adding support for multiline descriptions for states
2020-04-25 17:01:20 +02:00
b646672d3e
#1295 Fix for statediagram labels
2020-04-25 14:12:35 +02:00
862f20ef20
Added cypress e2e tests for suggested improvements
...
This commits adds e2e tests for the suggested improvements.
I've went over the generated screenshots and they look good to me.
2020-04-23 18:31:22 +03:00
5c902001b9
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2020-04-23 17:08:25 +03:00
5f6887b316
Sequence diagram fixes & improvements
...
This commit fixes some bugs, and I believe, improves upon the current
implementation.
In no particular order, it adds:
1. Control over note font size, family and alignment (now defaults to
center)
2. Dynamic actor resizing - actor's width will now scale if its
description is bigger than the static configured width
3. Dynamic actor margins - the margin between actors will now be
dynamically calculated by taking into account the width of connecting
messages or notes
4. Fixed a small visual annoyance where a loop arrow would intersect
with the text it loops on
5. Fixed a bug where if global config -> fontFamily wasn't defined, it
would override the actorFontFamily with an undefined
6. Removed some stale / commented out code
7. Added missing config variables to the global config object in mermaidAPI.js
8. Added messageFontSize, messageFontFamily to control message (non-note)
font settings
9. Memoized the actor widths in a pre-calculation that takes notes and
signals lengths into account
10. Removed redundant console.log lines
11. Extracted out actor width & margin calculation to getMaxMessageWidthPerActor, and
calculateActorMargins
2020-04-23 16:50:00 +03:00
197d006860
Extracted out the commonly used line break regex
...
This commit extract the commonly used /br\s*\/?>/gi regex to common.js,
in order to keep the code more DRY.
2020-04-23 07:55:28 +03:00
49f8aac6a9
Fixed outdated doc strings
...
This commit fixes some outdated docstrings, replacing the description
and @params where necessary.
2020-04-23 07:55:09 +03:00
22dd50a047
Extracted out the commonly used line break regex
...
This commit extract the commonly used /br\s*\/?>/gi regex to common.js,
in order to keep the code more DRY.
2020-04-23 07:20:47 +03:00
59f3d2a11e
#1295 Fix for edges in subgraphs and handling of concurrent states in statediagram-v2
2020-04-22 20:03:41 +02:00
249a14f84a
Merge remote-tracking branch 'upstream/develop' into feature/user-journey
2020-04-17 07:30:53 +01:00
c3f2e8dde1
#1295 Render fix for flowchart, correct marker handling and some cleanup
2020-04-16 19:44:11 +02:00
433f88b459
Merge remote-tracking branch 'upstream/develop' into feature/user-journey
2020-04-13 20:08:20 +01:00
704d56d193
#1295 Updates mermaid-graphlib
2020-04-13 16:25:10 +02:00
5f4da6e0bc
Merge branch 'develop' into feature/1295_generic_rendering_engine
2020-04-11 18:53:47 +02:00
22e17172dd
#1295 Recursive rendering, draft
2020-04-11 17:16:01 +02:00
6ec731e263
Merge pull request #1345 from GDFaber/feature/1343_add_flowchart_subroutine_shape
...
Add flowchart subroutine node shape
2020-04-11 14:12:20 +02:00
7cd8b6f938
Merge pull request #1336 from GDFaber/feature/1290_hide_or_style_gantt_today_marker
...
#1290 Hide/style today marker in gantt diagram
2020-04-11 14:04:31 +02:00
a4a19845d4
Merge pull request #1335 from GDFaber/bug/1271_fix_autonumber_position_for_multiline_texts
...
#1271 Fix autonumber positioning in sequence diagrams with multiline texts
2020-04-11 14:01:24 +02:00
fffb0eafde
Merge pull request #1332 from Soptq/stateRenderer
...
Add useMaxWidth to stateRenderer
2020-04-11 11:58:22 +02:00
7f67435cb9
#1343 Add flowchart subroutine node shape
2020-04-10 00:14:41 +02:00
dcfa903176
#1290 Hide/style today marker in gantt diagram
2020-04-05 01:59:18 +02:00
fc70a8e145
#1271 Fix autonumber positioning in sequence diagrams with multiline texts
2020-04-04 21:53:31 +02:00
f081527731
User journey handler
2020-04-04 16:38:30 +01:00
365c741864
#1295 Fix for intersection calculation for edges to clusters and adding concurrency in stateDiagrams as clusters
2020-04-02 19:35:12 +02:00
9d5303c59d
Prevent un-labelled edges that are left of the left-most vertex from being cut off the diagram
2020-04-02 15:29:12 +01:00
c527392e21
Add useMaxWidth to stateRenderer
2020-04-01 15:12:45 +08:00
933cc333cc
#1295 Backwards compatability
2020-03-30 22:08:48 +02:00
e72c3b2c86
#1295 Re-enabling state diagram tests
2020-03-30 21:40:14 +02:00
a5af248715
Merge branch 'develop' into feature/1295_generic_rendering_engine
2020-03-30 19:15:17 +02:00
240077ffe8
#1295 Adding note support to state diagrams
2020-03-29 14:20:49 +02:00
eee9a1661f
Merge branch 'develop' into feature/1309_erDiagram_PlantUML
2020-03-29 08:55:19 +01:00
9199546dca
Alter ERD syntax for compatibility with PlantUML
2020-03-29 08:42:20 +01:00
5fbb69e7c5
#1295 Styling of composite states
2020-03-28 17:34:23 +01:00
85f47e1693
#1295 Styling of start/end nodes, arrows and regular states
2020-03-28 13:59:41 +01:00
391dc06013
Merge branch 'develop' into feature/1295_generic_rendering_engine
2020-03-25 20:28:10 +01:00
598b392878
#1295 Lint fixes
2020-03-25 20:26:53 +01:00
159a3a3706
#1295 Start shape and handling of setting a unique start id per cluster level
2020-03-25 20:16:27 +01:00
cbdb2e6e6f
Align left/center/right multiline messages
2020-03-24 22:17:11 +01:00
d409da2201
Multiline sequence message
...
This commit allow user to write multiline messages in sequence diagram.
For instance:
```
sequenceDiagram
Alice->>+John: Hello John<br>How are you?<br>I mean...<br>Are you OK today?
Alice->>+John: John, can you hear me?
John-->>-Alice: Hi Alice, I can hear you!<br>Keep calm!<br>I'm there.
John-->>-Alice: And I feel great!
```
2020-03-24 18:26:56 +01:00
c7aa67b07a
#1295 Lint fix
2020-03-22 23:06:32 +01:00
5b302ae2e6
#1295 Applying new rendering engine for stateDiagrams
2020-03-22 21:45:14 +01:00
02b19fed27
Merge branch 'develop' into feature/1295_generic_rendering_engine
2020-03-22 14:44:43 +01:00
17f06564a2
#1295 Added the flowchart shapes
2020-03-18 22:08:19 +01:00
d3f78299e7
Add integration tests, basic docs, and fix multi-diagram bug
2020-03-18 16:53:26 +00:00
a3b97f7c24
Remove roleB - only roleA is labelled
2020-03-17 10:16:19 +00:00
4f50e36e5b
Tidy up for lint
2020-03-17 09:48:32 +00:00
a0bbbe1404
Merge branch 'develop' into feature/117_er_diagram
2020-03-17 09:28:10 +00:00
50f983871b
Add labels to relationships (needs further tidy up)
2020-03-17 09:25:16 +00:00
2d3b02df6a
Minor tidy up
2020-03-16 10:08:43 +00:00
4010c89899
#1295 'arrow' renamed to 'arrow_point'
2020-03-16 08:02:32 +01:00
215e930da4
#1295 Markers implmented, the gereric pattern and diagram specific for flowcharts.
2020-03-16 07:55:02 +01:00
5b74d75011
#1295 Arrow head start
2020-03-14 18:13:34 +01:00
963a0ce6ef
#1295 Edges between subgraphs
2020-03-14 17:38:35 +01:00
5f5e453fb3
Small for for merge issue
2020-03-14 08:56:47 +01:00
35ea4d1a00
Merge branch 'develop' into feature/1295_generic_rendering_engine
2020-03-14 08:44:49 +01:00
10583610bd
Lint fixes
2020-03-14 08:36:49 +01:00
1e498eccb6
Change rendering algorithm
2020-03-11 22:17:11 +00:00
7bd5529bb7
1295 Support for subgraphs with wide labels
2020-03-11 19:52:57 +01:00
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
Knut Sveidqvist