Merge branch 'develop'

g1eb · Jan 2, 2017 · 96b0b71 · 96b0b71
2 parents 807a8b0 + 26a6690
commit 96b0b71
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-calendar-heatmap",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "main": [
     "dist/calendar-heatmap.min.js",
     "dist/calendar-heatmap.min.css"

diff --git a/dist/calendar-heatmap.min.js b/dist/calendar-heatmap.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-calendar-heatmap",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Angular directive of calendar heatmap graph representing time series data.",
   "homepage": "https://github.com/g1eb/calendar-heatmap#readme",
   "repository": {

diff --git a/src/calendar-heatmap.js b/src/calendar-heatmap.js
@@ -53,10 +53,9 @@ angular.module('g1b.calendar-heatmap', []).
           .style('opacity', 0);
 
         var getNumberOfWeeks = function () {
-          var dayInMillis = 1000*60*60*24;
-          var extraDays = ((moment() - moment().subtract(1, 'year').subtract(1, 'day')) / dayInMillis) - 52 * 7;
-          var currentDay = Math.ceil((moment() - moment().startOf('week')) / dayInMillis);
-          var numWeeks = currentDay < extraDays ? 54 : 53;
+          var dayIndex = Math.floor((moment() - moment().subtract(1, 'year').startOf('week')) / 86400000);
+          var colIndex = Math.trunc(dayIndex / 7);
+          var numWeeks = colIndex + 1;
           return numWeeks;
         }
 
@@ -149,8 +148,9 @@ angular.module('g1b.calendar-heatmap', []).
 
           var calcItemX = function (d) {
             var date = moment(d.date);
-            var week_num = date.week() - year_ago.week() + (year_ago.weeksInYear() * (date.weekYear() - year_ago.weekYear()));
-            return week_num * (item_size + gutter) + label_padding;
+            var dayIndex = Math.floor((date - moment(year_ago).startOf('week')) / 86400000);
+            var colIndex = Math.trunc(dayIndex / 7);
+            return colIndex * (item_size + gutter) + label_padding;
           };
           var calcItemY = function (d) {
             return label_padding + moment(d.date).weekday() * (item_size + gutter);