From b8779f4a6a581cb378368eac398a262047397472 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Sat, 6 Jan 2007 03:36:40 +0000
Subject: Fixed #485.

---
 framework/Web/Javascripts/js/debug/ajax.js  | 11 ++++++++++-
 framework/Web/Javascripts/js/debug/prado.js |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'framework/Web/Javascripts/js/debug')

diff --git a/framework/Web/Javascripts/js/debug/ajax.js b/framework/Web/Javascripts/js/debug/ajax.js
index c2822f10..9b1046ba 100644
--- a/framework/Web/Javascripts/js/debug/ajax.js
+++ b/framework/Web/Javascripts/js/debug/ajax.js
@@ -734,7 +734,7 @@ Prado.CallbackRequest.prototype =
 	/**
 	 * Callback URL, same url as the current page.
 	 */
-		this.url = window.location.href;
+		this.url = this.getCallbackUrl();
 
 		/**
 		 * Current callback request.
@@ -758,6 +758,15 @@ Prado.CallbackRequest.prototype =
 		}, options || {});
 	},
 
+	/**
+	 * Gets the url from the forms that contains the PRADO_PAGESTATE
+	 * @return {String} callback url.
+	 */
+	getCallbackUrl : function()
+	{
+		return $('PRADO_PAGESTATE').form.action;
+	},
+
 	/**
 	 * Sets the request parameter
 	 * @param {Object} parameter value
diff --git a/framework/Web/Javascripts/js/debug/prado.js b/framework/Web/Javascripts/js/debug/prado.js
index ca95bfbb..9a6cc823 100644
--- a/framework/Web/Javascripts/js/debug/prado.js
+++ b/framework/Web/Javascripts/js/debug/prado.js
@@ -3023,8 +3023,8 @@ Prado.Element =
 
 	extractContent : function(text, boundary)
 	{
-		f = RegExp('(<!--'+boundary+'-->)([\\s\\S\\w\\W]*)(<!--//'+boundary+'-->)',"m");
-		result = text.match(f);
+		var f = RegExp('(<!--'+boundary+'-->)([\\s\\S\\w\\W]*)(<!--//'+boundary+'-->)',"m");
+		var result = text.match(f);
 		if(result && result.length >= 2)
 			return result[2];
 		else
-- 
cgit v1.2.3