Dump 3.1.8

apache · May 11, 2016 · 3f0a6af · 3f0a6af
1 parent 87bed8a
commit 3f0a6af
Show file tree

Hide file tree

Showing 9 changed files with 5,320 additions and 3,537 deletions.
diff --git a/dist/echarts.common.js b/dist/echarts.common.js
diff --git a/dist/echarts.common.min.js b/dist/echarts.common.min.js
diff --git a/dist/echarts.js b/dist/echarts.js
diff --git a/dist/echarts.min.js b/dist/echarts.min.js
diff --git a/dist/echarts.simple.js b/dist/echarts.simple.js
diff --git a/dist/echarts.simple.min.js b/dist/echarts.simple.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "echarts",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "description": "A powerful charting and visualization library for browser",
   "keywords": [
     "visualization",
@@ -35,10 +35,10 @@
     "prepublish": "node build/amd2common.js"
   },
   "dependencies": {
-    "zrender": "^3.0.8"
+    "zrender": "^3.0.9"
   },
   "devDependencies": {
-    "zrender": "^3.0.8",
+    "zrender": "^3.0.9",
     "escodegen": "^1.8.0",
     "esprima": "^2.7.2",
     "estraverse": "^4.1.1",

diff --git a/src/chart/sankey/SankeyView.js b/src/chart/sankey/SankeyView.js
@@ -148,12 +148,9 @@ define(function (require) {
                 group.add(curve);
 
             });
-            if (!this._data) {
+            if (!this._data && seriesModel.get('animation')) {
                 group.setClipPath(createGridClipShape(group.getBoundingRect(), seriesModel, function () {
-                    // Remove clip path in next tick in case animation is disabled
-                    setTimeout(function () {
-                        group.removeClipPath();
-                    });
+                    group.removeClipPath();
                 }));
             }
             this._data = seriesModel.getData();

diff --git a/src/echarts.js b/src/echarts.js
@@ -970,9 +970,9 @@ define(function (require) {
         /**
          * @type {number}
          */
-        version: '3.1.7',
+        version: '3.1.8',
         dependencies: {
-            zrender: '3.0.8'
+            zrender: '3.0.9'
         }
     };