From 01592a72fd28002536025b903682f50598118fe2 Mon Sep 17 00:00:00 2001
From: Vincent Broute <neveldo@gmail.com>
Date: Sun, 22 Sep 2013 12:46:49 +0200
Subject: [PATCH] Improved handling of callbacks with events

---
 examples.js         | 58 +++++++++++++++++++++++++++++++++++++++++----
 js/jquery.mapael.js | 25 +++++++++----------
 2 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/examples.js b/examples.js
index fcb395b53..79f14f9db 100644
--- a/examples.js
+++ b/examples.js
@@ -12,6 +12,9 @@ $(function(){
 	$(".maparea2").mapael({
 		map : {
 			name : "france_departments"
+			, zoom: {
+				enabled: true
+			}
 		},
 		areas: {
 			"department-56" : {
@@ -50,30 +53,74 @@ $(function(){
 	$(".maparea3").mapael({
 		map : {
 			name : "france_departments", 
+			zoom : {
+				enabled : true
+			},
 			defaultArea: {
 				attrs : {
 					fill: "#5ba4ff",
 					stroke: "#99c7ff",
 					cursor: "pointer"
 				},
+				attrsHover : {
+					animDuration:0
+				},
 				textAttrs : {
 					cursor: "pointer",
+					"font-size" : 10,
 					fill :"#000"
 				},
-				onclick: function(params, mapElem, textElem) {
-					mapElem.attr({fill: '#ff0000'});
+				textAttrsHover : {
+					animDuration:0
+				},
+				eventHandlers : {
+					click: function(id, mapElem, textElem) {
+						var newData = {'areas' : {}};
+						if (mapElem.originalAttrs.fill == "#5ba4ff") {
+							newData.areas[id] = {
+								attrs : {
+									fill : "#0088db"
+								}
+							};
+						} else {
+							newData.areas[id] = {
+								attrs : {
+									fill : "#5ba4ff"
+								}
+							};
+						}
+						$(".maparea3").trigger('update', [newData, false, false, 0]);
+					}
 				}
 			}
 		},
 		areas: {
 			"department-29" : {
-				text : "29", 
+				text : "dblclick", 
 				attrs : {
 					fill :"#0088db"
 				},
+				textPosition: "top",
 				tooltip: {content : "Finistère (29)"},
-				onclick: function(params, mapElem, textElem) {
-					mapElem.attr({fill: '#24ff00'});
+				eventHandlers : {
+					click: function() {},
+					dblclick: function(id, mapElem, textElem) {
+						var newData = {'areas' : {}};
+						if (mapElem.originalAttrs.fill == "#5ba4ff") {
+							newData.areas[id] = {
+								attrs : {
+									fill : "#0088db"
+								}
+							};
+						} else {
+							newData.areas[id] = {
+								attrs : {
+									fill : "#5ba4ff"
+								}
+							};
+						}
+						$(".maparea3").trigger('update', [newData, false, false, 0]);
+					}
 				}
 			}
 		}
@@ -97,6 +144,7 @@ $(function(){
 			area : {
 				display : true,
 				title :"Population of France by department", 
+				labelAttrs : {title : "Hide the matching departments"},
 				slices : [
 					{
 						max :300000, 
diff --git a/js/jquery.mapael.js b/js/jquery.mapael.js
index 7e432f97b..629f9b2eb 100644
--- a/js/jquery.mapael.js
+++ b/js/jquery.mapael.js
@@ -99,7 +99,7 @@
 						}
 					};
 				
-				if (!animDuration) animDuration = 300;
+				if (typeof animDuration == "undefined") animDuration = 300;
 				if (!easing) easing = 'linear';
 				if (resetAreas) options.areas = {};
 				if (resetPlots) options.plots = {};
@@ -235,11 +235,11 @@
 			options.href && $.fn.mapael.setHref(elem.textElem, options.href);
 			$.fn.mapael.setHoverOptions(elem.textElem, options.textAttrs, options.textAttrsHover);
 			$.fn.mapael.setHover(paper, elem.mapElem, elem.textElem);
-			$.fn.mapael.setCallbacks(options, elem.mapElem, elem.textElem);
+			options.eventHandlers && $.fn.mapael.setEventHandlers(id, options, elem.mapElem, elem.textElem);
 			$(elem.textElem.node).attr('class', id);
 		} else {
 			$.fn.mapael.setHover(paper, elem.mapElem);
-			$.fn.mapael.setCallbacks(options, elem.mapElem);
+			options.eventHandlers && $.fn.mapael.setEventHandlers(id, options, elem.mapElem);
 		}
 		
 		if (options.tooltip && options.tooltip.content) {
@@ -289,21 +289,18 @@
 	};
 	
 	/**
-	* Set user defined callbacks on areas and plots
+	* Set user defined handlers for events on areas and plots
+	* @param id the id of the element 
 	* @param elemOptions the element parameters
 	* @param mapElem the map element to set callback on
 	* @param textElem the optional text within the map element
 	*/
-	$.fn.mapael.setCallbacks = function(elemOptions, mapElem, textElem) {
-		var availableCallbacks = ['click', 'mouseover', 'mouseout']
-			, callbackFct = {};
-			
-		for(var i = 0, length = availableCallbacks.length; i < length; ++i) {
-			if (elemOptions["on" + availableCallbacks[i]]) {
-				callbackFct = elemOptions["on" + availableCallbacks[i]];
-				$(mapElem.node).on(availableCallbacks[i], function() {!$.fn.mapael.panning && callbackFct(elemOptions, mapElem, textElem)});
-				textElem && $(textElem.node).on(availableCallbacks[i], function() {!$.fn.mapael.panning && callbackFct(elemOptions, mapElem, textElem)});
-			}
+	$.fn.mapael.setEventHandlers = function(id, elemOptions, mapElem, textElem) {
+		for(var event in elemOptions.eventHandlers) {
+			(function(event) {
+				$(mapElem.node).on(event, function() {!$.fn.mapael.panning && elemOptions.eventHandlers[event](id, mapElem, textElem)});
+				textElem && $(textElem.node).on(event, function() {!$.fn.mapael.panning && elemOptions.eventHandlers[event](id, mapElem, textElem)});
+			})(event);
 		}
 	}