animation升级

coolgate · Sep 30, 2013 · dbddd71 · dbddd71
1 parent 5fd3ba8
commit dbddd71
Show file tree

Hide file tree

Showing 14 changed files with 1,700 additions and 1,360 deletions.
diff --git a/build/echarts-map.js b/build/echarts-map.js
diff --git a/build/echarts-original-map.js b/build/echarts-original-map.js
diff --git a/build/echarts-original.js b/build/echarts-original.js
diff --git a/build/echarts.js b/build/echarts.js
diff --git a/doc/example/www/js/echarts-map.js b/doc/example/www/js/echarts-map.js
diff --git a/doc/example/www/js/echarts-original-map.js b/doc/example/www/js/echarts-original-map.js
diff --git a/doc/example/www/js/echarts-original.js b/doc/example/www/js/echarts-original.js
diff --git a/doc/example/www/js/echarts.js b/doc/example/www/js/echarts.js
diff --git a/src/chart/bar.js b/src/chart/bar.js
@@ -745,10 +745,9 @@ define(function(require) {
                                     {
                                         x : x,
                                         width : width
-                                    },
-                                    easing
+                                    }
                                 )
-                                .start();
+                                .start(easing);
                         }
                         else {
                             zr.modShape(
@@ -764,10 +763,9 @@ define(function(require) {
                                     duration + dataIndex * 100,
                                     {
                                         width : width
-                                    },
-                                    easing
+                                    }
                                 )
-                                .start();
+                                .start(easing);
                         }
                     }
                     else {
@@ -788,10 +786,9 @@ define(function(require) {
                                     duration + dataIndex * 100,
                                     {
                                         height : height
-                                    },
-                                    easing
+                                    }
                                 )
-                                .start();
+                                .start(easing);
                         }
                         else {
                             zr.modShape(
@@ -809,10 +806,9 @@ define(function(require) {
                                     {
                                         y : y,
                                         height : height
-                                    },
-                                    easing
+                                    }
                                 )
-                                .start();
+                                .start(easing);
                         }
                     }
                 }

diff --git a/src/chart/k.js b/src/chart/k.js
@@ -467,13 +467,11 @@ define(function(require) {
                         .when(
                             (self.deepQuery([serie],'animationDuration')
                             || duration),
-
-                            {scale : [1, 1, x, y]},
-
-                            (self.deepQuery([serie], 'animationEasing')
-                            || easing)
+                            {scale : [1, 1, x, y]}
                         )
-                        .start();
+                        .start(
+                            self.deepQuery([serie], 'animationEasing') || easing
+                        );
                 }
             }
         }

diff --git a/src/chart/line.js b/src/chart/line.js
@@ -894,13 +894,11 @@ define(function(require) {
                             (self.deepQuery([serie],'animationDuration')
                             || duration)
                             + dataIndex * 100,
-
-                            {scale : [1, 1, x, y]},
-
-                            (self.deepQuery([serie], 'animationEasing')
-                            || easing)
+                            {scale : [1, 1, x, y]}
                         )
-                        .start();
+                        .start(
+                            self.deepQuery([serie], 'animationEasing') || easing
+                        );
                 }
                 else {
                     x = self.shapeList[i]._x || 0;
@@ -911,10 +909,9 @@ define(function(require) {
                     zr.animate(self.shapeList[i].id, '')
                         .when(
                             duration,
-                            {scale : [1, 1, x, y]},
-                            'QuinticOut'
+                            {scale : [1, 1, x, y]}
                         )
-                        .start();
+                        .start('QuinticOut');
                 }
             }
         }

diff --git a/src/chart/pie.js b/src/chart/pie.js
@@ -898,27 +898,22 @@ define(function(require) {
                             (self.deepQuery([serie],'animationDuration')
                             || duration)
                             + dataIndex * 10,
-
                             {
                                 r0 : r0,
                                 r : r
-                            },
-
-                            'QuinticOut'
+                            }
                         )
-                        .start();
+                        .start('QuinticOut');
                     zr.animate(self.shapeList[i].id, '')
                         .when(
                             (self.deepQuery([serie],'animationDuration')
                             || duration)
                             + dataIndex * 100,
-
-                            {rotation : [0, x, y]},
-
-                            (self.deepQuery([serie], 'animationEasing')
-                            || easing)
+                            {rotation : [0, x, y]}
                         )
-                        .start();
+                        .start(
+                            self.deepQuery([serie], 'animationEasing') || easing
+                        );
                 }
                 else {
                     dataIndex = self.shapeList[i]._dataIndex;
@@ -928,10 +923,9 @@ define(function(require) {
                     zr.animate(self.shapeList[i].id, '')
                         .when(
                             duration + dataIndex * 100,
-                            {scale : [1, 1, x, y]},
-                            'QuinticOut'
+                            {scale : [1, 1, x, y]}
                         )
-                        .start();
+                        .start('QuinticOut');
                 }
             }
         }

diff --git a/src/chart/radar.js b/src/chart/radar.js
@@ -476,13 +476,11 @@
                             (self.deepQuery([serie],'animationDuration')
                             || duration)
                             + dataIndex * 100,
-
-                            {scale : [1, 1, x, y]},
-
-                            (self.deepQuery([serie], 'animationEasing')
-                            || easing)
+                            {scale : [1, 1, x, y]}
                         )
-                        .start();
+                        .start(
+                            self.deepQuery([serie], 'animationEasing') || easing
+                        );
                 }
                 else {
                     x = self.shapeList[i]._x || 0;
@@ -493,10 +491,9 @@
                     zr.animate(self.shapeList[i].id, '')
                         .when(
                             duration,
-                            {scale : [1, 1, x, y]},
-                            'QuinticOut'
+                            {scale : [1, 1, x, y]}
                         )
-                        .start();
+                        .start('QuinticOut');
                 }
             }
 

diff --git a/src/chart/scatter.js b/src/chart/scatter.js
@@ -425,13 +425,11 @@ define(function(require) {
                     .when(
                         (self.deepQuery([serie],'animationDuration')
                         || duration),
-
-                        {scale : [1, 1, x, y]},
-
-                        (self.deepQuery([serie], 'animationEasing')
-                        || easing)
+                        {scale : [1, 1, x, y]}
                     )
-                    .start();
+                    .start(
+                        self.deepQuery([serie], 'animationEasing') || easing
+                    );
             }
         }