Skip to content

Commit

Permalink
#931 Aligning code standard
Browse files Browse the repository at this point in the history
  • Loading branch information
knsv committed Sep 12, 2019
1 parent e14922f commit e67b8c8
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 50 deletions.
22 changes: 11 additions & 11 deletions src/diagrams/info/info.spec.js
Original file line number Diff line number Diff line change
@@ -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);
});
});
26 changes: 13 additions & 13 deletions src/diagrams/info/infoDb.js
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -33,4 +33,4 @@ export default {
setInfo,
getInfo
// parseError
}
};
51 changes: 25 additions & 26 deletions src/diagrams/info/infoRenderer.js
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -23,35 +22,35 @@ 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)
.attr('y', 40)
.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
}
};

0 comments on commit e67b8c8

Please sign in to comment.