GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity

Refactor tag parsing of tags

Browse Source 
The allowed tags are now a const at the top of the code.
Adding a tag there, automatically assigns the property to the
javascript object, if the tag is present in the data.
This commit is contained in:
Gijs van Dam 2019-02-01 14:21:25 +08:00
parent 901df242b7
commit f903090e0f
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ let title = ''
let sections = []
let tasks = []
let currentSection = ''
const tags = ['active', 'done', 'crit', 'milestone']
export const clear = function () {
sections = []
@ -158,7 +159,7 @@ const compileData = function (prevTask, dataStr) {
const task = {}
// Get tags like active, done, crit and milestone
getTaskTags(data, task)
getTaskTags(data, task, tags)
for (let i = 0; i < data.length; i++) {
data[i] = data[i].trim()
@ -199,7 +200,7 @@ const parseData = function (prevTaskId, dataStr) {
const task = {}
// Get tags like active, done, crit and milestone
getTaskTags(data, task)
getTaskTags(data, task, tags)
for (let i = 0; i < data.length; i++) {
data[i] = data[i].trim()
@ -330,29 +331,18 @@ export default {
addTaskOrg
}
function getTaskTags (data, task) {
function getTaskTags (data, task, tags) {
let matchFound = true
while (matchFound) {
matchFound = false
if (data[0].match(/^\s*active\s*$/)) {
task.active = true
data.shift(1)
matchFound = true
}
if (data[0].match(/^\s*done\s*$/)) {
task.done = true
data.shift(1)
matchFound = true
}
if (data[0].match(/^\s*crit\s*$/)) {
task.crit = true
data.shift(1)
matchFound = true
}
if (data[0].match(/^\s*milestone\s*$/)) {
task.milestone = true
data.shift(1)
matchFound = true
}
tags.forEach(function (t) {
const pattern = '^\\s*' + t + '\\s*$'
const regex = new RegExp(pattern)
if (data[0].match(regex)) {
task[t] = true
data.shift(1)
matchFound = true
}
})
}
}