Skip to content
This repository was archived by the owner on Sep 1, 2021. It is now read-only.

Commit 44a7d2a

Browse files
Release v4.1.3
1 parent ee2a76b commit 44a7d2a

14 files changed

+66
-39
lines changed

CHANGELOG.markdown

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 4.1.3 / 2015-02-27
2+
3+
* Updated Highcharts to 4.1.3
4+
* Fixed #3900, duplicated Y axis in exported charts. Made export module more testable so it would have caught this error.
5+
* Fixed #3898, zones incorrectly applied if outside axis range.
6+
* Fixed #3895, error in title setter when setting a non-string value.
7+
18
# 4.1.2 / 2015-02-27
29

310
* Updated Highcharts to 4.1.2

app/assets/javascripts/highcharts.js

+14-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// @compilation_level SIMPLE_OPTIMIZATIONS
33

44
/**
5-
* @license Highcharts JS v4.1.2 (2015-02-27)
5+
* @license Highcharts JS v4.1.3 (2015-02-27)
66
*
77
* (c) 2009-2014 Torstein Honsi
88
*
@@ -56,7 +56,7 @@ var UNDEFINED,
5656
charts = [],
5757
chartCount = 0,
5858
PRODUCT = 'Highcharts',
59-
VERSION = '4.1.2',
59+
VERSION = '4.1.3',
6060

6161
// some constants for frequently used strings
6262
DIV = 'div',
@@ -1259,8 +1259,8 @@ defaultOptions = {
12591259
global: {
12601260
useUTC: true,
12611261
//timezoneOffset: 0,
1262-
canvasToolsURL: 'http://code.highcharts.com/4.1.2/modules/canvas-tools.js',
1263-
VMLRadialGradientURL: 'http://code.highcharts.com/4.1.2/gfx/vml-radial-gradient.png'
1262+
canvasToolsURL: 'http://code.highcharts.com/4.1.3/modules/canvas-tools.js',
1263+
VMLRadialGradientURL: 'http://code.highcharts.com/4.1.3/gfx/vml-radial-gradient.png'
12641264
},
12651265
chart: {
12661266
//animation: true,
@@ -2828,7 +2828,7 @@ SVGElement.prototype = {
28282828
titleNode = doc.createElementNS(SVG_NS, 'title');
28292829
this.element.appendChild(titleNode);
28302830
}
2831-
titleNode.textContent = pick(value, '').replace(/<[^>]*>/g, ''); // #3276
2831+
titleNode.textContent = (String(pick(value), '')).replace(/<[^>]*>/g, ''); // #3276 #3895
28322832
},
28332833
textSetter: function (value) {
28342834
if (value !== this.textStr) {
@@ -14279,7 +14279,8 @@ Series.prototype = {
1427914279
zoneAxis = this.zoneAxis || 'y',
1428014280
axis = this[zoneAxis + 'Axis'],
1428114281
reversed = axis.reversed,
14282-
horiz = axis.horiz;
14282+
horiz = axis.horiz,
14283+
ignoreZones = false;
1428314284

1428414285
if (zones.length && (graph || area)) {
1428514286
// The use of the Color Threshold assumes there are no gaps
@@ -14292,6 +14293,10 @@ Series.prototype = {
1429214293
translatedFrom = pick(translatedTo, (reversed ? (horiz ? chart.plotWidth : 0) : (horiz ? 0 : axis.toPixels(axis.min))));
1429314294
translatedTo = mathRound(axis.toPixels(pick(threshold.value, axis.max), true));
1429414295

14296+
if (ignoreZones) {
14297+
translatedFrom = translatedTo = axis.toPixels(axis.max);
14298+
}
14299+
1429514300
if (axis.isXAxis) {
1429614301
clipAttr = {
1429714302
x: reversed ? translatedTo : translatedFrom,
@@ -14345,6 +14350,8 @@ Series.prototype = {
1434514350
series['colorArea' + i].clip(clips[i]);
1434614351
}
1434714352
}
14353+
// if this zone extends out of the axis, ignore the others
14354+
ignoreZones = threshold.value > axis.max;
1434814355
});
1434914356
this.clips = clips;
1435014357
}
@@ -17528,7 +17535,7 @@ if (seriesTypes.column) {
1752817535

1752917536

1753017537
/**
17531-
* Highcharts JS v4.1.2 (2015-02-27)
17538+
* Highcharts JS v4.1.3 (2015-02-27)
1753217539
* Highcharts module to hide overlapping data labels. This module is included by default in Highmaps.
1753317540
*
1753417541
* (c) 2010-2014 Torstein Honsi

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license Highcharts JS v4.1.2 (2015-02-27)
2+
* @license Highcharts JS v4.1.3 (2015-02-27)
33
*
44
* Standalone Highcharts Framework
55
*

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// @compilation_level SIMPLE_OPTIMIZATIONS
33

44
/**
5-
* @license Highcharts JS v4.1.2 (2015-02-27)
5+
* @license Highcharts JS v4.1.3 (2015-02-27)
66
*
77
* (c) 2009-2013 Torstein Hønsi
88
*

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// @compilation_level SIMPLE_OPTIMIZATIONS
33

44
/**
5-
* @license Highcharts JS v4.1.2 (2015-02-27)
5+
* @license Highcharts JS v4.1.3 (2015-02-27)
66
*
77
* (c) 2009-2014 Torstein Honsi
88
*

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

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Highcharts JS v4.1.2 (2015-02-27)
2+
* Highcharts JS v4.1.3 (2015-02-27)
33
* Highcharts Broken Axis module
44
*
55
* Author: Stephane Vanraes, Torstein Honsi
@@ -89,7 +89,6 @@
8989
});
9090

9191
wrap(Axis.prototype, 'init', function (proceed, chart, userOptions) {
92-
9392
// Force Axis to be not-ordinal when breaks are defined
9493
if (userOptions.breaks && userOptions.breaks.length) {
9594
userOptions.ordinal = false;
@@ -142,6 +141,17 @@
142141
return nval;
143142
};
144143

144+
this.setExtremes = function (newMin, newMax, redraw, animation, eventArguments) {
145+
// If trying to set extremes inside a break, extend it to before and after the break ( #3857 )
146+
while (this.isInAnyBreak(newMin)) {
147+
newMin -= this.closestPointRange;
148+
}
149+
while (this.isInAnyBreak(newMax)) {
150+
newMax -= this.closestPointRange;
151+
}
152+
Axis.prototype.setExtremes.call(this, newMin, newMax, redraw, animation, eventArguments);
153+
};
154+
145155
this.setAxisTranslation = function (saveOld) {
146156
Axis.prototype.setAxisTranslation.call(this, saveOld);
147157

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2908,7 +2908,7 @@ if (CanvasRenderingContext2D) {
29082908
});
29092909
}
29102910
}/**
2911-
* @license Highcharts JS v4.1.2 (2015-02-27)
2911+
* @license Highcharts JS v4.1.3 (2015-02-27)
29122912
* CanVGRenderer Extension module
29132913
*
29142914
* (c) 2011-2012 Torstein Honsi, Erik Olsson

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license Highcharts JS v4.1.2 (2015-02-27)
2+
* @license Highcharts JS v4.1.3 (2015-02-27)
33
* Data module
44
*
55
* (c) 2012-2014 Torstein Honsi

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

+23-20
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license Highcharts JS v4.1.2 (2015-02-27)
2+
* @license Highcharts JS v4.1.3 (2015-02-27)
33
* Exporting module
44
*
55
* (c) 2010-2014 Torstein Honsi
@@ -320,10 +320,10 @@ extend(Chart.prototype, {
320320
}
321321
});
322322

323-
// Axis options must be merged in one by one, since it may be an array or an object (#2022)
323+
// Axis options must be merged in one by one, since it may be an array or an object (#2022, #3900)
324324
if (additionalOptions) {
325-
each(['xAxis', 'yAxis'], function (axisType, i) {
326-
each(splat(additionalOptions[axisType]), function (axisOptions) {
325+
each(['xAxis', 'yAxis'], function (axisType) {
326+
each(splat(additionalOptions[axisType]), function (axisOptions, i) {
327327
options[axisType][i] = merge(options[axisType][i], axisOptions);
328328
});
329329
});
@@ -364,30 +364,33 @@ extend(Chart.prototype, {
364364
return svg;
365365
},
366366

367+
getSVGForExport: function (options, chartOptions) {
368+
var chartExportingOptions = this.options.exporting;
369+
370+
return this.getSVG(merge(
371+
{ chart: { borderRadius: 0 } },
372+
chartExportingOptions.chartOptions,
373+
chartOptions,
374+
{
375+
exporting: {
376+
sourceWidth: (options && options.sourceWidth) || chartExportingOptions.sourceWidth,
377+
sourceHeight: (options && options.sourceHeight) || chartExportingOptions.sourceHeight
378+
}
379+
}
380+
));
381+
},
382+
367383
/**
368384
* Submit the SVG representation of the chart to the server
369385
* @param {Object} options Exporting options. Possible members are url, type, width and formAttributes.
370386
* @param {Object} chartOptions Additional chart options for the SVG representation of the chart
371387
*/
372388
exportChart: function (options, chartOptions) {
373-
options = options || {};
374-
375-
var chart = this,
376-
chartExportingOptions = chart.options.exporting,
377-
svg = chart.getSVG(merge(
378-
{ chart: { borderRadius: 0 } },
379-
chartExportingOptions.chartOptions,
380-
chartOptions,
381-
{
382-
exporting: {
383-
sourceWidth: options.sourceWidth || chartExportingOptions.sourceWidth,
384-
sourceHeight: options.sourceHeight || chartExportingOptions.sourceHeight
385-
}
386-
}
387-
));
389+
390+
var svg = this.getSVGForExport(options, chartOptions);
388391

389392
// merge the options
390-
options = merge(chart.options.exporting, options);
393+
options = merge(this.options.exporting, options);
391394

392395
// do the post
393396
Highcharts.post(options.url, {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license Highcharts JS v4.1.2 (2015-02-27)
2+
* @license Highcharts JS v4.1.3 (2015-02-27)
33
*
44
* (c) 2011-2014 Torstein Honsi
55
*

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license Highcharts JS v4.1.2 (2015-02-27)
2+
* @license Highcharts JS v4.1.3 (2015-02-27)
33
* Plugin for displaying a message when there is no data visible in chart.
44
*
55
* (c) 2010-2014 Highsoft AS

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license Highcharts JS v4.1.2 (2015-02-27)
2+
* @license Highcharts JS v4.1.3 (2015-02-27)
33
* Solid angular gauge module
44
*
55
* (c) 2010-2014 Torstein Honsi

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license Highcharts JS v4.1.2 (2015-02-27)
2+
* @license Highcharts JS v4.1.3 (2015-02-27)
33
*
44
* (c) 2014 Highsoft AS
55
* Authors: Jon Arild Nygard / Oystein Moseng

lib/highcharts/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Highcharts
2-
VERSION = "4.1.2"
2+
VERSION = "4.1.3"
33
end

0 commit comments

Comments
 (0)