Merge remote-tracking branch 'origin/master' into krevje

# Conflicts: # build.properties # gulpfile.js # js/highcharts-3d.src.js # js/highcharts-more.src.js # js/highcharts.src.js # js/highmaps.src.js # js/highstock.src.js # js/modules/annotations.src.js # js/modules/drilldown.src.js # js/modules/heatmap.src.js # js/modules/map.src.js # js/parts-map/MapPointSeries.js # js/parts-map/MapSeries.js # js/parts-more/RadialAxis.js # js/parts-more/WaterfallSeries.js # js/parts/Axis.js # js/parts/Dynamics.js # js/parts/Html.js # js/parts/Interaction.js # js/parts/Scrollbar.js # js/parts/SvgRenderer.js # js/parts/Utilities.js # lib/highcharts-3d.js # lib/highcharts-3d.src.js # lib/highcharts-more.js # lib/highcharts-more.src.js # lib/highcharts.js # lib/highcharts.src.js # lib/highmaps.js # lib/highmaps.src.js # lib/highstock.js # lib/highstock.src.js # lib/modules/boost.js # lib/modules/boost.src.js # lib/modules/broken-axis.src.js # lib/modules/canvas-tools.js # lib/modules/canvas-tools.src.js # lib/modules/data.js # lib/modules/data.src.js # lib/modules/drilldown.js # lib/modules/drilldown.src.js # lib/modules/exporting.js # lib/modules/exporting.src.js # lib/modules/heatmap.js # lib/modules/heatmap.src.js # lib/modules/map.js # lib/modules/map.src.js # lib/modules/no-data-to-display.js # lib/modules/no-data-to-display.src.js # lib/modules/offline-exporting.js # lib/modules/offline-exporting.src.js # lib/modules/solid-gauge.js # lib/modules/solid-gauge.src.js # lib/modules/treemap.js # lib/modules/treemap.src.js # samples/highcharts/accessibility/accessible-datetime/demo.js # samples/highcharts/css/exporting/demo.js # samples/highcharts/demo/gauge-clock/demo.js # samples/highcharts/studies/tooltip-split/demo.js # samples/issues/highmaps-1.1.9/4784-allareas-disabled-centers-map/demo.js # samples/maps/demo/map-bubble/demo.js # samples/maps/plotoptions/mapbubble-allowpointselect/demo.js # samples/maps/plotoptions/mapbubble-animation-false/demo.js # samples/maps/plotoptions/mapbubble-color/demo.js # samples/maps/plotoptions/mapbubble-negativecolor/demo.js # samples/unit-tests/utilities/utilities/demo.js # utils/issue-by-commit/main.php
highcharts · Sep 21, 2016 · d42b8c0 · d42b8c0
2 parents ad86031 + 7922d4a
commit d42b8c0
Show file tree

Hide file tree

Showing 621 changed files with 17,546 additions and 3,708 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,6 +54,7 @@ nbproject/
 *.access_log
 
 *.log
+*.patch
 samples/highcharts/common-js/browserify/demo.js
 samples/highcharts/common-js/webpack/demo.js
 /samples/cloud/charts
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "highcharts",
-    "version": "4.2.6",
+    "version": "4.2.7",
     "description": "JavaScript charting framework",
     "main": "lib/highcharts.js",
     "authors": [

diff --git a/changelog-highcharts.htm b/changelog-highcharts.htm
diff --git a/changelog-highmaps.htm b/changelog-highmaps.htm
@@ -1,20 +1,24 @@
-<p>Highmaps 4.2.6 (2016-08-02)</p>
-<ul>
-    <li>Most changes listed under Highcharts 4.2.6 above also apply to Highmaps 4.2.6.</li>
+<p>Highmaps 4.2.7 (2016-09-21)</p>
+<ul>    <li>Most changes listed under Highcharts 4.2.7 above also apply to Highmaps 4.2.7.</li>
+    <li>Added new option, <a href="http://api.highcharts.com/highmaps/colorAxis.showInLegend">colorAxis.showInLegend</a>.</li>
+    <li>Added new option, <a href="http://api.highcharts.com/highmaps/plotOptions.map.nullInteraction">series.nullInteraction</a> to allow tooltips and mouse events on null points.</li>
 </ul>
 <div id="accordion" class="panel-group">
     <div class="panel panel-default">
-        <div id="hm-heading-4-2-6-bug-fixes" class="panel-heading">
+        <div id="hm-heading-4-2-7-bug-fixes" class="panel-heading">
             <h4 class="panel-title">
-                <a href="#hm-4-2-6-bug-fixes" data-toggle="collapse" data-parent="#accordion">
+                <a href="#hm-4-2-7-bug-fixes" data-toggle="collapse" data-parent="#accordion">
                     Bug fixes
                 </a>
             </h4>
         </div>
-        <div id="hm-4-2-6-bug-fixes" class="panel-collapse collapse">
+        <div id="hm-4-2-7-bug-fixes" class="panel-collapse collapse">
             <div class="panel-body">
                 <ul>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5011">#5011</a>, mousewheel zoom also scrolled page.</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5201">#5201</a>, lineWidth ignored for mapline in IE11.</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5685">#5685</a>, axis padding was not included when zooming out.</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5694">#5694</a>, issue with line width on latlon mappoints.</li>
+
                 </ul>
             </div>
         </div>

diff --git a/changelog-highstock.htm b/changelog-highstock.htm
@@ -1,35 +1,32 @@
-<p>Highstock 4.2.6 (2016-08-02)</p>
-<ul>
-    <li>Most changes listed under Highcharts 4.2.6 above also apply to Highstock 4.2.6.</li>
-    <li>Added new option set, <a href="http://api.highcharts.com/highstock#yAxis.scrollbar">yAxis.scrollbar</a>, to allow scrollbars on Y axis (or in fact any axis) in Highstock.</li>
-    <li>Refactored sideways graph animation to allow smooth navigation when clicking scrollbar buttons, adding multiple points etc.</li>
+<p>Highstock 4.2.7 (2016-09-21)</p>
+<ul>    <li>Most changes listed under Highcharts 4.2.7 above also apply to Highstock 4.2.7.</li>
+    <li>Added <code>Series.dataGroupInfo</code> to allow accessing data grouping information from the <a href="http://api.highcharts.com/highstock/plotOptions.series.dataGrouping.approximation">approximation</a> function.</li>
+    <li>Added warning on trying to update grouped point.</li>
 </ul>
 <div id="accordion" class="panel-group">
     <div class="panel panel-default">
-        <div id="hs-heading-4-2-6-bug-fixes" class="panel-heading">
+        <div id="hs-heading-4-2-7-bug-fixes" class="panel-heading">
             <h4 class="panel-title">
-                <a href="#hs-4-2-6-bug-fixes" data-toggle="collapse" data-parent="#accordion">
+                <a href="#hs-4-2-7-bug-fixes" data-toggle="collapse" data-parent="#accordion">
                     Bug fixes
                 </a>
             </h4>
         </div>
-        <div id="hs-4-2-6-bug-fixes" class="panel-collapse collapse">
+        <div id="hs-4-2-7-bug-fixes" class="panel-collapse collapse">
             <div class="panel-body">
                 <ul>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/687">#687</a>, first value of compare chart should be the last of the previous range.</li>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5316">#5316</a>, wrong columns and ticks after toggling ordinal setting with axis update.</li>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5323">#5323</a>, regression causing JS error on redrawing empty stock chart.</li>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5330">#5330</a>, JS error when enabling range selector in Chart constructor.</li>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5395">#5395</a>, animation mixed up on navigator and range selector.</li>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5414">#5414</a>, navigator series updated wrong on addPoint when data grouping was disabled.</li>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5453">#5453</a>, unresponsive first drag on navigator.</li>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5477">#5477</a>, error on first mouse hover with crosshairs.</li>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5485">#5485</a>, setCompare did not affect exported chart.</li>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5489">#5489</a>, a regression causing data grouping on range selector buttons to fail.</li>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/4222">#4222</a>, flag's title wasn't updated with <code>Point.update</code>.</li>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5388">#5388</a>, performance hit when running a forced data grouping with a lot of empty groups.</li>
-                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5390">#5390</a>, navigator series wasn't updated when chart initialized without series.</li>
-
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5635">#5635</a>, regression causing background images on flags to fail.</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5493">#5493</a>, hidden series with data grouping caused wrong extremes on xAxis.</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/2049">#2049</a>, flags were misplaced when using more than one column-type series.</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/3228">#3228</a>, inputs in range selector didn't allow to view the historical data in lazy loading.</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/3961">#3961</a>, bubble series caused JavaScript errors in Highstock.</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/3111">#3111</a>, column series were clipped off when resizing chart during initial animation.</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/3112">#3112</a>, compare for candlestick.</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5231">#5231</a>, input fields not receiving focus after showing hidden chart</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5600">#5600</a>, YTD button was disabled when all the data was within the same year.</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5686">#5686</a>, <code>scrollbar.minWidth</code> option causes misplacement for a scrollbar bar.</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5699">#5699</a>, column series dissapeared when added after chart initialization and using navigator.</li>
+                    <li>Fixed <a href="https://github.com/highslide-software/highcharts.com/issues/5702">#5702</a>, crosshair label's anchor was misplaced during mouse move.</li>
                 </ul>
             </div>
         </div>

diff --git a/exporting-server/readme.md b/exporting-server/readme.md
@@ -1,5 +1,5 @@
 # The Highcharts export server has moved
-We decided to move the code for the export servers for Java, PhantomJS and PHP to it's own repository [highcharts-export-server](highcharts-export-server).
+We decided to move the code for the export servers for Java, PhantomJS and PHP to its own repository [highcharts-export-server](https://github.com/highcharts/highcharts-export-server).
 You'll find the repository here, https://github.com/highcharts/highcharts-export-server.
 
 You will find documentation for getting started and setting up the server [here](http://www.highcharts.com/docs/export-module/export-module-overview)  
diff --git a/gulpfile.js b/gulpfile.js
@@ -267,7 +267,8 @@ gulp.task('nightly', function () {
 
 gulp.task('filesize', function () {
     var oldSize,
-        newSize;
+        newSize,
+        filename = argv.file ? argv.file : 'highcharts.src.js';
 
     /**
      * Pad a string to a given length by adding spaces to the beginning
@@ -289,7 +290,7 @@ gulp.task('filesize', function () {
             color = diff > 0 ? 'yellow' : 'green';
         console.log([
             '',
-            colors.cyan('highcharts.js ') + colors.gray('(gzipped)'),
+            colors.cyan(filename.replace('.src', '')) + colors.gray('(gzipped)'),
             'HEAD: ' + pad(oldSize.toLocaleString(), 7) + ' B',
             'New:  ' + pad(newSize.toLocaleString(), 7) + ' B',
             colors[color]('Diff: ' + pad(sign + diff, 7) + ' B'),
@@ -298,7 +299,7 @@ gulp.task('filesize', function () {
     }
 
     closureCompiler.compile(
-        ['code/highcharts.src.js'],
+        ['js/' + filename],
         null,
         function (error, ccResult) {
             if (ccResult) {
@@ -311,7 +312,7 @@ gulp.task('filesize', function () {
                     }
 
                     closureCompiler.compile(
-                        ['code/highcharts.src.js'],
+                        ['js/' + filename],
                         null,
                         function (ccError, ccResultOld) {
                             if (ccResultOld) {

diff --git a/js/modules/accessibility.src.js b/js/modules/accessibility.src.js
@@ -138,7 +138,7 @@ import '../parts/Tooltip.js';
 			a11yOptions = this.series.chart.options.accessibility,
 			infoString = '',
 			hasSpecialKey = false,
-			dateTimePoint = point.series.xAxis.isDatetimeAxis,
+			dateTimePoint = point.series.xAxis && point.series.xAxis.isDatetimeAxis,
 			timeDesc = dateTimePoint && dateFormat(a11yOptions.pointDateFormatter && a11yOptions.pointDateFormatter(point) || a11yOptions.pointDateFormat || // docs
 				H.Tooltip.prototype.getXDateFormat(point, point.series.chart.options.tooltip, point.series.xAxis), point.x);
 

diff --git a/js/modules/data.src.js b/js/modules/data.src.js
@@ -762,6 +762,9 @@ import '../parts/Chart.js';
 					chartOptions.xAxis = {
 						type: type
 					};
+					if (type === 'category') {
+						chartOptions.xAxis.nameToX = false;
+					}
 				}
 
 				if (options.complete) {

diff --git a/js/modules/drilldown.src.js b/js/modules/drilldown.src.js
@@ -273,7 +273,7 @@ import '../parts/Tick.js';
 			.addClass('highcharts-drillup-button')
 			.attr({
 				align: buttonOptions.position.align,
-				zIndex: 9
+				zIndex: 7
 			})
 			.add()
 			.align(buttonOptions.position, false, buttonOptions.relativeTo || 'plotBox');
@@ -543,14 +543,16 @@ import '../parts/Tick.js';
 						animateTo.fill = point.color;
 						/*= } =*/
 
-						point.graphic
-							.attr(H.merge(animateFrom, {
-								start: start + i * startAngle,
-								end: start + (i + 1) * startAngle
-							}))[animationOptions ? 'animate' : 'attr'](
-								animateTo, 
-								animationOptions
-							);
+						if (point.graphic) {
+							point.graphic
+								.attr(H.merge(animateFrom, {
+									start: start + i * startAngle,
+									end: start + (i + 1) * startAngle
+								}))[animationOptions ? 'animate' : 'attr'](
+									animateTo, 
+									animationOptions
+								);
+						}
 					});
 					this.animate = null;
 				}
@@ -643,9 +645,10 @@ import '../parts/Tick.js';
 		var pos = this.pos,
 			label = this.label,
 			axis = this.axis,
-			ddPointsX = axis.getDDPoints(pos);
+			isDrillable = axis.coll === 'xAxis' && axis.getDDPoints,
+			ddPointsX = isDrillable && axis.getDDPoints(pos);
 
-		if (axis.coll === 'xAxis') {
+		if (isDrillable) {
 			if (label && ddPointsX.length) {
 				label.drillable = true;