Release 3.5.3

Nagle · Jul 22, 2015 · 4c973f2 · 4c973f2
1 parent bab4584
commit 4c973f2
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v3.5.3 [2015-07-23]
+
+* [fix] Fix #156 Remove trailing comma in object literal
+* [fix] Fix #161 `domainDynamicDimension` not working with x_week subdomain
+
 ## v3.5.2 [2015-02-05]
 
 * [fix] Fix #74: Let `empty` target cells with no data

diff --git a/bower.json b/bower.json
@@ -7,7 +7,7 @@
     "d3js",
     "heat map"
   ],
-  "version": "3.5.2",
+  "version": "3.5.3",
   "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.5.2 (Thu Feb 05 2015 17:06:47)
+/*! cal-heatmap v3.5.3 (Thu Jul 23 2015 01:27:26)
  *  ---------------------------------------------
  *  Cal-Heatmap is a javascript module to create calendar heatmap to visualize time series data
  *  https://github.com/kamisama/cal-heatmap
@@ -70,11 +70,23 @@ var CalHeatMap = function() {
 
 		maxDate: null,
 
+		// ================================================
+		// DATA
+		// ================================================
+
+		// Data source
 		// URL, where to fetch the original datas
 		data: "",
 
+		// Data type
+		// Default: json
 		dataType: this.allowedDataType[0],
 
+		// Payload sent when using POST http method
+		// Leave to null (default) for GET request
+		// Expect a string, formatted like "a=b;c=d"
+		dataPostPayload: null,
+
 		// Whether to consider missing date:value from the datasource
 		// as equal to 0, or just leave them as missing
 		considerMissingDataAsZero: false,
@@ -438,7 +450,7 @@ var CalHeatMap = function() {
 				case "year":
 					return self._domainType.week.maxItemNumber;
 				case "month":
-					return self.getWeekNumber(new Date(d.getFullYear(), d.getMonth()+1, 0)) - self.getWeekNumber(d);
+					return self.options.domainDynamicDimension ? self.getWeekNumber(new Date(d.getFullYear(), d.getMonth()+1, 0)) - self.getWeekNumber(d) : 5;
 				}
 			},
 			defaultRowNumber: 1,
@@ -527,7 +539,7 @@ var CalHeatMap = function() {
 				column: d.row,
 				position: {
 					x: d.position.y,
-					y: d.position.x,
+					y: d.position.x
 				},
 				format: d.format,
 				extractUnit: d.extractUnit
@@ -2503,18 +2515,28 @@ CalHeatMap.prototype = {
 				_callback({});
 				return true;
 			} else {
+				var url = this.parseURI(source, startDate, endDate);
+				var requestType = "GET";
+				if (self.options.dataPostPayload !== null ) {
+					requestType = "POST";
+				}
+				var payload = null;
+				if (self.options.dataPostPayload !== null) {
+					payload = this.parseURI(self.options.dataPostPayload, startDate, endDate);
+				}
+
 				switch(this.options.dataType) {
 				case "json":
-					d3.json(this.parseURI(source, startDate, endDate), _callback);
+					d3.json(url, _callback).send(requestType, payload);
 					break;
 				case "csv":
-					d3.csv(this.parseURI(source, startDate, endDate), _callback);
+					d3.csv(url, _callback).send(requestType, payload);
 					break;
 				case "tsv":
-					d3.tsv(this.parseURI(source, startDate, endDate), _callback);
+					d3.tsv(url, _callback).send(requestType, payload);
 					break;
 				case "txt":
-					d3.text(this.parseURI(source, startDate, endDate), "text/plain", _callback);
+					d3.text(url, "text/plain", _callback).send(requestType, payload);
 					break;
 				}
 			}

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.5.2",
+  "version": "3.5.3",
   "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.5.2 (Thu Feb 05 2015 17:06:47)
+/*! cal-heatmap v3.5.3 (Thu Jul 23 2015 01:27:26)
  *  ---------------------------------------------
  *  Cal-Heatmap is a javascript module to create calendar heatmap to visualize time series data
  *  https://github.com/kamisama/cal-heatmap