From 70f0a7fae5cec1dc62430e29a6cce83ed1d49f6d Mon Sep 17 00:00:00 2001
From: "haertl.mike" <>
Date: Tue, 28 Oct 2008 16:41:52 +0000
Subject: Fixed issue 4 (trac ticket 900)

---
 HISTORY                                               |  1 +
 .../source/prado/activecontrols/activecontrols3.js    |  1 +
 .../Web/Javascripts/source/prado/controls/controls.js | 19 ++++++++++++++-----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/HISTORY b/HISTORY
index 4c7319ce..41ab2093 100644
--- a/HISTORY
+++ b/HISTORY
@@ -19,6 +19,7 @@ BUG: Ticket#872 - use PATH_SEPARATOR in phpunit.php (fragmaster b)
 BUG: Ticket#886 - TSimpleDateFormatter: One month offset in time stamp with date pattern "yyyy" (Knut)
 BUG: Ticket#897 - TSimpleDateFormatter: If no YearPattern is set it should default to current year (Knut)
 BUG: Ticket#899 - TSqlCriteria: SQL-statements with limit and offset doesn't work (Knut)
+BUG: Ticket#900 - TDataGrid with TRequireFieldValidator and TEditCommandColumn interaction error (Michael)
 BUG: Ticket#904 - TDbConnection: Add emulate prepares workaround for boolean compares (Knut)
 BUG: Ticket#908 - TDbCache::init / Exception (Knut)
 BUG: Ticket#922 - Problem with TUrlMapping and urlencoding (Michael)
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
index aa1fd99b..d5cae7b8 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
@@ -28,6 +28,7 @@ Prado.WebUI.TActiveImageButton = Class.extend(Prado.WebUI.TImageButton,
 		var request = new Prado.CallbackRequest(options.EventTarget, options);
 		request.dispatch();
 		Event.stop(event);
+		this.removeXYInput(event,options);
 	}
 });
 /**
diff --git a/framework/Web/Javascripts/source/prado/controls/controls.js b/framework/Web/Javascripts/source/prado/controls/controls.js
index bea18e76..dac7a0c0 100644
--- a/framework/Web/Javascripts/source/prado/controls/controls.js
+++ b/framework/Web/Javascripts/source/prado/controls/controls.js
@@ -69,12 +69,9 @@ Object.extend(Prado.WebUI.TImageButton.prototype,
 	 */
 	onPostBack : function(event, options)
 	{
-		if(!this.hasXYInput)
-		{
-			this.addXYInput(event,options);
-			this.hasXYInput = true;
-		}
+		this.addXYInput(event,options);
 		Prado.PostBack(event, options);
+		this.removeXYInput(event,options);
 	},
 
 	/**
@@ -111,6 +108,18 @@ Object.extend(Prado.WebUI.TImageButton.prototype,
 			y_input = INPUT({type:'hidden',name:id+'_y','id':id+'_y',value:y});
 			this.element.parentNode.appendChild(y_input);
 		}
+	},
+
+	/**
+	 * Remove hidden inputs for x,y-click capturing
+	 * @param event DOM click event.
+	 * @param array image button options.
+	 */
+	removeXYInput : function(event,options)
+	{
+		id = options['EventTarget'];
+		this.element.parentNode.removeChild($(id+"_x"));
+		this.element.parentNode.removeChild($(id+"_y"));
 	}
 });
 
-- 
cgit v1.2.3