Commit ce4e8910 authored by Mike Greiling's avatar Mike Greiling

resolve no-mixed-operators and no-return-assign eslint violations

parent 45a446ea
/* eslint-disable no-var, vars-on-top, eqeqeq, no-mixed-operators, no-return-assign, newline-per-chained-call, prefer-arrow-callback, consistent-return, one-var, one-var-declaration-per-line, prefer-template, quotes, no-unused-vars, no-else-return, max-len, class-methods-use-this */ /* eslint-disable no-var, vars-on-top, eqeqeq, newline-per-chained-call, prefer-arrow-callback, consistent-return, one-var, one-var-declaration-per-line, prefer-template, quotes, no-unused-vars, no-else-return, max-len, class-methods-use-this */
import d3 from 'd3'; import d3 from 'd3';
...@@ -77,8 +77,8 @@ export default class ActivityCalendar { ...@@ -77,8 +77,8 @@ export default class ActivityCalendar {
} }
renderSvg(group) { renderSvg(group) {
var width = (group + 1) * this.daySizeWithSpace + this.getExtraWidthPadding(group); var width = ((group + 1) * this.daySizeWithSpace) + this.getExtraWidthPadding(group);
return this.svg = d3.select('.js-contrib-calendar').append('svg').attr('width', width).attr('height', 167).attr('class', 'contrib-calendar'); this.svg = d3.select('.js-contrib-calendar').append('svg').attr('width', width).attr('height', 167).attr('class', 'contrib-calendar');
} }
renderDays() { renderDays() {
...@@ -88,7 +88,7 @@ export default class ActivityCalendar { ...@@ -88,7 +88,7 @@ export default class ActivityCalendar {
var lastMonth, lastMonthX, month, x; var lastMonth, lastMonthX, month, x;
if (a === 0 && stamp.day === 0) { if (a === 0 && stamp.day === 0) {
month = stamp.date.getMonth(); month = stamp.date.getMonth();
x = (this.daySizeWithSpace * i + 1) + this.daySizeWithSpace; x = (this.daySizeWithSpace * i) + 1 + this.daySizeWithSpace;
lastMonth = _.last(this.months); lastMonth = _.last(this.months);
if (lastMonth != null) { if (lastMonth != null) {
lastMonthX = lastMonth.x; lastMonthX = lastMonth.x;
...@@ -100,7 +100,7 @@ export default class ActivityCalendar { ...@@ -100,7 +100,7 @@ export default class ActivityCalendar {
} }
} }
}); });
return "translate(" + ((this.daySizeWithSpace * i + 1) + this.daySizeWithSpace) + ", 18)"; return "translate(" + ((this.daySizeWithSpace * i) + 1 + this.daySizeWithSpace) + ", 18)";
}) })
.selectAll('rect') .selectAll('rect')
.data(stamp => stamp) .data(stamp => stamp)
...@@ -174,7 +174,7 @@ export default class ActivityCalendar { ...@@ -174,7 +174,7 @@ export default class ActivityCalendar {
const keyColors = ['#ededed', this.colorKey(0), this.colorKey(1), this.colorKey(2), this.colorKey(3)]; const keyColors = ['#ededed', this.colorKey(0), this.colorKey(1), this.colorKey(2), this.colorKey(3)];
this.svg.append('g') this.svg.append('g')
.attr('transform', `translate(18, ${this.daySizeWithSpace * 8 + 16})`) .attr('transform', `translate(18, ${(this.daySizeWithSpace * 8) + 16})`)
.selectAll('rect') .selectAll('rect')
.data(keyColors) .data(keyColors)
.enter() .enter()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment