Merge branch 'develop'

g1eb · Jan 2, 2017 · 807a8b0 · 807a8b0
2 parents c7e3a24 + 2f71ce0
commit 807a8b0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -1,9 +1,9 @@
 {
   "name": "angular-calendar-heatmap",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "main": [
-    "calendar-heatmap.js",
-    "calendar-heatmap.css"
+    "dist/calendar-heatmap.min.js",
+    "dist/calendar-heatmap.min.css"
   ],
   "homepage": "https://github.com/g1eb/angular-calendar-heatmap",
   "authors": [

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.3",
+  "version": "0.2.4",
   "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
@@ -52,12 +52,20 @@ angular.module('g1b.calendar-heatmap', []).
           .attr('class', 'heatmap-tooltip')
           .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;
+          return numWeeks;
+        }
+
         scope.$watch(function () {
           return element[0].clientWidth;
         }, function ( w ) {
           if ( !w ) { return; }
           width = w < 1000 ? 1000 : w;
-          item_size = ((width - label_padding) / 53 - gutter);
+          item_size = ((width - label_padding) / getNumberOfWeeks() - gutter);
           height = label_padding + 7 * (item_size + gutter);
           svg.attr({'width': width, 'height': height});
           if ( !!scope.data && !!scope.data[0].summary ) {