Merge branch 'master' of https://www.github.com/ecomfe/echarts

src/component/toolbox/ToolboxView.js

@@ -30,15 +30,15 @@ define(function (require) {
             });
 
             (new DataDiffer(this._featureNames || [], featureNames))
-                .add(process)
-                .update(process)
-                .remove(zrUtil.curry(process, null))
+                .add(processFeature)
+                .update(processFeature)
+                .remove(zrUtil.curry(processFeature, null))
                 .execute();
 
             // Keep for diff.
             this._featureNames = featureNames;
 
-            function process(newIndex, oldIndex) {
+            function processFeature(newIndex, oldIndex) {
                 var featureName = featureNames[newIndex];
                 var oldName = featureNames[oldIndex];
                 var featureOpt = featureOpts[featureName];

src/util/symbol.js

@@ -86,14 +86,16 @@ define(function(require) {
             var tanX = Math.sin(angle);
             var tanY = Math.cos(angle);
 
+            var cpLen = r * 0.6;
+            var cpLen2 = r * 0.7;
+
+            path.moveTo(x - dx, cy + dy);
+
             path.arc(
                 x, cy, r,
                 Math.PI - angle,
                 Math.PI * 2 + angle
             );
-
-            var cpLen = r * 0.6;
-            var cpLen2 = r * 0.7;
             path.bezierCurveTo(
                 x + dx - tanX * cpLen, cy + dy + tanY * cpLen,
                 x, y - cpLen2,