1.1.2 release

blueblueblue · Aug 23, 2013 · 9d7fdde · 9d7fdde
1 parent daef8fa
commit 9d7fdde
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 74 deletions.
diff --git a/doc/asset/js/echartsExample.js b/doc/asset/js/echartsExample.js
@@ -59,49 +59,59 @@ function needMap() {
            || href.indexOf('mix5') != -1;
 
 }
-//*
-require.config({
-    packages: [
-        {
-            name: 'echarts',
-            location: '../../src',
-            main: 'echarts'
-        },
-        {
-            name: 'zrender',
-            //location: 'http://ecomfe.github.io/zrender/src',
-            location: '../../../zrender/src',
-            main: 'zrender'
-        }
-    ]
-});
-//*/
-/*
-require.config({
-    paths:{ 
-        echarts: needMap() ? './www/js/echarts-map' : './www/js/echarts'
-    }
-});
-*/
 
 var echarts;
-require(
-    [
-        'echarts'   ,
-        'echarts/chart/line',
-        'echarts/chart/bar',
-        'echarts/chart/scatter',
-        'echarts/chart/k',
-        'echarts/chart/pie',
-        'echarts/chart/map',
-        'echarts/chart/force'
-    ],
-    function(ec) {
-        echarts = ec;
-        if (myChart && myChart.dispose) {
-            myChart.dispose();
+var developMode = true;
+
+if (developMode) {
+    // for develop
+    require.config({
+        packages: [
+            {
+                name: 'echarts',
+                location: '../../src',
+                main: 'echarts'
+            },
+            {
+                name: 'zrender',
+                //location: 'http://ecomfe.github.io/zrender/src',
+                location: '../../../zrender/src',
+                main: 'zrender'
+            }
+        ]
+    });
+    require(
+        [
+            'echarts'   ,
+            'echarts/chart/line',
+            'echarts/chart/bar',
+            'echarts/chart/scatter',
+            'echarts/chart/k',
+            'echarts/chart/pie',
+            'echarts/chart/map',
+            'echarts/chart/force'
+        ],
+        requireCallback
+    );
+}
+else {
+    // for echarts online home page
+    require.config({
+        paths:{ 
+            echarts: needMap() ? './www/js/echarts-map' : './www/js/echarts'
         }
-        myChart = echarts.init(domMain);
-        refresh();
+    });
+    require(
+        ['echarts'],
+        requireCallback
+    );
+}
+
+function requireCallback (ec) {
+    echarts = ec;
+    if (myChart && myChart.dispose) {
+        myChart.dispose();
     }
-)
+    myChart = echarts.init(domMain);
+    refresh();
+}
diff --git a/doc/example/loading.html b/doc/example/loading.html
@@ -199,7 +199,7 @@
         */
         require.config({
             paths:{ 
-                echarts:'./www/js/echarts'
+                echarts:'./www/js/echarts-map'
             }
         });
 

diff --git a/doc/example/map.html b/doc/example/map.html
@@ -187,8 +187,7 @@
                 {name: '海南',value: Math.round(Math.random()*1000)},
                 {name: '台湾',value: Math.round(Math.random()*1000)},
                 {name: '香港',value: Math.round(Math.random()*1000)},
-                {name: '澳门',value: Math.round(Math.random()*1000)},
-                {name: '南海诸岛',value: Math.round(Math.random()*1000)}
+                {name: '澳门',value: Math.round(Math.random()*1000)}
             ]
         }
     ]

diff --git a/doc/example/map1.html b/doc/example/map1.html
@@ -149,8 +149,7 @@
                 {name: '海南',value: Math.round(Math.random()*1000)},
                 {name: '台湾',value: Math.round(Math.random()*1000)},
                 {name: '香港',value: Math.round(Math.random()*1000)},
-                {name: '澳门',value: Math.round(Math.random()*1000)},
-                {name: '南海诸岛',value: Math.round(Math.random()*1000)}
+                {name: '澳门',value: Math.round(Math.random()*1000)}
             ]
         },
         {

diff --git a/doc/example/mix3.html b/doc/example/mix3.html
@@ -139,8 +139,7 @@
                 {name: '海南',value: Math.round(Math.random()*1000)},
                 {name: '台湾',value: Math.round(Math.random()*1000)},
                 {name: '香港',value: Math.round(Math.random()*1000)},
-                {name: '澳门',value: Math.round(Math.random()*1000)},
-                {name: '南海诸岛',value: Math.round(Math.random()*1000)}
+                {name: '澳门',value: Math.round(Math.random()*1000)}
             ]
         },
         {

diff --git a/doc/slide/css/theme/default.css b/doc/slide/css/theme/default.css
@@ -1,4 +1,6 @@
+/*
 @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic);
+*/
 /**
  * Default theme for reveal.js.
  *

diff --git a/doc/slide/js/echarts.js b/doc/slide/js/echarts.js
diff --git a/doc/slide/js/whyEcharts.js b/doc/slide/js/whyEcharts.js
@@ -1,23 +1,6 @@
-/*
-require.config({
-    packages: [
-        {
-            name: 'echarts',
-            location: '../../src',
-            main: 'echarts'
-        },
-        {
-            name: 'zrender',
-            location: 'http://ecomfe.github.io/zrender/src',
-            //location: '../../../zrender/src',
-            main: 'zrender'
-        }
-    ]
-});
-*/
 require.config({
     paths:{ 
-        echarts:'../../build/echarts',
+        echarts:'./js/echarts',
         webkitDep : '../../doc/example/webkit-dep',
     }
 });
@@ -344,8 +327,7 @@ var optionMap = {
                     {name: '海南',value: Math.round(Math.random()*1000)},
                     {name: '台湾',value: Math.round(Math.random()*1000)},
                     {name: '香港',value: Math.round(Math.random()*1000)},
-                    {name: '澳门',value: Math.round(Math.random()*1000)},
-                    {name: '南海诸岛',value: Math.round(Math.random()*1000)}
+                    {name: '澳门',value: Math.round(Math.random()*1000)}
                 ]
             }
         ]
@@ -1079,8 +1061,8 @@ var optionMap = {
                 },
                 selectedMode : 'multiple',
                 itemStyle:{
-                    normal:{label:{show:true,textStyle:{fontSize:16}}},
-                    emphasis:{label:{show:true,textStyle:{fontSize:16}}}
+                    normal:{label:{show:true}},
+                    emphasis:{label:{show:true}}
                 },
                 data:[
                     {name: '北京',value: 790,selected:true},
@@ -1116,8 +1098,7 @@ var optionMap = {
                     {name: '海南',value: Math.round(Math.random()*1000)},
                     {name: '台湾',value: Math.round(Math.random()*1000)},
                     {name: '香港',value: Math.round(Math.random()*1000)},
-                    {name: '澳门',value: Math.round(Math.random()*1000)},
-                    {name: '南海诸岛',value: Math.round(Math.random()*1000)}
+                    {name: '澳门',value: Math.round(Math.random()*1000)}
                 ]
             },
             {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "echarts",
     "description": "Enterprise Charts，基于Canvas，纯Javascript图表库，提供直观，生动，可交互，可个性化定制的数据可视化表。",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "maintainers": [
         { "name": "Kener", "email": "[email protected]" },
         { "name": "Pissang", "email": "[email protected]" }
-Original file line number
+Diff line change
@@ Expand Up / @@ -199,7 +199,7 @@ @@
             */
             require.config({
                 paths:{
-                    echarts:'./www/js/echarts'
+                    echarts:'./www/js/echarts-map'
                 }
             });
@@ Expand Down @@