# HG changeset patch # User Matti Hamalainen # Date 1394627282 -7200 # Node ID 2a2a5e992b9f94b302dce446a365b37313184211 # Parent 06a62216428f3fe52a378ffad43ea205d180e986 Fix some errors of accessing nonexisting elements. diff -r 06a62216428f -r 2a2a5e992b9f markers.js --- a/markers.js Wed Mar 12 14:27:35 2014 +0200 +++ b/markers.js Wed Mar 12 14:28:02 2014 +0200 @@ -39,7 +39,7 @@ var pmapMMgr; var pmapAreas = []; var pmapMarkers = []; -var pmapMIndex = 0; +var pmapMIndex; var pmapMarkerInfo = []; var pmapSideBuiltinHTML, pmapSidePublicHTML, pmapSidePrivateHTML; var pmapInfoWindow; @@ -143,6 +143,7 @@ function pmapLoadMarkers() { + pmapMIndex = 0; pmapInfoWindow = new google.maps.InfoWindow; google.maps.event.addListener(pmap, 'click', function() @@ -290,9 +291,13 @@ { for (var i = 0; i < pmapMarkerInfo.length; i++) { - var show = markerVisStates[pmapMarkerInfo[i][0]] && markerVisStates[pmapMarkerInfo[i][1]]; - document.getElementById("marker" + i).style.display = show ? "block" : "none"; - pmapMarkers[i].setVisible(show); + var elem = document.getElementById("marker" + i); + if (elem) + { + var show = markerVisStates[pmapMarkerInfo[i][0]] && markerVisStates[pmapMarkerInfo[i][1]]; + elem.style.display = show ? "block" : "none"; + pmapMarkers[i].setVisible(show); + } } }