1.1.2 release

example页面升级

doc/asset/css/flexslider.css

+/*
+ * jQuery FlexSlider v2.0
+ * http://www.woothemes.com/flexslider/
+ *
+ * Copyright 2012 WooThemes
+ * Free to use under the GPLv2 license.
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Contributing author: Tyler Smith (@mbmufffin)
+ */
+
+ 
+/* Browser Resets */
+.flex-container a:active,
+.flexslider a:active,
+.flex-container a:focus,
+.flexslider a:focus  {outline: none;}
+.slides,
+.flex-control-nav,
+.flex-direction-nav {margin: 0; padding: 0; list-style: none;} 
+
+/* FlexSlider Necessary Styles
+*********************************/ 
+.flexslider {margin: 0; padding: 0;overflow:hidden;}
+.flexslider .slides > li {display: none; -webkit-backface-visibility: hidden;} /* Hide the slides before the JS is loaded. Avoids image jumping */
+.flexslider .slides img {width: 100%; display: block;}
+.flex-pauseplay span {text-transform: capitalize;}
+
+/* Clearfix for the .slides element */
+.slides:after {content: "."; display: block; clear: both; visibility: hidden; line-height: 0; height: 0;} 
+html[xmlns] .slides {display: block;} 
+* html .slides {height: 1%;}
+
+/* No JavaScript Fallback */
+/* If you are not using another script, such as Modernizr, make sure you
+ * include js that eliminates this class on page load */
+.no-js .slides > li:first-child {display: block;}
+
+
+/* FlexSlider Default Theme
+*********************************/
+.flexslider {margin: 0 0 60px; background: #fff; border: 1px solid #c3e7fd; position: relative; -webkit-border-radius: 4px; -moz-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; box-shadow: 0 1px 4px rgba(0,0,0,.2); -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.2); -moz-box-shadow: 0 1px 4px rgba(0,0,0,.2); -o-box-shadow: 0 1px 4px rgba(0,0,0,.2); zoom: 1;}
+.flex-viewport {max-height: 2000px; -webkit-transition: all 1s ease; -moz-transition: all 1s ease; transition: all 1s ease;}
+.loading .flex-viewport {max-height: 300px;}
+.flexslider .slides {zoom: 1;}
+
+.carousel li {margin-right: 5px}
+
+
+/* Direction Nav */
+.flex-direction-nav a {width: 30px; height: 30px; margin: -20px 0 0; display: block; background: url(../img/bg_direction_nav.png) no-repeat 0 0; position: absolute; top: 50%; cursor: pointer; text-indent: -9999px; opacity: 0; -webkit-transition: all .3s ease;}
+.flex-direction-nav .flex-next {background-position: 100% 0; right: -36px; }
+.flex-direction-nav .flex-prev {left: -36px;}
+.flexslider:hover .flex-next {opacity: 0.8; right: 5px;}
+.flexslider:hover .flex-prev {opacity: 0.8; left: 5px;}
+.flexslider:hover .flex-next:hover, .flexslider:hover .flex-prev:hover {opacity: 1;}
+.flex-direction-nav .disabled {opacity: .3!important; filter:alpha(opacity=30); cursor: default;}
+
+/* Control Nav */
+.flex-control-nav {width: 100%; position: absolute; bottom: -40px; text-align: center;}
+.flex-control-nav li {margin: 0 6px; display: inline-block; zoom: 1; *display: inline;}
+.flex-control-paging li a {width: 11px; height: 11px; display: block; background: #666; background: rgba(0,0,0,0.5); cursor: pointer; text-indent: -9999px; -webkit-border-radius: 20px; -moz-border-radius: 20px; -o-border-radius: 20px; border-radius: 20px; box-shadow: inset 0 0 3px rgba(0,0,0,0.3);}
+.flex-control-paging li a:hover { background: #333; background: rgba(0,0,0,0.7); }
+.flex-control-paging li a.flex-active { background: #000; background: rgba(0,0,0,0.9); cursor: default; }
+
+.flex-control-thumbs {margin: 5px 0 0; position: static; overflow: hidden;}
+.flex-control-thumbs li {width: 25%; float: left; margin: 0;}
+.flex-control-thumbs img {width: 100%; display: block; opacity: .8; cursor: pointer;border-bottom:10px solid #fff}
+.flex-control-thumbs img:hover {opacity: 1;border-bottom:10px solid #90ee90}
+.flex-control-thumbs img.active {opacity: 1; cursor: default;}
+img.flex-active {border-bottom:10px solid #c3e7fd}
+
+@media screen and (max-width: 860px) {
+  .flex-direction-nav .flex-prev {opacity: 1; left: 0;}
+  .flex-direction-nav .flex-next {opacity: 1; right: 0;}
+}
+
+.thumb5 .flex-control-thumbs li {width: 20%;}
+.thumb3 .flex-control-thumbs li {width: 33.3%;}
+.thumb2 .flex-control-thumbs li {width: 50%;}
+.slides p{
+    font-weight: bolder;
+    text-align:center;
+    background-color:#c3e7fd;
+}
\ No newline at end of file

doc/asset/js/bootstrap-transition.js

@@ -60,5 +60,5 @@
 }(window.jQuery);
 
 var lrl = document.getElementById('last-release-link');
-lrl.href = 'https://github.com/ecomfe/echarts/archive/1.1.1.zip';
-lrl.innerHTML = 'ZIP (1.1.1)'
\ No newline at end of file
+lrl.href = 'https://github.com/ecomfe/echarts/archive/1.1.2.zip';
+lrl.innerHTML = 'ZIP (1.1.2)'
\ No newline at end of file

doc/asset/js/echartsExample.js

@@ -51,6 +51,14 @@ function refresh(isBtnRefresh){
     myChart.setOption(option, true);
     domMessage.innerHTML = '';
 }
+
+function needMap() {
+    var href = location.href;
+    return href.indexOf('map') != -1
+           || href.indexOf('mix3') != -1
+           || href.indexOf('mix5') != -1;
+
+}
 //*
 require.config({
     packages: [
@@ -71,7 +79,7 @@ require.config({
 /*
 require.config({
     paths:{ 
-        echarts:'./www/js/echarts'
+        echarts: needMap() ? './www/js/echarts-map' : './www/js/echarts'
     }
 });
 */

doc/changelog.html

@@ -64,12 +64,17 @@
         <span>[+]新增 [-]删除 [^]升级 [#]修复 【】重要</span>
         <div class="row-fluid">
             <div>
-                <h3>undergoing</h3>
+                <h3>1.1.2</h3>
                 <ul>
+                    <li>【+】 [map] 新增全国34个省市自治区地图支持</li>
                     <li>[^] [tooltip] 坐标轴指示器样式可配，新增shadow样式，见tooltip.axisPointer</li>
                     <li>[^] [tooltip] 显示延迟（showDelay）、隐藏延迟（hideDelay）、缓动时长（transitionDuration）开放可配置</li>
                     <li>[^] [legend] 可配置默认选中状态</li>
-                    
+                    <li>[^] [pie] 饼图默认起始角改为90度（12点钟方向）</li>
+                    <li>[^] [line] symbolRotate图形标志支持旋转</li>
+                    <li>[+] 单文件构建工具</li>
+                    <li>[#] [dataRange] 修正值域控件颜色拾取</li>
+                    <li>[#] [toolbox] 保存图片显示位置居中修正</li>
                 </ul>
             </div>
             <div>

index.html

@@ -71,7 +71,7 @@
           <div class="container">
             <div class="carousel-caption">
               <h1>ECharts</h1>
-              <h6>（1.1.1 <a href="doc/changelog.html" target="_blank" class="link">Changelog</a>）</h6>
+              <h6>（1.1.2 <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>

src/util/mapData/textFixed.js

@@ -12,7 +12,17 @@ define(function() {
         '北京': [-10, 0, 732],
         '天津': [0, 5, 732],
         '上海': [0, 5, 732],
-        '山西': [-5, 0, 732],
+        '山西': [-10, 0, 732],
+        '河南': [-10, 0, 732],
+        '河北': [-10, -5, 732],
+        '山东': [-10, 0, 732],
+        '安徽': [-10, 0, 732],
+        '江西': [-15, -5, 732],
+        '浙江': [-10, 0, 732],
+        '福建': [-10, 0, 732],
+        '江苏': [-10, 0, 732],
+        '湖南': [-10, 0, 732],
+        '陕西': [-15, 20, 732],
         '黑龙江': [0, 15, 732],
         // 广东
         '深圳市': [-40, 0, 4772],