Skip to content

Commit

Permalink
v1.3.2
Browse files Browse the repository at this point in the history
* Added: ([drawing.autoClose](#annotation-settings)) new flag to
automatically close the annotation mode after download
* Fixed: Internal pdfMake issue which interrupted the generation in
IE10, uses custom build until officially fixed
  • Loading branch information
maertz committed Aug 31, 2015
1 parent 8d32f69 commit 7e9370e
Show file tree
Hide file tree
Showing 6 changed files with 18,526 additions and 18,332 deletions.
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# amCharts Export

Version: 1.3.1
Version: 1.3.2


## Description
Expand Down Expand Up @@ -510,6 +510,8 @@ Following setup shows you all available settings. If you don't have the
"mode": "pencil", // Drawing mode when entering the annotation mode "pencil", "line" and "arrow" are available
"modes": [ "pencil" , "line", "arrow" ], // Choice of modes offered in the menu
"arrow": "end", // position of the arrow on drawn lines; "start","middle" and "end" are available
"autoClose": true // Flag to automatically close the annotation mode after download
}
}
```
Expand Down Expand Up @@ -872,6 +874,10 @@ http://www.apache.org/licenses/LICENSE-2.0

## Changelog

### 1.3.2
* Added: ([drawing.autoClose](#annotation-settings)) new flag to automatically close the annotation mode after download
* Fixed: Internal pdfMake issue which prevented to generate PDFs in IE10, uses custom build until officially fixed

### 1.3.1
* Added: Timestamp date fields get converted as dates
* Fixed: XLSX respects given dateFormat
Expand Down
15 changes: 10 additions & 5 deletions export.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Plugin Name: amCharts Export
Description: Adds export capabilities to amCharts products
Author: Benjamin Maertz, amCharts
Version: 1.3.1
Version: 1.3.2
Author URI: http://www.amcharts.com/
Copyright 2015 amCharts
Expand Down Expand Up @@ -68,7 +68,7 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
AmCharts[ "export" ] = function( chart, config ) {
var _this = {
name: "export",
version: "1.3.1-rc1",
version: "1.3.2",
libs: {
async: true,
autoLoad: true,
Expand Down Expand Up @@ -471,7 +471,8 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
widths: [ 1, 5, 10, 15 ],
opacity: 1,
opacities: [ 1, 0.8, 0.6, 0.4, 0.2 ],
menu: undefined
menu: undefined,
autoClose: true
}
},
pdfMake: {
Expand Down Expand Up @@ -2525,7 +2526,9 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
} else if ( _this.drawing.buffer.enabled ) {
item.click = ( function( item ) {
return function() {
this.drawing.handler.done();
if ( this.config.drawing.autoClose ) {
this.drawing.handler.done();
}
this[ "to" + item.format ]( item, function( data ) {
if ( item.action == "download" ) {
this.download( data, item.mimeType, [ item.fileName, item.extension ].join( "." ) );
Expand All @@ -2540,7 +2543,9 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
return function() {
if ( item.capture || item.action == "print" || item.format == "PRINT" ) {
this.capture( item, function() {
this.drawing.handler.done();
if ( this.config.drawing.autoClose ) {
this.drawing.handler.done();
}
this[ "to" + item.format ]( item, function( data ) {
if ( item.action == "download" ) {
this.download( data, item.mimeType, [ item.fileName, item.extension ].join( "." ) );
Expand Down
4 changes: 2 additions & 2 deletions export.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 7e9370e

Please sign in to comment.