From 7f31e624cab93f0ae70587524416d7c8f21624de Mon Sep 17 00:00:00 2001 From: Justin Greywolf Date: Thu, 2 Jan 2020 11:24:06 -0800 Subject: [PATCH] Addressing code style issues --- src/diagrams/class/classDb.js | 2 +- src/diagrams/class/classRenderer.js | 5 +---- src/utils.js | 13 ++++++------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/diagrams/class/classDb.js b/src/diagrams/class/classDb.js index 252a3f069..35e40411d 100644 --- a/src/diagrams/class/classDb.js +++ b/src/diagrams/class/classDb.js @@ -196,7 +196,7 @@ const setClickFunc = function(_id, functionName, tooltip) { funs.push(function() { const elem = document.querySelector(`[id="${elemId}"]`); if (elem !== null) { - + elem.addEventListener( 'click', function() { diff --git a/src/diagrams/class/classRenderer.js b/src/diagrams/class/classRenderer.js index a4a02af8b..ae0696cf6 100644 --- a/src/diagrams/class/classRenderer.js +++ b/src/diagrams/class/classRenderer.js @@ -11,7 +11,6 @@ parser.yy = classDb; const MERMAID_DOM_ID_PREFIX = 'classid-'; let idCache = {}; -let classCnt = 0; const conf = { dividerMargin: 10, padding: 5, @@ -433,8 +432,7 @@ const drawClass = function(elem, classDef) { }); if (classDef.tooltip) { - const tooltip = title - .insert('title') + title.insert('title') .text(classDef.tooltip); } @@ -445,7 +443,6 @@ const drawClass = function(elem, classDef) { classInfo.height = classBox.height + conf.padding + 0.5 * conf.dividerMargin; idCache[id] = classInfo; - classCnt++; return classInfo; }; diff --git a/src/utils.js b/src/utils.js index 0f1a87203..1e17366d1 100644 --- a/src/utils.js +++ b/src/utils.js @@ -95,13 +95,12 @@ export const sanitize = (text, config) => { }; export const formatUrl = (linkStr, config) => { - let url = linkStr; + let url = linkStr.trim(); - if (config.securityLevel !== 'loose') { - return sanitizeUrl(url); - } else { - url = url.trim(); - if (!!url) { + if (url) { + if (config.securityLevel !== 'loose') { + return sanitizeUrl(url); + } else { if (!/^(https?:)?\/\//i.test(url)) { url = 'http://' + url; } @@ -109,7 +108,7 @@ export const formatUrl = (linkStr, config) => { return url; } -} +}; const distance = (p1, p2) => p1 && p2 ? Math.sqrt(Math.pow(p2.x - p1.x, 2) + Math.pow(p2.y - p1.y, 2)) : 0;