highcharts-rails 3.0.9 → 3.0.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- checksums.yaml.gz.asc +13 -13
- data.tar.gz.asc +13 -13
- data/CHANGELOG.markdown +66 -0
- data/app/assets/javascripts/highcharts.js +2404 -2172
- data/app/assets/javascripts/highcharts/adapters/mootools-adapter.js +1 -1
- data/app/assets/javascripts/highcharts/adapters/prototype-adapter.js +1 -1
- data/app/assets/javascripts/highcharts/adapters/standalone-framework.js +13 -15
- data/app/assets/javascripts/highcharts/highcharts-more.js +37 -17
- data/app/assets/javascripts/highcharts/modules/canvas-tools.js +1 -1
- data/app/assets/javascripts/highcharts/modules/data.js +71 -66
- data/app/assets/javascripts/highcharts/modules/drilldown.js +198 -99
- data/app/assets/javascripts/highcharts/modules/exporting.js +1 -1
- data/app/assets/javascripts/highcharts/modules/funnel.js +28 -8
- data/app/assets/javascripts/highcharts/modules/no-data-to-display.js +4 -2
- data/app/assets/javascripts/highcharts/themes/gray.js +2 -2
- data/lib/highcharts/version.rb +1 -1
- metadata +2 -2
- metadata.gz.asc +13 -13
@@ -27,7 +27,7 @@ defaultPlotOptions.funnel = merge(defaultPlotOptions.pie, {
|
|
27
27
|
neckWidth: '30%',
|
28
28
|
height: '100%',
|
29
29
|
neckHeight: '25%',
|
30
|
-
|
30
|
+
reversed: false,
|
31
31
|
dataLabels: {
|
32
32
|
//position: 'right',
|
33
33
|
connectorWidth: 1,
|
@@ -48,6 +48,7 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
|
|
48
48
|
|
49
49
|
type: 'funnel',
|
50
50
|
animate: noop,
|
51
|
+
singularTooltips: true,
|
51
52
|
|
52
53
|
/**
|
53
54
|
* Overrides the pie translate method
|
@@ -65,10 +66,11 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
|
|
65
66
|
sum = 0,
|
66
67
|
series = this,
|
67
68
|
chart = series.chart,
|
69
|
+
options = series.options,
|
70
|
+
reversed = options.reversed,
|
68
71
|
plotWidth = chart.plotWidth,
|
69
72
|
plotHeight = chart.plotHeight,
|
70
73
|
cumulative = 0, // start at top
|
71
|
-
options = series.options,
|
72
74
|
center = options.center,
|
73
75
|
centerX = getLength(center[0], plotWidth),
|
74
76
|
centerY = getLength(center[0], plotHeight),
|
@@ -99,7 +101,7 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
|
|
99
101
|
neckWidth + (width - neckWidth) * ((height - neckHeight - y) / (height - neckHeight));
|
100
102
|
};
|
101
103
|
series.getX = function (y, half) {
|
102
|
-
|
104
|
+
return centerX + (half ? -1 : 1) * ((getWidthAt(reversed ? plotHeight - y : y) / 2) + options.dataLabels.distance);
|
103
105
|
};
|
104
106
|
|
105
107
|
// Expose
|
@@ -163,6 +165,11 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
|
|
163
165
|
y3 = neckY;
|
164
166
|
}
|
165
167
|
|
168
|
+
if (reversed) {
|
169
|
+
y1 = height - y1;
|
170
|
+
y3 = height - y3;
|
171
|
+
y5 = (y5 ? height - y5 : null);
|
172
|
+
}
|
166
173
|
// save the path
|
167
174
|
path = [
|
168
175
|
'M',
|
@@ -199,10 +206,7 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
|
|
199
206
|
point.half = half;
|
200
207
|
|
201
208
|
cumulative += fraction;
|
202
|
-
});
|
203
|
-
|
204
|
-
|
205
|
-
series.setTooltipPoints();
|
209
|
+
});
|
206
210
|
},
|
207
211
|
/**
|
208
212
|
* Draw a single point (wedge)
|
@@ -239,7 +243,11 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
|
|
239
243
|
/**
|
240
244
|
* Funnel items don't have angles (#2289)
|
241
245
|
*/
|
242
|
-
sortByAngle:
|
246
|
+
sortByAngle: function (points) {
|
247
|
+
points.sort(function (a, b) {
|
248
|
+
return a.plotY - b.plotY;
|
249
|
+
});
|
250
|
+
},
|
243
251
|
|
244
252
|
/**
|
245
253
|
* Extend the pie data label method
|
@@ -285,5 +293,17 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
|
|
285
293
|
|
286
294
|
});
|
287
295
|
|
296
|
+
/**
|
297
|
+
* Pyramid series type.
|
298
|
+
* A pyramid series is a special type of funnel, without neck and reversed by default.
|
299
|
+
*/
|
300
|
+
defaultOptions.plotOptions.pyramid = Highcharts.merge(defaultOptions.plotOptions.funnel, {
|
301
|
+
neckWidth: '0%',
|
302
|
+
neckHeight: '0%',
|
303
|
+
reversed: true
|
304
|
+
});
|
305
|
+
Highcharts.seriesTypes.pyramid = Highcharts.extendClass(Highcharts.seriesTypes.funnel, {
|
306
|
+
type: 'pyramid'
|
307
|
+
});
|
288
308
|
|
289
309
|
}(Highcharts));
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/**
|
2
|
-
* @license Highcharts JS v3.0.
|
2
|
+
* @license Highcharts JS v3.0.10 (2014-03-10)
|
3
3
|
* Plugin for displaying a message when there is no data visible in chart.
|
4
4
|
*
|
5
5
|
* (c) 2010-2014 Highsoft AS
|
@@ -44,7 +44,9 @@
|
|
44
44
|
return !!this.points.length; /* != 0 */
|
45
45
|
}
|
46
46
|
|
47
|
-
seriesTypes.pie
|
47
|
+
if (seriesTypes.pie) {
|
48
|
+
seriesTypes.pie.prototype.hasData = hasDataPie;
|
49
|
+
}
|
48
50
|
|
49
51
|
if (seriesTypes.gauge) {
|
50
52
|
seriesTypes.gauge.prototype.hasData = hasDataPie;
|
@@ -15,7 +15,7 @@ Highcharts.theme = {
|
|
15
15
|
]
|
16
16
|
},
|
17
17
|
borderWidth: 0,
|
18
|
-
borderRadius:
|
18
|
+
borderRadius: 0,
|
19
19
|
plotBackgroundColor: null,
|
20
20
|
plotShadow: false,
|
21
21
|
plotBorderWidth: 0
|
@@ -102,7 +102,7 @@ Highcharts.theme = {
|
|
102
102
|
|
103
103
|
plotOptions: {
|
104
104
|
series: {
|
105
|
-
|
105
|
+
nullColor: '#444444'
|
106
106
|
},
|
107
107
|
line: {
|
108
108
|
dataLabels: {
|
data/lib/highcharts/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: highcharts-rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.
|
4
|
+
version: 3.0.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Per Christian B. Viken
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-03-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: railties
|
metadata.gz.asc
CHANGED
@@ -2,17 +2,17 @@
|
|
2
2
|
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
|
3
3
|
Comment: GPGTools - http://gpgtools.org
|
4
4
|
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
/
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
=
|
5
|
+
iQIcBAABAgAGBQJTHr6JAAoJEH1ncb0Txu7XTCEP+gOjIMHaFGDvK98B4g03ohZL
|
6
|
+
PceG6Qy3SZXU4m0dUNmwcm1lNIDbDrd3zz5x8WGq8JOPF9NNoGt7x8UcLQdtzAsF
|
7
|
+
aEoFTjuyenqgUXbEfAp000oJMcU+vdw6c2Oxh7ayX69X/JasbJDE7lTa1S442b/j
|
8
|
+
YdNI5qqSyiPAvB0EDPlkWhF/QegBzLWDV+pdYi4di1bufn4f7WxpZaBN/+A1ZX9F
|
9
|
+
TjxBRRrelnx0hUDi/GfjpnPN38wlluMoO9q7r+KvWfxcPfsaYGtX0SofRcIeul6L
|
10
|
+
/gokmitKUfUUF3t9cR1VaF15Uv9EqG3Hm6zzQ1jSKj2++r2irX0nHUkPasSaQqLp
|
11
|
+
O4A+TNUjmJ0uTed9TibZBxACd24c4MJuFr4bW20aDAZNF8oWAhwfvPP8H3z/774z
|
12
|
+
sFmDOydQUSnD9/cc/MDIwv7aTnMWMMjE50XXTKxqRyMIlBuq3Yvr0ceavgECxE7c
|
13
|
+
ThwlV7wEbxwQBw3/P8YyFkEpqugwYAdfoAgK+RS2VzvwMBjX1nA3ZN4gTD8Yhxh6
|
14
|
+
TO1vnhwoV+ucSK39chmvWtfMR/LAktIUuCxvDl2bUaNllqiC2lKI1XXavfNMUBhi
|
15
|
+
PD93ZTuAnt4+P/g38SB7qH63BFzGSdDl25wNOAZhhCjrhHmV41Msq5pn3ryPD0uT
|
16
|
+
8ULiOuvc460T7Z4hE58o
|
17
|
+
=cD1y
|
18
18
|
-----END PGP SIGNATURE-----
|