Skip to content
Snippets Groups Projects
Commit 931ae969 authored by Clement Ho's avatar Clement Ho
Browse files

Reduce contributions calendar data payload

parent 4c29c254
No related branches found
No related tags found
No related merge requests found
Please view this file on the master branch, on stable branches it's out of date.
 
v 8.12.0 (unreleased)
- Reduce contributions calendar data payload (ClemMakesApps)
v 8.11.0 (unreleased)
- Remove the http_parser.rb dependency by removing the tinder gem. !5758 (tbalthazar)
- Fix don't pass a local variable called `i` to a partial. !20510 (herminiotorres)
Loading
Loading
Loading
Loading
@@ -67,6 +67,14 @@
$.timeago.settings.strings = tmpLocale;
};
 
w.gl.utils.getDayDifference = function(a, b) {
var minutesPerDay = 1000 * 60 * 60 * 24;
var date1 = Date.UTC(a.getFullYear(), a.getMonth(), a.getDate());
var date2 = Date.UTC(b.getFullYear(), b.getMonth(), b.getDate());
return Math.floor((date2 - date1) / minutesPerDay);
}
})(window);
 
}).call(this);
Loading
Loading
@@ -3,7 +3,6 @@
 
this.Calendar = (function() {
function Calendar(timestamps, calendar_activities_path) {
var group, i;
this.calendar_activities_path = calendar_activities_path;
this.clickDay = bind(this.clickDay, this);
this.currentSelectedDate = '';
Loading
Loading
@@ -13,26 +12,36 @@
this.monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
this.months = [];
this.timestampsTmp = [];
i = 0;
group = 0;
_.each(timestamps, (function(_this) {
return function(count, date) {
var day, innerArray, newDate;
newDate = new Date(parseInt(date) * 1000);
day = newDate.getDay();
var group = 0;
var today = new Date()
today.setHours(0, 0, 0, 0, 0);
var oneYearAgo = new Date(today);
oneYearAgo.setFullYear(today.getFullYear() - 1);
var days = gl.utils.getDayDifference(oneYearAgo, today);
for(var i = 0; i <= days; i++) {
var date = new Date(oneYearAgo);
date.setDate(date.getDate() + i);
var day = date.getDay();
var count = timestamps[date.getTime() * 0.001];
if ((day === 0 && i !== 0) || i === 0) {
_this.timestampsTmp.push([]);
this.timestampsTmp.push([]);
group++;
}
innerArray = _this.timestampsTmp[group - 1];
var innerArray = this.timestampsTmp[group - 1];
innerArray.push({
count: count,
date: newDate,
count: count || 0,
date: date,
day: day
});
return i++;
};
})(this));
}
this.colorKey = this.initColorKey();
this.color = this.initColor();
this.renderSvg(group);
Loading
Loading
Loading
Loading
@@ -23,7 +23,6 @@ module Gitlab
 
dates.each do |date|
date_id = date.to_time.to_i.to_s
@timestamps[date_id] = 0
day_events = events.find { |day_events| day_events["date"] == date }
 
if day_events
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment