Building 3.4.0

wa0x6e · Feb 2, 2014 · 352a69a · 352a69a
1 parent 8e60b40
commit 352a69a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.4.0 [2014-02-02]
+
+* [fix] Fix #57 display data values in subdomain
+
 ## v3.3.12 [2014-01-31]
 
 * [fix] Fix #69 the 'now' and 'highlight' classes are not applied to subdomain text

diff --git a/bower.json b/bower.json
@@ -7,7 +7,7 @@
     "d3js",
     "heat map"
   ],
-  "version": "3.3.12",
+  "version": "3.4.0",
   "main": ["./cal-heatmap.js", "./cal-heatmap.css"],
   "dependencies": {
     "d3": ">= v3.0.6"

diff --git a/cal-heatmap.js b/cal-heatmap.js
@@ -1,4 +1,4 @@
-/*! cal-heatmap v3.3.11 (Fri Jan 31 2014 23:01:23)
+/*! cal-heatmap v3.4.0 (Sun Feb 02 2014 13:03:14)
  *  ---------------------------------------------
  *  Cal-Heatmap is a javascript module to create calendar heatmap to visualize time series data
  *  https://github.com/kamisama/cal-heatmap
@@ -995,7 +995,9 @@ var CalHeatMap = function() {
 				.attr("y", function(d) { return self.positionSubDomainY(d.t) + options.cellSize/2; })
 				.attr("text-anchor", "middle")
 				.attr("dominant-baseline", "central")
-				.text(function(d){ return self.formatDate(new Date(d.t), options.subDomainTextFormat); })
+				.text(function(d){
+					return self.formatDate(new Date(d.t), options.subDomainTextFormat);
+				})
 			;
 		}
 
@@ -1408,8 +1410,20 @@ CalHeatMap.prototype = {
 			.text(function(d) { return parent.getSubDomainTitle(d); })
 		;
 
+		function formatSubDomainText(element) {
+			if (typeof options.subDomainTextFormat === "function") {
+				element.text(function(d) { return options.subDomainTextFormat(d.t, d.v); });
+			}
+		}
+
+		/**
+		 * Change the subDomainText class if necessary
+		 * Also change the text, e.g when text is representing the value
+		 * instead of the date
+		 */
 		rect.transition().duration(options.animationDuration).select("text")
 			.attr("class", function(d) { return "subdomain-text" + parent.getHighlightClassName(d.t); })
+			.call(formatSubDomainText)
 		;
 	},
 

diff --git a/cal-heatmap.min.js b/cal-heatmap.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cal-heatmap",
-  "version": "3.3.12",
+  "version": "3.4.0",
   "description": "Cal-Heatmap is a javascript module to create calendar heatmap to visualize time series data",
   "keywords": [
     "calendar",

diff --git a/test/test.js b/test/test.js
@@ -1,4 +1,4 @@
-/*! cal-heatmap v3.3.11 (Fri Jan 31 2014 23:01:23)
+/*! cal-heatmap v3.4.0 (Sun Feb 02 2014 13:03:14)
  *  ---------------------------------------------
  *  Cal-Heatmap is a javascript module to create calendar heatmap to visualize time series data
  *  https://github.com/kamisama/cal-heatmap