Releasing 3.3.10

wa0x6e · Dec 3, 2013 · da6b304 · da6b304
1 parent 12ebf1f
commit da6b304
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v3.3.10 [2013-12-03]
+
+* [fix] Fix #58 Legend colors are shifted
+* [fix] Fix #62 Bug when calendar container already have a style attribute
+
 ## v3.3.9 [2013-11-24]
 
 * [new] Fix hidden day cells for leap year in some domain/subDomainc configuration

diff --git a/bower.json b/bower.json
@@ -7,7 +7,7 @@
     "d3js",
     "heat map"
   ],
-  "version": "3.3.9",
+  "version": "3.3.10",
   "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.9 (Sun Nov 24 2013 15:00:55)
+/*! cal-heatmap v3.3.10 (Tue Dec 03 2013 19:30:01)
  *  ---------------------------------------------
  *  Cal-Heatmap is a javascript module to create calendar heatmap to visualize time series data
  *  https://github.com/kamisama/cal-heatmap
@@ -589,7 +589,10 @@ var CalHeatMap = function() {
 		self.root = d3.select(self.options.itemSelector).append("svg").attr("class", "cal-heatmap-container");
 
 		self.tooltip = d3.select(self.options.itemSelector)
-			.attr("style", d3.select(self.options.itemSelector).attr("style") + "position:relative;")
+			.attr("style", function() {
+				var current = d3.select(self.options.itemSelector).attr("style");
+				return (current !== null ? current : "") + "position:relative;";
+			})
 			.append("div")
 			.attr("class", "ch-tooltip")
 		;
@@ -1372,7 +1375,7 @@ CalHeatMap.prototype = {
 					return options.legendColors.overflow;
 				}
 
-				return parent.legendScale(Math.min(d.v, options.legend[options.legend.length-2]));
+				return parent.legendScale(Math.min(d.v, options.legend[options.legend.length-1]));
 			});
 		}
 

diff --git a/cal-heatmap.min.js b/cal-heatmap.min.js
diff --git a/cal-heatmap.source-map.js b/cal-heatmap.source-map.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cal-heatmap",
-  "version": "3.3.9",
+  "version": "3.3.10",
   "description": "Cal-Heatmap is a javascript module to create calendar heatmap to visualize time series data",
   "keywords": [
     "calendar",
@@ -28,7 +28,6 @@
     "karma-qunit": "~0.1.0",
     "grunt-karma-coveralls": "~2.0.2",
     "grunt-contrib-watch": "~0.5.3",
-    "karma-phantomjs-launcher": "0.0.2",
     "phantomjs": "~1.9.1-0",
     "grunt-contrib-qunit": "~0.3.0"
   },