update chapter popup

maptime · Jun 25, 2015 · 0d0cc53 · 0d0cc53
1 parent 91bc87b
commit 0d0cc53
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/js/chapters.js b/js/chapters.js
@@ -32,9 +32,15 @@ $(function() {
 
     var chapterMarkers = L.geoJson( data, {
       onEachFeature: function (feature, layer) {
-	    var popupOptions = {'maxWidth' : '1000'};  
-        var popupContent = '<h2>'+ feature.properties.title +'</h2>' + 'Twitter: ' + 
-          '<a href="http://twitter.com/' + feature.properties.twitter + '" target="_blank">@' + feature.properties.twitter +'</a>';
+        var popupOptions = {'maxWidth' : '1000'};  
+        var popupContent = '<h2>'+ feature.properties.title +'</h2>';
+        if (feature.properties.location && feature.properties.location.length  > 0) {
+          popupContent = popupContent + '<h3>'+ feature.properties.location +'</h3>';
+        }
+        if (feature.properties.twitter && feature.properties.twitter.length  > 0) {
+          popupContent = popupContent + 'Twitter: ' + '<a href="http://twitter.com/' + 
+            feature.properties.twitter + '" target="_blank">@' + feature.properties.twitter +'</a>';
+        }
         layer.bindPopup(popupContent,popupOptions);
         layer.setIcon(new L.Icon({
           iconUrl:'/img/maptime-marker.png',