[portal-commits] JBoss Portal SVN: r13749 - branches/Enterprise_Portal_Platform_4_3/theme/src/bin/portal-ajax-war/dyna.
Author: thomas.heute(a)jboss.com
Date: 2009-08-12 14:11:08 -0400 (Wed, 12 Aug 2009)
New Revision: 13749
Modified:
branches/Enterprise_Portal_Platform_4_3/theme/src/bin/portal-ajax-war/dyna/dyna.js
Log:
JBEPP-101: Partial refresh does not work with HTTPS
Fix from cpage ! Thanks !
Modified:
branches/Enterprise_Portal_Platform_4_3/theme/src/bin/portal-ajax-war/dyna/dyna.js
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/theme/src/bin/portal-ajax-war/dyna/dyna.js 2009-08-12
15:22:18 UTC (rev 13748)
+++
branches/Enterprise_Portal_Platform_4_3/theme/src/bin/portal-ajax-war/dyna/dyna.js 2009-08-12
18:11:08 UTC (rev 13749)
@@ -71,27 +71,12 @@
{
server_base_url =
server_base_url.substring(0,indexOfSessionId-";jsessionid".length-1);
}
-
- if (url.indexOf("http://") == 0)
- {
- var indexOfSlash = url.indexOf("/", "http://".length);
- if (indexOfSlash < 0)
- {
- return false;
- }
- else if (indexOfSlash > 0)
- {
- var path = url.substring(indexOfSlash);
- if (path.indexOf(server_base_url) != 0)
- {
- return false;
- }
- }
+
+ var base_url_escaped = server_base_url.replace(/\//g,"\\/");
+ var regexp = "/^http[s]{0,1}:\\/\\/[^\\/]*" + base_url_escaped +
".*$|^" + base_url_escaped + "/";
+ if (!url.match(eval(regexp))) {
+ return false;
}
- else if (url.indexOf(server_base_url) != 0)
- {
- return false;
- }
//
return true;