Author: mageshbk(a)jboss.com
Date: 2009-04-22 05:42:34 -0400 (Wed, 22 Apr 2009)
New Revision: 13259
Modified:
branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-60/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java
branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-60/theme/src/bin/portal-ajax-war/dyna/dyna.js
Log:
[JBEPP-60] - Merged JBEPP-34 Partial refresh is not updating the content
Modified:
branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-60/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java
===================================================================
---
branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-60/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java 2009-04-22
08:50:27 UTC (rev 13258)
+++
branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-60/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java 2009-04-22
09:42:34 UTC (rev 13259)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -25,11 +25,11 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
import org.jboss.portal.core.controller.ControllerContext;
-import org.jboss.portal.core.model.portal.PortalObjectPath;
import org.jboss.portal.core.model.portal.Window;
import
org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand;
import org.jboss.portal.core.model.portal.command.response.MarkupResponse;
import org.jboss.portal.core.model.portal.content.WindowRendition;
+import org.jboss.portal.portlet.impl.jsr168.PortletUtils;
import org.jboss.portal.server.ServerInvocationContext;
import org.jboss.portal.server.request.URLContext;
import org.jboss.portal.server.request.URLFormat;
@@ -84,7 +84,7 @@
//
return new WindowContext(
- window.getId().toString(PortalObjectPath.LEGACY_BASE64_FORMAT),
+ PortletUtils.generateNamespaceFrom(window.getId().toString()),
region,
order,
windowResult);
Modified:
branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-60/theme/src/bin/portal-ajax-war/dyna/dyna.js
===================================================================
---
branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-60/theme/src/bin/portal-ajax-war/dyna/dyna.js 2009-04-22
08:50:27 UTC (rev 13258)
+++
branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-60/theme/src/bin/portal-ajax-war/dyna/dyna.js 2009-04-22
09:42:34 UTC (rev 13259)
@@ -225,13 +225,13 @@
*/
function copyInnerHTML(srcContainer, dstContainer, className)
{
- var srcs = Element.getElementsByClassName(srcContainer, className);
+ var srcs = srcContainer.select("." + className);
if (srcs.length == 1)
{
var src = srcs[0];
//
- var dsts = Element.getElementsByClassName(dstContainer, className)
+ var dsts = dstContainer.select("." + className);
if (dsts.length == 1)
{
var dst = dsts[0];