[Mapbender-commits] r6379 - trunk/mapbender/lib

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-06-22 10:04:53 +0000 (Tue, 22 Jun 2010)
New Revision: 6379

Modified:
   trunk/mapbender/lib/wizard.js
Log:


Modified: trunk/mapbender/lib/wizard.js
===================================================================
--- trunk/mapbender/lib/wizard.js	2010-06-22 10:02:46 UTC (rev 6378)
+++ trunk/mapbender/lib/wizard.js	2010-06-22 10:04:53 UTC (rev 6379)
@@ -44,10 +44,6 @@
 		};
 
 		var clickHandler = function (e, $t) {
-			var proceed = o.onBeforeClickLink(e, $t);
-			if (!proceed) {
-				return;
-			}
 			getPath($t);
 			navigate($t);
 			e.preventDefault();
@@ -81,14 +77,13 @@
 			if (abort || !found) {
 				return;
 			}
-			
-			if (typeof o.onBeforeClickLink === "function") {
-				var proceed = o.onBeforeClickLink($target);
-				if (!proceed) {
-					new Mapbender.Warning("Clicked link " + href + " in wizard " + wizardInstance.id + " aborted!");
-					return;
-				}
+
+			var proceed = o.onBeforeClickLink(e, $t);
+			if (!proceed) {
+				new Mapbender.Warning("Clicked link " + href + " in wizard " + wizardInstance.id + " aborted!");
+				return;
 			}
+			
 			new Mapbender.Warning("Clicked link " + href + " in wizard " + wizardInstance.id);
 			clickHandler(e, $target);
 		});