From 708f0b3c80a268c1f08239b88cd72e51bf244f61 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Thu, 15 Dec 2011 23:48:11 +0800
Subject: [PATCH] Make it so that blank label ("") on area marker disables
 popup on area

---
 web/js/markers.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/web/js/markers.js b/web/js/markers.js
index 3b0cf841..270134ee 100644
--- a/web/js/markers.js
+++ b/web/js/markers.js
@@ -125,18 +125,19 @@ componentconstructors['markers'] = function(dynmap, configuration) {
 			}
 		}
 		area.timestamp = ts;
-		var popup = document.createElement('div');
-		if(area.desc) {
-			$(popup).addClass('AreaPopup').append(area.desc);
+		if(area.label != "") {
+			var popup = document.createElement('div');
+			if(area.desc) {
+				$(popup).addClass('AreaPopup').append(area.desc);
+			}
+			else if(area.markup) {
+				$(popup).addClass('AreaPopup').append(area.label);
+			}
+			else {
+				$(popup).text(area.label);
+			}
+			area.our_area.bindPopup(popup, {});
 		}
-		else if(area.markup) {
-			$(popup).addClass('AreaPopup').append(area.label);
-		}
-		else {
-			$(popup).text(area.label);
-		}		
-		area.our_area.bindPopup(popup, {});
-		
 		set.layergroup.addLayer(area.our_area);
 	}