mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-11-14 17:54:13 +01:00
Merge branch 'develop' into minmaps
This commit is contained in:
@@ -30,7 +30,6 @@ export class Diagram {
|
||||
const error = { str, hash };
|
||||
throw error;
|
||||
};
|
||||
this.db.clear();
|
||||
this.parse(this.txt, parseError);
|
||||
}
|
||||
|
||||
|
||||
@@ -213,6 +213,7 @@ export interface RequirementDiagramConfig extends BaseDiagramConfig {
|
||||
rect_padding?: number;
|
||||
line_height?: number;
|
||||
}
|
||||
|
||||
export interface MindmapDiagramConfig extends BaseDiagramConfig {
|
||||
useMaxWidth: boolean;
|
||||
padding: number;
|
||||
|
||||
@@ -6,6 +6,7 @@ import mindmapParser from '../diagrams/mindmap/parser/mindmap';
|
||||
import { mindmapDetector } from '../diagrams/mindmap/mindmapDetector';
|
||||
import mindmapStyles from '../diagrams/mindmap/styles';
|
||||
|
||||
|
||||
import gitGraphDb from '../diagrams/git/gitGraphAst';
|
||||
import gitGraphRenderer from '../diagrams/git/gitGraphRenderer';
|
||||
// @ts-ignore
|
||||
|
||||
5
src/diagrams/mindmap/mindamapDetector.ts
Normal file
5
src/diagrams/mindmap/mindamapDetector.ts
Normal file
@@ -0,0 +1,5 @@
|
||||
import { DiagramDetector } from '../../diagram-api/detectType';
|
||||
|
||||
export const mindmapDetector: DiagramDetector = (txt) => {
|
||||
return txt.match(/^\s*mindmap/) !== null;
|
||||
};
|
||||
@@ -42,7 +42,6 @@ const init = function (
|
||||
try {
|
||||
initThrowsErrors(config, nodes, callback);
|
||||
} catch (e) {
|
||||
console.error('Syntax Error rendering');
|
||||
log.warn('Syntax Error rendering');
|
||||
if (isDetailedError(e)) {
|
||||
log.warn(e.str);
|
||||
@@ -128,8 +127,7 @@ const initThrowsErrors = function (
|
||||
element
|
||||
);
|
||||
} catch (error) {
|
||||
console.error('Catching Error (bootstrap)', error);
|
||||
log.warn('Catching Error (bootstrap)');
|
||||
log.warn('Catching Error (bootstrap)', error);
|
||||
// @ts-ignore
|
||||
// TODO: We should be throwing an error object.
|
||||
throw { error, message: error.str };
|
||||
|
||||
Reference in New Issue
Block a user