Dump 2.2.4

xhxxac16 · Jun 17, 2015 · df02720 · df02720
1 parent 79db918
commit df02720
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 5 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "echarts",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "homepage": "http://echarts.baidu.com",
   "repository": "git://github.com/ecomfe/echarts",
   "authors": [

diff --git a/doc/asset/js/echartsHome.js b/doc/asset/js/echartsHome.js
@@ -1,4 +1,4 @@
-var version = '2.2.3';
+var version = '2.2.4';
 var sp = location.href.lastIndexOf('/');
 var ep = location.href.lastIndexOf('.html');
 var curPage = sp < ep ? location.href.slice(sp + 1, ep) : 'index';

diff --git a/doc/changelog-en.html b/doc/changelog-en.html
@@ -47,6 +47,15 @@
         <h2>ChangeLog</h2>
         <span>[+]Added [-]Deleted [^]Upgraded [#]Fixed 【】Important</span>
         <div class="row-fluid">
+            <div>
+                <h3>2.2.4<small> (2015-06-17) </small></h3>
+                <ul>
+                    <li>[^] Fix chord label textStyle color not work, Fix <a href="https://github.com/ecomfe/echarts/issues/1649">#1649 »</a></li>
+                    <li>[^] Fix timeline not dispose bug when setOption with notMerge true。Fix <a href="https://github.com/ecomfe/echarts/issues/1601">#1601 »</a></li>
+                    <li>[^] Treemap add root option</li>
+                    <li>[^] Fix arrow drag and zoom bug in force。Fix <a href="https://github.com/ecomfe/echarts/issues/1604">#1604 »</a></li>
+                </ul>
+            </div>
             <div>
                 <h3>2.2.3<small> (2015-06-01) </small></h3>
                 <ul>

diff --git a/doc/changelog.html b/doc/changelog.html
@@ -47,6 +47,15 @@
         <h2>修改记录</h2>
         <span>[+]新增 [-]删除 [^]升级 [#]修复 【】重要</span>
         <div class="row-fluid">
+            <div>
+                <h3>2.2.4<small> (2015-06-17) </small></h3>
+                <ul>
+                    <li>[^] 修复chord label设置textStyle color失效, Fix <a href="https://github.com/ecomfe/echarts/issues/1649">#1649 »</a></li>
+                    <li>[^] 修复setOption中notMerge为true时timeline不销毁的bug。Fix <a href="https://github.com/ecomfe/echarts/issues/1601">#1601 »</a></li>
+                    <li>[^] 矩形树图加入 root 配置项</li>
+                    <li>[^] 修复力导向中拖拽和缩放时，箭头不会跟着拖动和缩放的bug。Fix <a href="https://github.com/ecomfe/echarts/issues/1604">#1604 »</a></li>
+                </ul>
+            </div>
             <div>
                 <h3>2.2.3<small> (2015-06-01) </small></h3>
                 <ul>

diff --git a/doc/doc-en.html b/doc/doc-en.html
@@ -3789,6 +3789,11 @@ <h5>series ( treemap )<a name="SeriesTreemap"> </a></h5>
                             <td> ['80%', '80%']</td>
                             <td> size of the chart, in pixels or percent.</td>
                         </tr>
+                        <tr>
+                            <td> <b>{string}</b> root</td>
+                            <td> ''</td>
+                            <td> Name of root node </td>
+                        </tr>
                         <tr>
                             <td> <b>{Object}</b> itemStyle </td>
                             <td> {} </td>

diff --git a/doc/doc.html b/doc/doc.html
@@ -3799,7 +3799,12 @@ <h5>series（矩形树图）<a name="SeriesTreemap"> </a></h5>
                             <td> <b>{Array}</b> size </td>
                             <td> ['80%', '80%']</td>
                             <td> 大小，支持绝对值（px）和百分比</td>
-                        </tr>  
+                        </tr>
+                        <tr>
+                            <td> <b>{string}</b> root</td>
+                            <td> ''</td>
+                            <td> 当前显示的根节点的名字 </td>
+                        </tr>
                         <tr>
                             <td> <b>{Object}</b> itemStyle </td>
                             <td> {} </td>

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "echarts",
     "description": "Enterprise Charts，基于Canvas，纯Javascript图表库，提供直观，生动，可交互，可个性化定制的数据可视化表。",
-    "version": "2.2.3",
+    "version": "2.2.4",
     "maintainers": [
         { "name": "Kener", "email": "kener.linfeng@gmail.com" },
         { "name": "Pissang", "email": "shenyi.914@gmail.com" },

diff --git a/src/echarts.js b/src/echarts.js
@@ -27,7 +27,7 @@ define(function (require) {
     var _instances = {};    // ECharts实例map索引
     var DOM_ATTRIBUTE_KEY = '_echarts_instance_';
 
-    self.version = '2.2.3';
+    self.version = '2.2.4';
     self.dependencies = {
         zrender: '2.0.9'
     };