3 files changed, 203 insertions, 201 deletions

diff --git a/framework/Web/Javascripts/prado/controls.js b/framework/Web/Javascripts/prado/controls.js
index bc902178..08b7e94f 100644
--- a/framework/Web/Javascripts/prado/controls.js
+++ b/framework/Web/Javascripts/prado/controls.js
@@ -1,167 +1,51 @@
-Prado.Focus = Class.create();

 

-Prado.Focus.setFocus = function(id)

-{

-	var target = document.getElementById ? document.getElementById(id) : document.all[id];

-	if(target && !Prado.Focus.canFocusOn(target))

-	{

-		target = Prado.Focus.findTarget(target);

-	}

-	if(target)

-	{

-        try

-		{

-            target.focus();

-			target.scrollIntoView(false);

-            if (window.__smartNav)

-			{

-				window.__smartNav.ae = target.id;

-			}

-		}

-        catch (e)

-		{

-		}

-	}

-}

 

-Prado.Focus.canFocusOn = function(element)

-{

-	if(!element || !(element.tagName))

-		return false;

-	var tagName = element.tagName.toLowerCase();

-	return !element.disabled && (!element.type || element.type.toLowerCase() != "hidden") && Prado.Focus.isFocusableTag(tagName) && Prado.Focus.isVisible(element);

-}

+Prado.Button = Class.create();

 

-Prado.Focus.isFocusableTag = function(tagName)

+/**

+ * Usage: Event.observe("panelID", "keypress", Prado.fireButton.bindEvent($("panelID"), "targetButtonID"));

+ */

+Object.extend(Prado.Button,

 {

-	return (tagName == "input" || tagName == "textarea" || tagName == "select" || tagName == "button" || tagName == "a");

-}

-

-

-Prado.Focus.findTarget = function(element)

-{

-	if(!element || !(element.tagName))

-	{

-		return null;

-	}

-	var tagName = element.tagName.toLowerCase();

-	if (tagName == "undefined")

-	{

-		return null;

-	}

-	var children = element.childNodes;

-	if (children)

-	{

-		for(var i=0;i<children.length;i++)

-		{

-			try

+	buttonFired : false,

+	fireButton : function(e, target)

+	{

+		var eventFired = !this.buttonFired && Event.keyCode(e) == Event.KEY_RETURN;

+		var isTextArea = Event.element(e).targName.toLowerCase() == "textarea";

+		if (eventFired && !isTextArea)

+        {

+			var defaultButton = $(target);

+			if (defaultButton)

 			{

-				if(Prado.Focus.canFocusOn(children[i]))

-				{

-					return children[i];

-				}

-				else

-				{

-					var target = Prado.Focus.findTarget(children[i]);

-					if(target)

-					{

-						return target;

-					}

-				}

+				Prado.Button.buttonFired = true;

+				Event.fireEvent(defaultButton,"click");

+				Event.stop(e);

+				return false;

 			}

-			catch (e)

-			{

-			}

-		}

-	}

-	return null;

-}

-

-Prado.Focus.isVisible = function(element)

-{

-	var current = element;

-	while((typeof(current) != "undefined") && (current != null))

-	{

-		if(current.disabled || (typeof(current.style) != "undefined" && ((typeof(current.style.display) != "undefined" && current.style.display == "none") || (typeof(current.style.visibility) != "undefined" && current.style.visibility == "hidden") )))

-		{

-			return false;

-		}

-		if(typeof(current.parentNode) != "undefined" &&	current.parentNode != null && current.parentNode != current && current.parentNode.tagName.toLowerCase() != "body")

-		{

-			current = current.parentNode;

-		}

-		else

-		{

-			return true;

-		}

+        }

+        return true;

 	}

-    return true;

-}

+});

 

+Prado.TextBox = Class.create();

 

-Prado.doPostBack = function(formID, eventTarget, eventParameter, performValidation, validationGroup, actionUrl, trackFocus, clientSubmit)

+/**

+ * Usage: Event.observe("textboxID", "keypress", Prado.fireButton.bindEvent($("textboxID")));

+ */

+Object.extend(Prado.TextBox,

 {

-	if (typeof(performValidation) == 'undefined')

-	{

-		var performValidation = false;

-		var validationGroup = '';

-		var actionUrl = null;

-		var trackFocus = false;

-		var clientSubmit = true;

-	}

-	var theForm = document.getElementById ? document.getElementById(formID) : document.forms[formID];

-	var canSubmit = true;

-    if (performValidation)

-	{

-		//canSubmit = Prado.Validation.validate(validationGroup);

-	/*	Prado.Validation.ActiveTarget = theForm;

-		Prado.Validation.CurrentTargetGroup = null;

-		Prado.Validation.IsGroupValidation = false;

-		canSubmit = Prado.Validation.IsValid(theForm);

-		Logger.debug(canSubmit);*/

-		canSubmit = Prado.Validation.IsValid(theForm);

-	}

-	if (canSubmit)

+	handleReturnKey : function(e)

 	{

-		if (actionUrl != null && (actionUrl.length > 0))

-		{

-			theForm.action = actionUrl;

-		}

-		if (trackFocus)

-		{

-			var lastFocus = theForm.elements['PRADO_LASTFOCUS'];

-			if ((typeof(lastFocus) != 'undefined') && (lastFocus != null))

+        if(Event.keyCode(e) == Event.KEY_RETURN)

+        {

+			var target = Event.element(e);

+			if(target)

 			{

-				var active = document.activeElement;

-				if (typeof(active) == 'undefined')

-				{

-					lastFocus.value = eventTarget;

-				}

-				else

-				{

-					if ((active != null) && (typeof(active.id) != 'undefined'))

-					{

-						if (active.id.length > 0)

-						{

-							lastFocus.value = active.id;

-						}

-						else if (typeof(active.name) != 'undefined')

-						{

-							lastFocus.value = active.name;

-						}

-					}

-				}

+				Event.fireEvent(target, "change");

+				Event.stop(e);

+				return false;

 			}

 		}

-		if (!clientSubmit)

-		{

-			canSubmit = false;

-		}

-	}

-	if (canSubmit && (!theForm.onsubmit || theForm.onsubmit()))

-	{

-		theForm.PRADO_POSTBACK_TARGET.value = eventTarget;

-		theForm.PRADO_POSTBACK_PARAMETER.value = eventParameter;

-		theForm.submit();

+		return true;

 	}

-}
\ No newline at end of file
+});

diff --git a/framework/Web/Javascripts/prado/form.js b/framework/Web/Javascripts/prado/form.js
new file mode 100644
index 00000000..810acbd8
--- /dev/null
+++ b/framework/Web/Javascripts/prado/form.js
@@ -0,0 +1,167 @@
+Prado.Focus = Class.create();

+

+Prado.Focus.setFocus = function(id)

+{

+	var target = document.getElementById ? document.getElementById(id) : document.all[id];

+	if(target && !Prado.Focus.canFocusOn(target))

+	{

+		target = Prado.Focus.findTarget(target);

+	}

+	if(target)

+	{

+        try

+		{

+            target.focus();

+			target.scrollIntoView(false);

+            if (window.__smartNav)

+			{

+				window.__smartNav.ae = target.id;

+			}

+		}

+        catch (e)

+		{

+		}

+	}

+}

+

+Prado.Focus.canFocusOn = function(element)

+{

+	if(!element || !(element.tagName))

+		return false;

+	var tagName = element.tagName.toLowerCase();

+	return !element.disabled && (!element.type || element.type.toLowerCase() != "hidden") && Prado.Focus.isFocusableTag(tagName) && Prado.Focus.isVisible(element);

+}

+

+Prado.Focus.isFocusableTag = function(tagName)

+{

+	return (tagName == "input" || tagName == "textarea" || tagName == "select" || tagName == "button" || tagName == "a");

+}

+

+

+Prado.Focus.findTarget = function(element)

+{

+	if(!element || !(element.tagName))

+	{

+		return null;

+	}

+	var tagName = element.tagName.toLowerCase();

+	if (tagName == "undefined")

+	{

+		return null;

+	}

+	var children = element.childNodes;

+	if (children)

+	{

+		for(var i=0;i<children.length;i++)

+		{

+			try

+			{

+				if(Prado.Focus.canFocusOn(children[i]))

+				{

+					return children[i];

+				}

+				else

+				{

+					var target = Prado.Focus.findTarget(children[i]);

+					if(target)

+					{

+						return target;

+					}

+				}

+			}

+			catch (e)

+			{

+			}

+		}

+	}

+	return null;

+}

+

+Prado.Focus.isVisible = function(element)

+{

+	var current = element;

+	while((typeof(current) != "undefined") && (current != null))

+	{

+		if(current.disabled || (typeof(current.style) != "undefined" && ((typeof(current.style.display) != "undefined" && current.style.display == "none") || (typeof(current.style.visibility) != "undefined" && current.style.visibility == "hidden") )))

+		{

+			return false;

+		}

+		if(typeof(current.parentNode) != "undefined" &&	current.parentNode != null && current.parentNode != current && current.parentNode.tagName.toLowerCase() != "body")

+		{

+			current = current.parentNode;

+		}

+		else

+		{

+			return true;

+		}

+	}

+    return true;

+}

+

+

+Prado.doPostBack = function(formID, eventTarget, eventParameter, performValidation, validationGroup, actionUrl, trackFocus, clientSubmit)

+{

+	if (typeof(performValidation) == 'undefined')

+	{

+		var performValidation = false;

+		var validationGroup = '';

+		var actionUrl = null;

+		var trackFocus = false;

+		var clientSubmit = true;

+	}

+	var theForm = document.getElementById ? document.getElementById(formID) : document.forms[formID];

+	var canSubmit = true;

+    if (performValidation)

+	{

+		//canSubmit = Prado.Validation.validate(validationGroup);

+	/*	Prado.Validation.ActiveTarget = theForm;

+		Prado.Validation.CurrentTargetGroup = null;

+		Prado.Validation.IsGroupValidation = false;

+		canSubmit = Prado.Validation.IsValid(theForm);

+		Logger.debug(canSubmit);*/

+		canSubmit = Prado.Validation.IsValid(theForm);

+	}

+	if (canSubmit)

+	{

+		if (actionUrl != null && (actionUrl.length > 0))

+		{

+			theForm.action = actionUrl;

+		}

+		if (trackFocus)

+		{

+			var lastFocus = theForm.elements['PRADO_LASTFOCUS'];

+			if ((typeof(lastFocus) != 'undefined') && (lastFocus != null))

+			{

+				var active = document.activeElement;

+				if (typeof(active) == 'undefined')

+				{

+					lastFocus.value = eventTarget;

+				}

+				else

+				{

+					if ((active != null) && (typeof(active.id) != 'undefined'))

+					{

+						if (active.id.length > 0)

+						{

+							lastFocus.value = active.id;

+						}

+						else if (typeof(active.name) != 'undefined')

+						{

+							lastFocus.value = active.name;

+						}

+					}

+				}

+			}

+		}

+		if (!clientSubmit)

+		{

+			canSubmit = false;

+		}

+	}

+	if (canSubmit && (!theForm.onsubmit || theForm.onsubmit()))

+	{

+		theForm.PRADO_POSTBACK_TARGET.value = eventTarget;

+		theForm.PRADO_POSTBACK_PARAMETER.value = eventParameter;

+		theForm.submit();

+	}

+}

diff --git a/framework/Web/Javascripts/prado/prado.js b/framework/Web/Javascripts/prado/prado.js
index 52bf2b89..90ddbe8d 100644
--- a/framework/Web/Javascripts/prado/prado.js
+++ b/framework/Web/Javascripts/prado/prado.js
@@ -1,51 +1,2 @@
 var Prado = { Version: '3.0a' };

 

-Prado.Button = Class.create();

-

-/**

- * Usage: Event.observe("panelID", "keypress", Prado.fireButton.bindEvent($("panelID"), "targetButtonID"));

- */

-Object.extend(Prado.Button,

-{

-	buttonFired : false,

-	fireButton : function(e, target)

-	{

-		var eventFired = !this.buttonFired && Event.keyCode(e) == Event.KEY_RETURN;

-		var isTextArea = Event.element(e).targName.toLowerCase() == "textarea";

-		if (eventFired && !isTextArea)

-        {

-			var defaultButton = $(target);

-			if (defaultButton)

-			{

-				Prado.Button.buttonFired = true;

-				Event.fireEvent(defaultButton,"click");

-				Event.stop(e);

-				return false;

-			}

-        }

-        return true;

-	}

-});

-

-Prado.TextBox = Class.create();

-

-/**

- * Usage: Event.observe("textboxID", "keypress", Prado.fireButton.bindEvent($("textboxID")));

- */

-Object.extend(Prado.TextBox,

-{

-	handleReturnKey = function(e)

-	{

-        if(Event.keyCode(e) == Event.KEY_RETURN)

-        {

-			var target = Event.element(e);

-			if(target)

-			{

-				Event.fireEvent(target, "change");

-				Event.stop(e);

-				return false;

-			}

-		}

-		return true;

-	}

-});