Merge branch 'tim2342-master'

g1eb · Sep 14, 2017 · 3371419 · 3371419
2 parents 3d3f4fd + d63f650
commit 3371419
Show file tree

Hide file tree

Showing 5 changed files with 486 additions and 483 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "calendar-heatmap-graph",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "d3.js calendar heatmap graph.",
   "homepage": "https://github.com/g1eb/calendar-heatmap",
   "authors": [
@@ -19,8 +19,8 @@
     "tests"
   ],
   "dependencies": {
-    "d3": "^3.5.16",
-    "moment": "^2.12.0"
+    "d3": "^4.10.2",
+    "moment": "^2.18.1"
   },
   "keywords": [
     "calendar",

diff --git a/dist/calendar-heatmap.min.js b/dist/calendar-heatmap.min.js
diff --git a/index.html b/index.html
@@ -6,16 +6,16 @@
 </head>
 <body>
 
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js" charset="utf-8"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.16/d3.js" charset="utf-8"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js" charset="utf-8"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/4.10.2/d3.min.js" charset="utf-8"></script>
   <script src="dist/calendar-heatmap.min.js"></script>
 
   <script>
     (function () {
       // Initialize random data for the demo
       var now = moment().endOf('day').toDate();
       var time_ago = moment().startOf('day').subtract(10, 'year').toDate();
-      var example_data = d3.time.days(time_ago, now).map(function (dateElement, index) {
+      var example_data = d3.timeDays(time_ago, now).map(function (dateElement, index) {
         return {
           date: dateElement,
           details: Array.apply(null, new Array(Math.floor(Math.random() * 15))).map(function(e, i, arr) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "calendar-heatmap-graph",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "d3.js calendar heatmap graph.",
   "homepage": "https://github.com/g1eb/calendar-heatmap#readme",
   "author": "g1eb <[email protected]> (https://g1eb.com)",
@@ -17,8 +17,8 @@
     "build": "gulp build"
   },
   "dependencies": {
-    "d3": "^3.5.16",
-    "moment": "^2.13.0"
+    "d3": "^4.10.2",
+    "moment": "^2.18.1"
   },
   "devDependencies": {
     "gulp": "^3.9.1",