1.3.0 release

f152249e · kener · 9d20a648 · f152249e · f152249e · f152249e
27 changed file
--- a/build/build-map.js
+++ b/build/build-map.js
@@ -22,6 +22,7 @@
        'echarts/chart/scatter',
        'echarts/chart/k',
        'echarts/chart/radar',
+        'echarts/chart/chord',
        'echarts/chart/force',
        'echarts/chart/map',
        'echarts/util/mapData/china/0',     // 全国

--- a/build/build-original-map.js
+++ b/build/build-original-map.js
@@ -22,6 +22,7 @@
        'echarts/chart/scatter',
        'echarts/chart/k',
        'echarts/chart/radar',
+        'echarts/chart/chord',
        'echarts/chart/force',
        'echarts/chart/map',
        'echarts/util/mapData/china/0',     // 全国

--- a/build/build-original.js
+++ b/build/build-original.js
@@ -22,6 +22,7 @@
        'echarts/chart/scatter',
        'echarts/chart/k',
        'echarts/chart/radar',
+        'echarts/chart/chord',
        'echarts/chart/force',
        /*
        'echarts/chart/map',

--- a/build/build.js
+++ b/build/build.js
@@ -22,6 +22,7 @@
        'echarts/chart/scatter',
        'echarts/chart/k',
        'echarts/chart/radar',
+        'echarts/chart/chord',
        'echarts/chart/force',
        /*
        'echarts/chart/map',

--- a/build/echarts-map.js
+++ b/build/echarts-map.js
--- a/build/echarts-original-map.js
+++ b/build/echarts-original-map.js
--- a/build/echarts-original.js
+++ b/build/echarts-original.js
--- a/build/echarts.js
+++ b/build/echarts.js
--- a/doc/asset/img/architecture.png
+++ b/doc/asset/img/architecture.png
--- a/doc/asset/img/doc/charts.jpg
+++ b/doc/asset/img/doc/charts.jpg
--- a/doc/asset/img/mix.jpg
+++ b/doc/asset/img/mix.jpg
--- a/doc/asset/js/bootstrap-transition.js
+++ b/doc/asset/js/bootstrap-transition.js
@@ -63,5 +63,5 @@ var _bdhmProtocol = (("https:" == document.location.protocol) ? " https://" : "
 document.write(unescape("%3Cscript src='" + _bdhmProtocol + "hm.baidu.com/h.js%3Fb78830c9a5dad062d08b90b2bc0cf5da' type='text/javascript'%3E%3C/script%3E"));

 var lrl = document.getElementById('last-release-link');
-lrl.href = 'https://github.com/ecomfe/echarts/archive/1.2.1.zip';
-lrl.innerHTML = 'ZIP (1.2.1)'
\ No newline at end of file
+lrl.href = 'https://github.com/ecomfe/echarts/archive/1.3.0.zip';
+lrl.innerHTML = 'ZIP (1.3.0)'
\ No newline at end of file
--- a/doc/changelog.html
+++ b/doc/changelog.html
@@ -81,7 +81,7 @@
        <span>[+]新增 [-]删除 [^]升级 [#]修复 【】重要</span>
        <div class="row-fluid">
            <div>
-                <h3>Latest<small>（After 2013-09-29）</small></h3>
+                <h3>1.3.0<small>（2013-11-05）</small></h3>
                <ul>
                    <li>【+】 [chord]新增和弦图，支持多维选择</li>
                    <li>【^】 [pie]升级支持南丁格尔玫瑰图（半径/面积）模式</li>

--- a/doc/example/www/js/echarts-map.js
+++ b/doc/example/www/js/echarts-map.js
--- a/doc/example/www/js/echarts-original-map.js
+++ b/doc/example/www/js/echarts-original-map.js
--- a/doc/example/www/js/echarts-original.js
+++ b/doc/example/www/js/echarts-original.js
--- a/doc/example/www/js/echarts.js
+++ b/doc/example/www/js/echarts.js
--- a/index.html
+++ b/index.html
@@ -71,7 +71,7 @@
          <div class="container">
            <div class="carousel-caption">
              <h1>ECharts</h1>
-              <h6>（1.2.1 <a href="doc/changelog.html" target="_blank" class="link">Changelog</a>）</h6>
+              <h6>（1.3.0 <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>
@@ -224,7 +224,7 @@
            <img src="doc/asset/img/custom.png"/>
        </div>
        <h2 class="featurette-heading">个性化定制</h2>
-        <p>近300个可配置选项结合多级控制设计满足高度定制的个性化需求。</p>
+        <p>超过500个可配置选项结合多级控制设计满足高度定制的个性化需求。</p>
        <a href="doc/doc.html" target="_blank">详细文档 &raquo;</a>
      </div>
      <hr class="featurette-divider">

--- a/src/chart/bar.js
+++ b/src/chart/bar.js
@@ -24,7 +24,6 @@ define(function(require) {
        var ecConfig = require('../config');
        var ecData = require('../util/ecData');
        
-        var zrUtil = require('zrender/tool/util');
        var zrColor = require('zrender/tool/color');

        var self = this;

--- a/src/chart/chord.js
+++ b/src/chart/chord.js
@@ -25,9 +25,6 @@ define(function(require) {
        var ecConfig = require('../config');
        var ecData = require('../util/ecData');

-        var zrConfig = require('zrender/config');
-        var zrEvent = require('zrender/tool/event');
-
        var zrUtil = require('zrender/tool/util');
        var vec2 = require('zrender/tool/vector');
        var NDArray = require('../util/ndarray');

--- a/src/chart/line.js
+++ b/src/chart/line.js
@@ -630,7 +630,9 @@ define(function(require) {
        /**
         * 生成空数据所需的可计算提示图形
         */
-        function _getCalculableItem(seriesIndex, dataIndex, name, x, y, orient) {
+        function _getCalculableItem(
+            seriesIndex, dataIndex, name, x, y, orient
+        ) {
            var color = series[seriesIndex].calculableHolderColor
                        || ecConfig.calculableHolderColor;

@@ -719,11 +721,11 @@ define(function(require) {
            );
            if (symbol.match('empty')) {
                if (typeof itemShape.style.textColor == 'undefined') {
-                    itemShape.style.textColor = itemShape.style.strokeColor
+                    itemShape.style.textColor = itemShape.style.strokeColor;
                }
                if (typeof itemShape.highlightStyle.textColor == 'undefined') {
                    itemShape.highlightStyle.textColor = 
-                        itemShape.highlightStyle.strokeColor
+                        itemShape.highlightStyle.strokeColor;
                }
            }
            

--- a/src/chart/pie.js
+++ b/src/chart/pie.js
@@ -105,7 +105,7 @@ define(function(require) {
                if (self.selectedMap[itemName]) {
                    totalSelected++;
                    totalValue += +data[i].value;
-                    maxValue = Math.max(maxValue, +data[i].value)
+                    maxValue = Math.max(maxValue, +data[i].value);
                }
            }

@@ -412,8 +412,8 @@ define(function(require) {
                if (labelControl.position == 'outer') {
                    // 外部显示，默认
                    radius = serie.radius[1]
-                             - -itemStyle[status].labelLine.length
-                             - -textStyle.fontSize;
+                             - (-itemStyle[status].labelLine.length)
+                             - (-textStyle.fontSize);
                    textAlign = (midAngle >= 150 && midAngle <= 210)
                                ? 'right'
                                : ((midAngle <= 30 || midAngle >= 330)
@@ -554,7 +554,7 @@ define(function(require) {
                // 视觉引导线起点半径
                var midRadius = r1;
                // 视觉引导线终点半径
-                var maxRadius = serie.radius[1] - -labelLineControl.length;
+                var maxRadius = serie.radius[1] - (-labelLineControl.length);
                var midAngle = ((endAngle + startAngle) / 2) % 360; // 角度中值
                var cosValue = zrMath.cos(midAngle, true);
                var sinValue = zrMath.sin(midAngle, true);
@@ -1119,9 +1119,6 @@ define(function(require) {
            var endAngle = shape.style.endAngle;
            var defaultColor = shape.highlightStyle.color;
            
-            var r0 = +series[seriesIndex].radius[0]; // 扇形内半径
-            var r1 = +series[seriesIndex].radius[1];  // 扇形外半径
-            
            // 文本标签，需要显示则会有返回
            var label = _getLabel(
                    seriesIndex, dataIndex, percent,

--- a/src/component/legend.js
+++ b/src/component/legend.js
@@ -81,7 +81,7 @@ define(function (require) {

            for (var i = 0; i < dataLength; i++) {
                itemName = data[i];
-                if (itemName == '') {
+                if (itemName === '') {
                    if (legendOption.orient == 'horizontal') {
                        lastX = _itemGroupLocation.x;
                        lastY += itemHeight + itemGap;
@@ -107,7 +107,7 @@ define(function (require) {
                        && (itemWidth + 5
                            + zrArea.getTextWidth(itemName, font)
                            // 分行的最后一个不用算itemGap
-                            + (i == dataLength - 1 || data[i+1] == ''
+                            + (i == dataLength - 1 || data[i+1] === ''
                               ? 0 : itemGap))
                            >= zrWidth - lastX
                    ) {
@@ -119,7 +119,7 @@ define(function (require) {
                    if (zrHeight - lastY < 200   // 最后200px做分行预判
                        && (itemHeight
                            // 分行的最后一个不用算itemGap
-                            + (i == dataLength - 1 || data[i+1] == ''
+                            + (i == dataLength - 1 || data[i+1] === ''
                               ? 0 : itemGap))
                            >= zrHeight - lastY
                    ) {
@@ -231,7 +231,7 @@ define(function (require) {
                // 水平布局，计算总宽度
                totalHeight = itemHeight;
                for (var i = 0; i < dataLength; i++) {
-                    if (data[i] == '') {
+                    if (data[i] === '') {
                        temp -= itemGap;
                        if (temp > zrWidth) {
                            totalWidth = zrWidth;
@@ -274,7 +274,7 @@ define(function (require) {
                maxWidth += itemWidth;
                totalWidth = maxWidth;
                for (var i = 0; i < dataLength; i++) {
-                    if (data[i] == '') {
+                    if (data[i] === '') {
                        temp -= itemGap;
                        if (temp > zrHeight) {
                            totalHeight = zrHeight;
@@ -479,7 +479,7 @@ define(function (require) {
            var color;
            for (var i = 0, dataLength = data.length; i < dataLength; i++) {
                itemName = data[i];
-                if (itemName == '') {
+                if (itemName === '') {
                    continue;
                }
                serie = _getSeriesByName(itemName);

--- a/src/component/title.js
+++ b/src/component/title.js
@@ -73,7 +73,7 @@ define(function (require) {
                textShape.clickable = true;
                textShape.onclick = function(){
                    window.open(link);
-                }
+                };
            }
            
            var subtextShape = {
@@ -93,7 +93,7 @@ define(function (require) {
                subtextShape.clickable = true;
                subtextShape.onclick = function(){
                    window.open(sublink);
-                }
+                };
            }

            

--- a/src/component/tooltip.js
+++ b/src/component/tooltip.js
@@ -895,7 +895,7 @@ define(function (require) {
                else if (serie.type == ecConfig.CHART_TYPE_CHORD) {
                    if (typeof special2 == 'undefined') {
                        // 外环上
-                        _tDom.innerHTML = _encodeHTML(name) + ' (' + value + ')';
+                        _tDom.innerHTML = _encodeHTML(name)+' (' + value + ')';
                    }
                    else {
                        var name1 = _encodeHTML(name);
@@ -1196,7 +1196,7 @@ define(function (require) {
                    tipShape[i].ondragend = null;
                    tipShape[i].ondragover = null;
                    tipShape[i].ondrop = null;
-                    zr.addShape(tipShape[i])
+                    zr.addShape(tipShape[i]);
                }
                _lastTipShape = {
                    dataIndex : param.dataIndex,
@@ -1303,11 +1303,11 @@ define(function (require) {
         */
        _encodeHTML = function (source) {
            return String(source)
-                        .replace(/&/g,'&amp;')
-                        .replace(/</g,'&lt;')
-                        .replace(/>/g,'&gt;')
-                        .replace(/"/g, "&quot;")
-                        .replace(/'/g, "&#39;");
+                        .replace(/&/g, '&amp;')
+                        .replace(/</g, '&lt;')
+                        .replace(/>/g, '&gt;')
+                        .replace(/"/g, '&quot;')
+                        .replace(/'/g, '&#39;');
        };
        
        zr.on(zrConfig.EVENT.MOUSEMOVE, _onmousemove);

--- a/src/echarts.js
+++ b/src/echarts.js
@@ -42,9 +42,9 @@
 define(function(require) {
    var self = {};
    var echarts = self;     // 提供内部反向使用静态方法；
-    self.version = '1.2.1';
+    self.version = '1.3.0';
    self.dependencies = {
-        zrender : '1.0.4'
+        zrender : '1.0.5'
    };
    /**
     * 入口方法 
@@ -405,7 +405,6 @@ define(function(require) {
                && _chartList[len].ontooltipHover
                && _chartList[len].ontooltipHover(param, tipShape);
            }
-            //_zr.refreshHover();
        }

        /**

--- a/src/util/shape/chord.js
+++ b/src/util/shape/chord.js
@@ -76,7 +76,7 @@
 */
 define(function(require) {

-    var util = require('zrender/tool/util')
+    var util = require('zrender/tool/util');
    function ChordShape() {
        this.type = 'chord';
    }
@@ -160,12 +160,12 @@ define(function(require) {
                y = originPos[1];
            }
            _ctx.beginPath();
-            ChordShape.prototype.buildPath.call(null, _ctx, e.style)
+            ChordShape.prototype.buildPath.call(null, _ctx, e.style);
            _ctx.closePath();
            
            return _ctx.isPointInPath(x, y);
        }
-    }
+    };

    require('zrender/shape/base').derive(ChordShape);
    require('zrender/shape').define('chord', new ChordShape());