Fixed regressions in master

highcharts · Apr 7, 2014 · f3366a6 · f3366a6
1 parent a15434c
commit f3366a6
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 356 deletions.
diff --git a/js/highcharts.src.js b/js/highcharts.src.js
@@ -6980,7 +6980,7 @@ Axis.prototype = {
 			tickPositions = [];
 
 		// For single points, add a tick regardless of the relative position (#2662)
-		if (min === max) {
+		if (min === max && isNumber(min)) {
 			return [min];
 		}
 

diff --git a/js/highmaps.src.js b/js/highmaps.src.js
@@ -6719,7 +6719,7 @@ Axis.prototype = {
 			tickPositions = [];
 
 		// For single points, add a tick regardless of the relative position (#2662)
-		if (min === max) {
+		if (min === max && isNumber(min)) {
 			return [min];
 		}
 

diff --git a/js/highstock.src.js b/js/highstock.src.js
@@ -6980,7 +6980,7 @@ Axis.prototype = {
 			tickPositions = [];
 
 		// For single points, add a tick regardless of the relative position (#2662)
-		if (min === max) {
+		if (min === max && isNumber(min)) {
 			return [min];
 		}
 
@@ -21560,7 +21560,7 @@ Axis.prototype.getPlotBandPath = function (from, to) {
 	if (path && toPath) {
 		// Go over each subpath
 		for (i = 0; i < path.length; i += 6) {
-			result.push('M', path[i + 1], path[i + 2], 'L', path[i + 4], path[i + 5], 'L', toPath[i + 4], toPath[i + 5], 'L', toPath[i + 1], toPath[i + 2]);
+			result.push('M', path[i + 1], path[i + 2], 'L', path[i + 4], path[i + 5], toPath[i + 4], toPath[i + 5], toPath[i + 1], toPath[i + 2]);
 		}
 	} else { // outside the axis area
 		result = null;
@@ -21855,7 +21855,11 @@ Point.prototype.tooltipFormatter = function (pointFormat) {
  * to using multiple panes, and a future pane logic should incorporate this feature.
  */
 wrap(Series.prototype, 'render', function (proceed) {
-	this.clipBox = merge(this.chart.clipBox, { height: this.yAxis.len });
+	if (this.isCartesian) {
+		this.clipBox = merge(this.chart.clipBox);
+		this.clipBox.width = this.xAxis.len;
+		this.clipBox.height = this.yAxis.len;
+	}
 	proceed.call(this);
 });
 

diff --git a/js/parts/Axis.js b/js/parts/Axis.js
@@ -617,7 +617,7 @@ Axis.prototype = {
 			tickPositions = [];
 
 		// For single points, add a tick regardless of the relative position (#2662)
-		if (min === max) {
+		if (min === max && isNumber(min)) {
 			return [min];
 		}
 

diff --git a/js/parts/StockChart.js b/js/parts/StockChart.js
@@ -236,7 +236,7 @@ Axis.prototype.getPlotBandPath = function (from, to) {
 	if (path && toPath) {
 		// Go over each subpath
 		for (i = 0; i < path.length; i += 6) {
-			result.push('M', path[i + 1], path[i + 2], 'L', path[i + 4], path[i + 5], 'L', toPath[i + 4], toPath[i + 5], 'L', toPath[i + 1], toPath[i + 2]);
+			result.push('M', path[i + 1], path[i + 2], 'L', path[i + 4], path[i + 5], toPath[i + 4], toPath[i + 5], toPath[i + 1], toPath[i + 2]);
 		}
 	} else { // outside the axis area
 		result = null;
@@ -531,6 +531,10 @@ Point.prototype.tooltipFormatter = function (pointFormat) {
  * to using multiple panes, and a future pane logic should incorporate this feature.
  */
 wrap(Series.prototype, 'render', function (proceed) {
-	this.clipBox = merge(this.chart.clipBox, { height: this.yAxis.len });
+	if (this.isCartesian) {
+		this.clipBox = merge(this.chart.clipBox);
+		this.clipBox.width = this.xAxis.len;
+		this.clipBox.height = this.yAxis.len;
+	}
 	proceed.call(this);
 });