Index: trunk/admin/toolbar.php
===================================================================
diff -u -r721 -r822
--- trunk/admin/toolbar.php	(.../toolbar.php)	(revision 721)
+++ trunk/admin/toolbar.php	(.../toolbar.php)	(revision 822)
@@ -174,22 +174,29 @@
     function GetActionHandlerScript()
     { 	
     	$o = '';
-    	if(strlen($this->DoubleClickAction)>0)
+
+		$o .= "function handleDoubleClick()\n{\n";
+    	
+		if(strlen($this->DoubleClickAction)>0)
     	{
-			$o .= "function handleDoubleClick()\n{\n";
 			$o .= "  ".$this->DoubleClickAction."\n";
-			$o .= "}\n\n";
     	}
-			if(count($this->ContextMenu))
+    	else {
+    		$o .= 'return';
+    	}
+		
+    	$o .= "}\n\n";
+    	
+		if(count($this->ContextMenu))
+		{
+			$o .= "function initContextMenu()\n{\n";
+  			$o .= "  window.contextMenu = new Menu(\"Context\");";
+			for($x=0;$x<count($this->ContextMenu);$x++)
 			{
-				$o .= "function initContextMenu()\n{\n";
-      			$o .= "  window.contextMenu = new Menu(\"Context\");";
-				for($x=0;$x<count($this->ContextMenu);$x++)
-				{
-					$o .= "  ".$this->ContextMenu[$x]."\n";
-				}
-				$o .= "  window.triedToWriteMenus = false;\n  window.contextMenu.writeMenus();\n  return true;\n}\n";
+				$o .= "  ".$this->ContextMenu[$x]."\n";
 			}
+			$o .= "  window.triedToWriteMenus = false;\n  window.contextMenu.writeMenus();\n  return true;\n}\n";
+		}
     	return $o;
     }