1.3.6 release

doc/asset/js/bootstrap-transition.js

@@ -64,6 +64,6 @@ document.write(unescape("%3Cscript src='" + _bdhmProtocol + "hm.baidu.com/h.js%3
 
 var lrl = document.getElementById('last-release-link');
 if (lrl) {
-    lrl.href = 'https://github.com/ecomfe/echarts/archive/1.3.5.zip';
-    lrl.innerHTML = 'ZIP (1.3.5)';
+    lrl.href = 'https://github.com/ecomfe/echarts/archive/1.3.6.zip';
+    lrl.innerHTML = 'ZIP (1.3.6)';
 }

doc/changelog.html

@@ -91,7 +91,10 @@ <h3>1.3.6<small>（2014-01-15）</small></h3>
                     <li>[^] [tooltip]支持图例开关过滤</li>
                     <li>[^] [grid][dataRange]x，y，width，height支持百分比</li>
                     <li>[^] 通用文本分行支持，'\n' 指定</li>
+                    <li>[^] 动画元素阀值（大规模数据时强制关闭动画效果）</li>
+                    <li>[#] [dataZoom]数据区域缩放下抛出事件dataIndex参数修正</li>
                     <li>[#] [sactter]大规模散点图像素偏移</li>
+                    <li>[#] [force]默认颜色从legend获取</li>
                     <li>[#] 修复script标签式引入文件构建错误，fix <a href="https://github.com/ecomfe/echarts/issues/174" target="_blank">this »</a></li>
                     <li>[+] 新增专题 <a href="example/topic/aqi-china/index.html" target="_blank">中国主要城市空气质量实况</a>
                     <li>[?] 依赖升级，<a href="http://ecomfe.github.io/zrender/" target="_blank">ZRender</a> 1.0.8+</li>

doc/doc.html

@@ -2013,11 +2013,17 @@ <h4>series<a name="Series"> </a></h4>
                             <td> 折线图  </td>
                             <td> 平滑曲线显示</td>
                         </tr>
+                        <tr>
+                            <td> <b>{boolean}</b> large </td>
+                            <td> false </td>
+                            <td> 散点图  </td>
+                            <td> 启动大规模散点图</td>
+                        </tr>
                         <tr>
                             <td> <b>{number}</b> largeThreshold </td>
                             <td> 2000 </td>
                             <td> 散点图  </td>
-                            <td> 大规模散点图自动切换阀值</td>
+                            <td> 大规模散点图自动切换阀值，large为true下有效</td>
                         </tr>
                         <tr>
                             <td> <b>{Array}</b> center </td>

doc/example/topic/aqi-china/js/main.js

@@ -1,4 +1,4 @@
-var developMode = true;
+var developMode = false;
 if (developMode) {
     // for develop
     require.config({

index.html

@@ -71,7 +71,7 @@
           <div class="container">
             <div class="carousel-caption">
               <h1>ECharts</h1>
-              <h6>（1.3.5 <a href="doc/changelog.html" target="_blank" class="link">Changelog</a>）</h6>
+              <h6>（1.3.6 <a href="doc/changelog.html" target="_blank" class="link">Changelog</a>）</h6>
               <p>基于Canvas，纯Javascript图表库，提供直观，生动，可交互，可个性化定制的数据可视化图表。创新的拖拽重计算、数据视图、值域漫游等特性大大增强了用户体验，赋予了用户对数据进行挖掘、整合的能力。</p>
               <p style="text-align: right;"><strong>———— 大数据时代，重新定义数据图表的时候到了</strong></p>
             </div>

package.json

@@ -1,14 +1,14 @@
 {
     "name": "echarts",
     "description": "Enterprise Charts，基于Canvas，纯Javascript图表库，提供直观，生动，可交互，可个性化定制的数据可视化表。",
-    "version": "1.2.1",
+    "version": "1.3.6",
     "maintainers": [
         { "name": "Kener", "email": "[email protected]" },
         { "name": "Pissang", "email": "[email protected]" },
         { "name": "Yangji", "email": "[email protected]" }
     ],
     "dependencies": {
-        "zrender": "~1.0.4"
+        "zrender": "~1.0.8"
     },
     "repository": "git://github.com/ecomfe/echarts",
     "main": "echarts",

src/chart/force.js

@@ -376,7 +376,7 @@ define(function(require) {
                     // data
                     node,
                     // data index
-                    rawNodes.indexOf(node),
+                    zrUtil.indexOf(rawNodes, node),
                     // name
                     node.name || '',
                     // value

src/echarts.js

@@ -18,9 +18,9 @@
 define(function(require) {
     var self = {};
     var echarts = self;     // 提供内部反向使用静态方法；
-    self.version = '1.3.5';
+    self.version = '1.3.6';
     self.dependencies = {
-        zrender : '1.0.7'
+        zrender : '1.0.8'
     };
     /**
      * 入口方法 

test/allchart/all.html

@@ -404,7 +404,7 @@ <h3 class="test-head"><a href="../../index.html">ECharts</a> - test all <button
             ],
             markPoint : {
                 data : [
-                    {name : '最高', value : 930, xAxis: '周六', yAxis: 930, symbolSize:14},
+                    {name : '最高', value : 930, xAxis: '周六', yAxis: 930, symbolSize:14}
                 ]
             },
             markLine : {
@@ -551,7 +551,7 @@ <h3 class="test-head"><a href="../../index.html">ECharts</a> - test all <button
                     normal:{label:{position:'top'}}
                 },
                 data : [
-                    {name : '有个东西', value : 1000, xAxis: 5, yAxis: 5, symbolSize:80},
+                    {name : '有个东西', value : 1000, xAxis: 5, yAxis: 5, symbolSize:80}
                 ]
             }
         }
@@ -974,7 +974,7 @@ <h3 class="test-head"><a href="../../index.html">ECharts</a> - test all <button
             markPoint : {
                 symbol: 'emptyHeart',
                 data : [
-                    {name : '打酱油的标注', value : 100, x:'50%', y:'15%', symbolSize:32},
+                    {name : '打酱油的标注', value : 100, x:'50%', y:'15%', symbolSize:32}
                 ]
             }
         }
@@ -1174,7 +1174,7 @@ <h3 class="test-head"><a href="../../index.html">ECharts</a> - test all <button
             markPoint : {
                 symbol: 'emptyHeart',
                 data : [
-                    {name : '打酱油的标注', value : 100, x:'50%', y:'15%', symbolSize:32},
+                    {name : '打酱油的标注', value : 100, x:'50%', y:'15%', symbolSize:32}
                 ]
             }
         }
@@ -1286,7 +1286,7 @@ <h3 class="test-head"><a href="../../index.html">ECharts</a> - test all <button
                 symbol: 'star',
                 data : [
                     {name : '打酱油的标注', value : 100, x:'5%', y:'50%', symbolSize:32},
-                    {name : '打酱油的标注', value : 100, x:'95%', y:'50%', symbolSize:32},
+                    {name : '打酱油的标注', value : 100, x:'95%', y:'50%', symbolSize:32}
                 ]
             }
         }
@@ -1422,7 +1422,7 @@ <h3 class="test-head"><a href="../../index.html">ECharts</a> - test all <button
                 symbol: 'emptyCircle',
                 data : [
                     {name : '打酱油的标注', value : 100, x:'5%', y:'50%', symbolSize:32},
-                    {name : '打酱油的标注', value : 100, x:'95%', y:'50%', symbolSize:32},
+                    {name : '打酱油的标注', value : 100, x:'95%', y:'50%', symbolSize:32}
                 ]
             }
         }

test/allchart/all.js

@@ -84,7 +84,7 @@ function refreshAll() {
     }
 }
 
-var developMode = true;
+var developMode = false;
 if (developMode) {
     // for develop
     require.config({
@@ -105,7 +105,7 @@ if (developMode) {
 }
 else {
     // for echarts online home page
-    var fileLocation = './www/js/echarts-map';
+    var fileLocation = '../../build/echarts-map';
     require.config({
         paths:{ 
             echarts: fileLocation,