例子更新

simcn · Mar 25, 2014 · 6f184b4 · 6f184b4
1 parent b13bdff
commit 6f184b4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/doc/asset/js/echartsTheme.js b/doc/asset/js/echartsTheme.js
@@ -5,14 +5,22 @@ var theme = 'erik';
 $('[name=theme-select]').on('change', function(){selectChange(this.value);});
 
 function selectChange(value){
-    window.location.hash = value;
+
     theme = value;
     showLoading();
     $('[name=theme-select]').val(theme);
-    require(['theme/' + theme], function(curTheme){
-        theme = curTheme;
+    if (theme != 'default') {
+        window.location.hash = value;
+        require(['theme/' + theme], function(curTheme){
+            theme = curTheme;
+            setTimeout(refreshAll, 500);
+        })
+    }
+    else {
+        window.location.hash = '';
+        theme = {};
         setTimeout(refreshAll, 500);
-    })
+    }
 }
 
 function showLoading() {
@@ -65,7 +73,7 @@ else {
     });
 }
 
-var hash = window.location.hash.replace('#','') || 'default';
+var hash = window.location.hash.replace('#','') || 'erik';
 if ($('[name=theme-select]').val(hash).val() != hash) {
     $('[name=theme-select]').val('erik');
     hash = 'erik';

diff --git a/doc/example/map1.html b/doc/example/map1.html
@@ -112,7 +112,7 @@
             type: 'map',
             mapType: 'china',
             itemStyle:{
-                normal:{label:{show:true}, color:'#ffd700'},// for legend
+                normal:{label:{show:true}},
                 emphasis:{label:{show:true}}
             },
             data:[
@@ -157,7 +157,7 @@
             type: 'map',
             mapType: 'china',
             itemStyle:{
-                normal:{label:{show:true}, color:'#ff8c00'},// for legend
+                normal:{label:{show:true}},
                 emphasis:{label:{show:true}}
             },
             data:[
@@ -187,7 +187,7 @@
             type: 'map',
             mapType: 'china',
             itemStyle:{
-                normal:{label:{show:true}, color:'#da70d6'},// for legend
+                normal:{label:{show:true}},
                 emphasis:{label:{show:true}}
             },
             data:[

diff --git a/doc/example/map4.html b/doc/example/map4.html
@@ -106,6 +106,7 @@
         min: 0,
         max: 1000000,
         text:['High','Low'],
+        realtime: false,
         calculable : true,
         color: ['orangered','yellow','lightskyblue']
     },

diff --git a/doc/example/map6.html b/doc/example/map6.html
@@ -103,6 +103,7 @@
         min: 800,
         max: 50000,
         text:['High','Low'],
+        realtime: false,
         calculable : true,
         color: ['orangered','yellow','lightskyblue']
     },

diff --git a/doc/example/theme.html b/doc/example/theme.html
@@ -77,6 +77,7 @@
                     <option name='gray'>gray</option>
                     <option name='green'>green</option>
                     <option name='red'>red</option>
+                    <option name='default'>default</option>
                 </select>
             </div>
             <button class="btn btn-info span4" type="button" onclick="saveAsImage()">Save As Image</button>
@@ -133,6 +134,7 @@
                     <option name='gray'>gray</option>
                     <option name='green'>green</option>
                     <option name='red'>red</option>
+                    <option name='default'>default</option>
                 </select>
             </div>
             <button class="btn btn-info span4" type="button" onclick="saveAsImage()">Save As Image</button>