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

Code refactoring: Pushing functions is now to the funs list is now available in a separate function. Also, setLink no longer using the .link attribute and instead calls links directly via window.open

Browse Source
This commit is contained in:
abzicht
2019-03-09 23:13:53 +01:00
parent 20b35cbe13
commit b322a964ca
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -294,8 +294,6 @@ export const addTask = function (descr, data) {
data: data
},
task: descr,
/* The link the rectangle will href to */
link: undefined,
classes: []
}
const taskInfo = parseData(lastTaskID, data)
@@ -325,8 +323,6 @@ export const addTaskOrg = function (descr, data) {
type: currentSection,
description: descr,
task: descr,
/* The link the rectangle will href to */
link: undefined,
classes: []
}
const taskInfo = compileData(lastTask, data)
@@ -385,7 +381,7 @@ export const setLink = function (ids, linkStr) {
ids.split(',').forEach(function (id) {
let rawTask = findTaskById(id)
if (typeof rawTask !== 'undefined') {
rawTask.link = linkStr
pushFun(id, ()=>{window.open(linkStr, "_self")})
}
})
setClass(ids, 'clickable')
@@ -412,26 +408,34 @@ const setClickFun = function (id, functionName, functionArgs) {
}
let rawTask = findTaskById(id)
if (typeof rawTask !== 'undefined') {
funs.push(function (element) {
const elem = d3.select(element).select(`[id="${id}"]`)
if (elem !== null) {
elem.on('click', function () {
window[functionName](id, ...functionArgs)
})
}
})
funs.push(function (element) {
const elem = d3.select(element).select(`[id="${id}-text"]`)
if (elem !== null) {
elem.on('click', function () {
console.log('test')
window[functionName](id, ...functionArgs)
})
}
})
pushFun(id, () => {window[functionName](id, ...functionArgs)})
}
}
/**
* The callbackFunction is executed in a click event bound to the task with the specified id or the task's assigned text
* @param id The task's id
* @param callbackFunction A function to be executed when clicked on the task or the task's text
*/
const pushFun = function (id, callbackFunction){
funs.push(function (element) {
const elem = d3.select(element).select(`[id="${id}"]`)
if (elem !== null) {
elem.on('click', function () {
callbackFunction()
})
}
})
funs.push(function (element) {
const elem = d3.select(element).select(`[id="${id}-text"]`)
if (elem !== null) {
elem.on('click', function () {
callbackFunction()
})
}
})
}
/**
* Called by parser when a click definition is found. Registers an event handler.
* @param ids Comma separated list of ids