fixes bjornd#72 Parameters for default selections should be available

Automattic · Sep 3, 2012 · 66c5913 · 66c5913
1 parent 7b67203
commit 66c5913
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/lib/world-map.js b/lib/world-map.js
@@ -123,6 +123,13 @@ jvm.WorldMap = function(params) {
     }
   }
 
+  if (this.params.selectedRegions) {
+    this.setSelectedRegions(this.params.selectedRegions);
+  }
+  if (this.params.selectedMarkers) {
+    this.setSelectedMarkers(this.params.selectedMarkers);
+  }
+
   if (this.params.series) {
     this.createSeries();
   }

diff --git a/tests/index.html b/tests/index.html
@@ -29,6 +29,7 @@
 
   <script src="../lib/vector-canvas.js"></script>
   <script src="../lib/numeric-scale.js"></script>
+  <script src="../lib/ordinal-scale.js"></script>
   <script src="../lib/color-scale.js"></script>
   <script src="../lib/data-series.js"></script>
   <script src="../lib/proj.js"></script>

diff --git a/tests/markers.html b/tests/markers.html
@@ -88,6 +88,8 @@
         },
         regionsSelectable: true,
         markersSelectable: true,
+        selectedRegions: JSON.parse( window.localStorage.getItem('jvectormap-selected-regions') || '[]' ),
+        selectedMarkers: JSON.parse( window.localStorage.getItem('jvectormap-selected-markers') || '[]' ),
 
         onMarkerLabelShow: function(event, label, index){
           label.html(label.html()+' (modified marker)');
@@ -134,9 +136,6 @@
         }
       });
 
-      map.setSelectedRegions( JSON.parse( window.localStorage.getItem('jvectormap-selected-regions') || '[]' ) );
-      map.setSelectedMarkers( JSON.parse( window.localStorage.getItem('jvectormap-selected-markers') || '[]' ) );
-
       $('.list-markers :checkbox').change(function(){
         var index = $(this).closest('li').attr('data-marker-index');