highcharts-rails 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e271caec12da1c1816bc7ba03229a5396e5bbcc
-  data.tar.gz: 21c07c02233a995a590028bf0d4b3797d1e7ecda
+  metadata.gz: 3b89f58bbf9482337db0d6631dafb3a0911f8f45
+  data.tar.gz: 8240049f958306eb2a9347b663ea7741bbd4f6a8
 SHA512:
-  metadata.gz: 8d2783c5c9e0a2ea1d6927c0d986672afbb638245415c5b9bd2e95a058adbe1715b885d94cae648d3a8d36dd9485edd201d3770f2a8ad980e2c221e7199968db
-  data.tar.gz: 56376a1d25174a0861dd1b0500c9814bb05436955453e8b4814c52dacae140bd850f5bf56001b666d2ea545bc957638cc3a6dcc493a99b022eae7b62d0369bbb
+  metadata.gz: a9d52b81b531629a2ac87907ec296ed7a8ad208a0f622fbf007ef86f07177b9301fc5b1207ea6a57e160b330c470ce355902eab058c30c558192cc79efeb1a7d
+  data.tar.gz: b39ea967f4042ca012d05e536bb9c27b4a068fc7d6d7af2336cd72c9bdf993d9200d0c7050ce9e62d3f13ac1329767bc3e8682a566fb5f4a98aab638f19d8022

data/CHANGELOG.markdown

@@ -1,4 +1,9 @@
-# 4.1.0 / 2015-01-26
+# 4.1.1 / 2015-02-17
+
+* Updated Highcharts to 4.1.1
+  * Fixed #3826, a 4.1 regression causing markers to be clipped after setSize.
+
+# 4.1.0 / 2015-02-16
 
 * Updated Highcharts to 4.1.0
   * Added polygon series type

data/app/assets/javascripts/highcharts.js

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.1.0 (2015-02-16)
+ * @license Highcharts JS v4.1.1 (2015-02-17)
  *
  * (c) 2009-2014 Torstein Honsi
  *
@@ -56,7 +56,7 @@ var UNDEFINED,
 	charts = [],
 	chartCount = 0,
 	PRODUCT = 'Highcharts',
-	VERSION = '4.1.0',
+	VERSION = '4.1.1',
 
 	// some constants for frequently used strings
 	DIV = 'div',
@@ -1259,8 +1259,8 @@ defaultOptions = {
 	global: {
 		useUTC: true,
 		//timezoneOffset: 0,
-		canvasToolsURL: 'http://code.highcharts.com/4.1.0/modules/canvas-tools.js',
-		VMLRadialGradientURL: 'http://code.highcharts.com/4.1.0/gfx/vml-radial-gradient.png'
+		canvasToolsURL: 'http://code.highcharts.com/4.1.1/modules/canvas-tools.js',
+		VMLRadialGradientURL: 'http://code.highcharts.com/4.1.1/gfx/vml-radial-gradient.png'
 	},
 	chart: {
 		//animation: true,
@@ -7678,6 +7678,10 @@ Axis.prototype = {
 
 		redraw = pick(redraw, true); // defaults to true
 
+		each(axis.series, function (serie) {
+			delete serie.kdTree;
+		});
+
 		// Extend the arguments with min and max
 		eventArguments = extend(eventArguments, {
 			min: newMin,
@@ -9492,7 +9496,7 @@ Pointer.prototype = {
 			distance = chart.chartWidth,
 			rdistance = chart.chartWidth,
 			anchor,
-
+			noSharedTooltip,
 			kdpoints = [],
 			kdpoint;
 
@@ -9505,12 +9509,13 @@ Pointer.prototype = {
 				}
 			}
 		}
-		
-		if (shared || !hoverSeries) {
+
+		if (!(hoverSeries && hoverSeries.noSharedTooltip) && (shared || !hoverSeries)) { // #3821 
 			// Find nearest points on all series
 			each(series, function (s) {
 				// Skip hidden series
-				if (s.visible && pick(s.options.enableMouseTracking, true)) {
+				noSharedTooltip = s.noSharedTooltip && shared;
+				if (s.visible && !noSharedTooltip && pick(s.options.enableMouseTracking, true)) { // #3821
 					kdpoints.push(s.searchPoint(e));
 				}
 			});
@@ -13661,7 +13666,9 @@ Series.prototype = {
 			chart[sharedClipKey] = clipRect = renderer.clipRect(clipBox);
 			
 		}
-		clipRect.count += 1;
+		if (animation) {
+			clipRect.count += 1;
+		}
 
 		if (this.options.clip !== false) {
 			this.group.clip(animation || seriesClipBox ? clipRect : chart.clipRect);
@@ -13672,7 +13679,7 @@ Series.prototype = {
 		// Remove the shared clipping rectancgle when all series are shown
 		if (!animation) {
 			clipRect.count -= 1;
-			if (clipRect.count === 0 && sharedClipKey && chart[sharedClipKey]) {
+			if (clipRect.count <= 0 && sharedClipKey && chart[sharedClipKey]) {
 				if (!seriesClipBox) {
 					chart[sharedClipKey] = chart[sharedClipKey].destroy();
 				}
@@ -15085,7 +15092,7 @@ extend(Point.prototype, {
 			i,
 			chart = series.chart,
 			seriesOptions = series.options,
-			names = series.xAxis.names;
+			names = series.xAxis && series.xAxis.names;
 
 		redraw = pick(redraw, true);
 
@@ -15244,6 +15251,7 @@ extend(Series.prototype, {
 		}
 
 		// redraw
+		delete series.kdTree; // #3816 kdTree has to be rebuild.
 		series.isDirty = true;
 		series.isDirtyData = true;
 		if (redraw) {
@@ -15276,6 +15284,7 @@ extend(Series.prototype, {
 				}
 
 				// redraw
+				delete series.kdTree; // #3816 kdTree has to be rebuild.
 				series.isDirty = true;
 				series.isDirtyData = true;
 				if (redraw) {
@@ -17442,7 +17451,7 @@ if (seriesTypes.column) {
 
 
 /**
- * @license Highcharts JS v4.1.0 (2015-02-16)
+ * Highcharts JS v4.1.1 (2015-02-17)
  * Highcharts module to hide overlapping data labels. This module is included by default in Highmaps.
  *
  * (c) 2010-2014 Torstein Honsi

data/app/assets/javascripts/highcharts/adapters/standalone-framework.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.0 (2015-02-16)
+ * @license Highcharts JS v4.1.1 (2015-02-17)
  *
  * Standalone Highcharts Framework
  *

data/app/assets/javascripts/highcharts/highcharts-3d.js

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.1.0 (2015-02-16)
+ * @license Highcharts JS v4.1.1 (2015-02-17)
  *
  * (c) 2009-2013 Torstein Hønsi
  *

data/app/assets/javascripts/highcharts/highcharts-more.js

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.1.0 (2015-02-16)
+ * @license Highcharts JS v4.1.1 (2015-02-17)
  *
  * (c) 2009-2014 Torstein Honsi
  *

data/app/assets/javascripts/highcharts/modules/broken-axis.js

@@ -0,0 +1,293 @@
+/**
+ * Highcharts JS v4.1.1 (2015-02-17)
+ * Highcharts Broken Axis module
+ * 
+ * Author: Stephane Vanraes, Torstein Honsi
+ * License: www.highcharts.com/license
+ */
+
+/*global HighchartsAdapter*/
+(function (H) {	
+
+	"use strict";
+
+	var pick = H.pick,
+		wrap = H.wrap,
+		extend = H.extend,
+		fireEvent = HighchartsAdapter.fireEvent,
+		Axis = H.Axis,
+		Series = H.Series;
+
+	function stripArguments() {
+		return Array.prototype.slice.call(arguments, 1);
+	}
+
+	extend(Axis.prototype, {
+		isInBreak: function (brk, val) {
+			var repeat = brk.repeat || Infinity,
+				from = brk.from,
+				length = brk.to - brk.from,
+				test = (val >= from ? (val - from) % repeat :  repeat - ((from - val) % repeat));
+
+			if (!brk.inclusive) {
+				return (test < length && test !== 0);
+			} else {
+				return (test <= length);
+			}
+		},
+
+		isInAnyBreak: function (val, testKeep) {
+			// Sanity Check			
+			if (!this.options.breaks) { return false; }
+
+			var breaks = this.options.breaks,
+				i = breaks.length,
+				inbrk = false,
+				keep = false;
+
+
+			while (i--) {
+				if (this.isInBreak(breaks[i], val)) {
+					inbrk = true;
+					if (!keep) {
+						keep = pick(breaks[i].showPoints, this.isXAxis ? false : true);
+					}
+				}
+			}
+
+			if (inbrk && testKeep) {
+				return inbrk && !keep;
+			} else {
+				return inbrk;
+			}
+		}
+	});
+
+	wrap(Axis.prototype, 'setTickPositions', function (proceed) {
+		proceed.apply(this, Array.prototype.slice.call(arguments, 1));
+		
+		if (this.options.breaks) {
+			var axis = this,
+				tickPositions = this.tickPositions,
+				info = this.tickPositions.info,
+				newPositions = [],
+				i;
+
+			if (info && info.totalRange >= axis.closestPointRange) { 
+				return;
+			}
+
+			for (i = 0; i < tickPositions.length; i++) {
+				if (!axis.isInAnyBreak(tickPositions[i])) {
+					newPositions.push(tickPositions[i]);
+				}
+			}
+
+			this.tickPositions = newPositions;
+			this.tickPositions.info = info;
+		}
+	});
+	
+	wrap(Axis.prototype, 'init', function (proceed, chart, userOptions) {
+
+		// Force Axis to be not-ordinal when breaks are defined
+		if (userOptions.breaks && userOptions.breaks.length) {
+			userOptions.ordinal = false;
+		}
+
+		proceed.call(this, chart, userOptions);
+
+		if (this.options.breaks) {
+
+			var axis = this;
+			
+			axis.postTranslate = true;
+
+			this.val2lin = function (val) {
+				var nval = val,
+					brk,
+					i;
+
+				for (i = 0; i < axis.breakArray.length; i++) {
+					brk = axis.breakArray[i];
+					if (brk.to <= val) {
+						nval -= (brk.len);
+					} else if (brk.from >= val) {
+						break;
+					} else if (axis.isInBreak(brk, val)) {
+						nval -= (val - brk.from);
+						break;
+					}
+				}
+
+				return nval;
+			};
+			
+			this.lin2val = function (val) {
+				var nval = val,
+					brk,
+					i;
+
+				for (i = 0; i < axis.breakArray.length; i++) {
+					brk = axis.breakArray[i];
+					if (brk.from >= nval) {
+						break;
+					} else if (brk.to < nval) {
+						nval += (brk.to - brk.from);
+					} else if (axis.isInBreak(brk, nval)) {
+						nval += (brk.to - brk.from);
+					}
+				}
+
+				return nval;
+			};
+
+			this.setAxisTranslation = function (saveOld) {
+				Axis.prototype.setAxisTranslation.call(this, saveOld);
+
+				var breaks = axis.options.breaks,
+					breakArrayT = [],	// Temporary one
+					breakArray = [],
+					length = 0, 
+					inBrk,
+					repeat,
+					brk,
+					min = axis.userMin || axis.min,
+					max = axis.userMax || axis.max,
+					start,
+					i,
+					j;
+
+				// Min & Max Check
+				for (i in breaks) {
+					brk = breaks[i];
+					if (axis.isInBreak(brk, min)) {
+						min += (brk.to % brk.repeat) - (min % brk.repeat);
+					}
+					if (axis.isInBreak(brk, max)) {
+						max -= (max % brk.repeat) - (brk.from % brk.repeat);
+					}
+				}
+
+				// Construct an array holding all breaks in the axis
+				for (i in breaks) {
+					brk = breaks[i];
+					start = brk.from;
+					repeat = brk.repeat || Infinity;
+
+					while (start - repeat > min) {
+						start -= repeat;
+					}
+					while (start < min) {
+						start += repeat;
+					}
+
+					for (j = start; j < max; j += repeat) {
+						breakArrayT.push({
+							value: j,
+							move: 'in'
+						});
+						breakArrayT.push({
+							value: j + (brk.to - brk.from),
+							move: 'out',
+							size: brk.breakSize
+						});
+					}
+				}
+
+				breakArrayT.sort(function (a, b) {
+					if (a.value === b.value) {
+						return (a.move === 'in' ? 0 : 1) - (b.move === 'in' ? 0 : 1);
+					} else {
+						return a.value - b.value;
+					}
+				});
+				
+				// Simplify the breaks
+				inBrk = 0;
+				start = min;
+
+				for (i in breakArrayT) {
+					brk = breakArrayT[i];
+					inBrk += (brk.move === 'in' ? 1 : -1);
+
+					if (inBrk === 1 && brk.move === 'in') {
+						start = brk.value;
+					}
+					if (inBrk === 0) {
+						breakArray.push({
+							from: start,
+							to: brk.value,
+							len: brk.value - start - (brk.size || 0)
+						});
+						length += brk.value - start - (brk.size || 0);
+					}
+				}
+
+				axis.breakArray = breakArray;
+
+				fireEvent(axis, 'afterBreaks');
+				
+				axis.transA *= ((max - axis.min) / (max - min - length));
+
+				axis.min = min;
+				axis.max = max;
+
+			};
+		}
+	});
+
+	wrap(Series.prototype, 'generatePoints', function (proceed) {
+
+		proceed.apply(this, stripArguments(arguments));
+
+		var series = this,
+			xAxis = series.xAxis,
+			yAxis = series.yAxis,
+			points = series.points,
+			point,
+			i = points.length;
+
+
+		if (xAxis && yAxis && (xAxis.options.breaks || yAxis.options.breaks)) {
+			while (i--) {
+				point = points[i];
+
+				if (xAxis.isInAnyBreak(point.x, true) || yAxis.isInAnyBreak(point.y, true)) {
+					points.splice(i, 1);
+				}
+			}
+		}
+
+	});
+
+	wrap(H.seriesTypes.column.prototype, 'drawPoints', function (proceed) {
+		proceed.apply(this);
+
+		var series = this,
+			points = series.points,
+			yAxis = series.yAxis,
+			breaks = yAxis.breakArray || [],
+			point,
+			brk,
+			i,
+			j,
+			y;
+
+		for (i = 0; i < points.length; i++) {
+			point = points[i];
+			y = point.stackY || point.y;
+			for (j = 0; j < breaks.length; j++) {
+				brk = breaks[j];
+				if (y < brk.from) {
+					break;
+				} else if (y > brk.to) {
+					fireEvent(yAxis, 'pointBreak', {point: point, brk: brk});
+				} else {
+					fireEvent(yAxis, 'pointInBreak', {point: point, brk: brk});
+				}
+			}
+		}
+
+	});
+}(Highcharts));

data/app/assets/javascripts/highcharts/modules/canvas-tools.js

@@ -2908,7 +2908,7 @@ if (CanvasRenderingContext2D) {
 		});
 	}
 }/**
- * @license Highcharts JS v4.1.0 (2015-02-16)
+ * @license Highcharts JS v4.1.1 (2015-02-17)
  * CanVGRenderer Extension module
  *
  * (c) 2011-2012 Torstein Honsi, Erik Olsson

data/app/assets/javascripts/highcharts/modules/data.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.0 (2015-02-16)
+ * @license Highcharts JS v4.1.1 (2015-02-17)
  * Data module
  *
  * (c) 2012-2014 Torstein Honsi

data/app/assets/javascripts/highcharts/modules/exporting.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.0 (2015-02-16)
+ * @license Highcharts JS v4.1.1 (2015-02-17)
  * Exporting module
  *
  * (c) 2010-2014 Torstein Honsi

data/app/assets/javascripts/highcharts/modules/heatmap.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.0 (2015-02-16)
+ * @license Highcharts JS v4.1.1 (2015-02-17)
  *
  * (c) 2011-2014 Torstein Honsi
  *

data/app/assets/javascripts/highcharts/modules/no-data-to-display.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.0 (2015-02-16)
+ * @license Highcharts JS v4.1.1 (2015-02-17)
  * Plugin for displaying a message when there is no data visible in chart.
  *
  * (c) 2010-2014 Highsoft AS

data/app/assets/javascripts/highcharts/modules/solid-gauge.js

@@ -1,5 +1,5 @@
 /**
- * @license  Highcharts JS v4.1.0 (2015-02-16)
+ * @license  Highcharts JS v4.1.1 (2015-02-17)
  * Solid angular gauge module
  *
  * (c) 2010-2014 Torstein Honsi

data/app/assets/javascripts/highcharts/modules/treemap.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.0 (2015-02-16)
+ * @license Highcharts JS v4.1.1 (2015-02-17)
  *
  * (c) 2014 Highsoft AS
  * Authors: Jon Arild Nygard / Oystein Moseng

data/lib/highcharts/version.rb

@@ -1,3 +1,3 @@
 module Highcharts
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: highcharts-rails
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Per Christian B. Viken
@@ -77,6 +77,7 @@ files:
 - app/assets/javascripts/highcharts/highcharts-3d.js
 - app/assets/javascripts/highcharts/highcharts-more.js
 - app/assets/javascripts/highcharts/modules/annotations.js
+- app/assets/javascripts/highcharts/modules/broken-axis.js
 - app/assets/javascripts/highcharts/modules/canvas-tools.js
 - app/assets/javascripts/highcharts/modules/data.js
 - app/assets/javascripts/highcharts/modules/drilldown.js