Merge from 3.0 branch till 1004.

2 files changed, 4 insertions, 4 deletions

diff --git a/framework/Web/Javascripts/js/prado.js b/framework/Web/Javascripts/js/prado.js
index d80f984d..498a6cf7 100644
--- a/framework/Web/Javascripts/js/prado.js
+++ b/framework/Web/Javascripts/js/prado.js
@@ -256,7 +256,7 @@ selection[method](isList?element:el,value);},click:function(element)
 {var el=$(element);if(!el)return;if(document.createEvent)
 {var evt=document.createEvent('HTMLEvents');evt.initEvent('click',true,true);el.dispatchEvent(evt);}
 else if(el.fireEvent)
-{el.fireEvent('onclick');if(isFunction(el.onclick))
+{el.fireEvent('onclick');if(typeof(el.onclick)=="function")
 el.onclick();}},setAttribute:function(element,attribute,value)
 {var el=$(element);if(attribute=="disabled"&&value==false)
 el.removeAttribute(attribute);else
@@ -265,7 +265,7 @@ el.setAttribute(attribute,value);},setOptions:function(element,options)
 {while(el.length>0)
 el.remove(0);for(var i=0;i<options.length;i++)
 el.options[el.options.length]=new Option(options[i][0],options[i][1]);}},focus:function(element)
-{var obj=$(element);if(isObject(obj)&&isdef(obj.focus))
+{var obj=$(element);if(typeof(obj)!="undefined"&&typeof(obj.focus)!="undefined")
 setTimeout(function(){obj.focus();},100);return false;}}
 Prado.Element.Selection={inputValue:function(el,value)
 {switch(el.type.toLowerCase())
diff --git a/framework/Web/Javascripts/prado/element.js b/framework/Web/Javascripts/prado/element.js
index fc84e4b1..06937253 100644
--- a/framework/Web/Javascripts/prado/element.js
+++ b/framework/Web/Javascripts/prado/element.js
@@ -38,7 +38,7 @@ Prado.Element =
         else if(el.fireEvent)

 		{

             el.fireEvent('onclick');

-			if(isFunction(el.onclick))

+			if(typeof(el.onclick) == "function")

 				el.onclick();

 		}

 	},

@@ -71,7 +71,7 @@ Prado.Element =
 	focus : function(element)

 	{

 		var obj = $(element);

-		if(isObject(obj) && isdef(obj.focus))

+		if(typeof(obj) != "undefined" && typeof(obj.focus) != "undefined")

 			setTimeout(function(){ obj.focus(); }, 100);

 		return false;

 	}