From e67b8c86d6d7fed8a9b0649807f70577fddd5b31 Mon Sep 17 00:00:00 2001 From: knsv Date: Thu, 12 Sep 2019 12:55:31 -0700 Subject: [PATCH] #931 Aligning code standard --- src/diagrams/info/info.spec.js | 22 ++++++------- src/diagrams/info/infoDb.js | 26 ++++++++-------- src/diagrams/info/infoRenderer.js | 51 +++++++++++++++---------------- 3 files changed, 49 insertions(+), 50 deletions(-) diff --git a/src/diagrams/info/info.spec.js b/src/diagrams/info/info.spec.js index 5b7c50577..502e4bdf8 100644 --- a/src/diagrams/info/info.spec.js +++ b/src/diagrams/info/info.spec.js @@ -1,15 +1,15 @@ /* eslint-env jasmine */ -describe('when parsing an info graph it', function () { - var ex - beforeEach(function () { - ex = require('./parser/info').parser - ex.yy = require('./infoDb') - }) +describe('when parsing an info graph it', function() { + var ex; + beforeEach(function() { + ex = require('./parser/info').parser; + ex.yy = require('./infoDb'); + }); - it('should handle an info definition', function () { + it('should handle an info definition', function() { var str = `info - showInfo` + showInfo`; - ex.parse(str) - }) -}) + ex.parse(str); + }); +}); diff --git a/src/diagrams/info/infoDb.js b/src/diagrams/info/infoDb.js index cd79b024c..2253c819e 100644 --- a/src/diagrams/info/infoDb.js +++ b/src/diagrams/info/infoDb.js @@ -1,27 +1,27 @@ /** * Created by knut on 15-01-14. */ -import { logger } from '../../logger' +import { logger } from '../../logger'; -var message = '' -var info = false +var message = ''; +var info = false; export const setMessage = txt => { - logger.debug('Setting message to: ' + txt) - message = txt -} + logger.debug('Setting message to: ' + txt); + message = txt; +}; export const getMessage = () => { - return message -} + return message; +}; export const setInfo = inf => { - info = inf -} + info = inf; +}; export const getInfo = () => { - return info -} + return info; +}; // export const parseError = (err, hash) => { // global.mermaidAPI.parseError(err, hash) @@ -33,4 +33,4 @@ export default { setInfo, getInfo // parseError -} +}; diff --git a/src/diagrams/info/infoRenderer.js b/src/diagrams/info/infoRenderer.js index dc4d7066e..8aceffb65 100644 --- a/src/diagrams/info/infoRenderer.js +++ b/src/diagrams/info/infoRenderer.js @@ -1,20 +1,19 @@ /** * Created by knut on 14-12-11. */ -import * as d3 from 'd3' -import db from './infoDb' -import infoParser from './parser/info' -import { logger } from '../../logger' +import * as d3 from 'd3'; +import db from './infoDb'; +import infoParser from './parser/info'; +import { logger } from '../../logger'; -const conf = { -} -export const setConf = function (cnf) { - const keys = Object.keys(cnf) +const conf = {}; +export const setConf = function(cnf) { + const keys = Object.keys(cnf); - keys.forEach(function (key) { - conf[key] = cnf[key] - }) -} + keys.forEach(function(key) { + conf[key] = cnf[key]; + }); +}; /** * Draws a an info picture in the tag with id: id based on the graph definition in text. @@ -23,16 +22,16 @@ export const setConf = function (cnf) { */ export const draw = (txt, id, ver) => { try { - const parser = infoParser.parser - parser.yy = db - logger.debug('Renering info diagram\n' + txt) + const parser = infoParser.parser; + parser.yy = db; + logger.debug('Renering info diagram\n' + txt); // Parse the graph definition - parser.parse(txt) - logger.debug('Parsed info diagram') + parser.parse(txt); + logger.debug('Parsed info diagram'); // Fetch the default direction, use TD if none was found - const svg = d3.select('#' + id) + const svg = d3.select('#' + id); - const g = svg.append('g') + const g = svg.append('g'); g.append('text') // text label for the x axis .attr('x', 100) @@ -40,18 +39,18 @@ export const draw = (txt, id, ver) => { .attr('class', 'version') .attr('font-size', '32px') .style('text-anchor', 'middle') - .text('v ' + ver) + .text('v ' + ver); - svg.attr('height', 100) - svg.attr('width', 400) + svg.attr('height', 100); + svg.attr('width', 400); // svg.attr('viewBox', '0 0 300 150'); } catch (e) { - logger.error('Error while rendering info diagram') - logger.error(e.message) + logger.error('Error while rendering info diagram'); + logger.error(e.message); } -} +}; export default { setConf, draw -} +};