Skip to content
Permalink
Browse files
Merge branch 'master' of github.com:ecomfe/echarts-www
  • Loading branch information
Ovilia committed Aug 30, 2017
2 parents f2a4eca + 91d2890 commit c363ffb3651519a8070e5abba4de42b46433453b
Showing 176 changed files with 18,856 additions and 8,389 deletions.
@@ -1,7 +1,6 @@
node_modules
css/*.css
css/font
/*.html
release
documents
*.zip
@@ -0,0 +1,4 @@
<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><script type="text/javascript">// If user visit a illegal link "http://echarts.baidu.com/asdf/zxcv.html",
// 404.html will show but folder level is incorrect.
// I have no time to figure that out, so use this stupid approach.
location.href = 'http://echarts.baidu.com/404.html'</script></head></html>
@@ -0,0 +1,15 @@
<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="http://apps.bdimg.com/libs/bootstrap/3.3.4/css/bootstrap.min.css"><!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries--><!--[if lt IE 9]><script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script><script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]--><link rel="stylesheet" type="text/css" href="./css/main.css"><script type="text/javascript" src="./vendors/pace/pace.min.js"></script><script id="font-hack" type="text/javascript">if (/windows/i.test(navigator.userAgent)) {
var el = document.createElement('style');
el.innerHTML = ''
+ '@font-face {font-family:"noto-thin";src:local("Microsoft Yahei");}'
+ '@font-face {font-family:"noto-light";src:local("Microsoft Yahei");}';
document.head.insertBefore(el, document.getElementById('font-hack'));
}
</script><script type="text/javascript" src="./vendors/jquery/jquery.min.js"></script></head><!--[if lte IE 8]><body class="lower-ie"><div id="lowie-main"><img src="./images/forie.png" alt="ie tip"></div></body><![endif]-->
<!--[if (gt IE 8)|!(IE)]><body class="undefined"></body><![endif]--><div id="main"><nav class="navbar navbar-default navbar-fixed-top"><div class="container-fluid"><div class="navbar-header"><button type="button" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false" class="navbar-toggle collapsed"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a href="http://echarts.baidu.com/index.html" class="navbar-brand"><img src="./images/logo.png" alt="echarts logo" class="navbar-logo"></a></div><div id="navbar-collapse" class="collapse navbar-collapse"><ul class="nav navbar-nav navbar-left"><li id="nav-index"><a href="http://echarts.baidu.com/index.html">首页</a></li><li id="nav-doc" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle">文档<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="http://echarts.baidu.com/feature.html">特性</a></li><li><a href="http://echarts.baidu.com/tutorial.html">教程</a></li><li><a href="http://echarts.baidu.com/api.html">API</a></li><li><a href="http://echarts.baidu.com/option.html">配置项手册</a></li><li><a href="http://echarts.baidu.com/option-gl.html">GL 配置项手册</a></li><li><a href="http://echarts.baidu.com/faq.html">常见问题</a></li><li><a href="http://echarts.baidu.com/changelog.html">版本记录</a></li></ul></li><li id="nav-download" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle">下载<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="http://echarts.baidu.com/download.html">下载</a></li><li><a href="http://echarts.baidu.com/download-theme.html">主题下载</a></li><li><a href="http://echarts.baidu.com/download-map.html">地图下载</a></li><li><a href="http://echarts.baidu.com/download-extension.html">扩展下载</a></li></ul></li><li id="nav-examples"><a href="#" data-toggle="dropdown" class="dropdown-toggle">实例<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="http://echarts.baidu.com/examples.html">官方实例</a></li><li><a href="http://gallery.echartsjs.com/explore.html#tags=echarts-gl">GL 实例</a></li></ul></li><li id="nav-community"><a href="#" data-toggle="dropdown" class="dropdown-toggle">社区<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="http://gallery.echartsjs.com">GALLERY</a></li><li><a href="http://efe.baidu.com/tags/ECharts/">博客</a></li></ul></li><li id="nav-tool"><a href="#" data-toggle="dropdown" class="dropdown-toggle">工具<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="http://echarts.baidu.com/spreadsheet.html">表格工具</a></li><li><a href="http://ecomfe.github.io/echarts-map-tool/">地图数据在线工具</a></li><li><a href="http://echarts.baidu.com/theme-builder/">主题构建工具</a></li></ul></li><li id="nav-about"><a href="#" data-toggle="dropdown" class="dropdown-toggle">关于<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="http://echarts.baidu.com/about.html">关于我们</a></li><li><a href="https://github.com/ecomfe/echarts/blob/master/LICENSE">版权声明</a></li></ul></li></ul><ul class="nav navbar-nav navbar-right"><li id="nav-github"><a href="https://github.com/ecomfe/echarts" target="_blank"><img src="http://echarts.baidu.com/images/github.png" width="18"></a></li><li id="nav-2" class="0"><a href="http://echarts.baidu.com/echarts2/">2.0</a></li><li id="nav-homeen"><a href="https://ecomfe.github.io/echarts-doc/public/en/index.html">EN</a></li></ul></div></div></nav><div class="not-found"><img src="./images/404.png" alt="404"><div class="text">非常抱歉,您所访问的网页找不到了!您可以选择<a href="./index.html" class="link">返回首页</a></div></div></div><script type="text/javascript" src="./vendors/bootstrap/js/bootstrap.min.js"></script><script type="text/javascript" src="./js/common.js"></script><script type="text/javascript"></script><script type="text/javascript">var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?4bad1df23f079e0d12bdbef5e65b072f";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();</script></html>
@@ -49,7 +49,7 @@ block content
each names, key in components
li(class=names[2] ? 'checked' : '')
img(src="images/builder/component/#{key}.svg", alt="")
input(type="checkbox" name="#{key}")
input(type="checkbox" name="#{names[3] || key}")
<h5>#{names[0]} <span>#{names[1]}</span></h5>

section#other
@@ -21,25 +21,25 @@ block content
a(class="download-echarts" target='_blank' href="dist/echarts.common.min.js" download="echarts.common.min.js")
.circle-wrap
span.mode 常用
span.size 387 KB
span.size 406 KB
.text 包含常用的图表组件<br><span>折 柱 饼 散点 图例<br />工具栏 标注/线/域<br /> 数据区域缩放</span>
.col-sm-3.col-xs-6
a(class="download-echarts" target='_blank' href="dist/echarts.simple.min.js" download="echarts.simple.min.js")
.circle-wrap
span.mode 精简
span.size 254 KB
span.size 267 KB
.text 只包含基础图表<br><span>折 柱 饼</span>
.col-sm-3.col-xs-6
a(class="download-echarts" target='_blank' href="dist/echarts.min.js" download="echarts.min.js")
.circle-wrap
span.mode 完整
span.size 644 KB
span.size 663 KB
.text 包含所有图表组件
.col-sm-3.col-xs-6
a(class="download-echarts" target='_blank' href="dist/echarts.js" download="echarts.js")
.circle-wrap
span.mode 源代码
span.size 2.44 MB
span.size 2.52 MB
.text 包含所有图表组件<br />的源码,常见的警告和错误提示
a.btn.btn-thirdary.more-btn(href="builder.html") 在线定制
p 可自由选择所需图表和组件进行打包下载

Large diffs are not rendered by default.

@@ -0,0 +1,109 @@

ecHomePath='http://echarts.baidu.com'
localPath=$(cd `dirname $0`; pwd)

normalPages=(
'404.html'
'about.html'
'api.html'
'builder.html'
'changelog.html'
'demo.html'
'download-extension.html'
'download-map.html'
'download-theme.html'
'download.html'
'examples.html'
'faq.html'
'index.html'
'option-gl.html'
'option.html'
'spreadsheet.html'
'tutorial.html'
);

codeDownloadURLs=(
'dist/echarts.common.min.js'
'dist/echarts.simple.min.js'
'dist/echarts.min.js'
'dist/echarts.js'
'builder/src/echarts/echarts.js'
);

function checkNormalPage() {
pagePath=$1
remotePageFullPath=${ecHomePath}/${pagePath}

echo "Checking: ${remotePageFullPath} ..."

pageContent=`curl -s ${remotePageFullPath}`
# originContent=`cat ${localPath}/index.html`

targetText='ECharts, a powerful, interactive charting and visualization library for browser'
result=`echo ${pageContent} | grep "${targetText}"`

if [[ "$result" != "" ]]
then
echo "OK.";
else
echo "${remotePageFullPath} ABNORMAL!!!";
exit 1;
fi
}


function checkCodeDownload() {
codePath=$1
remoteCodeFullPath=${ecHomePath}/${codePath}

echo "Checking: ${remoteCodeFullPath} ..."

# Find current version.
# versionFetchRegExp="version:\\s*.\\d\\+[.]\\d\\+[.]\\d\\+"
# Do not use "\d" or "[ ]" in shell, which does not work in online OS.
# see https://en.wikibooks.org/wiki/Regular_Expressions/POSIX_Extended_Regular_Expressions
versionFetchRegExp="version:[[:space:]]*.[[:digit:]]\\+[.][[:digit:]]\\+[.][[:digit:]]\\+"
versionStr=`cat ${localPath}"/config/env.js" | grep -o -e ${versionFetchRegExp}`

if [[ "$versionStr" == "" ]]
then
echo "Error version string in config";
exit 1;
fi

# Remove "version: "
versionStr=`echo $versionStr | sed -n -e "s/[a-zA-Z: ']*//gp"`
echo "echarts version should be: ${versionStr}"
# Replace "." to "[.]"
versionRegExp="version:[[:space:]]*."`echo $versionStr | sed -n -e "s/[.]/[.]/gp"`

codeContent=`curl -s ${remoteCodeFullPath}`

# For example:
# versionRegExp="version:\\s*.3[.]6[.]2"
# Match:
# version: "3.6.2"
# version:"3.6.2"
# version: '3.6.2'
# version:'3.6.2'
result=`echo ${codeContent} | grep -e ${versionRegExp}`

if [[ "$result" != "" ]]
then
echo "OK.";
else
echo "${remoteCodeFullPath} ABNORMAL!!!";
exit 1;
fi
}


for pagePath in ${normalPages[@]}; do
checkNormalPage ${pagePath}
done

for codePath in ${codeDownloadURLs[@]}; do
checkCodeDownload ${codePath}
done

echo "All Correct."
@@ -0,0 +1,86 @@
<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="http://apps.bdimg.com/libs/bootstrap/3.3.4/css/bootstrap.min.css"><!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries--><!--[if lt IE 9]><script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script><script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]--><link rel="stylesheet" type="text/css" href="./css/main.css"><script type="text/javascript" src="./vendors/pace/pace.min.js"></script><script id="font-hack" type="text/javascript">if (/windows/i.test(navigator.userAgent)) {
var el = document.createElement('style');
el.innerHTML = ''
+ '@font-face {font-family:"noto-thin";src:local("Microsoft Yahei");}'
+ '@font-face {font-family:"noto-light";src:local("Microsoft Yahei");}';
document.head.insertBefore(el, document.getElementById('font-hack'));
}
</script><title>ECharts Documentation</title><link rel="stylesheet" type="text/css" href="css/ecOption.css?_v_=1504036309305"><link rel="stylesheet" type="text/css" href="vendors/prettify/prettify.css"><link rel="stylesheet" type="text/css" href="vendors/perfect-scrollbar/0.6.8/css/perfect-scrollbar.min.css"><link rel="stylesheet" type="text/css" href="vendors/jquery-autocomplete/jquery.auto-complete.css"><link rel="stylesheet" type="text/css" href="vendors/twentytwenty/twentytwenty.css"><script src="js/log.js"></script><script src="vendors/prettify/prettify.js"></script><script src="vendors/prettify/lang-css.js"></script><script src="vendors/esl.js"></script><script type="text/javascript" src="./vendors/jquery/jquery.min.js"></script></head><!--[if lte IE 8]><body class="lower-ie"><div id="lowie-main"><img src="./images/forie.png" alt="ie tip"></div></body><![endif]-->
<!--[if (gt IE 8)|!(IE)]><body class="undefined"></body><![endif]--><div id="main"><nav class="navbar navbar-default navbar-fixed-top"><div class="container-fluid"><div class="navbar-header"><button type="button" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false" class="navbar-toggle collapsed"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a href="http://echarts.baidu.com/index.html" class="navbar-brand"><img src="./images/logo.png" alt="echarts logo" class="navbar-logo"></a></div><div id="navbar-collapse" class="collapse navbar-collapse"><ul class="nav navbar-nav navbar-left"><li id="nav-index"><a href="http://echarts.baidu.com/index.html">首页</a></li><li id="nav-doc" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle">文档<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="http://echarts.baidu.com/feature.html">特性</a></li><li><a href="http://echarts.baidu.com/tutorial.html">教程</a></li><li><a href="http://echarts.baidu.com/api.html">API</a></li><li><a href="http://echarts.baidu.com/option.html">配置项手册</a></li><li><a href="http://echarts.baidu.com/option-gl.html">GL 配置项手册</a></li><li><a href="http://echarts.baidu.com/faq.html">常见问题</a></li><li><a href="http://echarts.baidu.com/changelog.html">版本记录</a></li></ul></li><li id="nav-download" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle">下载<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="http://echarts.baidu.com/download.html">下载</a></li><li><a href="http://echarts.baidu.com/download-theme.html">主题下载</a></li><li><a href="http://echarts.baidu.com/download-map.html">地图下载</a></li><li><a href="http://echarts.baidu.com/download-extension.html">扩展下载</a></li></ul></li><li id="nav-examples"><a href="#" data-toggle="dropdown" class="dropdown-toggle">实例<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="http://echarts.baidu.com/examples.html">官方实例</a></li><li><a href="http://gallery.echartsjs.com/explore.html#tags=echarts-gl">GL 实例</a></li></ul></li><li id="nav-community"><a href="#" data-toggle="dropdown" class="dropdown-toggle">社区<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="http://gallery.echartsjs.com">GALLERY</a></li><li><a href="http://efe.baidu.com/tags/ECharts/">博客</a></li></ul></li><li id="nav-tool"><a href="#" data-toggle="dropdown" class="dropdown-toggle">工具<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="http://echarts.baidu.com/spreadsheet.html">表格工具</a></li><li><a href="http://ecomfe.github.io/echarts-map-tool/">地图数据在线工具</a></li><li><a href="http://echarts.baidu.com/theme-builder/">主题构建工具</a></li></ul></li><li id="nav-about"><a href="#" data-toggle="dropdown" class="dropdown-toggle">关于<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="http://echarts.baidu.com/about.html">关于我们</a></li><li><a href="https://github.com/ecomfe/echarts/blob/master/LICENSE">版权声明</a></li></ul></li></ul><ul class="nav navbar-nav navbar-right"><li id="nav-github"><a href="https://github.com/ecomfe/echarts" target="_blank"><img src="http://echarts.baidu.com/images/github.png" width="18"></a></li><li id="nav-2" class="0"><a href="http://echarts.baidu.com/echarts2/">2.0</a></li><li id="nav-homeen"><a href="https://ecomfe.github.io/echarts-doc/public/en/index.html">EN</a></li></ul></div></div></nav><div class="ecdoc-apidoc"></div></div><script type="text/javascript" src="./vendors/bootstrap/js/bootstrap.min.js"></script><script type="text/javascript" src="./js/common.js"></script><script src="vendors/twentytwenty/jquery.event.move.js"></script><script src="vendors/twentytwenty/jquery.twentytwenty.js"></script><script type="text/javascript">window.globalArgsExtra = {
pageName: 'api',
schemaUrl: 'documents/cn/api.json',
initHash: 'echarts',
hideTreeRoot: true,
docTreeChildrenPre: 'API',
docTreeChildrenPost: '',
lang: {
cn: {
queryBoxTextFuzzyPath: 'API搜索',
queryBoxPlaceholderFuzzyPath: 'API名称搜索(快捷键\'/\')'
},
en: {
queryBoxTextFuzzyPath: 'API search',
queryBoxPlaceholderFuzzyPath: 'API search (shortcut: \'/\')'
}
}
};</script><script src="vendors/jquery-autocomplete/jquery.auto-complete.min.js"></script><script type="text/javascript">document.getElementById('nav-doc').className = 'active';

var vendorPath = '../vendors';

define('globalArgs', extend({
version: '1504036309305',
basePath: './',
// Schema url is added by each doc page
schemaUrl: '',
iconfont: {
down: '&#' + parseInt('e600', 16),
up: '&#' + parseInt('e603', 16),
right: '&#' + parseInt('e602', 16),
left: '&#' + parseInt('e604', 16),
handLens: '&#' + parseInt('e601', 16)
}
}, window.globalArgsExtra || {}));

define('prettyPrint', function () {
return prettyPrint;
});

define('ecLog', function () {
// log maybe blocked
if (typeof ecLog === 'undefined') {
ecLog = function () {};
}
return ecLog;
});

require.config({
baseUrl: './js',
paths: {
dt: vendorPath + '/dt/0.0.1',
tpl: vendorPath + '/dt/0.0.1/tplLoader',
etpl: vendorPath + '/etpl/3.0.0/etpl.min',
signals: vendorPath + '/signals/1.0.0/signals.min',
hasher: vendorPath + '/hasher/1.2.0/hasher.min',
perfectScrollbar: vendorPath + '/perfect-scrollbar/0.6.8/js/perfect-scrollbar'
},
urlArgs: '_v_=1504036309305'
});

require(['docTool/main'], function (main) {
main.init();
});

function extend(tar, src) {
for (var name in src) {
if (src.hasOwnProperty(name)) {
tar[name] = src[name];
}
}
return tar;
}</script><script type="text/javascript">var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?4bad1df23f079e0d12bdbef5e65b072f";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();</script></html>

0 comments on commit c363ffb

Please sign in to comment.