Building 3.5.0

Nagle · Nov 12, 2014 · f931864 · f931864
1 parent a48b9ea
commit f931864
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## v3.5.0 [2014-11-12]
+
+* [fix] Fix #84 Fixing highlighting for week subdomain (Dominic Barnes)
+* [new] Fix #85 Adding some CommonJS as well as Component support (Dominic Barnes)
+* [fix] Fix #107 Fix connectors for week/month/year (Andreas Jaggi)
+* [change] Use NPM to install jquery and qunit dev dependencies
+
 ## v3.4.0 [2014-02-02]
 
 * [fix] Fix #57 display data values in subdomain

diff --git a/cal-heatmap.js b/cal-heatmap.js
@@ -1,4 +1,4 @@
-/*! cal-heatmap v3.4.0 (Tue May 13 2014 12:22:20)
+/*! cal-heatmap v3.5.0 (Wed Nov 12 2014 16:19:34)
  *  ---------------------------------------------
  *  Cal-Heatmap is a javascript module to create calendar heatmap to visualize time series data
  *  https://github.com/kamisama/cal-heatmap
@@ -460,7 +460,7 @@ var CalHeatMap = function() {
 			format: {
 				date: "%B Week #%W",
 				legend: "%B Week #%W",
-				connector: "on"
+				connector: "in"
 			},
 			extractUnit: function(d) {
 				var dt = new Date(d.getFullYear(), d.getMonth(), d.getDate());
@@ -488,7 +488,7 @@ var CalHeatMap = function() {
 			format: {
 				date: "%B %Y",
 				legend: "%B",
-				connector: "on"
+				connector: "in"
 			},
 			extractUnit: function(d) {
 				return new Date(d.getFullYear(), d.getMonth()).getTime();
@@ -506,7 +506,7 @@ var CalHeatMap = function() {
 			format: {
 				date: "%Y",
 				legend: "%Y",
-				connector: "on"
+				connector: "in"
 			},
 			extractUnit: function(d) {
 				return new Date(d.getFullYear()).getTime();
@@ -1889,6 +1889,8 @@ CalHeatMap.prototype = {
 				dateA.getDate() === dateB.getDate();
 		case "x_week":
 		case "week":
+			return dateA.getFullYear() === dateB.getFullYear() &&
+				this.getWeekNumber(dateA) === this.getWeekNumber(dateB);
 		case "x_month":
 		case "month":
 			return dateA.getFullYear() === dateB.getFullYear() &&

diff --git a/cal-heatmap.min.js b/cal-heatmap.min.js
diff --git a/test/test.js b/test/test.js
@@ -1,4 +1,4 @@
-/*! cal-heatmap v3.4.0 (Sun Feb 02 2014 13:03:14)
+/*! cal-heatmap v3.5.0 (Wed Nov 12 2014 16:19:34)
  *  ---------------------------------------------
  *  Cal-Heatmap is a javascript module to create calendar heatmap to visualize time series data
  *  https://github.com/kamisama/cal-heatmap