2.1.9 release

tianfan · Dec 8, 2014 · ad25a54 · ad25a54
1 parent bc1454e
commit ad25a54
Show file tree

Hide file tree

Showing 9 changed files with 314 additions and 252 deletions.
diff --git a/build/dist/chart/force.js b/build/dist/chart/force.js
diff --git a/build/dist/echarts-all.js b/build/dist/echarts-all.js
diff --git a/build/dist/echarts.js b/build/dist/echarts.js
diff --git a/build/source/chart/force.js b/build/source/chart/force.js
@@ -472,6 +472,19 @@ define('echarts/chart/force', [
                 } else if (node.fixY) {
                     position[1] = shape.position[1];
                     shape.position[0] = position[0];
+                } else if (isNaN(node.fixX - 0) == false && isNaN(node.fixY - 0) == false) {
+                    shape.position[0] += (position[0] - shape.position[0]) * node.fixX;
+                    position[0] = shape.position[0];
+                    shape.position[1] += (position[1] - shape.position[1]) * node.fixY;
+                    position[1] = shape.position[1];
+                } else if (isNaN(node.fixX - 0) == false) {
+                    shape.position[0] += (position[0] - shape.position[0]) * node.fixX;
+                    position[0] = shape.position[0];
+                    shape.position[1] = position[1];
+                } else if (isNaN(node.fixY - 0) == false) {
+                    shape.position[1] += (position[1] - shape.position[1]) * node.fixY;
+                    position[1] = shape.position[1];
+                    shape.position[0] = position[0];
                 } else {
                     vec2.copy(shape.position, position);
                 }

diff --git a/build/source/echarts-all.js b/build/source/echarts-all.js
diff --git a/build/source/echarts.js b/build/source/echarts.js
diff --git a/doc/example/www/js/chart/force.js b/doc/example/www/js/chart/force.js
diff --git a/doc/example/www/js/echarts.js b/doc/example/www/js/echarts.js
diff --git a/doc/example/www2/js/echarts-all.js b/doc/example/www2/js/echarts-all.js