From 5ba6cd4be568f686d890835a77586077cde1a943 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 25 Apr 2006 01:31:43 +0000
Subject: Merge from 3.0 branch till 967.

---
 framework/Web/Javascripts/extended/event.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'framework/Web/Javascripts/extended')

diff --git a/framework/Web/Javascripts/extended/event.js b/framework/Web/Javascripts/extended/event.js
index 40cf60a1..13e875da 100644
--- a/framework/Web/Javascripts/extended/event.js
+++ b/framework/Web/Javascripts/extended/event.js
@@ -95,9 +95,10 @@ Object.extend(Event,
         else if(element.fireEvent)
         {
             element.fireEvent('on'+type);
-            element[type]();
+            if(element[type])
+	            element[type]();
         }
-        else
+        else if(element[type])
             element[type]();
 	}
 });
\ No newline at end of file
-- 
cgit v1.2.3