3.20.10

amcharts/plugins/export/README.md

@@ -1,6 +1,6 @@
 # amCharts Export
 
-Version: 1.4.30
+Version: 1.4.33
 
 
 ## Description
@@ -600,7 +600,7 @@ your exported images.
         top: 50,
         left: 100,
         family: this.setup.chart.fontFamily,
-        size: this.setup.chart.fontSize * 2
+        fontSize: this.setup.chart.fontSize * 2
       });
       this.setup.fabric.add(text);
   },
@@ -615,7 +615,7 @@ your exported images.
           top: 50,
           left: 100,
           family: this.setup.chart.fontFamily,
-          size: this.setup.chart.fontSize * 2
+          fontSize: this.setup.chart.fontSize * 2
         });
         this.setup.fabric.add(text);
     }
@@ -971,6 +971,15 @@ http://www.apache.org/licenses/LICENSE-2.0
 
 ## Changelog
 
+### 1.4.33
+* Fixed: fill/stroke polyfilling issue on svg elements with color validation/preparation for fabric 
+
+### 1.4.32
+* Fixed: Issue polyfilling the color attributes with "rgba" color codes
+
+### 1.4.31
+* Changed: Included independent IE detection to handle specific IE10, IE11 svg image in canvas issue
+
 ### 1.4.30
 * Fixed: Pattern loading, positioning issue, supports x,y offset now
 

amcharts/plugins/export/export.js

@@ -2,7 +2,7 @@
 Plugin Name: amCharts Export
 Description: Adds export capabilities to amCharts products
 Author: Benjamin Maertz, amCharts
-Version: 1.4.30
+Version: 1.4.33
 Author URI: http://www.amcharts.com/
 
 Copyright 2016 amCharts
@@ -70,7 +70,7 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
 	AmCharts[ "export" ] = function( chart, config ) {
 		var _this = {
 			name: "export",
-			version: "1.4.30",
+			version: "1.4.33",
 			libs: {
 				async: true,
 				autoLoad: true,
@@ -91,7 +91,9 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
 			setup: {
 				chart: chart,
 				hasBlob: false,
-				wrapper: false
+				wrapper: false,
+				isIE: !!window.document.documentMode,
+				IEversion: window.document.documentMode
 			},
 			drawing: {
 				enabled: false,
@@ -241,7 +243,7 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
 						}
 
 						// APPLY OPACITY ON CURRENT COLOR
-						rgba = new fabric.Color( _this.drawing.color ).getSource();
+						rgba = _this.getRGBA( _this.drawing.color );
 						rgba.pop();
 						rgba.push( _this.drawing.opacity );
 						_this.drawing.color = "rgba(" + rgba.join() + ")";
@@ -259,7 +261,7 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
 								cfg.opacity = cfg.opacity || state.opacity;
 								cfg.fontSize = cfg.fontSize || cfg.width * 3;
 
-								rgba = new fabric.Color( cfg.color ).getSource();
+								rgba = _this.getRGBA( cfg.color );
 								rgba.pop();
 								rgba.push( cfg.opacity );
 								cfg.color = "rgba(" + rgba.join() + ")";
@@ -865,7 +867,7 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
 						return true;
 
 						// IE 10 internal bug handling SVG images in canvas context
-					} else if ( AmCharts.isIE && AmCharts.IEversion == 10 && source.toLowerCase().indexOf( ".svg" ) != -1 ) {
+					} else if ( _this.setup.isIE && ( _this.setup.IEversion == 10 || _this.setup.IEversion == 11 ) && source.toLowerCase().indexOf( ".svg" ) != -1 ) {
 						return true;
 					}
 				}
@@ -906,7 +908,7 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
 				}
 
 				// CHECK IE; ATTEMPT TO ACCESS HEAD ELEMENT
-				if ( AmCharts.isIE && AmCharts.IEversion <= 9 ) {
+				if ( _this.setup.isIE && _this.setup.IEversion <= 9 ) {
 					if ( !Array.prototype.indexOf || !document.head || _this.config.fallback === false ) {
 						return false;
 					}
@@ -1059,25 +1061,37 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
 					} else {
 						var attrs = [ "fill", "stroke" ];
 						for ( i2 = 0; i2 < attrs.length; i2++ ) {
-							var attr = attrs[ i2 ]
-							var attrVal = String( childNode.getAttribute( attr ) || "none" );
-
-							// CHECk VALUE AGAINST BLACKLIST
-							if ( [ "none", "transparent" ].indexOf( attrVal ) == -1 && !_this.isHashbanged( attrVal ) ) {
-								var attrRGBA = fabric.Color.fromHex( attrVal ).getSource();
-
-								// ENOUGH IS ENOUGH, SOMETHING IS WRONG, LETS RESET IT
-								if ( attrRGBA === undefined ) {
-									childNode.setAttribute( attr, "none" );
-									childNode.setAttribute( attr + "-opacity", "0" );
-								}
+							var attr = attrs[ i2 ];
+							var attrVal = childNode.getAttribute( attr );
+							var attrRGBA = _this.getRGBA( attrVal );
+
+							// VALIDATE AND RESET UNKNOWN COLORS (avoids fabric to crash)
+							if ( attrVal && !attrRGBA ) {
+								childNode.setAttribute( attr, "none" );
+								childNode.setAttribute( attr + "-opacity", "0" );
 							}
 						}
 					}
 				}
 				return group;
 			},
 
+			/*
+			 ** GET RGBA COLOR ARRAY FROM INPUT
+			 */
+			getRGBA: function( source, returnInstance ) {
+
+				if ( source != "none" && source != "transparent" && !_this.isHashbanged( source ) ) {
+					source = new fabric.Color( source );
+
+					if ( source._source ) {
+						return returnInstance ? source : source.getSource();
+					}
+				}
+
+				return false;
+			},
+
 			/*
 			 ** GATHER MOUSE POSITION;
 			 */
@@ -1920,7 +1934,7 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
 								var attr = attrs[ i1 ]
 								var attrVal = String( svg.getAttribute( attr ) || "none" );
 								var attrOpacity = Number( svg.getAttribute( attr + "-opacity" ) || "1" );
-								var attrRGBA = fabric.Color.fromHex( attrVal ).getSource();
+								var attrRGBA = _this.getRGBA( attrVal );
 
 								if ( attrRGBA ) {
 									attrRGBA.pop();
@@ -2066,8 +2080,8 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
 								var value = pair[ 1 ];
 
 								if ( [ "fill", "stroke" ].indexOf( key ) != -1 ) {
-									value = fabric.Color.fromRgba( value );
-									if ( value && value._source ) {
+									value = _this.getRGBA( value, true );
+									if ( value ) {
 										var color = "#" + value.toHex();
 										var opacity = value._source[ 3 ];
 
@@ -3594,5 +3608,4 @@ if ( !AmCharts.translations[ "export" ][ "en" ] ) {
  */
 AmCharts.addInitHandler( function( chart ) {
 	new AmCharts[ "export" ]( chart );
-
 }, [ "pie", "serial", "xy", "funnel", "radar", "gauge", "stock", "map", "gantt" ] );

package.json

@@ -1,6 +1,6 @@
 {
   "name": "amstock3",
-  "version": "3.20.9",
+  "version": "3.20.10",
   "description": "JavaScript Stock Chart V3",
   "main": "amcharts/amcharts.js",
   "repository": {

samples/_usingThemes.html

@@ -94,7 +94,7 @@
 					document.body.style.backgroundImage = "url(" + bgImage + ")";
 				}
 
-				AmCharts.makeChart("chartdiv", {
+				chart = AmCharts.makeChart("chartdiv", {
 					type: "stock",
 					theme: theme,