Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-11-24 00:35:49 +0300
committerJose Ivan Vargas <jvargas@gitlab.com>2017-12-19 01:13:05 +0300
commit2ba30096d26174f22851feb8d35f287b8db772e3 (patch)
treec57d862385712ee8fcda4a41acabdbc7d572792b /app/assets/javascripts/users
parent36ba5f8272b11e02eda8110eb8e88b5dd4521928 (diff)
Modified contributors graph to use d3 v4
Diffstat (limited to 'app/assets/javascripts/users')
-rw-r--r--app/assets/javascripts/users/activity_calendar.js12
1 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/javascripts/users/activity_calendar.js b/app/assets/javascripts/users/activity_calendar.js
index 4fa8c680580..c888c67396a 100644
--- a/app/assets/javascripts/users/activity_calendar.js
+++ b/app/assets/javascripts/users/activity_calendar.js
@@ -1,5 +1,9 @@
import _ from 'underscore';
-import d3 from 'd3';
+import {
+ select as d3Select,
+ scaleLinear as d3ScaleLinear,
+ scaleThreshold as d3ScaleThreshold,
+} from 'd3';
import { getDayName, getDayDifference } from '../lib/utils/datetime_utility';
const LOADING_HTML = `
@@ -28,7 +32,7 @@ function formatTooltipText({ date, count }) {
return `${contribText}<br />${dateDayName} ${dateText}`;
}
-const initColorKey = () => d3.scale.linear().range(['#acd5f2', '#254e77']).domain([0, 3]);
+const initColorKey = () => d3ScaleLinear().range(['#acd5f2', '#254e77']).domain([0, 3]);
export default class ActivityCalendar {
constructor(container, timestamps, calendarActivitiesPath, utcOffset = 0) {
@@ -103,7 +107,7 @@ export default class ActivityCalendar {
renderSvg(container, group) {
const width = ((group + 1) * this.daySizeWithSpace) + this.getExtraWidthPadding(group);
- return d3.select(container)
+ return d3Select(container)
.append('svg')
.attr('width', width)
.attr('height', 167)
@@ -205,7 +209,7 @@ export default class ActivityCalendar {
initColor() {
const colorRange = ['#ededed', this.colorKey(0), this.colorKey(1), this.colorKey(2), this.colorKey(3)];
- return d3.scale.threshold().domain([0, 10, 20, 30]).range(colorRange);
+ return d3ScaleThreshold().domain([0, 10, 20, 30]).range(colorRange);
}
clickDay(stamp) {