amcharts.rb 3.2.0.2 → 3.4.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (30) hide show
  1. checksums.yaml +8 -8
  2. data/lib/amcharts.rb +1 -1
  3. data/lib/amcharts/version.rb +1 -1
  4. data/lib/tasks/amcharts.thor +27 -10
  5. data/vendor/assets/images/amcharts/dragIconBlack.gif +0 -0
  6. data/vendor/assets/images/amcharts/dragIconHBlack.gif +0 -0
  7. data/vendor/assets/images/amcharts/export.png +0 -0
  8. data/vendor/assets/images/amcharts/exportWhite.png +0 -0
  9. data/vendor/assets/images/amcharts/lensWhite.png +0 -0
  10. data/vendor/assets/images/amcharts/patterns/black/pattern1.png +0 -0
  11. data/vendor/assets/images/amcharts/patterns/black/pattern2.png +0 -0
  12. data/vendor/assets/images/amcharts/patterns/black/pattern3.png +0 -0
  13. data/vendor/assets/javascripts/amcharts/amcharts.js +337 -321
  14. data/vendor/assets/javascripts/amcharts/amstock.js +88 -85
  15. data/vendor/assets/javascripts/amcharts/changeLog.txt +265 -168
  16. data/vendor/assets/javascripts/amcharts/exporting/amexport.js +73 -72
  17. data/vendor/assets/javascripts/amcharts/exporting/filesaver.js +3 -2
  18. data/vendor/assets/javascripts/amcharts/funnel.js +7 -7
  19. data/vendor/assets/javascripts/amcharts/gauge.js +18 -16
  20. data/vendor/assets/javascripts/amcharts/pie.js +10 -9
  21. data/vendor/assets/javascripts/amcharts/radar.js +5 -5
  22. data/vendor/assets/javascripts/amcharts/serial.js +52 -49
  23. data/vendor/assets/javascripts/amcharts/themes/black.js +206 -0
  24. data/vendor/assets/javascripts/amcharts/themes/chalk.js +216 -0
  25. data/vendor/assets/javascripts/amcharts/themes/dark.js +205 -0
  26. data/vendor/assets/javascripts/amcharts/themes/light.js +197 -0
  27. data/vendor/assets/javascripts/amcharts/themes/patterns.js +259 -0
  28. data/vendor/assets/javascripts/amcharts/xy.js +17 -17
  29. data/vendor/assets/stylesheets/amcharts/style.css +20 -12
  30. metadata +12 -2
@@ -0,0 +1,259 @@
1
+ AmCharts.themes.patterns = {
2
+
3
+ themeName:"patterns",
4
+
5
+ AmChart: {
6
+ color: "#000000"
7
+ },
8
+
9
+ AmCoordinateChart: {
10
+ colors:["#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000"],
11
+ patterns:[
12
+ {"url":"../amcharts/patterns/black/pattern1.png", "width":4, "height":4},
13
+ {"url":"../amcharts/patterns/black/pattern2.png", "width":4, "height":4},
14
+ {"url":"../amcharts/patterns/black/pattern3.png", "width":4, "height":4},
15
+ {"url":"../amcharts/patterns/black/pattern4.png", "width":4, "height":4},
16
+ {"url":"../amcharts/patterns/black/pattern5.png", "width":4, "height":4},
17
+ {"url":"../amcharts/patterns/black/pattern6.png", "width":4, "height":4},
18
+ {"url":"../amcharts/patterns/black/pattern7.png", "width":4, "height":4},
19
+ {"url":"../amcharts/patterns/black/pattern8.png", "width":4, "height":4},
20
+ {"url":"../amcharts/patterns/black/pattern9.png", "width":4, "height":4},
21
+ {"url":"../amcharts/patterns/black/pattern10.png", "width":4, "height":4},
22
+ {"url":"../amcharts/patterns/black/pattern11.png", "width":4, "height":4},
23
+ {"url":"../amcharts/patterns/black/pattern12.png", "width":4, "height":4},
24
+ {"url":"../amcharts/patterns/black/pattern13.png", "width":4, "height":4},
25
+ {"url":"../amcharts/patterns/black/pattern14.png", "width":4, "height":4},
26
+ {"url":"../amcharts/patterns/black/pattern15.png", "width":4, "height":4},
27
+ {"url":"../amcharts/patterns/black/pattern16.png", "width":4, "height":4},
28
+ {"url":"../amcharts/patterns/black/pattern17.png", "width":4, "height":4},
29
+ {"url":"../amcharts/patterns/black/pattern18.png", "width":4, "height":4},
30
+ {"url":"../amcharts/patterns/black/pattern19.png", "width":4, "height":4},
31
+ {"url":"../amcharts/patterns/black/pattern20.png", "width":4, "height":4},
32
+ {"url":"../amcharts/patterns/black/pattern21.png", "width":4, "height":4}]
33
+ },
34
+
35
+
36
+ AmStockChart: {
37
+ colors:["#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000"]
38
+ },
39
+
40
+ AmPieChart: {
41
+ depth3D:0,
42
+ angle:0,
43
+ labelRadius:10
44
+ },
45
+
46
+ AmSlicedChart: {
47
+ outlineAlpha: 0.3,
48
+ colors:["#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000","#000000"],
49
+ outlineThickness: 1,
50
+ outlineColor:"#000000",
51
+ labelTickColor: "#000000",
52
+ labelTickAlpha: 0.3,
53
+ patterns:[
54
+ {"url":"../amcharts/patterns/black/pattern1.png", "width":4, "height":4},
55
+ {"url":"../amcharts/patterns/black/pattern2.png", "width":4, "height":4},
56
+ {"url":"../amcharts/patterns/black/pattern3.png", "width":4, "height":4},
57
+ {"url":"../amcharts/patterns/black/pattern4.png", "width":4, "height":4},
58
+ {"url":"../amcharts/patterns/black/pattern5.png", "width":4, "height":4},
59
+ {"url":"../amcharts/patterns/black/pattern6.png", "width":4, "height":4},
60
+ {"url":"../amcharts/patterns/black/pattern7.png", "width":4, "height":4},
61
+ {"url":"../amcharts/patterns/black/pattern8.png", "width":4, "height":4},
62
+ {"url":"../amcharts/patterns/black/pattern9.png", "width":4, "height":4},
63
+ {"url":"../amcharts/patterns/black/pattern10.png", "width":4, "height":4},
64
+ {"url":"../amcharts/patterns/black/pattern11.png", "width":4, "height":4},
65
+ {"url":"../amcharts/patterns/black/pattern12.png", "width":4, "height":4},
66
+ {"url":"../amcharts/patterns/black/pattern13.png", "width":4, "height":4},
67
+ {"url":"../amcharts/patterns/black/pattern14.png", "width":4, "height":4},
68
+ {"url":"../amcharts/patterns/black/pattern15.png", "width":4, "height":4},
69
+ {"url":"../amcharts/patterns/black/pattern16.png", "width":4, "height":4},
70
+ {"url":"../amcharts/patterns/black/pattern17.png", "width":4, "height":4},
71
+ {"url":"../amcharts/patterns/black/pattern18.png", "width":4, "height":4},
72
+ {"url":"../amcharts/patterns/black/pattern19.png", "width":4, "height":4},
73
+ {"url":"../amcharts/patterns/black/pattern20.png", "width":4, "height":4},
74
+ {"url":"../amcharts/patterns/black/pattern21.png", "width":4, "height":4}]
75
+ },
76
+
77
+ AmRectangularChart: {
78
+ zoomOutButtonColor: '#000000',
79
+ zoomOutButtonRollOverAlpha: 0.15,
80
+ zoomOutButtonImage: "lens.png"
81
+ },
82
+
83
+
84
+
85
+ AxisBase: {
86
+ axisColor: "#000000",
87
+ axisAlpha: 0.3,
88
+ gridAlpha: 0.05,
89
+ gridColor: "#000000"
90
+ },
91
+
92
+ ChartScrollbar: {
93
+ backgroundColor: "#000000",
94
+ backgroundAlpha: 0.13,
95
+ graphFillAlpha: 0.4,
96
+ selectedGraphFillAlpha: 0.7,
97
+ graphLineAlpha: 0,
98
+ selectedBackgroundColor: "#FFFFFF",
99
+ selectedBackgroundAlpha: 0.9,
100
+ gridAlpha: 0.15
101
+ },
102
+
103
+ ChartCursor: {
104
+ cursorColor: "#000000",
105
+ color: "#FFFFFF",
106
+ cursorAlpha: 0.5
107
+ },
108
+
109
+ AmLegend: {
110
+ color: "#000000",
111
+ markerBorderAlpha:0.1,
112
+ markerSize:20,
113
+ switchColor:"#000000"
114
+ },
115
+
116
+ AmGraph: {
117
+ lineAlpha: 0.4,
118
+ fillAlphas:0.5
119
+ },
120
+
121
+ AmAngularGauge:{
122
+ faceAlpha:0.5,
123
+ facePattern:{"url":"../amcharts/patterns/black/pattern1.png", "width":4, "height":4}
124
+ },
125
+
126
+
127
+ GaugeArrow: {
128
+ color: "#000000",
129
+ alpha: 1,
130
+ nailAlpha: 1,
131
+ innerRadius: "0%",
132
+ nailRadius: 15,
133
+ startWidth: 15,
134
+ borderAlpha: 1,
135
+ radius:"70%",
136
+ nailBorderAlpha: 1
137
+ },
138
+
139
+ GaugeAxis: {
140
+ tickColor: "#000000",
141
+ tickAlpha: 1,
142
+ tickLength: 15,
143
+ minorTickLength: 8,
144
+ axisThickness: 1,
145
+ axisColor: '#000000',
146
+ axisAlpha: 1,
147
+ bandAlpha: 1
148
+ },
149
+
150
+ TrendLine: {
151
+ lineColor: "#c03246",
152
+ lineAlpha: 0.8
153
+ },
154
+
155
+ // ammap
156
+ AreasSettings: {
157
+ alpha: 0.8,
158
+ color: "#000000",
159
+ colorSolid: "#000000",
160
+ unlistedAreasAlpha: 0.4,
161
+ unlistedAreasColor: "#000000",
162
+ outlineColor: "#FFFFFF",
163
+ outlineAlpha: 0.5,
164
+ outlineThickness: 0.5,
165
+ rollOverColor: "#3c5bdc",
166
+ rollOverOutlineColor: "#FFFFFF",
167
+ selectedOutlineColor: "#FFFFFF",
168
+ selectedColor: "#f15135",
169
+ unlistedAreasOutlineColor: "#FFFFFF",
170
+ unlistedAreasOutlineAlpha: 0.5
171
+ },
172
+
173
+ LinesSettings: {
174
+ color: "#000000",
175
+ alpha: 0.8
176
+ },
177
+
178
+ ImagesSettings: {
179
+ alpha: 0.8,
180
+ labelColor: "#000000",
181
+ color: "#000000",
182
+ labelRollOverColor: "#3c5bdc"
183
+ },
184
+
185
+ ZoomControl: {
186
+ buttonRollOverColor: "#3c5bdc",
187
+ buttonFillColor: "#f15135",
188
+ buttonFillAlpha: 0.8,
189
+ buttonBorderColor: "#000000",
190
+ gridBackgroundColor: "#000000",
191
+ gridAlpha: 0.8
192
+ },
193
+
194
+ SmallMap: {
195
+ mapColor: "#000000",
196
+ rectangleColor: "#FFFFFF",
197
+ backgroundColor: "#FFFFFF",
198
+ backgroundAlpha: 0.7,
199
+ borderThickness: 1,
200
+ borderAlpha: 0.8
201
+ },
202
+
203
+ // the defaults below are set using CSS syntax, you can use any existing css property
204
+ // if you don't use Stock chart, you can delete lines below
205
+ PeriodSelector: {
206
+ color: "#000000"
207
+ },
208
+
209
+ PeriodButton: {
210
+ color: "#000000",
211
+ background: "transparent",
212
+ opacity: 0.7,
213
+ border: "1px solid rgba(0, 0, 0, .3)",
214
+ MozBorderRadius: "5px",
215
+ borderRadius: "5px",
216
+ margin: "1px",
217
+ outline: "none",
218
+ boxSizing: "border-box"
219
+ },
220
+
221
+ PeriodButtonSelected: {
222
+ color: "#000000",
223
+ backgroundColor: "rgba(0, 0, 0, 0.1)",
224
+ border: "1px solid rgba(0, 0, 0, .3)",
225
+ MozBorderRadius: "5px",
226
+ borderRadius: "5px",
227
+ margin: "1px",
228
+ outline: "none",
229
+ opacity: 1,
230
+ boxSizing: "border-box"
231
+ },
232
+
233
+ PeriodInputField: {
234
+ color: "#000000",
235
+ background: "transparent",
236
+ border: "1px solid rgba(0, 0, 0, .3)",
237
+ outline: "none"
238
+ },
239
+
240
+ DataSetSelector: {
241
+ color: "#000000",
242
+ selectedBackgroundColor: "rgba(0, 0, 0, .25)",
243
+ rollOverBackgroundColor: "rgba(0, 0, 0, .15)"
244
+ },
245
+
246
+ DataSetCompareList: {
247
+ color: "#000000",
248
+ lineHeight: "100%",
249
+ boxSizing: "initial",
250
+ webkitBoxSizing: "initial",
251
+ border: "1px solid rgba(0, 0, 0, .3)"
252
+ },
253
+
254
+ DataSetSelect: {
255
+ border: "1px solid rgba(0, 0, 0, .3)",
256
+ outline: "none"
257
+ }
258
+
259
+ };
@@ -1,17 +1,17 @@
1
- AmCharts.AmXYChart=AmCharts.Class({inherits:AmCharts.AmRectangularChart,construct:function(a){this.chartType="xy";AmCharts.AmXYChart.base.construct.call(this,a);this.theme=a;this.createEvents("zoomed");this.maxZoomFactor=20;AmCharts.applyTheme(this,a,"AmXYChart")},initChart:function(){AmCharts.AmXYChart.base.initChart.call(this);this.dataChanged&&(this.updateData(),this.dataChanged=!1,this.dispatchDataUpdated=!0);this.updateScrollbar=!0;this.drawChart();this.autoMargins&&!this.marginsUpdated&&(this.marginsUpdated=
2
- !0,this.measureMargins());var a=this.marginLeftReal,c=this.marginTopReal,b=this.plotAreaWidth,d=this.plotAreaHeight;this.graphsSet.clipRect(a,c,b,d);this.bulletSet.clipRect(a,c,b,d);this.trendLinesSet.clipRect(a,c,b,d)},createValueAxes:function(){var a=[],c=[];this.xAxes=a;this.yAxes=c;var b=this.valueAxes,d,e;for(e=0;e<b.length;e++){d=b[e];var f=d.position;if("top"==f||"bottom"==f)d.rotate=!0;d.setOrientation(d.rotate);f=d.orientation;"V"==f&&c.push(d);"H"==f&&a.push(d)}0===c.length&&(d=new AmCharts.ValueAxis(this.theme),
3
- d.rotate=!1,d.setOrientation(!1),b.push(d),c.push(d));0===a.length&&(d=new AmCharts.ValueAxis(this.theme),d.rotate=!0,d.setOrientation(!0),b.push(d),a.push(d));for(e=0;e<b.length;e++)this.processValueAxis(b[e],e);a=this.graphs;for(e=0;e<a.length;e++)this.processGraph(a[e],e)},drawChart:function(){AmCharts.AmXYChart.base.drawChart.call(this);AmCharts.ifArray(this.chartData)?(this.chartScrollbar&&this.updateScrollbars(),this.zoomChart()):this.cleanChart();if(this.hideXScrollbar){var a=this.scrollbarH;
4
- a&&(this.removeListener(a,"zoomed",this.handleHSBZoom),a.destroy());this.scrollbarH=null}if(this.hideYScrollbar){if(a=this.scrollbarV)this.removeListener(a,"zoomed",this.handleVSBZoom),a.destroy();this.scrollbarV=null}if(!this.autoMargins||this.marginsUpdated)this.dispDUpd(),this.chartCreated=!0,this.zoomScrollbars()},cleanChart:function(){AmCharts.callMethod("destroy",[this.valueAxes,this.graphs,this.scrollbarV,this.scrollbarH,this.chartCursor])},zoomChart:function(){this.toggleZoomOutButton();this.zoomObjects(this.valueAxes);
5
- this.zoomObjects(this.graphs);this.zoomTrendLines();this.dispatchAxisZoom()},toggleZoomOutButton:function(){1==this.heightMultiplier&&1==this.widthMultiplier?this.showZB(!1):this.showZB(!0)},dispatchAxisZoom:function(){var a=this.valueAxes,c;for(c=0;c<a.length;c++){var b=a[c];if(!isNaN(b.min)&&!isNaN(b.max)){var d,e;"V"==b.orientation?(d=b.coordinateToValue(-this.verticalPosition),e=b.coordinateToValue(-this.verticalPosition+this.plotAreaHeight)):(d=b.coordinateToValue(-this.horizontalPosition),e=
6
- b.coordinateToValue(-this.horizontalPosition+this.plotAreaWidth));if(!isNaN(d)&&!isNaN(e)){if(d>e){var f=e;e=d;d=f}b.dispatchZoomEvent(d,e)}}}},zoomObjects:function(a){var c=a.length,b;for(b=0;b<c;b++){var d=a[b];this.updateObjectSize(d);d.zoom(0,this.chartData.length-1)}},updateData:function(){this.parseData();var a=this.chartData,c=a.length-1,b=this.graphs,d=this.dataProvider,e=0,f,g;for(f=0;f<b.length;f++)if(g=b[f],g.data=a,g.zoom(0,c),g=g.valueField){var k;for(k=0;k<d.length;k++){var m=d[k][g];
7
- m>e&&(e=m)}}for(f=0;f<b.length;f++)g=b[f],g.maxValue=e;if(a=this.chartCursor)a.updateData(),a.type="crosshair",a.valueBalloonsEnabled=!1},zoomOut:function(){this.verticalPosition=this.horizontalPosition=0;this.heightMultiplier=this.widthMultiplier=1;this.zoomChart();this.zoomScrollbars()},processValueAxis:function(a){a.chart=this;a.minMaxField="H"==a.orientation?"x":"y";a.minTemp=NaN;a.maxTemp=NaN;this.listenTo(a,"axisSelfZoomed",this.handleAxisSelfZoom)},processGraph:function(a){AmCharts.isString(a.xAxis)&&
8
- (a.xAxis=this.getValueAxisById(a.xAxis));AmCharts.isString(a.yAxis)&&(a.yAxis=this.getValueAxisById(a.yAxis));a.xAxis||(a.xAxis=this.xAxes[0]);a.yAxis||(a.yAxis=this.yAxes[0]);a.valueAxis=a.yAxis},parseData:function(){AmCharts.AmXYChart.base.parseData.call(this);this.chartData=[];var a=this.dataProvider,c=this.valueAxes,b=this.graphs,d;for(d=0;d<a.length;d++){var e={axes:{},x:{},y:{}},f=a[d],g;for(g=0;g<c.length;g++){var k=c[g].id;e.axes[k]={};e.axes[k].graphs={};var m;for(m=0;m<b.length;m++){var l=
9
- b[m],q=l.id;if(l.xAxis.id==k||l.yAxis.id==k){var n={};n.serialDataItem=e;n.index=d;var p={},h=Number(f[l.valueField]);isNaN(h)||(p.value=h);h=Number(f[l.xField]);isNaN(h)||(p.x=h);h=Number(f[l.yField]);isNaN(h)||(p.y=h);h=Number(f[l.errorField]);isNaN(h)||(p.error=h);n.values=p;this.processFields(l,n,f);n.serialDataItem=e;n.graph=l;e.axes[k].graphs[q]=n}}}this.chartData[d]=e}},formatString:function(a,c){var b=c.graph.numberFormatter;b||(b=this.numberFormatter);a=AmCharts.formatValue(a,c.values,["value",
10
- "x","y"],b);-1!=a.indexOf("[[")&&(a=AmCharts.formatDataContextValue(a,c.dataContext));return a=AmCharts.AmXYChart.base.formatString.call(this,a,c)},addChartScrollbar:function(a){AmCharts.callMethod("destroy",[this.chartScrollbar,this.scrollbarH,this.scrollbarV]);if(a){this.chartScrollbar=a;this.scrollbarHeight=a.scrollbarHeight;var c="backgroundColor backgroundAlpha selectedBackgroundColor selectedBackgroundAlpha scrollDuration resizeEnabled hideResizeGrips scrollbarHeight updateOnReleaseOnly".split(" ");
11
- if(!this.hideYScrollbar){var b=new AmCharts.SimpleChartScrollbar(this.theme);b.skipEvent=!0;b.chart=this;this.listenTo(b,"zoomed",this.handleVSBZoom);AmCharts.copyProperties(a,b,c);b.rotate=!0;this.scrollbarV=b}this.hideXScrollbar||(b=new AmCharts.SimpleChartScrollbar(this.theme),b.skipEvent=!0,b.chart=this,this.listenTo(b,"zoomed",this.handleHSBZoom),AmCharts.copyProperties(a,b,c),b.rotate=!1,this.scrollbarH=b)}},updateTrendLines:function(){var a=this.trendLines,c;for(c=0;c<a.length;c++){var b=a[c],
12
- b=AmCharts.processObject(b,AmCharts.TrendLine,this.theme);a[c]=b;b.chart=this;var d=b.valueAxis;AmCharts.isString(d)&&(b.valueAxis=this.getValueAxisById(d));d=b.valueAxisX;AmCharts.isString(d)&&(b.valueAxisX=this.getValueAxisById(d));b.valueAxis||(b.valueAxis=this.yAxes[0]);b.valueAxisX||(b.valueAxisX=this.xAxes[0])}},updateMargins:function(){AmCharts.AmXYChart.base.updateMargins.call(this);var a=this.scrollbarV;a&&(this.getScrollbarPosition(a,!0,this.yAxes[0].position),this.adjustMargins(a,!0));
13
- if(a=this.scrollbarH)this.getScrollbarPosition(a,!1,this.xAxes[0].position),this.adjustMargins(a,!1)},updateScrollbars:function(){AmCharts.AmXYChart.base.updateScrollbars.call(this);var a=this.scrollbarV;a&&(this.updateChartScrollbar(a,!0),a.draw());if(a=this.scrollbarH)this.updateChartScrollbar(a,!1),a.draw()},zoomScrollbars:function(){var a=this.scrollbarH;a&&a.relativeZoom(this.widthMultiplier,-this.horizontalPosition/this.widthMultiplier);(a=this.scrollbarV)&&a.relativeZoom(this.heightMultiplier,
14
- -this.verticalPosition/this.heightMultiplier)},fitMultiplier:function(a){a>this.maxZoomFactor&&(a=this.maxZoomFactor);return a},handleHSBZoom:function(a){var c=this.fitMultiplier(a.multiplier);a=-a.position*c;var b=-(this.plotAreaWidth*c-this.plotAreaWidth);a<b&&(a=b);this.widthMultiplier=c;this.horizontalPosition=a;this.zoomChart()},handleVSBZoom:function(a){var c=this.fitMultiplier(a.multiplier);a=-a.position*c;var b=-(this.plotAreaHeight*c-this.plotAreaHeight);a<b&&(a=b);this.heightMultiplier=
15
- c;this.verticalPosition=a;this.zoomChart()},handleAxisSelfZoom:function(a){if("H"==a.valueAxis.orientation){var c=this.fitMultiplier(a.multiplier);a=-a.position*c;var b=-(this.plotAreaWidth*c-this.plotAreaWidth);a<b&&(a=b);this.horizontalPosition=a;this.widthMultiplier=c}else c=this.fitMultiplier(a.multiplier),a=-a.position*c,b=-(this.plotAreaHeight*c-this.plotAreaHeight),a<b&&(a=b),this.verticalPosition=a,this.heightMultiplier=c;this.zoomChart();c=this.graphs;for(a=0;a<c.length;a++)c[a].setAnimationPlayed();
16
- this.zoomScrollbars()},handleCursorZoom:function(a){var c=this.widthMultiplier*this.plotAreaWidth/a.selectionWidth,b=this.heightMultiplier*this.plotAreaHeight/a.selectionHeight,c=this.fitMultiplier(c),b=this.fitMultiplier(b);this.horizontalPosition=(this.horizontalPosition-a.selectionX)*c/this.widthMultiplier;this.verticalPosition=(this.verticalPosition-a.selectionY)*b/this.heightMultiplier;this.widthMultiplier=c;this.heightMultiplier=b;this.zoomChart();this.zoomScrollbars()},removeChartScrollbar:function(){AmCharts.callMethod("destroy",
17
- [this.scrollbarH,this.scrollbarV]);this.scrollbarV=this.scrollbarH=null},handleReleaseOutside:function(a){AmCharts.AmXYChart.base.handleReleaseOutside.call(this,a);AmCharts.callMethod("handleReleaseOutside",[this.scrollbarH,this.scrollbarV])}});
1
+ AmCharts.AmXYChart=AmCharts.Class({inherits:AmCharts.AmRectangularChart,construct:function(a){this.type="xy";AmCharts.AmXYChart.base.construct.call(this,a);this.cname="AmXYChart";this.theme=a;this.createEvents("zoomed");this.maxZoomFactor=20;AmCharts.applyTheme(this,a,this.cname)},initChart:function(){AmCharts.AmXYChart.base.initChart.call(this);this.dataChanged&&(this.updateData(),this.dataChanged=!1,this.dispatchDataUpdated=!0);this.updateScrollbar=!0;this.drawChart();this.autoMargins&&!this.marginsUpdated&&
2
+ (this.marginsUpdated=!0,this.measureMargins());var a=this.marginLeftReal,c=this.marginTopReal,b=this.plotAreaWidth,d=this.plotAreaHeight;this.graphsSet.clipRect(a,c,b,d);this.bulletSet.clipRect(a,c,b,d);this.trendLinesSet.clipRect(a,c,b,d)},prepareForExport:function(){var a=this.bulletSet;a.clipPath&&this.container.remove(a.clipPath)},createValueAxes:function(){var a=[],c=[];this.xAxes=a;this.yAxes=c;var b=this.valueAxes,d,e;for(e=0;e<b.length;e++){d=b[e];var f=d.position;if("top"==f||"bottom"==f)d.rotate=
3
+ !0;d.setOrientation(d.rotate);f=d.orientation;"V"==f&&c.push(d);"H"==f&&a.push(d)}0===c.length&&(d=new AmCharts.ValueAxis(this.theme),d.rotate=!1,d.setOrientation(!1),b.push(d),c.push(d));0===a.length&&(d=new AmCharts.ValueAxis(this.theme),d.rotate=!0,d.setOrientation(!0),b.push(d),a.push(d));for(e=0;e<b.length;e++)this.processValueAxis(b[e],e);a=this.graphs;for(e=0;e<a.length;e++)this.processGraph(a[e],e)},drawChart:function(){AmCharts.AmXYChart.base.drawChart.call(this);AmCharts.ifArray(this.chartData)?
4
+ (this.chartScrollbar&&this.updateScrollbars(),this.zoomChart()):this.cleanChart();if(this.hideXScrollbar){var a=this.scrollbarH;a&&(this.removeListener(a,"zoomed",this.handleHSBZoom),a.destroy());this.scrollbarH=null}if(this.hideYScrollbar){if(a=this.scrollbarV)this.removeListener(a,"zoomed",this.handleVSBZoom),a.destroy();this.scrollbarV=null}if(!this.autoMargins||this.marginsUpdated)this.dispDUpd(),this.chartCreated=!0,this.zoomScrollbars()},cleanChart:function(){AmCharts.callMethod("destroy",[this.valueAxes,
5
+ this.graphs,this.scrollbarV,this.scrollbarH,this.chartCursor])},zoomChart:function(){this.toggleZoomOutButton();this.zoomObjects(this.valueAxes);this.zoomObjects(this.graphs);this.zoomTrendLines();this.dispatchAxisZoom()},toggleZoomOutButton:function(){1==this.heightMultiplier&&1==this.widthMultiplier?this.showZB(!1):this.showZB(!0)},dispatchAxisZoom:function(){var a=this.valueAxes,c;for(c=0;c<a.length;c++){var b=a[c];if(!isNaN(b.min)&&!isNaN(b.max)){var d,e;"V"==b.orientation?(d=b.coordinateToValue(-this.verticalPosition),
6
+ e=b.coordinateToValue(-this.verticalPosition+this.plotAreaHeight)):(d=b.coordinateToValue(-this.horizontalPosition),e=b.coordinateToValue(-this.horizontalPosition+this.plotAreaWidth));if(!isNaN(d)&&!isNaN(e)){if(d>e){var f=e;e=d;d=f}b.dispatchZoomEvent(d,e)}}}},zoomObjects:function(a){var c=a.length,b;for(b=0;b<c;b++){var d=a[b];this.updateObjectSize(d);d.zoom(0,this.chartData.length-1)}},updateData:function(){this.parseData();var a=this.chartData,c=a.length-1,b=this.graphs,d=this.dataProvider,e=
7
+ -Infinity,f=Infinity,k,g;for(k=0;k<b.length;k++)if(g=b[k],g.data=a,g.zoom(0,c),g=g.valueField){var m;for(m=0;m<d.length;m++){var h=Number(d[m][g]);h>e&&(e=h);h<f&&(f=h)}}for(k=0;k<b.length;k++)g=b[k],g.maxValue=e,g.minValue=f;if(a=this.chartCursor)a.updateData(),a.type="crosshair",a.valueBalloonsEnabled=!1},zoomOut:function(){this.verticalPosition=this.horizontalPosition=0;this.heightMultiplier=this.widthMultiplier=1;this.zoomChart();this.zoomScrollbars()},processValueAxis:function(a){a.chart=this;
8
+ a.minMaxField="H"==a.orientation?"x":"y";a.minTemp=NaN;a.maxTemp=NaN;this.listenTo(a,"axisSelfZoomed",this.handleAxisSelfZoom)},processGraph:function(a){AmCharts.isString(a.xAxis)&&(a.xAxis=this.getValueAxisById(a.xAxis));AmCharts.isString(a.yAxis)&&(a.yAxis=this.getValueAxisById(a.yAxis));a.xAxis||(a.xAxis=this.xAxes[0]);a.yAxis||(a.yAxis=this.yAxes[0]);a.valueAxis=a.yAxis},parseData:function(){AmCharts.AmXYChart.base.parseData.call(this);this.chartData=[];var a=this.dataProvider,c=this.valueAxes,
9
+ b=this.graphs,d;for(d=0;d<a.length;d++){var e={axes:{},x:{},y:{}},f=a[d],k;for(k=0;k<c.length;k++){var g=c[k].id;e.axes[g]={};e.axes[g].graphs={};var m;for(m=0;m<b.length;m++){var h=b[m],q=h.id;if(h.xAxis.id==g||h.yAxis.id==g){var n={};n.serialDataItem=e;n.index=d;var p={},l=Number(f[h.valueField]);isNaN(l)||(p.value=l);l=Number(f[h.xField]);isNaN(l)||(p.x=l);l=Number(f[h.yField]);isNaN(l)||(p.y=l);l=Number(f[h.errorField]);isNaN(l)||(p.error=l);n.values=p;this.processFields(h,n,f);n.serialDataItem=
10
+ e;n.graph=h;e.axes[g].graphs[q]=n}}}this.chartData[d]=e}},formatString:function(a,c,b){var d=c.graph.numberFormatter;d||(d=this.nf);a=AmCharts.formatValue(a,c.values,["value","x","y"],d);-1!=a.indexOf("[[")&&(a=AmCharts.formatDataContextValue(a,c.dataContext));return a=AmCharts.AmXYChart.base.formatString.call(this,a,c,b)},addChartScrollbar:function(a){AmCharts.callMethod("destroy",[this.chartScrollbar,this.scrollbarH,this.scrollbarV]);if(a){this.chartScrollbar=a;this.scrollbarHeight=a.scrollbarHeight;
11
+ var c="backgroundColor backgroundAlpha selectedBackgroundColor selectedBackgroundAlpha scrollDuration resizeEnabled hideResizeGrips scrollbarHeight updateOnReleaseOnly".split(" ");if(!this.hideYScrollbar){var b=new AmCharts.SimpleChartScrollbar(this.theme);b.skipEvent=!0;b.chart=this;this.listenTo(b,"zoomed",this.handleVSBZoom);AmCharts.copyProperties(a,b,c);b.rotate=!0;this.scrollbarV=b}this.hideXScrollbar||(b=new AmCharts.SimpleChartScrollbar(this.theme),b.skipEvent=!0,b.chart=this,this.listenTo(b,
12
+ "zoomed",this.handleHSBZoom),AmCharts.copyProperties(a,b,c),b.rotate=!1,this.scrollbarH=b)}},updateTrendLines:function(){var a=this.trendLines,c;for(c=0;c<a.length;c++){var b=a[c],b=AmCharts.processObject(b,AmCharts.TrendLine,this.theme);a[c]=b;b.chart=this;var d=b.valueAxis;AmCharts.isString(d)&&(b.valueAxis=this.getValueAxisById(d));d=b.valueAxisX;AmCharts.isString(d)&&(b.valueAxisX=this.getValueAxisById(d));b.valueAxis||(b.valueAxis=this.yAxes[0]);b.valueAxisX||(b.valueAxisX=this.xAxes[0])}},updateMargins:function(){AmCharts.AmXYChart.base.updateMargins.call(this);
13
+ var a=this.scrollbarV;a&&(this.getScrollbarPosition(a,!0,this.yAxes[0].position),this.adjustMargins(a,!0));if(a=this.scrollbarH)this.getScrollbarPosition(a,!1,this.xAxes[0].position),this.adjustMargins(a,!1)},updateScrollbars:function(){AmCharts.AmXYChart.base.updateScrollbars.call(this);var a=this.scrollbarV;a&&(this.updateChartScrollbar(a,!0),a.draw());if(a=this.scrollbarH)this.updateChartScrollbar(a,!1),a.draw()},zoomScrollbars:function(){var a=this.scrollbarH;a&&a.relativeZoom(this.widthMultiplier,
14
+ -this.horizontalPosition/this.widthMultiplier);(a=this.scrollbarV)&&a.relativeZoom(this.heightMultiplier,-this.verticalPosition/this.heightMultiplier)},fitMultiplier:function(a){a>this.maxZoomFactor&&(a=this.maxZoomFactor);return a},handleHSBZoom:function(a){var c=this.fitMultiplier(a.multiplier);a=-a.position*c;var b=-(this.plotAreaWidth*c-this.plotAreaWidth);a<b&&(a=b);this.widthMultiplier=c;this.horizontalPosition=a;this.zoomChart()},handleVSBZoom:function(a){var c=this.fitMultiplier(a.multiplier);
15
+ a=-a.position*c;var b=-(this.plotAreaHeight*c-this.plotAreaHeight);a<b&&(a=b);this.heightMultiplier=c;this.verticalPosition=a;this.zoomChart()},handleAxisSelfZoom:function(a){if("H"==a.valueAxis.orientation){var c=this.fitMultiplier(a.multiplier);a=-a.position*c;var b=-(this.plotAreaWidth*c-this.plotAreaWidth);a<b&&(a=b);this.horizontalPosition=a;this.widthMultiplier=c}else c=this.fitMultiplier(a.multiplier),a=-a.position*c,b=-(this.plotAreaHeight*c-this.plotAreaHeight),a<b&&(a=b),this.verticalPosition=
16
+ a,this.heightMultiplier=c;this.zoomChart();c=this.graphs;for(a=0;a<c.length;a++)c[a].setAnimationPlayed();this.zoomScrollbars()},handleCursorZoom:function(a){var c=this.widthMultiplier*this.plotAreaWidth/a.selectionWidth,b=this.heightMultiplier*this.plotAreaHeight/a.selectionHeight,c=this.fitMultiplier(c),b=this.fitMultiplier(b);this.horizontalPosition=(this.horizontalPosition-a.selectionX)*c/this.widthMultiplier;this.verticalPosition=(this.verticalPosition-a.selectionY)*b/this.heightMultiplier;this.widthMultiplier=
17
+ c;this.heightMultiplier=b;this.zoomChart();this.zoomScrollbars()},removeChartScrollbar:function(){AmCharts.callMethod("destroy",[this.scrollbarH,this.scrollbarV]);this.scrollbarV=this.scrollbarH=null},handleReleaseOutside:function(a){AmCharts.AmXYChart.base.handleReleaseOutside.call(this,a);AmCharts.callMethod("handleReleaseOutside",[this.scrollbarH,this.scrollbarV])}});
@@ -17,21 +17,24 @@
17
17
  border-color:#CC0000;
18
18
  border-width:1px;
19
19
  color:#FFFFFF;
20
- -moz-border-radius: 5px;
21
- border-radius: 5px;
22
- margin: 1px;
20
+ -moz-border-radius: 5px;
21
+ border-radius: 5px;
22
+ margin: 1px;
23
+ outline: none;
24
+ box-sizing: border-box;
23
25
  }
24
26
 
25
27
  .amChartsButton
26
28
  {
27
- background-color:#EEEEEE;
28
- border-style:solid;
29
- border-color:#CCCCCC;
30
- border-width:1px;
31
- color:#000000;
32
- -moz-border-radius: 5px;
33
- border-radius: 5px;
34
- margin: 1px;
29
+ color: #000000;
30
+ background: transparent;
31
+ opacity: 0.7;
32
+ border: 1px solid rgba(0, 0, 0, .3);
33
+ -moz-border-radius: 5px;
34
+ border-radius: 5px;
35
+ margin: 1px;
36
+ outline: none;
37
+ box-sizing: border-box;
35
38
  }
36
39
 
37
40
  .amChartsCompareList
@@ -41,6 +44,11 @@
41
44
  border-width:1px;
42
45
  }
43
46
 
47
+ .amChartsCompareList div
48
+ {
49
+ -webkit-box-sizing: initial;
50
+ box-sizing: initial;
51
+ }
44
52
 
45
53
  .amChartsInputField
46
54
  {
@@ -54,5 +62,5 @@
54
62
 
55
63
  .amChartsPanel
56
64
  {
57
-
65
+
58
66
  }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: amcharts.rb
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.0.2
4
+ version: 3.4.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Vandersluis
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-30 00:00:00.000000000 Z
11
+ date: 2014-04-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  type: :runtime
@@ -176,10 +176,15 @@ files:
176
176
  - spec/chart_builder/literal_spec.rb
177
177
  - spec/chart_spec.rb
178
178
  - vendor/assets/images/amcharts/dragIcon.gif
179
+ - vendor/assets/images/amcharts/dragIconBlack.gif
179
180
  - vendor/assets/images/amcharts/dragIconH.gif
181
+ - vendor/assets/images/amcharts/dragIconHBlack.gif
180
182
  - vendor/assets/images/amcharts/eraserIcon.gif
181
183
  - vendor/assets/images/amcharts/eraserIconH.gif
184
+ - vendor/assets/images/amcharts/export.png
185
+ - vendor/assets/images/amcharts/exportWhite.png
182
186
  - vendor/assets/images/amcharts/lens.png
187
+ - vendor/assets/images/amcharts/lensWhite.png
183
188
  - vendor/assets/images/amcharts/patterns/black/pattern1.png
184
189
  - vendor/assets/images/amcharts/patterns/black/pattern10.png
185
190
  - vendor/assets/images/amcharts/patterns/black/pattern11.png
@@ -249,6 +254,11 @@ files:
249
254
  - vendor/assets/javascripts/amcharts/pie.js
250
255
  - vendor/assets/javascripts/amcharts/radar.js
251
256
  - vendor/assets/javascripts/amcharts/serial.js
257
+ - vendor/assets/javascripts/amcharts/themes/black.js
258
+ - vendor/assets/javascripts/amcharts/themes/chalk.js
259
+ - vendor/assets/javascripts/amcharts/themes/dark.js
260
+ - vendor/assets/javascripts/amcharts/themes/light.js
261
+ - vendor/assets/javascripts/amcharts/themes/patterns.js
252
262
  - vendor/assets/javascripts/amcharts/thirdPartySoftwareList.txt
253
263
  - vendor/assets/javascripts/amcharts/xy.js
254
264
  - vendor/assets/stylesheets/amcharts/style.css