marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-10 19:09:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

#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).

Browse Source
This commit is contained in:
knsv
2019-08-11 03:26:44 -07:00
parent a6f21c2b91
commit 7b335fb62e
5 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
e2e/platform/click.html Normal file
View File

@@ -0,0 +1,23 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Mermaid Quick Test Page</title>
<link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgo=">
</head>
<body>
<div id="FirstLine" class="mermaid">
graph TB
FullFirstSquad-->StripedFirstSquad
click FullFirstSquad showFullFirstSquad "show <strong>details</strong>"
</div>
<script src="./mermaid.js"></script>
<script>
function showFullFirstSquad(elemName) {
console.log('show ' + elemName);
}
mermaid.initialize({ startOnLoad: true, securityLevel: 'loose', logLevel: 1 });
</script>
</body>
</html>

8
src/diagrams/flowchart/flowDb.js
View File

@@ -18,7 +18,7 @@ let funs = []
const sanitize = text => { const sanitize = text => {
let txt = text let txt = text
if (config.securityLevel === 'strict') { if (config.securityLevel !== 'loose') {
txt = txt.replace(/<br>/g, '#br#') txt = txt.replace(/<br>/g, '#br#')
txt = txt.replace(/<br\S*?\/>/g, '#br#') txt = txt.replace(/<br\S*?\/>/g, '#br#')
txt = txt.replace(/</g, '&lt;').replace(/>/g, '&gt;') txt = txt.replace(/</g, '&lt;').replace(/>/g, '&gt;')
@@ -182,13 +182,13 @@ export const setClass = function (ids, className) {
const setTooltip = function (ids, tooltip) { const setTooltip = function (ids, tooltip) {
ids.split(',').forEach(function (id) { ids.split(',').forEach(function (id) {
if (typeof tooltip !== 'undefined') { if (typeof tooltip !== 'undefined') {
tooltips[id] = tooltip tooltips[id] = sanitize(tooltip)
} }
}) })
} }
const setClickFun = function (id, functionName) { const setClickFun = function (id, functionName) {
if (config.securityLevel === 'strict') { if (config.securityLevel !== 'loose') {
return return
} }
if (typeof functionName === 'undefined') { if (typeof functionName === 'undefined') {
@@ -215,7 +215,7 @@ const setClickFun = function (id, functionName) {
export const setLink = function (ids, linkStr, tooltip) { export const setLink = function (ids, linkStr, tooltip) {
ids.split(',').forEach(function (id) { ids.split(',').forEach(function (id) {
if (typeof vertices[id] !== 'undefined') { if (typeof vertices[id] !== 'undefined') {
if (config.securityLevel === 'strict') { if (config.securityLevel !== 'loose') {
vertices[id].link = sanitizeUrl(linkStr) // .replace(/javascript:.*/g, '') vertices[id].link = sanitizeUrl(linkStr) // .replace(/javascript:.*/g, '')
} else { } else {
vertices[id].link = linkStr vertices[id].link = linkStr

3
src/diagrams/flowchart/flowRenderer.js
View File

@@ -228,6 +228,7 @@ export const addEdges = function (edges, g) {
* @returns {object} classDef styles * @returns {object} classDef styles
*/ */
export const getClasses = function (text) { export const getClasses = function (text) {
logger.info('Extracting classes')
flowDb.clear() flowDb.clear()
const parser = flow.parser const parser = flow.parser
parser.yy = flowDb parser.yy = flowDb
@@ -243,7 +244,7 @@ export const getClasses = function (text) {
* @param id * @param id
*/ */
export const draw = function (text, id) { export const draw = function (text, id) {
logger.debug('Drawing flowchart') logger.info('Drawing flowchart')
flowDb.clear() flowDb.clear()
const parser = flow.parser const parser = flow.parser
parser.yy = flowDb parser.yy = flowDb

4
src/diagrams/gantt/ganttDb.js
View File

@@ -430,7 +430,7 @@ const compileTasks = function () {
*/ */
export const setLink = function (ids, _linkStr) { export const setLink = function (ids, _linkStr) {
let linkStr = _linkStr let linkStr = _linkStr
if (config.securityLevel === 'strict') { if (config.securityLevel !== 'loose') {
linkStr = sanitizeUrl(_linkStr) linkStr = sanitizeUrl(_linkStr)
} }
ids.split(',').forEach(function (id) { ids.split(',').forEach(function (id) {
@@ -457,7 +457,7 @@ export const setClass = function (ids, className) {
} }
const setClickFun = function (id, functionName, functionArgs) { const setClickFun = function (id, functionName, functionArgs) {
if (config.securityLevel === 'strict') { if (config.securityLevel !== 'loose') {
return return
} }
if (typeof functionName === 'undefined') { if (typeof functionName === 'undefined') {

9
src/mermaidAPI.js
View File

@@ -497,10 +497,17 @@ const render = function (id, txt, cb, container) {
svgCode = decodeEntities(svgCode) svgCode = decodeEntities(svgCode)
if (typeof cb !== 'undefined') { if (typeof cb !== 'undefined') {
switch(graphType) {
case 'flowchart':
cb(svgCode, flowDb.bindFunctions) cb(svgCode, flowDb.bindFunctions)
break;
case 'gantt':
cb(svgCode, ganttDb.bindFunctions) cb(svgCode, ganttDb.bindFunctions)
break;
default:
}
} else { } else {
logger.warn('CB = undefined!') logger.debug('CB = undefined!')
} }
const node = d3.select('#d' + id).node() const node = d3.select('#d' + id).node()