highcharts-rails 4.1.9 → 4.1.10

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

@@ -1,5 +1,5 @@
 /**
- * @license  Highcharts JS v4.1.9 (2015-10-07)
+ * @license  Highcharts JS v4.1.10 (2015-12-07)
  * Solid angular gauge module
  *
  * (c) 2010-2014 Torstein Honsi
@@ -7,9 +7,14 @@
  * License: www.highcharts.com/license
  */
 
-/*global Highcharts, HighchartsAdapter*/
-(function (H) {
-	"use strict";
+(function (factory) {
+	if (typeof module === 'object' && module.exports) {
+		module.exports = factory;
+	} else {
+		factory(Highcharts);
+	}
+}(function (H) {
+	'use strict';
 
 	var defaultPlotOptions = H.getOptions().plotOptions,
 		pInt = H.pInt,
@@ -132,7 +137,7 @@
 
 			// Unsupported color, return to-color (#3920)
 			if (!to.rgba.length || !from.rgba.length) {
-				ret = to.raw || 'none';
+				ret = to.input || 'none';
 
 			// Interpolate
 			} else {
@@ -153,7 +158,7 @@
 	 * Handle animation of the color attributes directly
 	 */
 	each(['fill', 'stroke'], function (prop) {
-		HighchartsAdapter.addAnimSetter(prop, function (fx) {
+		H.addAnimSetter(prop, function (fx) {
 			fx.elem.attr(prop, colorAxisMethods.tweenColors(H.Color(fx.start), H.Color(fx.end), fx.pos));
 		});
 	});
@@ -196,7 +201,6 @@
 					shapeArgs,
 					d,
 					toColor = yAxis.toColor(point.y, point),
-					fromColor,
 					axisMinAngle = Math.min(yAxis.startAngleRad, yAxis.endAngleRad),
 					axisMaxAngle = Math.max(yAxis.startAngleRad, yAxis.endAngleRad),
 					minAngle,
@@ -206,7 +210,6 @@
 					toColor = point.color || series.color || 'none';
 				}
 				if (toColor !== 'none') {
-					fromColor = point.color;
 					point.color = toColor;
 				}
 
@@ -267,4 +270,4 @@
 		}
 	});
 
-}(Highcharts));
+}));

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.9 (2015-10-07)
+ * @license Highcharts JS v4.1.10 (2015-12-07)
  *
  * (c) 2014 Highsoft AS
  * Authors: Jon Arild Nygard / Oystein Moseng
@@ -7,8 +7,13 @@
  * License: www.highcharts.com/license
  */
 
-/*global HighchartsAdapter */
-(function (H) {
+(function (factory) {
+	if (typeof module === 'object' && module.exports) {
+		module.exports = factory;
+	} else {
+		factory(Highcharts);
+	}
+}(function (H) {
 	var seriesTypes = H.seriesTypes,
 		map = H.map,
 		merge = H.merge,
@@ -16,11 +21,13 @@
 		extendClass = H.extendClass,
 		defaultOptions = H.getOptions(),
 		plotOptions = defaultOptions.plotOptions,
-		noop = function () { return; },
+		noop = function () {
+		},
 		each = H.each,
-		grep = HighchartsAdapter.grep,
+		grep = H.grep,
 		pick = H.pick,
 		Series = H.Series,
+		stableSort = H.stableSort,
 		Color = H.Color,
 		eachObject = function (list, func, context) {
 			var key;
@@ -81,9 +88,9 @@
 		},
 		drillUpButton: {
 			position: { 
-				align: 'left',
-				x: 10,
-				y: -50
+				align: 'right',
+				x: -10,
+				y: 10
 			}
 		}
 	});
@@ -117,7 +124,7 @@
 		 */
 		getListOfParents: function (data, ids) {
 			var listOfParents = reduce(data, function (prev, curr, i) {
-				var parent = pick(curr.parent, "");
+				var parent = pick(curr.parent, '');
 				if (prev[parent] === undefined) {
 					prev[parent] = [];
 				}
@@ -127,9 +134,9 @@
 
 			// If parent does not exist, hoist parent to root of tree.
 			eachObject(listOfParents, function (children, parent, list) {
-				if ((parent !== "") && (HighchartsAdapter.inArray(parent, ids) === -1)) {
+				if ((parent !== '') && (H.inArray(parent, ids) === -1)) {
 					each(children, function (child) {
-						list[""].push(child);
+						list[''].push(child);
 					});
 					delete list[parent];
 				}
@@ -148,12 +155,12 @@
 				parentList = series.getListOfParents(this.data, allIds);
 
 			series.nodeMap = [];
-			tree = series.buildNode("", -1, 0, parentList, null);
+			tree = series.buildNode('', -1, 0, parentList, null);
 			recursive(this.nodeMap[this.rootNode], function (node) {
 				var next = false,
 					p = node.parent;
 				node.visible = true;
-				if (p || p === "") {
+				if (p || p === '') {
 					next = series.nodeMap[p];
 				}
 				return next;
@@ -208,16 +215,14 @@
 			var series = this,
 				options = series.options,
 				childrenTotal = 0,
-				sorted = [],
+				children = [],
 				val,
 				point = series.points[tree.i];
 
 			// First give the children some values
 			each(tree.children, function (child) {
 				child = series.setTreeValues(child);
-				series.insertElementSorted(sorted, child, function (el, el2) {
-					return el.val > el2.val; 
-				});
+				children.push(child);
 
 				if (!child.ignore) {
 					childrenTotal += child.val;
@@ -239,17 +244,21 @@
 					});
 				}
 			});
-
+			// Sort the children
+			stableSort(children, function (a, b) {
+				return a.sortIndex - b.sortIndex;
+			});
 			// Set the values
 			val = pick(point && point.value, childrenTotal);
 			extend(tree, {
-				children: sorted,
+				children: children,
 				childrenTotal: childrenTotal,
 				// Ignore this node if point is not visible
 				ignore: !(pick(point && point.visible, true) && (val > 0)),
 				isLeaf: tree.visible && !childrenTotal,
 				levelDynamic: (options.levelIsConstant ? tree.level : (tree.level - series.nodeMap[series.rootNode].level)),
-				name: pick(point && point.name, ""),
+				name: pick(point && point.name, ''),
+				sortIndex: pick(point && point.sortIndex, -val),
 				val: val
 			});
 			return tree;
@@ -347,7 +356,7 @@
 				}
 			}
 		},
-		alg_func_group: function (h, w, d, p) {
+		algorithmGroup: function (h, w, d, p) {
 			this.height = h;
 			this.width = w;
 			this.plot = p;
@@ -402,7 +411,7 @@
 				this.total = 0;
 			};
 		},
-		alg_func_calcPoints: function (directionChange, last, group, childrenArea) {
+		algorithmCalcPoints: function (directionChange, last, group, childrenArea) {
 			var pX,
 				pY,
 				pW,
@@ -463,7 +472,7 @@
 				group.addElement(keep);
 			}
 		},
-		alg_func_lowAspectRatio: function (directionChange, parent, children) {
+		algorithmLowAspectRatio: function (directionChange, parent, children) {
 			var childrenArea = [],
 				series = this,
 				pTot,
@@ -475,23 +484,23 @@
 				direction = parent.direction,
 				i = 0,
 				end = children.length - 1,
-				group = new this.alg_func_group(parent.height, parent.width, direction, plot);
+				group = new this.algorithmGroup(parent.height, parent.width, direction, plot);
 			// Loop through and calculate all areas
 			each(children, function (child) {
 				pTot = (parent.width * parent.height) * (child.val / parent.val);
 				group.addElement(pTot);
 				if (group.lP.nR > group.lP.lR) {
-					series.alg_func_calcPoints(directionChange, false, group, childrenArea, plot);
+					series.algorithmCalcPoints(directionChange, false, group, childrenArea, plot);
 				}
 				// If last child, then calculate all remaining areas
 				if (i === end) {
-					series.alg_func_calcPoints(directionChange, true, group, childrenArea, plot);
+					series.algorithmCalcPoints(directionChange, true, group, childrenArea, plot);
 				}
 				i = i + 1;
 			});
 			return childrenArea;
 		},
-		alg_func_fill: function (directionChange, parent, children) {
+		algorithmFill: function (directionChange, parent, children) {
 			var childrenArea = [],
 				pTot,
 				direction = parent.direction,
@@ -531,16 +540,16 @@
 			return childrenArea;
 		},
 		strip: function (parent, children) {
-			return this.alg_func_lowAspectRatio(false, parent, children);
+			return this.algorithmLowAspectRatio(false, parent, children);
 		},
 		squarified: function (parent, children) {
-			return this.alg_func_lowAspectRatio(true, parent, children);
+			return this.algorithmLowAspectRatio(true, parent, children);
 		},
 		sliceAndDice: function (parent, children) {
-			return this.alg_func_fill(true, parent, children);
+			return this.algorithmFill(true, parent, children);
 		},
 		stripes: function (parent, children) {
-			return this.alg_func_fill(false, parent, children);
+			return this.algorithmFill(false, parent, children);
 		},
 		translate: function () {
 			var pointValues,
@@ -551,26 +560,24 @@
 			// Call prototype function
 			Series.prototype.translate.call(this);
 
-			if (this.points.length) {
-				// Assign variables
-				this.rootNode = pick(this.options.rootId, "");
-				// Create a object map from level to options
-				this.levelMap = reduce(this.options.levels, function (arr, item) {
-					arr[item.level] = item;
-					return arr;
-				}, {});
-				tree = this.tree = this.getTree(); // @todo Only if series.isDirtyData is true
-
-				// Calculate plotting values.
-				this.axisRatio = (this.xAxis.len / this.yAxis.len);
-				this.nodeMap[""].pointValues = pointValues = {x: 0, y: 0, width: 100, height: 100 };
-				this.nodeMap[""].values = seriesArea = merge(pointValues, {
-					width: (pointValues.width * this.axisRatio),
-					direction: (this.options.layoutStartingDirection === 'vertical' ? 0 : 1),
-					val: tree.val
-				});
-				this.calculateChildrenAreas(tree, seriesArea);
-			}
+			// Assign variables
+			this.rootNode = pick(this.options.rootId, '');
+			// Create a object map from level to options
+			this.levelMap = reduce(this.options.levels, function (arr, item) {
+				arr[item.level] = item;
+				return arr;
+			}, {});
+			tree = this.tree = this.getTree(); // @todo Only if series.isDirtyData is true
+
+			// Calculate plotting values.
+			this.axisRatio = (this.xAxis.len / this.yAxis.len);
+			this.nodeMap[''].pointValues = pointValues = { x: 0, y: 0, width: 100, height: 100 };
+			this.nodeMap[''].values = seriesArea = merge(pointValues, {
+				width: (pointValues.width * this.axisRatio),
+				direction: (this.options.layoutStartingDirection === 'vertical' ? 0 : 1),
+				val: tree.val
+			});
+			this.calculateChildrenAreas(tree, seriesArea);
 
 			// Logic for point colors
 			if (this.colorAxis) {
@@ -605,7 +612,7 @@
 			each(points, function (point) {
 				level = series.levelMap[point.node.levelDynamic];
 				// Set options to new object to avoid problems with scope
-				options = {style: {}};
+				options = { style: {} };
 
 				// If not a leaf, then label should be disabled as default
 				if (!point.node.isLeaf) {
@@ -645,17 +652,14 @@
 				'stroke': point.borderColor || level.borderColor || stateOptions.borderColor || options.borderColor,
 				'stroke-width': pick(point.borderWidth, level.borderWidth, stateOptions.borderWidth, options.borderWidth),
 				'dashstyle': point.borderDashStyle || level.borderDashStyle || stateOptions.borderDashStyle || options.borderDashStyle,
-				'fill': point.color || this.color
+				'fill': point.color || this.color,
+				'zIndex': state === 'hover' ? 1 : 0
 			};
 
-			if (state === 'hover') {
-				attr.zIndex = 1;
-			}
-
 			if (point.node.level <= this.nodeMap[this.rootNode].level) {
 				// Hide levels above the current view
 				attr.fill = 'none';
-				attr["stroke-width"] = 0;
+				attr['stroke-width'] = 0;
 			} else if (!point.node.isLeaf) {
 				// If not a leaf, then remove fill
 				// @todo let users set the opacity
@@ -678,7 +682,7 @@
 				});
 
 			each(points, function (point) {
-				var groupKey = "levelGroup-" + point.node.levelDynamic;
+				var groupKey = 'levelGroup-' + point.node.levelDynamic;
 				if (!series[groupKey]) {
 					series[groupKey] = series.chart.renderer.g(groupKey)
 						.attr({
@@ -704,35 +708,12 @@
 						drillId;
 					if (point.graphic) {
 						drillId = point.drillId = series.options.interactByLeaf ? series.drillToByLeaf(point) : series.drillToByGroup(point);
-						cursor = drillId ? "pointer" : "default";
+						cursor = drillId ? 'pointer' : 'default';
 						point.graphic.css({ cursor: cursor });
 					}
 				});
 			}
 		},
-		/**
-		 * Inserts an element into an array, sorted by a condition.
-		 * Modifies the referenced array
-		 * @param {*[]} arr The array which the element is inserted into.
-		 * @param {*} el The element to insert.
-		 * @param {function} cond The condition to sort on. First parameter is el, second parameter is array element
-		 */
-		insertElementSorted: function (arr, el, cond) {
-			var i = 0,
-				inserted = false;
-			if (arr.length !== 0) {
-				each(arr, function (arrayElement) {
-					if (cond(el, arrayElement) && !inserted) {
-						arr.splice(i, 0, el);
-						inserted = true;
-					}
-					i = i + 1;					
-				});
-			} 
-			if (!inserted) {
-				arr.push(el);
-			}
-		},
 		/**
 		* Add drilling on the suitable points
 		*/
@@ -795,13 +776,13 @@
 				if (node.parent !== null) {
 					drillPoint = this.nodeMap[node.parent];
 				} else {
-					drillPoint = this.nodeMap[""];
+					drillPoint = this.nodeMap[''];
 				}
 			}
 
 			if (drillPoint !== null) {
 				this.drillToNode(drillPoint.id);
-				if (drillPoint.id === "") {
+				if (drillPoint.id === '') {
 					this.drillUpButton = this.drillUpButton.destroy();
 				} else {
 					parent = this.nodeMap[drillPoint.parent];
@@ -884,4 +865,4 @@
 			H.extend(this.xAxis.options, treeAxis);
 		}
 	}));
-}(Highcharts));
+}));

data/app/assets/javascripts/highcharts/themes/grid-light.js

@@ -67,7 +67,7 @@ Highcharts.theme = {
 
 	// General
 	background2: '#F0F0EA'
-	
+
 };
 
 // Apply the theme

data/app/assets/javascripts/highcharts/themes/sand-signika.js

@@ -97,7 +97,7 @@ Highcharts.theme = {
 
 	// General
 	background2: '#E0E0E8'
-	
+
 };
 
 // Apply the theme

data/lib/highcharts/version.rb

@@ -1,3 +1,3 @@
 module Highcharts
-  VERSION = "4.1.9"
+  VERSION = "4.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: highcharts-rails
 version: !ruby/object:Gem::Version
-  version: 4.1.9
+  version: 4.1.10
 platform: ruby
 authors:
 - Per Christian B. Viken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -67,6 +67,7 @@ files:
 - README.markdown
 - Rakefile
 - app/assets/images/highcharts/meteogram-symbols-30px.png
+- app/assets/images/highcharts/search.png
 - app/assets/images/highcharts/skies.jpg
 - app/assets/images/highcharts/snow.png
 - app/assets/images/highcharts/sun.png