From 66c5913d5b8668923136f2369cd6246c2aa0ab69 Mon Sep 17 00:00:00 2001 From: Kirill Lebedev Date: Mon, 3 Sep 2012 14:46:03 +0300 Subject: [PATCH] fixes #72 Parameters for default selections should be available --- lib/world-map.js | 7 +++++++ tests/index.html | 1 + tests/markers.html | 5 ++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/world-map.js b/lib/world-map.js index 45ff882f..8fdde9dd 100644 --- 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 index 21e0bec8..502a236e 100644 --- a/tests/index.html +++ b/tests/index.html @@ -29,6 +29,7 @@ + diff --git a/tests/markers.html b/tests/markers.html index 0feded91..5afbb03f 100644 --- 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');