代码优化

src/component/base.js

@@ -21,7 +21,7 @@ define(function(require) {
         self.effectList = [];
         
         var EFFECT_ZLEVEL = 7;
-        var canvasSupported = !G_vmlCanvasManager;
+        var _canvasSupported = require('zrender/tool/env').canvasSupported;
         
         var _aniMap = {};
         _aniMap[ecConfig.CHART_TYPE_LINE] = true;
@@ -955,7 +955,7 @@ define(function(require) {
         function animationEffect() {
             clearAnimationShape();
             var zlevel = EFFECT_ZLEVEL;
-            if (canvasSupported) {
+            if (_canvasSupported) {
                 zr.modLayer(
                     zlevel,
                     {
@@ -1008,7 +1008,7 @@ define(function(require) {
                             draggable : false,
                             hoverable : false
                         };
-                        if (canvasSupported) {  // 提高性能，换成image
+                        if (_canvasSupported) {  // 提高性能，换成image
                             effectShape.style.image = zr.shapeToImage(
                                 effectShape, 
                                 effectShape.style.width + shadowBlur * 2 + 2, 
@@ -1037,7 +1037,7 @@ define(function(require) {
                             draggable : false,
                             hoverable : false
                         };
-                        if (canvasSupported) {  // 提高性能，换成image
+                        if (_canvasSupported) {  // 提高性能，换成image
                             effectShape.style.image = zr.shapeToImage(
                                 effectShape, 
                                 (size + shadowBlur) * 2,

src/component/dataView.js

@@ -22,6 +22,8 @@ define(function (require) {
 
         var _lang = ['Data View', 'close', 'refresh'];
 
+        var _canvasSupported = require('zrender/tool/env').canvasSupported;
+        
         // dataview dom & css
         var _tDom = document.createElement('div');
         var _textArea = document.createElement('textArea');
@@ -237,7 +239,7 @@ define(function (require) {
                     );
                 },
                 // 有动画，所以高级浏览器时间更长点
-                !G_vmlCanvasManager ? 800 : 100
+                _canvasSupported ? 800 : 100
             );
         }
 

src/component/toolbox.js

@@ -26,7 +26,9 @@ define(function (require) {
         
         var self = this;
         self.type = ecConfig.COMPONENT_TYPE_TOOLBOX;
-
+        
+        var _canvasSupported = require('zrender/tool/env').canvasSupported;
+        
         var _zlevelBase = self.getZlevelBase();
         var _magicType = {};
         var _magicMap;
@@ -78,7 +80,7 @@ define(function (require) {
                             iconName.push({key : key, name : 'dataZoomReset'});
                             break;
                         case 'saveAsImage' :
-                            if (!G_vmlCanvasManager) {
+                            if (_canvasSupported) {
                                 iconName.push({key : key, name : 'saveAsImage'});
                             }
                             break;

src/echarts.js

@@ -19,7 +19,7 @@ define(function(require) {
     var self = {};
     var echarts = self;     // 提供内部反向使用静态方法；
     
-    var _canvasSupported = !!document.createElement('canvas').getContext;
+    var _canvasSupported = require('zrender/tool/env').canvasSupported;
     var _idBase = new Date() - 0;
     var _instances = {};    // ECharts实例map索引
     var DOM_ATTRIBUTE_KEY = '_echarts_instance_';
@@ -803,8 +803,6 @@ define(function(require) {
 
             _toolbox.render(magicOption, {dataZoom: dataZoom});
             
-            _zr.render();
-            
             if (magicOption.animation && !magicOption.renderAsImage) {
                 var len = _chartList.length;
                 while (len--) {
@@ -818,6 +816,10 @@ define(function(require) {
                         chart.animation();
                     }
                 }
+                _zr.refresh();
+            }
+            else {
+                _zr.render();
             }
             
             var imgId = 'IMG' + self.id;